bfg-common 1.3.334 → 1.3.335

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

@@ -27,7 +27,7 @@
             :step-position="stepPosition"
             :datastore-type="datastoreType"
             :local-create-name-submit="localCreateNameSubmit"
-            :datacenter-hosts="datacenterHosts"
+            :datacenter-hosts="props.datacenterHosts"
             :is-main-filter="props.isMainFilter"
             @loading="(e) => (loading = e)"
             @submit="onSaveNameAndNextLocal"
@@ -40,7 +40,7 @@
             :step-position="stepPosition"
             :datastore-type="datastoreType"
             :device-selection-submit="deviceSelectionSubmit"
-            :datacenter-hosts="datacenterHosts"
+            :datacenter-hosts="props.datacenterHosts"
             :is-main-filter="props.isMainFilter"
             @loading="(e) => (loading = e)"
             @submit="onSaveAndNextSharedStorm"
@@ -54,6 +54,7 @@
             :datastore-type="datastoreType"
             :nfs-configuration-submit="nfsConfigurationSubmit"
             :host-accessibility-submit="hostAccessibilitySubmit"
+            :datacenter-hosts="props.datacenterHosts"
             @loading="(e) => (loading = e)"
             @change-nfs-version="updateNfsVersion"
             @submit="saveChangesAndNextNfs"
