♻️ fixed cmfeedback with new name

WilliamsRizzi · WilliamsRizzi · commit 0b96f6b4846f · 2020-07-03T08:07:45.000+02:00
diff --git a/src/__tests__/actions/ServerActions.test.js b/src/__tests__/actions/ServerActions.test.js
@@ -15,7 +15,7 @@ import {
     getDecodingDf,
     getEncodedUniqueValues,
     getRetrainValues,
-    getCfFeedbackValues,
+    getCmFeedbackValues,
     getModels,
     postPrediction,
     postReplay,
@@ -29,11 +29,11 @@ import {splitFailed, splitsFailed, splitsRetrieved, splitSucceeded} from '../../
 import {limeValueListFailed, limeValueListRetrieved, shapValueListRetrieved,
      shapValueListFailed, iceValueListRetrieved, iceValueListFailed,
       skaterValueListRetrieved, skaterValueListFailed, retrainValueListRetrieved,
-       retrainValueListFailed, cffeedbackValueListRetrieved,
-        cffeedbackValueListFailed} from '../../actions/ExplanationActions';
+       retrainValueListFailed, cmfeedbackValueListRetrieved,
+        cmfeedbackValueListFailed} from '../../actions/ExplanationActions';
 import {limeTemporalStabilityResult, encodedUniqueDFResultList, temporalStabilityResult,
     limeList, shapResult, iceResultList, skaterResult,
-    retrainResult, cfFeedbackResult, decodedDFResultList, traceList} from '../../../stories/Explanation';
+    retrainResult, cmFeedbackResult, decodedDFResultList, traceList} from '../../../stories/Explanation';
 import {temporalLimePredictionListRetrieved, temporalPredictionListRetrieved,
      temporalPredictionListFailed, temporalLimePredictionListFailed} from '../../actions/PredictionAction';
 import {modelsRetrieved, modelsFailed} from '../../actions/ModelActions';
@@ -511,24 +511,24 @@ describe('ServerActions', function () {
         });
     });
 
