bfg-common 1.5.74 → 1.5.75

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

@@ -32,17 +32,18 @@ import type {
   UI_I_ValidationReturn,
 } from '~/components/atoms/wizard/lib/models/interfaces'
 import Wizard from '~/components/atoms/wizard/lib/utils/utils'
-import {
-  stepsFunc,
-  stepsSchemeInitial,
-} from '~/components/common/wizards/datastore/add/lib/config/steps'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import type { UI_I_ChangeStepsSchemes } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import {
+  stepsFunc,
+  stepsSchemeInitial,
+  getStepScheme,
+} from '~/components/common/wizards/datastore/add/lib/config/steps'
+import { datastoreDefaultFormFunc } from '~/components/common/wizards/datastore/add/lib/config/createDatastore'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
 import * as validation from '~/components/common/wizards/datastore/add/lib/validations'
 
@@ -73,21 +74,9 @@ const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const title = computed<string>(() => localization.value.common.addHost)
 
-// const datastoreType = ref<UI_T_DatastoreTypeCode>(
-//   props.project === 'procurator' ? 'local' : 'shared-storm'
-// )
-const datastoreType = ref<UI_T_DatastoreTypeCode>(2)
-const form = ref<UI_I_CreateDatastoreForm>({
-  name: 'Datastore',
-  lunDisk: [],
-  hosts: props.hostId ? [props?.hostId] : [],
-  type_code: 2,
-  nfsVersion: 'nfs-4.1',
-  readonly: false,
-  server: '',
-  folder: '',
-})
-
+const form = ref<UI_I_CreateDatastoreForm>(
+  useDeepCopy(datastoreDefaultFormFunc(props.hostId))
+)
 const validationFunc = async (
   value: UI_I_WizardStep[],
   currentStep: UI_I_WizardStep,
@@ -196,26 +185,14 @@ const onChangeSteps = async (value: UI_I_WizardStep[]): Promise<void> =>
 
 // Choosing Scheme
 watch(
-  datastoreType,
+  () => form.value.type_code,
   (newValue: UI_T_DatastoreTypeCode) => {
-    const schemes: UI_I_ChangeStepsSchemes = {
-      procurator: {
-        '2': 0,
-        '4': 1,
-      },
-      sphere: {
-        '2': 2,
-        '4': !props.hostId ? 3 : 1,
-      },
-    }
-
-    const projectSchemes = schemes[props.project]
-
-    if (projectSchemes && projectSchemes[newValue] !== undefined) {
-      wizard.changeScheme(projectSchemes[newValue] as number)
+    const step = getStepScheme(props.project, newValue, props.hostId)
+    if (step !== undefined) {
+      wizard.changeScheme(step)
     }
   },
-  { deep: true, immediate: true }
+  { immediate: true }
 )
 
 const dataReadyView = computed<UI_I_DetailsItem>(() =>

package/components/common/wizards/datastore/add/lib/config/createDatastore.ts

@@ -1,9 +1,11 @@
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-export const datastoreDefaultFormFunc = (): UI_I_CreateDatastoreForm => {
+export const datastoreDefaultFormFunc = (
+  hostId?: string
+): UI_I_CreateDatastoreForm => {
   return {
     name: 'Datastore',
     lunDisk: [],
-    hosts: [],
+    hosts: hostId ? [hostId] : [],
     type_code: 2,
     nfsVersion: 'nfs-4.1',
     readonly: false,

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

@@ -1,7 +1,9 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_WizardStep } from '~/components/atoms/wizard/lib/models/interfaces'
 import { UI_E_WIZARD_STATUS } from '~/components/atoms/wizard/lib/models/enums'
-
+import type { UI_I_ChangeStepsSchemes } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datastore/add/lib/models/types'
 export const dynamicSteps = {
   type: 0,
   nameAndDevice: 1,
@@ -146,3 +148,22 @@ export const stepsSchemeInitial: number[][] = [
   [dynamicSteps.type, dynamicSteps.nameAndDevice, 11], // Sphere Scheme for "shared-storm" type
   [dynamicSteps.type, 4, 5, 11], // Sphere Scheme for "nfs" type
 ]
+
+export const getStepScheme = (
+  project: UI_T_Project,
+  typeCode: UI_T_DatastoreTypeCode,
+  hostId?: string
+): number | undefined => {
+  const schemes: UI_I_ChangeStepsSchemes = {
+    procurator: {
+      '2': 0,
+      '4': 1,
+    },
+    sphere: {
+      '2': 2,
+      '4': !hostId ? 3 : 1,
+    },
+  }
+
+  return schemes[project]?.[typeCode]
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.74",
+  "version": "1.5.75",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",