Implement redirects for submit/cancel on the cloud provider form

ManageIQ · Feb 25, 2020 · 684f66d · 684f66d
1 parent 827e78d
commit 684f66d
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/app/helpers/ems_cloud_helper.rb b/app/helpers/ems_cloud_helper.rb
@@ -1,4 +1,8 @@
 module EmsCloudHelper
   include_concern 'TextualSummary'
   include_concern 'ComplianceSummaryHelper'
+
+  def edit_redirect_path(lastaction, ems)
+    lastaction == 'show_list' ? ems_clouds_path : ems_cloud_path(ems)
+  end
 end
diff --git a/app/javascript/forms/provider-forms/cloud-provider-form/index.jsx b/app/javascript/forms/provider-forms/cloud-provider-form/index.jsx
@@ -3,6 +3,7 @@ import { componentTypes, validatorTypes } from '@data-driven-forms/react-form-re
 
 import { API } from '../../../http_api';
 import MiqFormRenderer from '../../data-driven-form';
+import miqRedirectBack from '../../../helpers/miq-redirect-back';
 
 const typeSelectorSchema = {
   fields: [
@@ -54,7 +55,7 @@ const initialSchema = includeType => ([
   },
 ]);
 
-const CloudProviderForm = ({ providerId, ...props }) => {
+const CloudProviderForm = ({ providerId, kind, redirect, ...props }) => {
   const [{ type, schema, values }, setState] = useState({ schema: { fields: [] } });
 
   const loadProviderSchema = (type, newValues = {}) => {
@@ -73,11 +74,12 @@ const CloudProviderForm = ({ providerId, ...props }) => {
         },
         values: { type, ...newValues },
       });
-    });
+    }).then(miqSparkleOff);
   };
 
   useEffect(() => {
     if (providerId) {
+      miqSparkleOn();
       API.get(`/api/providers/${providerId}?attributes=endpoints,authentications,zone_name`).then(({
         type,
         endpoints: _endpoints,
@@ -101,21 +103,29 @@ const CloudProviderForm = ({ providerId, ...props }) => {
 
   const typeSelected = ({ active, values: { type: newType } = {} }) => {
     if (active === 'type' && type !== newType) {
+      miqSparkleOn();
       loadProviderSchema(newType);
     }
   };
 
-  const onSubmit = ({ type, ..._data }, { getState }) => {
+  const onCancel = () => {
+    const message = sprintf(providerId ? __('Edit of %s was cancelled by the user') : __('Add of %s was cancelled by the user'), kind);
+    miqRedirectBack(message, 'success', redirect);
+  };
+
+  const onSubmit = (_data, { getState }) => {
+    miqSparkleOn();
+
+    const message = sprintf(__('%s %s was saved'), kind, values.name);
+
     // Retrieve fields from the schema, but omit the validator components as the API doesn't like them
     const fields = Object.keys(getState().modified).filter(field => !field.match(/^authentications\.[^.]+\.valid$/));
     // Filter out fields that are not available in the form schema
-    const data = _.pick(_data, fields);
+    const data = { ..._.pick(_data, fields), ddf: true };
 
-    if (providerId) {
-      API.patch(`/api/providers/${providerId}`, { ...data, ddf: true });
-    } else {
-      API.post('/api/providers', { ...data, type, ddf: true });
-    }
+    const request = providerId ? API.patch(`/api/providers/${providerId}`, data) : API.post('/api/providers', { type, ...data });
+
+    request.then(() => miqRedirectBack(message, 'success', redirect)).catch(miqSparkleOff);
   };
 
   return (
@@ -129,7 +139,14 @@ const CloudProviderForm = ({ providerId, ...props }) => {
         />
       ) }
       <EditingContext.Provider value={providerId}>
-        <MiqFormRenderer schema={schema} onSubmit={onSubmit} initialValues={values} clearedValue={null} />
+        <MiqFormRenderer
+          schema={schema}
+          onSubmit={onSubmit}
+          onCancel={onCancel}
+          initialValues={values}
+          clearedValue={null}
+          clearOnUnmount
+        />
       </EditingContext.Provider>
     </div>
   );

diff --git a/app/views/ems_cloud/edit.html.haml b/app/views/ems_cloud/edit.html.haml
@@ -1,4 +1,4 @@
-= react('CloudProviderForm', :providerId => @ems.id)
+= react('CloudProviderForm', :providerId => @ems.id, :redirect => edit_redirect_path(@lastaction, @ems), :kind => ui_lookup(:model => 'ManageIQ::Providers::CloudManager'))
 
 = form_for(@ems,
            :url    => ems_cloud_path(@ems),

diff --git a/app/views/ems_cloud/new.html.haml b/app/views/ems_cloud/new.html.haml
@@ -1,6 +1,6 @@
 - url = @ems.persisted? ? ems_clouds_path(@ems) : ems_clouds_path
 
-= react('CloudProviderForm')
+= react('CloudProviderForm', :redirect => ems_clouds_path, :kind => ui_lookup(:model => 'ManageIQ::Providers::CloudManager'))
 
 = form_for(@ems,
            :url    => url,