bfg-common 1.3.462 → 1.3.464

package/components/common/mainNavigationPanel/MainNavigationPanel.vue

@@ -2,11 +2,11 @@
   <common-main-navigation-panel-new
     v-if="props.isNewView"
     v-model:main-menu-hovered="mainMenuHovered"
+    v-model:menu-pined="menuPined"
     :main-menu-status="props.mainMenuStatus"
     :navigation-items="props.navigationItems"
     :parent-status="props.parentStatus"
     :disabled-pin="props.disabledPin"
-    :menu-pined="menuPined"
     :menu-collapsed="menuCollapsed"
     :show-menu="showMenu"
     @toggle="emits('toggle', $event)"
@@ -17,11 +17,11 @@
   <common-main-navigation-panel-old
     v-else
     v-model:main-menu-hovered="mainMenuHovered"
+    v-model:menu-pined="menuPined"
     :main-menu-status="props.mainMenuStatus"
     :navigation-items="props.navigationItems"
     :parent-status="props.parentStatus"
     :disabled-pin="props.disabledPin"
-    :menu-pined="menuPined"
     :menu-collapsed="menuCollapsed"
     :show-menu="showMenu"
     @toggle="emits('toggle', $event)"

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -12,7 +12,7 @@
         <div v-show="!props.menuCollapsed" class="pin-wrap">
           <input
             id="pin-menu-control"
-            v-model="props.menuPined"
+            v-model="menuPined"
             data-id="navigation-panel-pin-menu-control"
             type="checkbox"
             :disabled="props.disabledPin"
@@ -20,17 +20,17 @@
           />
           <label for="pin-menu-control" class="pointer flex-align-center">
             <ui-icon-main-navigation-panel
-              :name="props.menuPined ? 'unpin' : 'pin'"
+              :name="menuPined ? 'unpin' : 'pin'"
               width="12px"
               height="12px"
             />
-            <span v-if="!props.menuPined">{{ localization.pinMenu }}</span>
+            <span v-if="!menuPined">{{ localization.pinMenu }}</span>
             <span v-else>{{ localization.unpinMenu }}</span>
           </label>
         </div>
 
         <button
-          v-if="props.menuPined"
+          v-if="menuPined"
           id="nav-trigger"
           data-id="navigation-panel-trigger"
           class="nav-trigger"
@@ -78,7 +78,6 @@ const props = defineProps<{
   navigationItems: UI_I_NavigationItem[][]
   parentStatus: UI_T_ParentStatus
   disabledPin: boolean
-  menuPined: boolean
   menuCollapsed: boolean
   showMenu: boolean
 }>()
