bfg-common 1.4.58 → 1.4.60

package/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/lib/config/selectOptions.ts

@@ -1,12 +1,12 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
 
 export const partitionConfigurationFunc = (
   localization: UI_I_Localization
 ): UI_I_SelectHostOptions[] => {
   return [
-    { text: localization.common.selectConfiguration, value: '', disabled: true },
-    { text: localization.common.useAllAvailablePartitions, value: 'all-partitions' },
+    { text: localization.selectConfiguration, value: '', disabled: true },
+    { text: localization.useAllAvailablePartitions, value: 'all-partitions' },
   ]
 }
 export const blockSizeFunc = (
@@ -14,7 +14,7 @@ export const blockSizeFunc = (
 ): UI_I_SelectHostOptions[] => {
   return [
     {
-      text: `1 ${localization.common.mb}`,
+      text: `1 ${localization.mb}`,
       value: '1',
     },
   ]
@@ -25,7 +25,7 @@ export const spaceGranularityFunc = (
 ): UI_I_SelectHostOptions[] => {
   return [
     {
-      text: `1 ${localization.common.mb}`,
+      text: `1 ${localization.mb}`,
       value: '1',
     },
   ]
@@ -35,11 +35,11 @@ export const spacePriorityFunc = (
 ): UI_I_SelectHostOptions[] => {
   return [
     {
-      text: localization.common.low,
+      text: localization.low,
       value: 'low',
     },
     {
-      text: localization.common.none,
+      text: localization.none,
       value: 'none',
     },
   ]

package/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/sizeGraphic/sizeGraphic.vue

@@ -189,7 +189,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
   selectedSize: number | null
@@ -205,7 +205,7 @@ const setProgress = computed<number>(() => {
 })
 
 const emptySizeText = computed<string>(() => {
-  const { empty, gb } = localization.value.common
+  const { empty, gb } = localization.value
 
   return `${empty}: ${props.capacity} ${gb}`
 })

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

@@ -19,46 +19,47 @@
           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>
 
     <common-select-radio-group
-      v-model="selectedType"
+      v-model="selectedDatastoreTypeLocal"
       :options="datastoreTypes"
+      @change="onChangeType"
     />
   </section>
 </template>
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-// import type { UI_T_Project } from '~/lib/models/types'
+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/datastore/add/lib/models/interfaces'
+import { E_DatastoreTypeKode } from '~/components/common/wizards/datastore/add/lib/models/enums'
 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
+  project: UI_T_Project
 }>()
+const selectedDatastoreTypeLocal =
+  defineModel<UI_T_DatastoreType>('datastoreType')
+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 => {
+  model.value.type_code = E_DatastoreTypeKode[selectedDatastoreTypeLocal.value]
 
-const selectedType = computed<string>({
-  get() {
-    return props.type
-  },
-  set(newValue) {
-    emits('update:type', newValue)
-  },
-})
+  model.value.name = 'Datastore' // default value is  'Datastore' every time
+}
 
 const isShowTypeHelp = ref<boolean>(false)
 </script>

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

@@ -1,12 +1,11 @@
-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 { 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'
 
 export const datastoreTypesFunc = (
   localization: UI_I_Localization,
-  // _project: UI_T_Project
+  _project?: UI_T_Project
 ): UI_I_RadioOption[] => {
-  // const types = [
   return [
     {
       label: localization.common.stormSharedStorage,
@@ -26,25 +25,17 @@ export const datastoreTypesFunc = (
       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,
+  //     label: localization.common.localStorage,
   //     value: 'local',
   //     disabled: false,
-  //     description: localization.localDesc,
+  //     description: localization.common.localDesc,
   //     isTooltip: false,
-  //     tooltipContent: localization.localStorageHelpDesc,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
   //     testId: 'datastore-type-local',
   //   })
   // }
-
-  // return types
 }

package/lib/models/enums.ts

@@ -31,4 +31,5 @@ export enum UI_E_Kind {
   UNKNOWN,
   NORMAL,
   SYSTEM,
+  STORAGE_VALIDATION_NAME = 10,
 }

package/package.json

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

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

@@ -1,225 +0,0 @@
-import type { UI_I_VerticalStepItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_T_WizardDatastoreMode,
-  UI_T_DatastoreType,
-  UI_T_NfsType,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-
-const stepFromSharedStorm = (
-  localization: UI_I_Localization,
-  mode: UI_T_WizardDatastoreMode
-): UI_I_VerticalStepItem[] => {
-  const steps = [
-    {
-      text: localization.common.type,
-      disabled: false,
-      complete: false,
-      testId: 'create-datastore-select-type',
-    },
-    {
-      text: localization.common.nameAndDeviceSelection,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-name-and-device-selection',
-    },
-    // {
-    //   text: localization.vmfsVersion,
-    //   disabled: true,
-    //   complete: false,
-    // }, <!-- TODO в shared-storm пока верси не будет  -->
-    // {
-    //   text: localization.partitionConfiguration,
-    //   disabled: true,
-    //   complete: false,
-    // },
-  ]
-  // TODO refactoring
-  if (mode === 'procurator') {
-    steps.push({
-      text: localization.common.partitionConfiguration,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-partition-configuration',
-    })
-  }
-  steps.push({
-    text: localization.common.readyComplete,
-    disabled: true,
-    complete: false,
-    testId: 'create-datastore-storm-ready-complete',
-  })
-  return steps
-}
-
-const stepFromNfs = (
-  localization: UI_I_Localization,
-  mode: UI_T_WizardDatastoreMode
-): UI_I_VerticalStepItem[] => {
-  const steps = [
-    {
-      text: localization.common.type,
-      disabled: false,
-      complete: false,
-      testId: 'create-datastore-select-type',
-    },
-    {
-      text: localization.common.nfsVersion,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-select-nfs-version',
-    },
-    {
-      text: localization.common.nameAndConfiguration,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-name-and-configuration',
-    },
-    // {
-    //   text: localization.kerberosAuthentication,
-    //   disabled: true,
-    //   complete: false,
-    //   permissions: ['nfs-4.1'],
-    // },// TODO Пока что не будет чут попоже
-    // { text: localization.hostsAccessibility, disabled: true, complete: false }, // Он будет когда будем делать групповое
-    // { text: localization.readyComplete, disabled: true, complete: false },
-  ]
-
-  if (mode === 'sphere') {
-    steps.push({
-      text: localization.common.hostsAccessibility,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-hosts-accessibility',
-    })
-  }
-
-  steps.push({
-    text: localization.common.readyComplete,
-    disabled: true,
-    complete: false,
-    testId: 'create-datastore-nfs-ready-complete',
-  })
-
-  return steps
-
-  // console.log(position, 'position')
-
-  // nfsItems = nfsItems.filter((item) => {
-  //   // return item.permissions
-  //   //   ? type !== null
-  //   //     ? item.permissions.includes(type)
-  //   //     : true
-  //   //   : false
-  //   return item.permissions ? item.permissions.includes(type) : true
-  // })
-  // nfsItems.forEach((x, key) => {
-  //   if (key <= position) {
-  //     // console.log(key, 'key')
-  //     x.complete = true
-  //     x.disabled = false
-  //   }
-  // })
-
-  // console.log(type, 'typeeeeee')
-}
-
-// const stemFromVvol = (localization: UI_I_Localization): UI_I_VerticalStepItem[] => {
-//   return [
-//     { text: localization.common.type, disabled: false, complete: false },
-//     {
-//       text: localization.nameAndContainerSelection,
-//       disabled: true,
-//       complete: false,
-//     },
-//     { text: localization.hostsAccessibility, disabled: true, complete: false },
-//     { text: localization.readyComplete, disabled: true, complete: false },
-//   ]
-// }
-const stemFromLocal = (
-  localization: UI_I_Localization,
-  mode: UI_T_WizardDatastoreMode
-): UI_I_VerticalStepItem[] => {
-  const isModeProcurator = mode === 'procurator'
-  return [
-    {
-      text: localization.common.type,
-      disabled: false,
-      complete: false,
-      testId: 'create-datastore-select-type',
-    },
-    {
-      text: localization.common[
-        isModeProcurator ? 'selectDatastoreName' : 'nameAndDeviceSelection'
-      ],
-      disabled: true,
-      complete: false,
-      testId: `create-datastore-${
-        isModeProcurator ? 'select-datastore-name' : 'name-and-device-selection'
-      }`,
-    },
-    {
-      text: localization.common.readyComplete,
-      disabled: true,
-      complete: false,
-      testId: 'create-datastore-local-ready-complete',
-    },
-  ]
-}
-
-export const stepItemsFunc = (
-  localization: UI_I_Localization,
-  type: UI_T_DatastoreType,
-  mode: UI_T_WizardDatastoreMode
-): UI_I_VerticalStepItem[] => {
-  const handlers = {
-    'shared-storm': stepFromSharedStorm,
-    nfs: stepFromNfs,
-    local: stemFromLocal,
-  }
-
-  return handlers[type](localization, mode)
-}
-
-interface SubTitles {
-  'shared-storm': string[]
-  nfs: string[]
-  local: string[]
-}
-
-export const subTitleFunc = (
-  localization: UI_I_Localization,
-  type: UI_T_DatastoreType,
-  position: number,
-  version?: UI_T_NfsType
-): string => {
-  position = position - 1
-
-  if (type === 'nfs' && version === 'nfs-3' && position === 2) {
-    position = position + 1
-  }
-
-  const description: string[] = [
-    localization.common.selectNfsVersion,
-    localization.common.nameAndConfigurationDesc,
-    // localization.kerberosAuthenticationDesc.replace(
-    //   '{0}',
-    //   version?.toUpperCase() || ''
-    // ),
-    // localization.hostsAccessibilityDesc,
-  ]
-
-  const sharedStormDesc: string[] = [
-    localization.common.nameAndDeviceSelectionDesc,
-    // localization.vmfsVersionDesc,
-    localization.common.partitionConfigurationDesc,
-  ]
-
-  const subTitles: SubTitles = {
-    nfs: description,
-    'shared-storm': sharedStormDesc,
-    local: [],
-  }
-
-  return subTitles[type][position]
-}

package/components/common/wizards/datastore/add/local/createName/lib/config/defaultForm.ts

@@ -1,15 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const defaultFormFunc = (localization: UI_I_Localization): any => {
-  return {
-    name: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.common.specifyDatastoreName,
-        },
-      ],
-    },
-  }
-}

package/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/config/hostsTableItems.ts

@@ -1,53 +0,0 @@
-import type {
-  I_CompatibleHostsTable,
-  I_IncompatibleHostsTable,
-} from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/interfaces'
-import type { T_HostsAccessibilityTab } from '~/components/common/wizards/datastore/add/nfs/accessibility/lib/models/types'
-import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
-
-const compatibleHostsTable: API_UI_I_DataTable<I_CompatibleHostsTable[]> = {
-  items: [
-    {
-      id: 1,
-      host: 'esxi0.иридиум',
-      cluster: 'Cluster00',
-    },
-    {
-      id: 2,
-      host: ' esxi0.иридиум',
-      cluster: 'Cluster00',
-    },
-    {
-      id: 3,
-      host: 'esxi3.иридиум',
-      cluster: 'Cluster00',
-    },
-    {
-      id: 4,
-      host: 'esxi4.иридиум',
-      cluster: 'Cluster00',
-    },
-    {
-      id: 5,
-      host: 'esxi1.иридиум',
-      cluster: 'Cluster01',
-    },
-  ],
-  total_items: 5,
-  total_pages: 1,
-}
-const incompatibleHostsTable: API_UI_I_DataTable<I_IncompatibleHostsTable[]> = {
-  items: [],
-  total_items: 0,
-  total_pages: 1,
-}
-
-export { incompatibleHostsTable, compatibleHostsTable }
-export const hostsAccessibilityTablesFunc = (type: T_HostsAccessibilityTab) => {
-  const hostItems = {
-    'compatible-hosts': compatibleHostsTable,
-    'incompatible-hosts': incompatibleHostsTable,
-  }
-
-  return hostItems[type]
-}

package/components/common/wizards/datastore/add/nfs/configuration/lib/config/defaultForm.ts

@@ -1,33 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const defaultFormFunc = (localization: UI_I_Localization): any => {
-  return {
-    name: {
-      value: 'Datastore',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.common.specifyDatastoreName,
-        },
-      ],
-    },
-    folder: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.common.specifyFolderName,
-        },
-      ],
-    },
-    server: {
-      value: '',
-      validations: [
-        {
-          value: 'required',
-          errorText: localization.common.specifyServerName,
-        },
-      ],
-    },
-  }
-}

