Fix ODC-2356: Solve Warning when closing Traffic Splitting Dialog"Can…

…'t perform a React state update" happend because the Dialog resetsthe formik state after unmounting it. Just close it instead.
openshift · May 12, 2020 · 493c274 · 493c274
1 parent 190744a
commit 493c274
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/frontend/packages/knative-plugin/src/components/traffic-splitting/TrafficSplitting.tsx b/frontend/packages/knative-plugin/src/components/traffic-splitting/TrafficSplitting.tsx
@@ -60,7 +60,13 @@ const TrafficSplitting: React.FC<TrafficSplittingProps> = ({
       onReset={cancel}
       initialStatus={{ error: '' }}
     >
-      {(props) => <TrafficSplittingModal {...props} revisionItems={revisionItems} />}
+      {(props) => (
+        <TrafficSplittingModal
+          {...props}
+          cancel={cancel}
+          revisionItems={revisionItems}
+        />
+      )}
     </Formik>
   );
 };

diff --git a/frontend/packages/knative-plugin/src/components/traffic-splitting/TrafficSplittingModal.tsx b/frontend/packages/knative-plugin/src/components/traffic-splitting/TrafficSplittingModal.tsx
@@ -10,12 +10,13 @@ import { RevisionItems } from '../../utils/traffic-splitting-utils';
 
 interface TrafficSplittingModalProps {
   revisionItems: RevisionItems;
+  cancel: () => void;
 }
 
 type Props = FormikProps<FormikValues> & TrafficSplittingModalProps;
 
 const TrafficSplittingModal: React.FC<Props> = (props) => {
-  const { handleSubmit, handleReset, isSubmitting, status } = props;
+  const { handleSubmit, cancel, isSubmitting, status } = props;
   return (
     <form className="modal-content" onSubmit={handleSubmit}>
       <ModalTitle>Set Traffic Distribution</ModalTitle>
@@ -26,7 +27,7 @@ const TrafficSplittingModal: React.FC<Props> = (props) => {
       <ModalSubmitFooter
         inProgress={isSubmitting}
         submitText="Save"
-        cancel={handleReset}
+        cancel={cancel}
         errorMessage={status.error}
       />
     </form>

diff --git a/.../knative-plugin/src/components/traffic-splitting/__tests__/TrafficSplittingModal.spec.tsx b/.../knative-plugin/src/components/traffic-splitting/__tests__/TrafficSplittingModal.spec.tsx
@@ -19,6 +19,7 @@ describe('TrafficSplittingModal', () => {
       status: { error: 'checkErrorProp' },
       values: { trafficSplitting: mockTrafficData },
       revisionItems: mockRevisionItems,
+      cancel: jest.fn(),
     };
     wrapper = shallow(<TrafficSplittingModal {...formProps} />);
   });