bfg-common 1.5.487 → 1.5.488

package/components/common/wizards/datastore/add/steps/typeMode/lib/config/typeOptions.ts

@@ -1,43 +1,43 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-
-export const datastoreTypesFunc = (
-  localization: UI_I_Localization,
-  _project?: UI_T_Project
-): UI_I_RadioOption[] => {
-  return [
-    {
-      id: 'datastore-type-shared-storm',
-      label: localization.common.stormSharedStorage,
-      value: 2,
-      disabled: false,
-      description: localization.common.sharedStormDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.stormSharedStorageHelpDesc,
-      testId: 'datastore-type-shared-storm',
-    },
-    {
-      id: 'datastore-type-nfs',
-      label: localization.common.nfs,
-      value: 4,
-      disabled: false,
-      description: localization.common.nfsDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.nfsHelpDesc,
-      testId: 'datastore-type-nfs',
-    },
-  ]
-
-  // if (project === 'procurator') {
-  //   types.unshift({
-  //     label: localization.common.localStorage,
-  //     value: 1,
-  //     disabled: false,
-  //     description: localization.common.localDesc,
-  //     isTooltip: false,
-  //     tooltipContent: localization.common.localStorageHelpDesc,
-  //     testId: 'datastore-type-local',
-  //   })
-  // }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+
+export const datastoreTypesFunc = (
+  localization: UI_I_Localization,
+  _project?: UI_T_Project
+): UI_I_RadioOption[] => {
+  return [
+    {
+      id: 'datastore-type-shared-storm',
+      label: localization.common.stormSharedStorage,
+      value: 2,
+      disabled: false,
+      description: localization.common.sharedStormDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.stormSharedStorageHelpDesc,
+      testId: 'datastore-type-shared-storm',
+    },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 4,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+  ]
+
+  // if (project === 'procurator') {
+  //   types.unshift({
+  //     label: localization.common.localStorage,
+  //     value: 1,
+  //     disabled: false,
+  //     description: localization.common.localDesc,
+  //     isTooltip: false,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
+  //     testId: 'datastore-type-local',
+  //   })
+  // }
+}

package/components/common/wizards/network/add/Add.vue

@@ -338,8 +338,8 @@ const onChangeConnectionSettings = (
   connectionSettings.value = newFields
 }
 
-const onHideAlert = (stepId: number): void => {
-  wizard.hideAlertMessagesByStepId(stepId)
+const onHideAlert = (stepId: number, field?: string): void => {
+  wizard.hideAlertMessagesByStepId(stepId, field)
 }
 
 let flagSwitch = ''
@@ -432,6 +432,7 @@ watch(
     if (newSelectedStep !== 7) return // If last step
     if (wizard.isSelectedScheme(0)) {
       readyCompleteFields.value = createZeroSchemeReadyCompleteFunc(
+        isNewView.value,
         targetDevice.value,
         portProperties.value,
         ipFourSettings.value,
@@ -442,6 +443,7 @@ watch(
 
     if (wizard.isSelectedScheme(1)) {
       readyCompleteFields.value = createFirstSchemeReadyCompleteFunc(
+        isNewView.value,
         targetDevice.value,
         portProperties.value,
         ipFourSettings.value,
@@ -452,6 +454,7 @@ watch(
     }
     if (wizard.isSelectedScheme(2)) {
       readyCompleteFields.value = createSecondSchemeReadyCompleteFunc(
+        isNewView.value,
         connectionSettings.value,
         targetDevice.value,
         localization.value
@@ -460,6 +463,7 @@ watch(
     }
     if (wizard.isSelectedScheme(3)) {
       readyCompleteFields.value = createThirdSchemeReadyCompleteFunc(
+        isNewView.value,
         connectionSettings.value,
         targetDevice.value,
         addedAdapters.value,
@@ -469,6 +473,7 @@ watch(
     }
     if (wizard.isSelectedScheme(4)) {
       readyCompleteFields.value = createFourthSchemeReadyCompleteFunc(
+        isNewView.value,
         targetDevice.value.switch,
         props.diagramsData,
         adapterStatus.value,
@@ -478,6 +483,7 @@ watch(
     }
     if (wizard.isSelectedScheme(5)) {
       readyCompleteFields.value = createFifthSchemeReadyCompleteFunc(
+        isNewView.value,
         targetDevice.value,
         adapterStatus.value,
         localization.value
@@ -530,7 +536,7 @@ const onConfirmNoActiveAdaptersModal = (): void => {
         )
       ),
       validationFunc,
-      finalValidationFunc,
+      props.project === 'sphere' ? null : finalValidationFunc,
       true
     )
     wizard.waitingStepId = -1