Merge pull request #368 from openreplay/dev

1.5.3 fixes

frontend/app/components/Funnels/FunnelHeader/FunnelHeader.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Icon, BackLink, IconButton, Dropdown, Popup, TextEllipsis, Button } from 'UI';
 import { remove as deleteFunnel, fetch, fetchInsights, fetchIssuesFiltered, fetchSessionsFiltered } from 'Duck/funnels';
-import { applyFilter } from 'Duck/funnelFilters';
+import { editFilter, addFilter } from 'Duck/funnels';
 import DateRange from 'Shared/DateRange';
 import { connect } from 'react-redux';
 import { confirm } from 'UI/Confirmation';
@@ -18,23 +18,18 @@ const Info = ({ label = '', value = '', className = 'mx-4' }) => {
 }
 
 const FunnelHeader = (props) => {
-  const { funnelFilters, funnel, insights, funnels, onBack, funnelId, showFilters = false, renameHandler } = props;
+  const { funnel, insights, funnels, onBack, funnelId, showFilters = false, renameHandler } = props;
 
   const [showSaveModal, setShowSaveModal] = useState(false)
 
-  const writeOption = (e, { name, value }) => {    
+  const writeOption = (e, { name, value }) => {
     props.fetch(value)
+    props.fetchInsights(value, {})
+    props.fetchIssuesFiltered(value, {})
+    props.fetchSessionsFiltered(value, {})
     props.redirect(value)
   }
 
-  useEffect(() => {
-    if (funnel.funnelId && funnel.funnelId !== funnelId) {
-      props.fetchInsights(funnel.funnelId, {})
-      props.fetchIssuesFiltered(funnel.funnelId, {})
-      props.fetchSessionsFiltered(funnel.funnelId, {})
-    }
-  }, [funnel])
-
   const deleteFunnel = async (e, funnel) => {
     e.preventDefault();
     e.stopPropagation();
@@ -49,7 +44,7 @@ const FunnelHeader = (props) => {
   }
   
   const onDateChange = (e) => {
-    props.applyFilter(e, funnel.funnelId)
+    props.editFilter(e, funnel.funnelId);
   }
 
   const options = funnels.map(({ funnelId, name }) => ({ text: name, value: funnelId })).toJS();
@@ -75,7 +70,7 @@ const FunnelHeader = (props) => {
             className={ stl.dropdown }
             name="funnel"
             value={ parseInt(funnelId) }
-            icon={null}
+            // icon={null}
             onChange={ writeOption }
             selectOnBlur={false}
             icon={ <Icon name="chevron-down" color="gray-dark" size="14" className={stl.dropdownIcon} /> }
@@ -104,9 +99,9 @@ const FunnelHeader = (props) => {
             />            
           </div>
           <DateRange
-            rangeValue={funnelFilters.rangeValue}
-            startDate={funnelFilters.startDate}
-            endDate={funnelFilters.endDate}
+            rangeValue={funnel.filter.rangeValue}
+            startDate={funnel.filter.startDate}
+            endDate={funnel.filter.endDate}
             onDateChange={onDateChange}
             customRangeRight
           />
@@ -117,5 +112,5 @@ const FunnelHeader = (props) => {
 }
 
 export default connect(state => ({
-  funnelFilters: state.getIn([ 'funnels', 'instance' ]),
-}), { applyFilter, deleteFunnel, fetch, fetchInsights, fetchIssuesFiltered, fetchSessionsFiltered })(FunnelHeader)
+  funnel: state.getIn([ 'funnels', 'instance' ]),
+}), { editFilter, deleteFunnel, fetch, fetchInsights, fetchIssuesFiltered, fetchSessionsFiltered })(FunnelHeader)

frontend/app/components/shared/SaveFunnelButton/SaveFunnelButton.tsx

@@ -1,14 +1,24 @@
 import React, { useState } from 'react';
 import { IconButton } from 'UI';
 import FunnelSaveModal from 'App/components/Funnels/FunnelSaveModal';
-
-export default function SaveFunnelButton() {
+import { connect } from 'react-redux';
+import { init } from 'Duck/funnels';
+interface Props {
+  filter: any
+  init: (instance: any) => void
+}
+function SaveFunnelButton(props: Props) {
   const [showModal, setshowModal] = useState(false)
+
+  const handleClick = () => {
+    props.init({ filter: props.filter })
+    setshowModal(true)
+  }
   return (
     <div>
         <IconButton
             className="mr-2"
-            onClick={() => setshowModal(true)} primaryText label="SAVE FUNNEL" icon="funnel"
+            onClick={handleClick} primaryText label="SAVE FUNNEL" icon="funnel"
         />
 
         <FunnelSaveModal
@@ -18,3 +28,7 @@ export default function SaveFunnelButton() {
     </div>
   )
 }
+
+export default connect(state => ({
+  filter: state.getIn(['search', 'instance']),
+}), { init })(SaveFunnelButton);

frontend/app/duck/funnelFilters.js

@@ -112,9 +112,9 @@ const reducer = (state = initialState, action = {}) => {
       return action.fromUrl 
         ? state.set('appliedFilter', 
             Filter(action.filter)
-            .set('events', state.getIn([ 'appliedFilter', 'events' ]))
+            // .set('events', state.getIn([ 'appliedFilter', 'events' ]))
           )
-          : state.mergeIn(['instance'], action.filter);
+          : state.mergeIn(['instance', 'filter'], action.filter);
     case ADD_CUSTOM_FILTER:
       return state.update('customFilters', vars => vars.set(action.filter, action.value));
     case REMOVE_CUSTOM_FILTER:

frontend/app/duck/search.js

@@ -60,7 +60,6 @@ function reducer(state = initialState, action = {}) {
     case EDIT:
       return state.mergeIn(['instance'], action.instance);
     case APPLY:
-      console.log('APPLY', action.filter);
       return action.fromUrl 
         ? state.set('instance', Filter(action.filter))
         : state.mergeIn(['instance'], action.filter);