Move component to basic tab

Author: GilbertCherrie

app/javascript/components/terraform-template-catalog-form/terraform-template-catalog-form.schema.js

@@ -30,6 +30,70 @@ const basicInformationTabSchema = (availableCatalogs, tenantTree, roleAllows, zo
         id: 'description',
         label: __('Description'),
       },
+      {
+        component: componentTypes.SELECT,
+        id: 'provisioning_entry_point_type',
+        name: 'provisioning_entry_point_type',
+        label: __('Provisioning Entry Point'),
+        initialValue: 'embedded_automate',
+        options: [{ value: 'embedded_automate', label: __('Embedded Automate') }, { value: 'embedded_workflow', label: __('Embedded Workflow') }],
+      },
+      {
+        component: componentTypes.TEXT_FIELD,
+        id: 'provisioning_entry_point_automate',
+        name: 'provisioning_entry_point_automate',
+        label: __('Provisioning Entry Point'),
+        initialValue: '/Service/Generic/StateMachines/GenericLifecycle/provision',
+        condition: {
+          when: 'provisioning_entry_point_type',
+          is: 'embedded_automate',
+        },
+      },
+      {
+        component: 'embedded-entry-point',
+        id: 'provisioning_entry_point_workflow',
+        name: 'provisioning_entry_point_workflow',
+        label: 'Provisioning Entry Point',
+        field: 'fqname',
+        selected: '',
+        type: 'provision',
+        condition: {
+          when: 'provisioning_entry_point_type',
+          is: 'embedded_workflow',
+        },
+      },
+      {
+        component: componentTypes.SELECT,
+        id: 'retirement_entry_point_type',
+        name: 'retirement_entry_point_type',
+        label: __('Retirement Entry Point'),
+        initialValue: 'embedded_automate',
+        options: [{ value: 'embedded_automate', label: __('Embedded Automate') }, { value: 'embedded_workflow', label: __('Embedded Workflow') }],
+      },
+      {
+        component: componentTypes.TEXT_FIELD,
+        id: 'retirement_entry_point_automate',
+        name: 'retirement_entry_point_automate',
+        label: __('Retirement Entry Point'),
+        initialValue: '/Service/Generic/StateMachines/GenericLifecycle/Retire_Basic_Resource',
+        condition: {
+          when: 'retirement_entry_point_type',
+          is: 'embedded_automate',
+        },
+      },
+      {
+        component: 'embedded-entry-point',
+        id: 'retirement_entry_point_workflow',
+        name: 'retirement_entry_point_workflow',
+        label: 'Retirement Entry Point',
+        field: 'retire_fqname',
+        selected: '',
+        type: 'retire',
+        condition: {
+          when: 'retirement_entry_point_type',
+          is: 'embedded_workflow',
+        },
+      },
       {
         component: componentTypes.CHECKBOX,
         name: 'display',
@@ -109,70 +173,6 @@ const provisionTabSchema = (
     name: 'provisioning-tab',
     label: __('Provisioning'),
     fields: [
-      {
-        component: componentTypes.SELECT,
-        id: 'provisioning_entry_point_type',
-        name: 'provisioning_entry_point_type',
-        label: __('Provisioning Entry Point'),
-        initialValue: 'embedded_automate',
-        options: [{ value: 'embedded_automate', label: __('Embedded Automate') }, { value: 'embedded_workflow', label: __('Embedded Workflow') }],
-      },
-      {
-        component: componentTypes.TEXT_FIELD,
-        id: 'provisioning_entry_point_automate',
-        name: 'provisioning_entry_point_automate',
-        label: __('Provisioning Entry Point'),
-        initialValue: '/Service/Generic/StateMachines/GenericLifecycle/provision',
-        condition: {
-          when: 'provisioning_entry_point_type',
-          is: 'embedded_automate',
-        },
-      },
-      {
-        component: 'provision-entry-point',
-        id: 'provisioning_entry_point_workflow',
-        name: 'provisioning_entry_point_workflow',
-        label: 'Provisioning Entry Point',
-        field: 'fqname',
-        selected: '',
-        type: 'provision',
-        condition: {
-          when: 'provisioning_entry_point_type',
-          is: 'embedded_workflow',
-        },
-      },
-      {
-        component: componentTypes.SELECT,
-        id: 'retirement_entry_point_type',
-        name: 'retirement_entry_point_type',
-        label: __('Retirement Entry Point'),
-        initialValue: 'embedded_automate',
-        options: [{ value: 'embedded_automate', label: __('Embedded Automate') }, { value: 'embedded_workflow', label: __('Embedded Workflow') }],
-      },
-      {
-        component: componentTypes.TEXT_FIELD,
-        id: 'retirement_entry_point_automate',
-        name: 'retirement_entry_point_automate',
-        label: __('Retirement Entry Point'),
-        initialValue: '/Service/Generic/StateMachines/GenericLifecycle/Retire_Basic_Resource',
-        condition: {
-          when: 'retirement_entry_point_type',
-          is: 'embedded_automate',
-        },
-      },
-      {
-        component: 'provision-entry-point',
-        id: 'retirement_entry_point_workflow',
-        name: 'retirement_entry_point_workflow',
-        label: 'Retirement Entry Point',
-        field: 'retire_fqname',
-        selected: '',
-        type: 'retire',
-        condition: {
-          when: 'provisioning_entry_point_type',
-          is: 'embedded_workflow',
-        },
-      },
       {
         component: componentTypes.SELECT,
         id: 'config_info.provision.repository_id',

app/javascript/forms/mappers/componentMapper.jsx

@@ -19,7 +19,7 @@ const mapper = {
   'edit-password-field': EditPasswordField,
   'file-upload': FileUploadComponent,
   'password-field': PasswordField,
-  'provision-entry-point': EmbeddedEntryPoint,
+  'embedded-entry-point': EmbeddedEntryPoint,
   'validate-credentials': AsyncCredentials,
   'tree-view': TreeViewField,
   'tree-selector': TreeViewSelector,