package/components/common/wizards/datastore/add/nfs/configuration/serversList/DeletePopover.vue

@@ -1,100 +0,0 @@
-<template>
-  <div class="popover">
-    <slot>
-      <span
-        class="popover__item"
-        data-id="delete-popover-text"
-        @click="onClickItem"
-        >{{ localization.common.removeMember }}</span
-      >
-    </slot>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'click-item'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const onClickItem = (): void => {
-  emits('click-item')
-}
-const hide = (): void => {
-  emits('hide')
-}
-const windowClick = (): void => {
-  hide()
-}
-
-onMounted(() => {
-  setTimeout(() => {
-    window.addEventListener('click', windowClick)
-  })
-})
-onUnmounted(() => {
-  window.removeEventListener('click', windowClick)
-})
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-
-.popover {
-  @include flex($align: center, $just: space-between);
-  height: 38px;
-  background: var(--block-view-bg-color2);
-  padding: 0.3rem;
-  margin-left: 0.3rem;
-  border: 0.05rem solid var(--block-border-color);
-  box-shadow: 0 0.05rem 0.15rem hsl(0deg 0% 55% / 25%);
-  transform: translateY(-50%);
-  border-radius: 0.15rem;
-  font-weight: 400;
-  white-space: nowrap;
-  z-index: 600;
-  &:before,
-  &:after {
-    content: '';
-    position: absolute;
-    top: 50%;
-    right: 100%;
-    width: 0;
-    height: 0;
-  }
-  &:before {
-    margin-top: -0.3rem;
-    border-bottom: 0.3rem solid transparent;
-    border-top: 0.3rem solid transparent;
-    border-left: 0;
-    border-right: 0.3rem solid var(--block-border-color);
-  }
-  &:after {
-    margin-top: -0.25rem;
-    border-right: 0.25rem solid var(--block-view-bg-color2);
-    border-top: 0.25rem solid transparent;
-    border-bottom: 0.25rem solid transparent;
-  }
-  &__item {
-    @include text($fs: 14px, $c: var(--global-font-color3));
-    line-height: 1.15rem;
-    padding: 0.05rem 1.2rem 0;
-    &:hover {
-      background-color: var(--popover-hover-bg-color);
-      cursor: pointer;
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --popover-hover-bg-color: #e8e8e8;
-}
-:root.dark-theme {
-  --popover-hover-bg-color: #28404d;
-}
-</style>