bfg-common 1.4.50 → 1.4.52

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

@@ -15,7 +15,7 @@
       <template #modalBody="{ selectedStep }">
         <common-wizards-datastore-new-add-types
           v-if="selectedStep.id === 0"
-          v-model="form.type_code"
+          v-model="form"
           v-model:datastore-type="datastoreType"
           :project="props.project"
         />
@@ -115,7 +115,7 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 const datastoreType = ref<UI_T_DatastoreType>('shared-storm')
 
 const form = ref<UI_I_CreateDatastoreForm>({
-  name: '',
+  name: 'Datastore',
   lunDisk: [],
   hosts: props.hostId ? [props?.hostId] : [],
   type_code: E_DatastoreTypeKode[datastoreType.value],

package/components/common/wizards/datastoreNew/add/local/Local.vue

@@ -15,6 +15,7 @@ import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_ArbitraryObject } from '~/lib/models/interfaces'
 import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -23,7 +24,7 @@ const props = defineProps<{
   alertMessages: string[]
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
 }>()
-const model = defineModel<any>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
 }>()

package/components/common/wizards/datastoreNew/add/nfs/Nfs.vue

@@ -31,6 +31,7 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -39,7 +40,7 @@ const props = defineProps<{
   messagesFields: UI_I_ArbitraryObject<UI_I_ErrorFields>
   hosts?: any
 }>()
-const model = defineModel<any>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
 }>()

package/components/common/wizards/datastoreNew/add/sharedStorm/SharedStorm.vue

@@ -42,6 +42,7 @@ import {
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastoreNew/add/nfs/accessibility/tablesView/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -53,7 +54,7 @@ const props = defineProps<{
   isMainFilter?: boolean
   hostId?: string
 }>()
-const model = defineModel<any>()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 const emits = defineEmits<{
   (event: 'hide-alert', value: boolean): void
   (event: 'main-filter', value: string): void

package/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/DeviceSelection.vue

@@ -34,7 +34,7 @@
     </div>
 
     <atoms-alert
-      v-show="alertInfo"
+      v-if="alertInfo"
       test-id="device-selection-information-alert"
       class="device-selection-step__alert-info"
       status="alert-info"
@@ -149,6 +149,8 @@ const nameErrorText = computed<string>(() => {
 
 const defaultDataId = ref<string>('device-selection-alert-error')
 const errorAlertDataId = computed<string>(() => {
+  if (!props.alertMessages?.length) return
+
   return !model.value.lunDisk.length
     ? `${defaultDataId.value}-not-selected-lundisk`
     : validateNameAndGenerateDataId(

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

@@ -19,7 +19,9 @@
           test-id="select-datastore-type"
           @hide="isShowTypeHelp = false"
         >
-          <p class="help-desc">{{ localization.common.datastoreTypeHelpDesc }}</p>
+          <p class="help-desc">
+            {{ localization.common.datastoreTypeHelpDesc }}
+          </p>
         </atoms-tooltip-signpost>
       </div>
     </div>
@@ -37,23 +39,26 @@ 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'
 import type { UI_T_DatastoreType } from '~/components/common/wizards/datastore/add/lib/models/types'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastoreNew/add/lib/models/interfaces'
 import { E_DatastoreTypeKode } from '~/components/common/wizards/datastoreNew/add/lib/models/enums'
-import { datastoreTypesFunc } from '~/components/common/wizards/datastore/add/types/lib/config/typeOptions'
+import { datastoreTypesFunc } from '~/components/common/wizards/datastoreNew/add/types/lib/config/typeOptions'
 
 const props = defineProps<{
   project: UI_T_Project
 }>()
 const selectedDatastoreTypeLocal =
   defineModel<UI_T_DatastoreType>('datastoreType')
-const typeCodeLocal = defineModel()
+const model = defineModel<UI_I_CreateDatastoreForm>({ required: true })
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const datastoreTypes = ref<UI_I_RadioOption[]>(
-  datastoreTypesFunc(localization.value, props.project)
+  datastoreTypesFunc(localization.value)
 )
 const onChangeType = (): void => {
-  typeCodeLocal.value = E_DatastoreTypeKode[selectedDatastoreTypeLocal.value]
+  model.value.type_code = E_DatastoreTypeKode[selectedDatastoreTypeLocal.value]
+
+  model.value.name = 'Datastore' // default value is  'Datastore' every time
 }
 
 const isShowTypeHelp = ref<boolean>(false)

package/components/common/wizards/datastoreNew/add/types/lib/config/typeOptions.ts

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

package/package.json

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