@@ -92,6 +91,9 @@ const emits = defineEmits<{
 const mainMenuHovered = defineModel<boolean>('mainMenuHovered', {
   required: true,
 })
+const menuPined = defineModel<boolean>('menuPined', {
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>

package/components/common/mainNavigationPanel/MainNavigationPanelOld.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    :class="['main-navigation-panel', { pinned: props.menuPined }]"
+    :class="['main-navigation-panel', { pinned: menuPined }]"
     @mouseenter="mainMenuHovered = true"
     @mouseleave="mainMenuHovered = false"
   >
@@ -11,7 +11,7 @@
       <div class="category-wrap">
         <div class="clr-vertical-nav">
           <button
-            v-if="props.menuPined"
+            v-if="menuPined"
             id="nav-trigger"
             data-id="navigation-panel-trigger"
             class="nav-trigger"
@@ -56,7 +56,7 @@
         <div class="clr-checkbox-wrapper">
           <input
             id="pin-menu-control"
-            v-model="props.menuPined"
+            v-model="menuPined"
             data-id="navigation-panel-pin-menu-control"
             type="checkbox"
             :disabled="props.disabledPin"
@@ -79,7 +79,6 @@ const props = defineProps<{
   navigationItems: UI_I_NavigationItem[][]
   parentStatus: UI_T_ParentStatus
   disabledPin: boolean
-  menuPined: boolean
   menuCollapsed: boolean
   showMenu: boolean
 }>()
@@ -93,6 +92,9 @@ const emits = defineEmits<{
 const mainMenuHovered = defineModel<boolean>('mainMenuHovered', {
   required: true,
 })
+const menuPined = defineModel<boolean>('menuPined', {
+  required: true,
+})
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 </script>

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

@@ -55,7 +55,6 @@
           :datastore-type="datastoreType"
           :alert-messages="alertMessages[selectedStep.id]"
           :messages-fields="selectedStep.fields"
-          :host-accessibility-submit="hostAccessibilitySubmit"
           :hosts="props.nfsHosts"
           @submit="saveChangesAndNextNfs"
         />
@@ -172,7 +171,7 @@ const checkName = async (
   }
   if (label && help) {
     return new Promise((resolve, _reject) =>
-      checkValidityName(label, wizard, (message: string) => {
+      checkValidityName(label, wizard, props.project, (message: string) => {
         resolve({
           isValid: message === '',
           message: message === '' ? '' : message,
@@ -215,6 +214,31 @@ const checkDatastoreNameAsync = async (
     stepHasError,
   }
 }
+
+const checkSelectedLunDiskSync = (
+  localization: UI_I_Localization,
+  { lunDisk, name }: UI_I_CreateDatastoreForm,
+  wizard: Wizard,
+  value: UI_I_WizardStep[]
+): UI_I_ValidationReturn => {
+  let stepHasError = false
+
+  if (!lunDisk.length && name) {
+    stepHasError = wizard.setValidation(2, 'lunDisk', {
+      fieldMessage: '',
+      alertMessage: localization.selectDiskToContinueAlert,
+      // alertMessage: localization.selectHostToContinueAlert,
+    })
+  } else if (wizard.hasMessage(2, 'lunDisk')) {
+    value = wizard.removeValidation(2, 'lunDisk', value)
+  }
+
+  return {
+    newValue: value,
+    stepHasError,
+  }
+}
+
 const checkNfsFolderSync = (
   localization: UI_I_Localization,
   name: string,
@@ -317,9 +341,16 @@ const validationFunc = async (
 
     value = nameValidation.newValue
 
-    //selectHostToContinueAlert
+    const lunDiskValidation = checkSelectedLunDiskSync(
+      localization.value,
+      form.value,
+      wizard,
+      value
+    )
 
-    stepHasError = nameValidation.stepHasError
+    value = lunDiskValidation.newValue
+
+    stepHasError = nameValidation.stepHasError || lunDiskValidation.stepHasError
   }
 
   if (wizard.isValidateForStep(5, currentStep.id, nextStep.id)) {
@@ -411,12 +442,6 @@ const dataReadyView = computed<UI_I_DetailsItem>(() =>
 )
 const onNextStep = (_force = false): void => {}
 
-const hostAccessibilitySubmit = ref<number>(0)
-
-const isWizardModeForSphere = computed<boolean>(
-  () => props.project === 'sphere'
-)
-
 const onSaveAndNextSharedStorm = (event: any): void => {
   const { sharedStorm } = datastoreForm.value
   sharedStorm.name = event.name
@@ -426,8 +451,7 @@ const onSaveAndNextSharedStorm = (event: any): void => {
   dataReadyView.value = constructDataReadyViewFunc(
     localization.value,
     'shared-storm',
-    event,
-    isWizardModeForSphere.value
+    event
   )
 
   onNextStep(true)
@@ -446,16 +470,11 @@ const saveChangesAndNextNfs = (event: any, next = true): void => {
         .map((host) => host.host)
     : []
 
-  dataReadyView.value = constructDataReadyViewFunc(
-    localization.value,
-    'nfs',
-    {
-      ...event,
-      hosts: hostsNames,
-      version: nfsVersion.value,
-    },
-    isWizardModeForSphere.value
-  )
+  dataReadyView.value = constructDataReadyViewFunc(localization.value, 'nfs', {
+    ...event,
+    hosts: hostsNames,
+    version: ' nfsVersion.value',
+  })
 
   next && onNextStep(true)
 }

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

@@ -37,6 +37,10 @@ export const stepsFunc = (
         alert: '',
         field: '',
       },
+      lunDisk: {
+        alert: '',
+        field: '',
+      },
     },
     isValid: true,
     testId: 'select-name-and-device-selection',

package/components/common/wizards/datastoreNew/add/lib/models/interfaces.ts

@@ -1,7 +1,8 @@
 import type { UI_T_NfsType } from '~/components/common/wizards/datastoreNew/add/lib/models/types'
+import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/datastoreNew/add/sharedStorm/deviceSelection/lib/models/interfaces'
 export interface UI_I_CreateDatastoreForm {
   name: string
-  lunDisk: any
+  lunDisk: UI_I_CreateStorageLunDiskItem
   nfsVersion: UI_T_NfsType
   type_code: 1 | 2 | 4
   readonly: boolean

package/components/common/wizards/datastoreNew/add/lib/utils.ts

@@ -5,8 +5,8 @@ import Wizard from '~/components/atoms/wizard/lib/utils/utils'
 export const checkValidityName = async (
   name: string,
   wizard: Wizard,
+  project: UI_T_Project,
   sendMessage: (message: string) => void,
-  project: UI_T_Project = 'procurator'
 ): Promise<void> => {
   // TODO move to projects!!!
 

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

@@ -22,11 +22,10 @@
 
     <common-wizards-datastore-new-add-nfs-accessibility
       v-if="showHostAccessibility"
-      v-model="model"
+      v-model="model.hosts"
       :alert-messages="props.alertMessages"
       :hosts="props.hosts"
       @hide-alert="(e) => emits('hide-alert', e)"
-      @next="onChangeAccessibilityAndNext"
     />
   </div>
 </template>
@@ -73,10 +72,6 @@ const onChangeConfigurationAndNext = (
   }
   emits('submit', sendData)
 }
-const onChangeAccessibilityAndNext = (hosts: string[]): void => {
-  sendData.hosts = hosts
-  emits('submit', sendData)
-}
 </script>
 
 <style lang="scss" scoped>

package/components/common/wizards/datastoreNew/add/nfs/accessibility/Accessibility.vue

@@ -17,8 +17,8 @@
       />
     </div>
     <div>
-      <common-wizards-datastore-add-nfs-accessibility-tables-view
-        v-model:selected-row="selectedHosts"
+      <common-wizards-datastore-new-add-nfs-accessibility-tables-view
+        v-model="modelHosts"
         :data-table="dataTable?.items || []"
         :total-items="dataTable?.total_items || 0"
         :total-pages="dataTable?.total_pages || 1"
@@ -42,10 +42,9 @@ const props = defineProps<{
   alertMessages: string[]
   hosts?: any
 }>()
-const model = defineModel<any>()
+const modelHosts = defineModel<string[]>()
 const emits = defineEmits<{
   (event: 'hide-alert', value: number): void
-  (event: 'next', value: string[]): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -67,23 +66,12 @@ const pagination = ref<UI_I_Pagination>({
   pageSize: 35,
 })
 const sort = ref<string | null>(null)
-
-const selectedHosts = ref<string[]>([])
-
 const updatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
 }
 const sortTable = (event: string): void => {
   sort.value = event
 }
-
-const submit = async () => {
-  if (!selectedHosts.value.length) {
-    return
-  }
-
-  emits('next', selectedHosts.value)
-}
 const onHideAlert = (): void => {
   emits('hide-alert', 6)
 }

package/components/common/wizards/datastoreNew/add/nfs/accessibility/tablesView/TablesView.vue

@@ -2,7 +2,7 @@
   <div class="data-table-view">
     <div>
       <atoms-table-data-grid
-        v-model:selected-row="selected"
+        v-model:selected-row="selectedHostsIdLocal"
         v-model:page-size="pagination.pageSize"
         v-model:page="pagination.page"
         type="checkbox"
@@ -46,14 +46,13 @@ import * as incompatibleTable from '~/components/common/wizards/datastore/add/nf
 
 const props = defineProps<{
   dataTable: I_CompatibleHostsTable[] | I_IncompatibleHostsTable[]
-  selectedRow: number[]
   tableType: T_HostsAccessibilityTab
   totalItems: number
   totalPages: number
   pagination: UI_I_Pagination
 }>()
+const selectedHostsIdLocal = defineModel<string[]>()
 const emits = defineEmits<{
-  (event: 'update:selected-row', value: number[]): void
   (event: 'pagination', value: UI_I_Pagination): void
   (event: 'sort', value: string): void
 }>()
@@ -61,16 +60,6 @@ const emits = defineEmits<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const loading = computed<boolean>(() => false)
-
-const selected = computed<number[]>({
-  get() {
-    return props.selectedRow
-  },
-  set(value) {
-    emits('update:selected-row', value)
-  },
-})
-
 const filtering = (e: [string, string][]): void => {
   console.log(e, 111)
 }
@@ -101,11 +90,8 @@ watch(
   },
   { deep: true, immediate: true }
 )
-interface TablesView {
-  'compatible-hosts': any
-  'incompatible-hosts': any
-}
-const tables: TablesView = {
+
+const tables: any = {
   'compatible-hosts': compatibleTable,
   'incompatible-hosts': incompatibleTable,
 }
@@ -113,20 +99,9 @@ const tables: TablesView = {
 const headItems = computed<UI_I_HeadItem[]>(() =>
   tables[props.tableType].headItems(localization.value)
 )
-
-const bodyItems = ref<UI_I_BodyItem[][]>([])
-watch(
-  () => props.dataTable,
-  (newValue) => {
-    if (!newValue?.length) {
-      bodyItems.value = []
-      return
-    }
-
-    bodyItems.value = tables[props.tableType].bodyItems(newValue)
-  },
-  { deep: true, immediate: true }
-)
+const bodyItems = computed<UI_I_BodyItem[][]>(() => {
+  return tables[props.tableType].bodyItems(props.dataTable)
+})
 </script>
 
 <style lang="scss" scoped>

package/package.json

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