-    describe('getCfFeedbackValues', () => {
-        it('dispatches CfFeedbackValues on success', () => {
-            mockXHR.responseText = JSON.stringify(cfFeedbackResult);
+    describe('getCmFeedbackValues', () => {
+        it('dispatches CmFeedbackValues on success', () => {
+            mockXHR.responseText = JSON.stringify(cmFeedbackResult);
 
-            getCfFeedbackValues({jobId: 1, attribute: 'Age'})(dispatch);
+            getCmFeedbackValues({jobId: 1, attribute: 'Age'})(dispatch);
             mockXHR.onreadystatechange();
 
             expect(dispatch.mock.calls[0][0])
-            .toEqual(cffeedbackValueListRetrieved(cfFeedbackResult));
+            .toEqual(cmfeedbackValueListRetrieved(cmFeedbackResult));
         });
-        it('dispatches CfFeedbackValues on error', () => {
+        it('dispatches CmFeedbackValues on error', () => {
             standardError(mockXHR);
 
-            getCfFeedbackValues({jobId: 1, traceId: 1})(dispatch);
+            getCmFeedbackValues({jobId: 1, traceId: 1})(dispatch);
             mockXHR.onreadystatechange();
 
             expect(dispatch.mock.calls[0][0])
-                .toEqual(cffeedbackValueListFailed(error.error));
+                .toEqual(cmfeedbackValueListFailed(error.error));
         });
     });
 });
diff --git a/src/__tests__/components/explanation/CfFeedback.test.js b/src/__tests__/components/explanation/CfFeedback.test.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 import CircularProgress from 'react-md/lib/Progress/CircularProgress';
-import {retrainResult, cfFeedbackResult, uniqueEncodedDecodedValues} from '../../../../stories/Explanation';
-import CfFeedback from '../../../components/explanation/CfFeedback';
+import {retrainResult, cmFeedbackResult, uniqueEncodedDecodedValues} from '../../../../stories/Explanation';
+import CmFeedback from '../../../components/explanation/CmFeedback';
 import RetrainResultTable from '../../../components/explanation/RetrainResultTable';
 import {TextField, SelectField} from 'react-md';
 import CfFeedbackResulttTable from '../../../components/explanation/CfFeedbackResulttTable';
@@ -11,17 +11,17 @@ import {getUniqueFeatureValues, getFeatureNames, encodePatternsForDropdown} from
 const onSubmitTopK = jest.fn();
 const onSubmitFeatureNamesAndValues = jest.fn();
 
-describe('CfFeedback result', () => {
+describe('CmFeedback result', () => {
     it('All data loaded', () => {
-        const element = shallow(<CfFeedback
+        const element = shallow(<CmFeedback
             jobId = {1}
-            cfFeedbackValue={cfFeedbackResult}
+            cfFeedbackValue={cmFeedbackResult}
             isCfFeedbackValuesLoaded={true}
             isRetrainValuesLoaded={true}
             isEncodedUniqueValuesLoaded={true}
             retrainValue={retrainResult}
             featureNames={getFeatureNames(uniqueEncodedDecodedValues)}
-            patterns={encodePatternsForDropdown(cfFeedbackResult[1])}
+            patterns={encodePatternsForDropdown(cmFeedbackResult[1])}
             featureValues={getUniqueFeatureValues(uniqueEncodedDecodedValues)}
             onSubmitTopK={onSubmitTopK}
             onSubmitFeatureNamesAndValues={onSubmitFeatureNamesAndValues}/>);
@@ -38,15 +38,15 @@ describe('CfFeedback result', () => {
     });
 
      it('None of the data loaded', () => {
-        const element = shallow(<CfFeedback
+        const element = shallow(<CmFeedback
             jobId = {1}
-            cfFeedbackValue={cfFeedbackResult}
+            cfFeedbackValue={cmFeedbackResult}
             isCfFeedbackValuesLoaded={false}
             isRetrainValuesLoaded={false}
             isEncodedUniqueValuesLoaded={false}
             retrainValue={retrainResult}
             featureNames={getFeatureNames(uniqueEncodedDecodedValues)}
-            patterns={encodePatternsForDropdown(cfFeedbackResult[1])}
+            patterns={encodePatternsForDropdown(cmFeedbackResult[1])}
             featureValues={getUniqueFeatureValues(uniqueEncodedDecodedValues)}
             onSubmitTopK={onSubmitTopK}
             onSubmitFeatureNamesAndValues={onSubmitFeatureNamesAndValues}/>);
diff --git a/src/__tests__/components/explanation/CfFeedbackResultTable.test.js b/src/__tests__/components/explanation/CfFeedbackResultTable.test.js
@@ -2,15 +2,15 @@ import React from 'react';
 import {shallow} from 'enzyme';
 import {DataTable, TableBody, TableColumn, TableHeader, TablePagination, TableRow} from 'react-md/lib/DataTables/index';
 import CfFeedbackResultTable from '../../../components/explanation/CfFeedbackResultTable';
-import {cfFeedbackResult} from '../../../../stories/Explanation';
+import {cmFeedbackResult} from '../../../../stories/Explanation';
 import {SelectField} from 'react-md';
 
 const onSelectedMatrixChange = jest.fn();
 
 describe('Cf feedback result Table', () => {
     it('renders', () => {
         const element = shallow(<CfFeedbackResultTable
-                                    cfFeedbackResult={cfFeedbackResult[1]}
+                                    cfFeedbackResult={cmFeedbackResult[1]}
                                     onSelectedMatrixChange={onSelectedMatrixChange}
                                     selectedMatrix={'All'}
                                     />);
diff --git a/src/__tests__/components/explanation/CfFeedbackResulttTable.test.js b/src/__tests__/components/explanation/CfFeedbackResulttTable.test.js
@@ -2,15 +2,15 @@ import React from 'react';
 import {shallow} from 'enzyme';
 import {DataTable, TableBody, TableColumn, TableHeader, TablePagination, TableRow} from 'react-md/lib/DataTables/index';
 import CfFeedbackResulttTable from '../../../components/explanation/CfFeedbackResulttTable';
-import {cfFeedbackResult} from '../../../../stories/Explanation';
+import {cmFeedbackResult} from '../../../../stories/Explanation';
 import {SelectField} from 'react-md';
 
 const onSelectedMatrixChange = jest.fn();
 
 describe('Cf feedback result Table', () => {
     it('renders', () => {
         const element = shallow(<CfFeedbackResulttTable
-                                    cfFeedbackResult={cfFeedbackResult[1]}
+                                    cfFeedbackResult={cmFeedbackResult[1]}
                                     onSelectedMatrixChange={onSelectedMatrixChange}
                                     selectedMatrix={'All'}
                                     />);
diff --git a/src/__tests__/reducers/Explanation.test.js b/src/__tests__/reducers/Explanation.test.js
@@ -3,11 +3,11 @@ import {limeValueListRequested, limeValueListRetrieved, limeValueListFailed,
     shapValueListFailed, shapValueListRequested, shapValueListRetrieved,
     iceValueListFailed, iceValueListRequested, iceValueListRetrieved,
     skaterValueListFailed, skaterValueListRequested, skaterValueListRetrieved,
-    cffeedbackValueListFailed, cffeedbackValueListRequested, cffeedbackValueListRetrieved,
+    cmfeedbackValueListFailed, cmfeedbackValueListRequested, cmfeedbackValueListRetrieved,
     retrainValueListFailed, retrainValueListRequested,
     retrainValueListRetrieved} from '../../actions/ExplanationActions';
 import {limeList, shapResult, iceResultList, skaterResult,
-     retrainResult, cfFeedbackResult} from '../../../stories/Explanation';
+     retrainResult, cmFeedbackResult} from '../../../stories/Explanation';
 
 
 const initialState = {
@@ -16,13 +16,13 @@ const initialState = {
     shapValueList: {},
     iceValueList: {},
     skaterValueList: {},
-    cfFeedbackValue: {},
+    cmFeedbackValue: {},
     retrainValue: {},
     isLimeValuesLoaded: true,
     isShapValuesLoaded: true,
     isSkaterValuesLoaded: true,
     isIceValuesLoaded: true,
-    isCfFeedbackLoaded: true,
+    isCmFeedbackLoaded: true,
     isRetrainLoaded: true,
 };
 
@@ -123,46 +123,46 @@ describe('Explanation reducer', () => {
         });
     });
 
-    describe('CfFeedback Value requested', () => {
-        const stateWithRequest = explanation(undefined, cffeedbackValueListRequested());
+    describe('CmFeedback Value requested', () => {
+        const stateWithRequest = explanation(undefined, cmfeedbackValueListRequested());
 
-        it('changes fetchState when CfFeedback requesting', () => {
+        it('changes fetchState when CmFeedback requesting', () => {
             expect(stateWithRequest.fetchState).toEqual({inFlight: true});
-            expect(stateWithRequest.isCfFeedbackLoaded).toEqual(false);
+            expect(stateWithRequest.isCmFeedbackLoaded).toEqual(false);
         });
 
-        it('changes fetchState when CfFeedback request completed', () => {
-            const state2 = explanation(stateWithRequest, cffeedbackValueListRetrieved(cfFeedbackResult));
+        it('changes fetchState when CmFeedback request completed', () => {
+            const state2 = explanation(stateWithRequest, cmfeedbackValueListRetrieved(cmFeedbackResult));
             expect(state2.fetchState).toEqual({inFlight: false});
-            expect(state2.isCfFeedbackLoaded).toEqual(true);
-            const {cfFeedbackValue} = state2;
-            expect(cfFeedbackValue).toEqual(cfFeedbackResult[1]);
+            expect(state2.isCmFeedbackLoaded).toEqual(true);
+            const {cmFeedbackValue} = state2;
+            expect(cmFeedbackValue).toEqual(cmFeedbackResult[1]);
         });
 
-        it('changes fetchState when CfFeedback request failed', () => {
-            const state2 = explanation(stateWithRequest, cffeedbackValueListFailed('error'));
+        it('changes fetchState when CmFeedback request failed', () => {
+            const state2 = explanation(stateWithRequest, cmfeedbackValueListFailed('error'));
             expect(state2.fetchState).toEqual({inFlight: false, error: 'error'});
-            expect(state2.isCfFeedbackLoaded).toEqual(true);
+            expect(state2.isCmFeedbackLoaded).toEqual(true);
         });
     });
 
     describe('Retrain Value requested', () => {
         const stateWithRequest = explanation(undefined, retrainValueListRequested());
 
-        it('changes fetchState when CfFeedback requesting', () => {
+        it('changes fetchState when CmFeedback requesting', () => {
             expect(stateWithRequest.fetchState).toEqual({inFlight: true});
             expect(stateWithRequest.isRetrainLoaded).toEqual(false);
         });
 
-        it('changes fetchState when CfFeedback request completed', () => {
+        it('changes fetchState when CmFeedback request completed', () => {
             const state2 = explanation(stateWithRequest, retrainValueListRetrieved(retrainResult));
             expect(state2.fetchState).toEqual({inFlight: false});
             expect(state2.isRetrainLoaded).toEqual(true);
             const {retrainValue} = state2;
             expect(retrainValue).toEqual(retrainResult[1]);
         });
 
-        it('changes fetchState when CfFeedback request failed', () => {
+        it('changes fetchState when CmFeedback request failed', () => {
             const state2 = explanation(stateWithRequest, retrainValueListFailed('error'));
             expect(state2.fetchState).toEqual({inFlight: false, error: 'error'});
             expect(state2.isRetrainLoaded).toEqual(true);
diff --git a/src/actions/ExplanationActions.js b/src/actions/ExplanationActions.js
@@ -27,12 +27,12 @@ export const skaterValueListRetrieved = createPayloadForwardingAction(SKATER_VAL
 export const SKATER_VALUE_LIST_FAILED = 'SKATER_VALUE_LIST_FAILED';
 export const skaterValueListFailed = createPayloadForwardingAction(SKATER_VALUE_LIST_FAILED);
 
-export const CFFEEDBACK_VALUE_LIST_REQUESTED = 'CFFEEFBACK_VALUE_LIST_REQUESTED';
-export const cffeedbackValueListRequested = createPayloadForwardingAction(CFFEEDBACK_VALUE_LIST_REQUESTED);
-export const CFFEEFBACK_VALUE_LIST_RETRIEVED = 'CFFEEFBACK_VALUE_LIST_RETRIEVED';
-export const cffeedbackValueListRetrieved = createPayloadForwardingAction(CFFEEFBACK_VALUE_LIST_RETRIEVED);
-export const CFFEEFBACK_VALUE_LIST_FAILED = 'CFFEEFBACK_VALUE_LIST_FAILED';
-export const cffeedbackValueListFailed = createPayloadForwardingAction(CFFEEFBACK_VALUE_LIST_FAILED);
+export const CMFEEDBACK_VALUE_LIST_REQUESTED = 'CMFEEFBACK_VALUE_LIST_REQUESTED';
+export const cmfeedbackValueListRequested = createPayloadForwardingAction(CMFEEDBACK_VALUE_LIST_REQUESTED);
+export const CMFEEFBACK_VALUE_LIST_RETRIEVED = 'CMFEEFBACK_VALUE_LIST_RETRIEVED';
+export const cmfeedbackValueListRetrieved = createPayloadForwardingAction(CMFEEFBACK_VALUE_LIST_RETRIEVED);
+export const CMFEEFBACK_VALUE_LIST_FAILED = 'CMFEEFBACK_VALUE_LIST_FAILED';
+export const cmfeedbackValueListFailed = createPayloadForwardingAction(CMFEEFBACK_VALUE_LIST_FAILED);
 
 
 export const RETRAIN_VALUE_LIST_REQUESTED = 'RETRAIN_VALUE_LIST_REQUESTED';
diff --git a/src/actions/ServerActions.js b/src/actions/ServerActions.js
@@ -13,7 +13,7 @@ import {temporalLimePredictionListRetrieved, temporalLimePredictionListFailed,
     temporalPredictionListRetrieved, temporalPredictionListFailed} from './PredictionAction';
 import {shapValueListRetrieved, shapValueListFailed, skaterValueListRetrieved,
     skaterValueListFailed, iceValueListFailed, iceValueListRetrieved,
-    cffeedbackValueListRetrieved, cffeedbackValueListFailed, retrainValueListRetrieved,
+    cmfeedbackValueListRetrieved, cmfeedbackValueListFailed, retrainValueListRetrieved,
     retrainValueListFailed} from './ExplanationActions';
 
 export const getJobs = () => (dispatch) => {
@@ -207,15 +207,15 @@ export const getIceValues = ({jobId, attribute}) => (dispatch) => {
     );
 };
 
-export const getCfFeedbackValues = ({jobId, attribute}) => (dispatch) => {
+export const getCmFeedbackValues = ({jobId, attribute}) => (dispatch) => {
     jsonAjax(
-        SERVER_URL + `/explanation/cffeedback/${jobId}&${attribute}/`,
+        SERVER_URL + `/explanation/cmfeedback/${jobId}&${attribute}/`,
         'GET',
         null,
-        (resul) => {
-            dispatch(cffeedbackValueListRetrieved(resul));
+        (result) => {
+            dispatch(cmfeedbackValueListRetrieved(result));
         },
-        ({error}) => dispatch(cffeedbackValueListFailed(error))
+        ({error}) => dispatch(cmfeedbackValueListFailed(error))
     );
 };
 
@@ -224,8 +224,8 @@ export const getRetrainValues = ({jobId, data}) => (dispatch) => {
         SERVER_URL + `/explanation/retrain/${jobId}/`,
         'POST',
         data,
-        (resul) => {
-            dispatch(retrainValueListRetrieved(resul));
+        (result) => {
+            dispatch(retrainValueListRetrieved(result));
         },
         ({error}) => dispatch(retrainValueListFailed(error))
     );
diff --git a/src/components/explanation/CmFeedback.js b/src/components/explanation/CmFeedback.js
@@ -9,7 +9,7 @@ import {Row} from 'react-grid-system';
 import RetrainResultTable from './RetrainResultTable';
 import {getFeatureNamesAndValueFromSelectedPatterns} from '../../util/dataReducers';
 
-class CfFeedback extends PureComponent {
+class CmFeedback extends PureComponent {
     constructor(props) {
       super(props);
       let removedIndexFeatures = [];
@@ -348,7 +348,7 @@ class CfFeedback extends PureComponent {
         );
     }
 }
-CfFeedback.propTypes = {
+CmFeedback.propTypes = {
   jobId: PropTypes.any,
   cfFeedbackValue: PropTypes.any,
   isCfFeedbackValuesLoaded: PropTypes.bool,
@@ -361,4 +361,4 @@ CfFeedback.propTypes = {
   onSubmitTopK: PropTypes.func,
   onSubmitFeatureNamesAndValues: PropTypes.func,
 };
-export default CfFeedback;
+export default CmFeedback;
diff --git a/src/middlewares/ServerMiddleware.js b/src/middlewares/ServerMiddleware.js
@@ -17,7 +17,7 @@ import {
     getIceValues,
     getSkaterValues,
     getDecodingDf,
-    getCfFeedbackValues,
+    getCmFeedbackValues,
     getRetrainValues,
     getEncodedUniqueValues
 } from '../actions/ServerActions';
@@ -27,7 +27,7 @@ import {TRACE_LIST_REQUESTED} from '../actions/TraceActions';
 import {LOG_INFO_REQUESTED, LOG_LIST_REQUESTED} from '../actions/LogActions';
 import {LIME_VALUE_LIST_REQUESTED, SHAP_VALUE_LIST_REQUESTED,
      ICE_VALUE_LIST_REQUESTED, SKATER_VALUE_LIST_REQUESTED,
-     CFFEEDBACK_VALUE_LIST_REQUESTED, RETRAIN_VALUE_LIST_REQUESTED} from '../actions/ExplanationActions';
+     CMFEEDBACK_VALUE_LIST_REQUESTED, RETRAIN_VALUE_LIST_REQUESTED} from '../actions/ExplanationActions';
 import {SPLIT_SUBMITTED, SPLITS_REQUESTED} from '../actions/SplitActions';
 import {MODELS_REQUESTED} from '../actions/ModelActions';
 import {PREDICTION_SUBMITTED, REPLAY_SUBMITTED} from '../actions/RuntimeActions';
@@ -54,7 +54,7 @@ const ACTION_TYPE_TO_SERVER_ACTION = {
     [TEMPORAL_STABILITY_PREDICTION_LIST_REQUESTED]: getPredictionTemporalStabilityValues,
     [DECODING_REQUESTED]: getDecodingDf,
     [ENCODED_UNIQUE_VALUES_REQUESTED]: getEncodedUniqueValues,
-    [CFFEEDBACK_VALUE_LIST_REQUESTED]: getCfFeedbackValues,
+    [CMFEEDBACK_VALUE_LIST_REQUESTED]: getCmFeedbackValues,
     [RETRAIN_VALUE_LIST_REQUESTED]: getRetrainValues,
 };
 
diff --git a/src/reducers/Explanation.js b/src/reducers/Explanation.js
diff --git a/src/views/Explanation/Explanation.js b/src/views/Explanation/Explanation.js
diff --git a/stories/Explanation.js b/stories/Explanation.js