@@ -293,6 +294,7 @@ const saveChangesAndNextNfs = (event: any, next = true): void => {
 }
 
 const isShowCompleteBlock = computed<boolean>(() => {
+  // TODO refactoring
   const localStep = datastoreType.value === 'local' && stepPosition.value === 2
 
   const sharesStep =
@@ -301,14 +303,31 @@ const isShowCompleteBlock = computed<boolean>(() => {
       ? stepPosition.value === 3
       : stepPosition.value === 2)
 
-  const nfsFirst =
-    datastoreType.value === 'nfs' &&
-    nfsVersion.value === 'nfs-3' &&
-    stepPosition.value === 3
-  const nfsSecond =
-    datastoreType.value === 'nfs' &&
-    nfsVersion.value === 'nfs-4.1' &&
-    stepPosition.value === 3
+  let nfsFirst
+  if (props.mode === 'procurator') {
+    nfsFirst =
+      datastoreType.value === 'nfs' &&
+      nfsVersion.value === 'nfs-3' &&
+      stepPosition.value === 3
+  } else {
+    nfsFirst =
+      datastoreType.value === 'nfs' &&
+      nfsVersion.value === 'nfs-3' &&
+      stepPosition.value === 4
+  }
+
+  let nfsSecond
+  if (props.mode === 'procurator') {
+    nfsSecond =
+      datastoreType.value === 'nfs' &&
+      nfsVersion.value === 'nfs-4.1' &&
+      stepPosition.value === 3
+  } else {
+    nfsSecond =
+      datastoreType.value === 'nfs' &&
+      nfsVersion.value === 'nfs-4.1' &&
+      stepPosition.value === 4
+  }
 
   return localStep || sharesStep || nfsFirst || nfsSecond
 })

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

@@ -21,9 +21,10 @@
     <!--      :nfs-version="nfsVersion"-->
     <!--    />--><!-- TODO Он будет когда будем делать групповое -->
 
-    <templates-home-datastore-actions-add-nfs-accessibility
+    <common-wizards-datastore-add-nfs-accessibility
       v-if="showHostAccessibility"
       :host-accessibility-submit="props.hostAccessibilitySubmit"
+      :datacenter-hosts="props.datacenterHosts"
       @next="applyChangesAndNext"
     />
     <!-- TODO Он будет когда будем делать групповое  -->
@@ -38,6 +39,7 @@ import {
   UI_T_WizardDatastoreMode,
 } from '~/components/common/wizards/datastore/add/lib/models/types'
 import { UI_I_ConfigurationSendDataNfs } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 import { subTitleFunc } from '~/components/common/wizards/datastore/add/lib/config/stepItems'
 
 const props = defineProps<{
@@ -46,6 +48,7 @@ const props = defineProps<{
   datastoreType: UI_T_DatastoreType
   nfsConfigurationSubmit: number
   hostAccessibilitySubmit: number
+  datacenterHosts?: UI_I_SelectHostOptions[]
 }>()
 const emits = defineEmits<{
   (event: 'loading', value: boolean): void
@@ -74,9 +77,16 @@ const stepSubTitle = computed<string>(() => {
 //   )
 // })
 const showHostAccessibility = computed<boolean>(() => {
-  return  props.mode === 'sphere' && props.stepPosition === 3
+  return props.mode === 'sphere' && props.stepPosition === 3
 })
 
+watch(
+  () => props.stepPosition,
+  (newValue: number) => {
+    console.log(showHostAccessibility.value, newValue, 1111, props.mode)
+  }
+)
+
 watch(nfsVersion, (newValue: UI_T_NfsType) => {
   emits('change-nfs-version', newValue)
 })

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

@@ -1,103 +1,111 @@
-<template>
-  <div>
-    <atoms-alert
-      v-show="errors.length"
-      test-id="accessibility"
-      status="alert-danger"
-      :items="errors"
-      @remove="removeValidationErrors"
-    />
-
-    <div>
-      <atoms-tabs
-        v-model="activeTab"
-        test-id="accessibility"
-        :items="tabs"
-        size="small"
-      />
-    </div>
-    <div>
-      <common-wizards-datastore-add-nfs-accessibility-tables-view
-        v-model:selected-row="selectedHost"
-        :data-table="dataTable?.items || []"
-        :total-items="dataTable?.total_items || 0"
-        :total-pages="dataTable?.total_pages || 1"
-        :pagination="pagination"
-        :table-type="activeTab"
-        @pagination="updatePagination"
-        @sort="sortTable"
-      />
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
-import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
-// import { hostsAccessibilityTablesFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems'
-
-const props = defineProps<{
-  hostAccessibilitySubmit: number
-}>()
-const localization = computed<UI_I_Localization>(() => useLocal())
-const emits = defineEmits<{
-  (event: 'next', value: string): void
-}>()
-
-const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
-const tabs = computed<UI_I_CollapseNavItem[]>(() =>
-  hostAccessibilityTabsFunc(localization.value, ['5', '3'])
-)
-
-// const dataTable = computed(() => hostsAccessibilityTablesFunc(activeTab.value))
-// TODO refactoring
-const { $store } = useNuxtApp()
-const dataTable = computed<any>(() => {
-  return $store.getters['storage/getNewDatastoreHosts']
-})
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 35,
-})
-const sort = ref<string | null>(null)
-
-const selectedHost = ref<number[]>([])
-
-const updatePagination = (event: UI_I_Pagination): void => {
-  pagination.value = event
-}
-const sortTable = (event: string): void => {
-  sort.value = event
-}
-
-const errors = ref<string[]>([])
-
-const showValidationErrors = (text: string): void => {
-  errors.value = [text]
-}
-const removeValidationErrors = (): void => {
-  errors.value = []
-}
-const submit = async () => {
-  if (!selectedHost.value.length) {
-    const text = localization.value.selectLeastEntityContinue
-    showValidationErrors(text)
-    return
-  }
-
-  removeValidationErrors()
-  emits('next', '')
-}
-watch(
-  () => props.hostAccessibilitySubmit,
-  () => {
-    submit()
-  }
-)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div>
+    <atoms-alert
+      v-show="errors.length"
+      test-id="accessibility"
+      status="alert-danger"
+      :items="errors"
+      @remove="removeValidationErrors"
+    />
+
+    <div>
+      <atoms-tabs
+        v-model="activeTab"
+        test-id="accessibility"
+        :items="tabs"
+        size="small"
+      />
+    </div>
+    <div>
+      <common-wizards-datastore-add-nfs-accessibility-tables-view
+        v-model:selected-row="selectedHost"
+        :data-table="dataTable?.items || []"
+        :total-items="dataTable?.total_items || 0"
+        :total-pages="dataTable?.total_pages || 1"
+        :pagination="pagination"
+        :table-type="activeTab"
+        @pagination="updatePagination"
+        @sort="sortTable"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
+import { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { hostAccessibilityTabsFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/config/tabsPannel'
+// import { hostsAccessibilityTablesFunc } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems'
+
+const props = defineProps<{
+  hostAccessibilitySubmit: number
+  datacenterHosts?: UI_I_SelectHostOptions[]
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+const emits = defineEmits<{
+  (event: 'next', value: string): void
+}>()
+
+const activeTab = ref<T_HostsAccessibilityTab>('compatible-hosts')
+const tabs = computed<UI_I_CollapseNavItem[]>(() =>
+  hostAccessibilityTabsFunc(localization.value, ['5', '3'])
+)
+
+console.log(444444)
+
+// const dataTable = computed(() => hostsAccessibilityTablesFunc(activeTab.value))
+// TODO refactoring
+const dataTable = computed<API_UI_I_DataTable<UI_I_SelectHostOptions[]>>(() => {
+  return {
+    items: props.datacenterHosts,
+    total_items: props.datacenterHosts.length,
+    total_pages: 1,
+  }
+})
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 35,
+})
+const sort = ref<string | null>(null)
+
+const selectedHost = ref<number[]>([])
+
+const updatePagination = (event: UI_I_Pagination): void => {
+  pagination.value = event
+}
+const sortTable = (event: string): void => {
+  sort.value = event
+}
+
+const errors = ref<string[]>([])
+
+const showValidationErrors = (text: string): void => {
+  errors.value = [text]
+}
+const removeValidationErrors = (): void => {
+  errors.value = []
+}
+const submit = async () => {
+  if (!selectedHost.value.length) {
+    const text = localization.value.selectLeastEntityContinue
+    showValidationErrors(text)
+    return
+  }
+
+  removeValidationErrors()
+  emits('next', '')
+}
+watch(
+  () => props.hostAccessibilitySubmit,
+  () => {
+    submit()
+  }
+)
+</script>
+
+<style lang="scss" scoped></style>

package/package.json

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