bfg-common 1.3.414 → 1.3.416

package/components/common/wizards/datastore/add/types/Types.vue

@@ -24,7 +24,7 @@
     </div>
 
     <common-select-radio-group
-      v-model="selectedType"
+      v-model="selectedDatastoreTypeLocal"
       :options="datastoreTypes"
     />
   </section>
@@ -34,30 +34,21 @@
 import { UI_I_Localization } from '~/lib/models/interfaces'
 import { UI_T_Project } from '~/lib/models/types'
 import { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+import { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { datastoreTypesFunc } from '~/components/common/wizards/datastore/add/types/lib/config/typeOptions'
 
 const props = defineProps<{
   project: UI_T_Project
-  type: string
-}>()
-const emits = defineEmits<{
-  (event: 'update:type', value: string): void
 }>()
+const selectedDatastoreTypeLocal =
+  defineModel<UI_T_DatastoreType>('datastore-type')
+
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const datastoreTypes = ref<UI_I_RadioOption[]>(
   datastoreTypesFunc(localization.value, props.project)
 )
 
-const selectedType = computed<string>({
-  get() {
-    return props.type
-  },
-  set(newValue) {
-    emits('update:type', newValue)
-  },
-})
-
 const isShowTypeHelp = ref<boolean>(false)
 </script>
 

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

@@ -2,12 +2,9 @@
   <div class="new-datastore">
     <atoms-wizard
       show
-      :steps="wizard.steps"
+      :wizard="wizard"
       :selected-scheme="selectedScheme"
-      :is-loading="wizard.wizardLoader.status"
-      :loader-messages="wizard.wizardLoader.messages"
       :title="localization.newDatastore"
-      :was-completed="wasCompleted"
       :localization="localization"
       class="add-datastore"
       test-id="add-datastore-wizard"
@@ -16,15 +13,16 @@
       @submit="onFinish"
     >
       <template #modalBody="{ selectedStep }">
+        {{ datastoreType }}
         <common-wizards-datastore-add-types
-          v-show="selectedStep.id === 0"
-          v-model:type="datastoreType"
-          :project="props.mode"
+          v-if="selectedStep.id === 0"
+          v-model:datastore-type="datastoreType"
+          :project="props.project"
         />
 
         <common-wizards-datastore-add-local
           v-show="datastoreType === 'local' && !isShowCompleteBlock"
-          :mode="props.mode"
+          :mode="props.project"
           :step-position="stepPosition"
           :datastore-type="datastoreType"
           :local-create-name-submit="localCreateNameSubmit"
@@ -37,7 +35,7 @@
 
         <common-wizards-datastore-add-shared-storm
           v-show="datastoreType === 'shared-storm' && !isShowCompleteBlock"
-          :mode="props.mode"
+          :mode="props.project"
           :step-position="stepPosition"
           :datastore-type="datastoreType"
           :device-selection-submit="deviceSelectionSubmit"
@@ -51,7 +49,7 @@
 
         <common-wizards-datastore-add-nfs
           v-show="datastoreType === 'nfs' && !isShowCompleteBlock"
-          :mode="props.mode"
+          :mode="props.project"
           :step-position="stepPosition"
           :datastore-type="datastoreType"
           :nfs-configuration-submit="nfsConfigurationSubmit"
@@ -88,7 +86,7 @@ import { UI_T_Project } from '~/lib/models/types'
 import {
   UI_T_DatastoreType,
   UI_T_NfsType,
-  UI_T_WizardDatastoreMode,
+  // UI_T_WizardDatastoreMode,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import {
@@ -99,8 +97,7 @@ import {
 import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
 
 const props = defineProps<{
-  // TODO refactoring to project
-  mode: UI_T_Project
+  project: UI_T_Project
   finishFunc: (
     datastoreForm: UI_I_CreateDatastoreForm,
     datastoreType: UI_T_DatastoreType,
@@ -124,13 +121,12 @@ const wizard: Wizard = new Wizard(
   stepsSchemeInitial
 )
 
-const wasCompleted = computed<boolean>(() => wizard.wasCompleted())
 const selectedScheme = computed<number[]>(() => wizard.selectedScheme.value)
 const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const loading = ref<boolean>(false)
 const datastoreType = ref<UI_T_DatastoreType>(
-  props.mode === 'procurator' ? 'local' : 'shared-storm'
+  props.project === 'procurator' ? 'local' : 'shared-storm'
 )
 const nfsVersion = ref<UI_T_NfsType>('nfs-3')
 
@@ -275,7 +271,9 @@ const deviceSelectionSubmit = ref<number>(0)
 //   return true
 // }
 
-const isWizardModeForSphere = computed<boolean>(() => props.mode === 'sphere')
+const isWizardModeForSphere = computed<boolean>(
+  () => props.project === 'sphere'
+)
 
 const onSaveNameAndNextLocal = (event: any): void => {
   const { local } = datastoreForm.value
@@ -348,12 +346,12 @@ const isShowCompleteBlock = computed<boolean>(() => {
 
   const sharesStep =
     datastoreType.value === 'shared-storm' &&
-    (props.mode === 'procurator'
+    (props.project === 'procurator'
       ? stepPosition.value === 3
       : stepPosition.value === 2)
 
   let nfsFirst
-  if (props.mode === 'procurator') {
+  if (props.project === 'procurator') {
     nfsFirst =
       datastoreType.value === 'nfs' &&
       nfsVersion.value === 'nfs-3' &&
@@ -366,7 +364,7 @@ const isShowCompleteBlock = computed<boolean>(() => {
   }
 
   let nfsSecond
-  if (props.mode === 'procurator') {
+  if (props.project === 'procurator') {
     nfsSecond =
       datastoreType.value === 'nfs' &&
       nfsVersion.value === 'nfs-4.1' &&

package/package.json

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