Merge pull request #62 from rekcurd/hotfix/request-only-when-model-sw…

…itched Thank you @yuki-mt ! Merged
rekcurd · Jan 22, 2019 · 5893f85 · 5893f85
2 parents 57dc2ba + 4098b16
commit 5893f85
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/frontend/src/components/App/Deploy/DeployStatusForm.tsx b/frontend/src/components/App/Deploy/DeployStatusForm.tsx
@@ -190,6 +190,7 @@ interface StateProps {
   switchModelsStatus: APIRequest<boolean[]>
   initialValues: {
     status
+    switch
     delete
   }
 }
@@ -205,6 +206,7 @@ const mapStateToProps = (state: any, extraProps: DeployStatusFormCustomProps) =>
     ...state.form,
     initialValues: {
       status: extraProps.deployStatus,
+      switch: extraProps.deployStatus,
       delete: {
         services: initialDeleteStatus
       }

diff --git a/frontend/src/components/App/Deploy/DeployStatusTable.tsx b/frontend/src/components/App/Deploy/DeployStatusTable.tsx
@@ -183,7 +183,7 @@ class DeployStatusTable extends React.Component<DeployStatusProps, {tooltipOpen}
       return (
         <Field
           component={CustomRadioButton}
-          name={`status.${serviceId}`}
+          name={`switch.${serviceId}`}
           serviceId={serviceId}
           modelId={model.id}
         />

diff --git a/frontend/src/components/App/Deploy/index.tsx b/frontend/src/components/App/Deploy/index.tsx
@@ -360,7 +360,14 @@ class Deploy extends React.Component<DeployStatusProps, DeployStatusState> {
     const { applicationId } = this.props.match.params
 
     const apiParams: SwitchModelParam[] =
-      Object.entries(params.status)
+      Object.entries(params.switch)
+        .filter(
+          ([key, value]) => {
+            if (params.status[key] === value) {
+              return false
+            }
+            return true
+          })
         .map(
           ([key, value]): SwitchModelParam => (
             {