bfg-common 1.5.773 → 1.5.775

package/components/common/wizards/common/steps/name/lib/models/interfaces.ts

@@ -1,4 +1,4 @@
-export interface UI_I_NameTestIds {
-  name: string
-  helpIcon: string
-}
+export interface UI_I_NameTestIds {
+  name: string
+  helpIcon: string
+}

package/components/common/wizards/common/steps/name/location/New.vue

@@ -1,40 +1,40 @@
-<template>
-  <div class="tree-view">
-    <ui-tree
-      :nodes="props.nodes"
-      :expand-all="false"
-      :is-loading="props.loading"
-      @toggle-node="onShowNodes"
-      @select-node="emits('select-node', $event)"
-    >
-      <template #content="{ node }">
-        <div class="flex-align-center">
-          <span :class="['node-icon', node.iconClassName]"></span>
-          <span class="node-name">{{ node.name }}</span>
-        </div>
-      </template>
-    </ui-tree>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-nodes', value: {
-    node: UI_I_TreeNode
-    cb: () => void
-  }): void
-}>()
-
-const onShowNodes = (node: UI_I_TreeNode) => {
-  emits('show-nodes', { node, cb: (): void => {} })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <div class="tree-view">
+    <ui-tree
+      :nodes="props.nodes"
+      :expand-all="false"
+      :is-loading="props.loading"
+      @toggle-node="onShowNodes"
+      @select-node="emits('select-node', $event)"
+    >
+      <template #content="{ node }">
+        <div class="flex-align-center">
+          <span :class="['node-icon', node.iconClassName]"></span>
+          <span class="node-name">{{ node.name }}</span>
+        </div>
+      </template>
+    </ui-tree>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const props = defineProps<{
+  loading: boolean
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-nodes', value: {
+    node: UI_I_TreeNode
+    cb: () => void
+  }): void
+}>()
+
+const onShowNodes = (node: UI_I_TreeNode) => {
+  emits('show-nodes', { node, cb: (): void => {} })
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -71,6 +71,7 @@ const props = withDefaults(
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'finish', value: UI_I_CreateDatastoreForm): void
+  (event: 'main-filter', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -12,16 +12,6 @@
       @hide="onHideModal"
       @submit="onCreateDatastore"
     >
-      <template #description="{ selectedStep }">
-        <div class="add-datastore__wizard-description">
-          <h2>{{ selectedStep.subTitle }}</h2>
-
-          <common-wizards-datastore-add-steps-type-mode-tooltip
-            v-if="selectedStep.id === dynamicSteps.type"
-          />
-        </div>
-      </template>
-
       <template #modalBody="{ selectedStep }">
         <common-wizards-datastore-add-steps-type-mode
           v-if="selectedStep.id === dynamicSteps.type"
@@ -122,12 +112,6 @@ const onCreateDatastore = (): void => emits('submit')
     height: 100%;
     padding-left: 24px;
   }
-
-  .add-datastore__wizard-description {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-  }
 }
 
 .finish-block {

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

@@ -6,7 +6,6 @@ export const datastoreDefaultFormFunc = (
   return {
     name: 'Datastore',
     dev_names: [],
-    level: 'linear',
     hosts: hostId ? [hostId] : [],
     type_code: 2,
     version: 4.1,

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

@@ -7,7 +7,6 @@ import type { UI_I_CreateStorageLunDiskItem } from '~/components/common/wizards/
 export interface UI_I_CreateDatastoreForm {
   name: string
   dev_names: UI_I_CreateStorageLunDiskItem[]
-  level: 'linear' | 'raid0' | 'raid1' | 'raid5' | 'raid6' | 'raid10'
   version: UI_T_NfsType
   type_code: UI_T_DatastoreTypeCode
   readonly: boolean

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

@@ -1,85 +1,85 @@
-import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import { UI_E_Kind } from '~/lib/models/enums'
-
-export const checkValidityName = async ({
-  name,
-  wizard,
-  project,
-  sendMessage,
-  datacenterId,
-}: {
-  name: string
-  wizard: Wizard
-  project: UI_T_Project
-  sendMessage: (message: string) => void
-  datacenterId?: string
-}): Promise<void> => {
-  wizard.setLoader(true)
-  const url = buildValidationUrl(name, project, datacenterId)
-
-  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-    method: 'GET',
-  })
-
-  wizard.setLoader(false)
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
-  }
-  sendMessage('')
-}
-
-const buildValidationUrl = (
-  name: string,
-  project: UI_T_Project,
-  datacenterId?: string
-): string => {
-  if (project === 'procurator') {
-    const params = new URLSearchParams({ name })
-    return `/ui/ds/validate?${params.toString()}`
-  }
-
-  const params = new URLSearchParams()
-  params.set('name', name)
-  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
-  if (datacenterId) params.set('datacenter', datacenterId)
-
-  return `/ui/object/validate_name_datacenter?${params.toString()}`
-}
-
-export const validateNameAndGenerateDataId = (
-  name: string,
-  _errorMessage: string,
-  defaultDataId?: string
-): string => {
-  let baseDataId = defaultDataId || 'storage-name-alert-error'
-
-  const patterns = [
-    {
-      regex: /^[a-zA-Z0-9_\-\.]+$/,
-      error_message:
-        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
-      suffix: '-invalid-name-symbols',
-    },
-    {
-      regex: /^.{3,64}$/,
-      error_message:
-        /invalid name length, must be between: \d+ and \d+ characters/,
-      suffix: '-invalid-name-length',
-    },
-  ]
-
-  // Проверка error_message на соответствие шаблонам
-
-  for (const pattern of patterns) {
-    if (!pattern.regex.test(name)) {
-      return `${baseDataId}${pattern.suffix}`
-    }
-  }
-
-  return baseDataId
-}
+import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import { UI_E_Kind } from '~/lib/models/enums'
+
+export const checkValidityName = async ({
+  name,
+  wizard,
+  project,
+  sendMessage,
+  datacenterId,
+}: {
+  name: string
+  wizard: Wizard
+  project: UI_T_Project
+  sendMessage: (message: string) => void
+  datacenterId?: string
+}): Promise<void> => {
+  wizard.setLoader(true)
+  const url = buildValidationUrl(name, project, datacenterId)
+
+  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+    method: 'GET',
+  })
+
+  wizard.setLoader(false)
+
+  if (error.value && error.value.data.error_code !== 0) {
+    const existError = error.value.data?.error_message || error.value.data
+    sendMessage(existError)
+    return
+  }
+  sendMessage('')
+}
+
+const buildValidationUrl = (
+  name: string,
+  project: UI_T_Project,
+  datacenterId?: string
+): string => {
+  if (project === 'procurator') {
+    const params = new URLSearchParams({ name })
+    return `/ui/ds/validate?${params.toString()}`
+  }
+
+  const params = new URLSearchParams()
+  params.set('name', name)
+  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
+  if (datacenterId) params.set('datacenter', datacenterId)
+
+  return `/ui/object/validate_name_datacenter?${params.toString()}`
+}
+
+export const validateNameAndGenerateDataId = (
+  name: string,
+  _errorMessage: string,
+  defaultDataId?: string
+): string => {
+  let baseDataId = defaultDataId || 'storage-name-alert-error'
+
+  const patterns = [
+    {
+      regex: /^[a-zA-Z0-9_\-\.]+$/,
+      error_message:
+        /invalid name, must only contain letters, numbers, and '_', '-' '.' symbols/,
+      suffix: '-invalid-name-symbols',
+    },
+    {
+      regex: /^.{3,64}$/,
+      error_message:
+        /invalid name length, must be between: \d+ and \d+ characters/,
+      suffix: '-invalid-name-length',
+    },
+  ]
+
+  // Проверка error_message на соответствие шаблонам
+
+  for (const pattern of patterns) {
+    if (!pattern.regex.test(name)) {
+      return `${baseDataId}${pattern.suffix}`
+    }
+  }
+
+  return baseDataId
+}

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceNew.vue

@@ -76,11 +76,6 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
-
-    <common-wizards-datastore-add-steps-name-and-device-advanced-options
-      v-model="formModelLocal.level"
-      :dev-names-count="formModelLocal.dev_names.length"
-    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/NameAndDeviceOld.vue

@@ -90,11 +90,6 @@
         @main-filter="emits('main-filter', $event)"
       />
     </div>
-
-    <common-wizards-datastore-add-steps-name-and-device-advanced-options
-      v-model="formModelLocal.level"
-      :dev-names-count="formModelLocal.dev_names.length"
-    />
   </div>
 </template>
 

package/components/common/wizards/datastore/add/steps/nameAndDevice/table/old/Old.vue

@@ -18,7 +18,8 @@
       hide-page-size
       @sorting="onSorting"
       @main-filter="emits('main-filter', $event)"
-    />
+    >
+    </atoms-table-data-grid>
   </div>
 </template>
 
@@ -91,7 +92,7 @@ watch(
   .data-table {
     height: inherit;
     :deep(.datagrid-outer-wrapper) {
-      max-height: 400px;
+      height: 400px;
     }
   }
 }

package/components/common/wizards/datastore/add/steps/readyComplete/lib/config/propertiesDetails.ts

@@ -112,7 +112,7 @@ const sharedStormDetailsFunc = (
   localization: UI_I_Localization,
   data: UI_I_CreateDatastoreForm
 ): UI_I_DetailsItem[] => {
-  const { name, dev_names, level } = data
+  const { name, dev_names } = data
 
   return [
     {
@@ -132,13 +132,6 @@ const sharedStormDetailsFunc = (
           items: [],
           testId: 'view-selected-lun-disks-in-complete',
         },
-        {
-          label: localization.common.advancedOptions,
-          value: level,
-          items: [],
-          testId: 'view-advanced-options-in-complete',
-          iconClassName: '',
-        },
       ],
       actions: [],
     },

package/components/common/wizards/datastore/add/steps/typeMode/TypeModeOld.vue

@@ -1,5 +1,31 @@
 <template>
   <section class="datastore-types">
+    <div class="header-row">
+      <span class="datastore-types__subtitle">
+        {{ localization.common.specifyDatastoreType }}
+      </span>
+      <div id="type-select-help-icon" class="signpost-container relative">
+        <atoms-the-icon
+          data-id="toggle-type-select-help-icon"
+          fill="#0072a3"
+          width="24px"
+          height="24px"
+          name="info-circle"
+          @click="isShowTypeHelp = !isShowTypeHelp"
+        />
+        <atoms-tooltip-signpost
+          v-if="isShowTypeHelp"
+          elem-id="type-select-help-icon"
+          test-id="select-datastore-type"
+          @hide="isShowTypeHelp = false"
+        >
+          <p class="help-desc">
+            {{ localization.common.datastoreTypeHelpDesc }}
+          </p>
+        </atoms-tooltip-signpost>
+      </div>
+    </div>
+
     <common-select-radio-group
       v-model="datastoreTypeModeLocal"
       :options="props.options"
@@ -9,6 +35,7 @@
 </template>
 
 <script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
 
 const datastoreTypeModeLocal = defineModel<number>({ required: true })
@@ -16,9 +43,29 @@ const props = defineProps<{
   options: UI_I_RadioOption[]
 }>()
 
+const localization = computed<UI_I_Localization>(() => useLocal())
+
 const onChangeType = (): void => {
   // model.value.name = 'Datastore' // default value is  'Datastore' every time
 }
+
+const isShowTypeHelp = ref<boolean>(false)
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.datastore-types {
+  .signpost-container {
+    display: flex;
+    cursor: pointer;
+
+    .help-desc-container {
+      max-width: 350px;
+    }
+  }
+  .header-row {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+  }
+}
+</style>

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

@@ -1,43 +1,43 @@
-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'
-
-export const datastoreTypesFunc = (
-  localization: UI_I_Localization,
-  _project?: UI_T_Project
-): UI_I_RadioOption[] => {
-  return [
-    {
-      id: 'datastore-type-shared-storm',
-      label: localization.common.stormSharedStorage,
-      value: 2,
-      disabled: false,
-      description: localization.common.sharedStormDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.stormSharedStorageHelpDesc,
-      testId: 'datastore-type-shared-storm',
-    },
-    {
-      id: 'datastore-type-nfs',
-      label: localization.common.nfs,
-      value: 4,
-      disabled: false,
-      description: localization.common.nfsDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.nfsHelpDesc,
-      testId: 'datastore-type-nfs',
-    },
-  ]
-
-  // if (project === 'procurator') {
-  //   types.unshift({
-  //     label: localization.common.localStorage,
-  //     value: 1,
-  //     disabled: false,
-  //     description: localization.common.localDesc,
-  //     isTooltip: false,
-  //     tooltipContent: localization.common.localStorageHelpDesc,
-  //     testId: 'datastore-type-local',
-  //   })
-  // }
-}
+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'
+
+export const datastoreTypesFunc = (
+  localization: UI_I_Localization,
+  _project?: UI_T_Project
+): UI_I_RadioOption[] => {
+  return [
+    {
+      id: 'datastore-type-shared-storm',
+      label: localization.common.stormSharedStorage,
+      value: 2,
+      disabled: false,
+      description: localization.common.sharedStormDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.stormSharedStorageHelpDesc,
+      testId: 'datastore-type-shared-storm',
+    },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 4,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+  ]
+
+  // if (project === 'procurator') {
+  //   types.unshift({
+  //     label: localization.common.localStorage,
+  //     value: 1,
+  //     disabled: false,
+  //     description: localization.common.localDesc,
+  //     isTooltip: false,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
+  //     testId: 'datastore-type-local',
+  //   })
+  // }
+}

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

@@ -146,7 +146,7 @@ import {
   connectionSettingsInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   addNetworkingZeroOrFirstSchemeDataFunc,
   addNetworkingSecondOrThirdSchemeDataFunc,
   addNetworkingFourthOrFifthSchemeDataFunc,
@@ -245,21 +245,8 @@ const alertMessages = computed<string[][]>(() => wizard.alertMessages.value)
 
 const readyCompleteFields = ref<UI_I_ReadyCompleteFields[]>([])
 
-const globalPermissions = computed<any>(
-  () => $store.getters['globalPermissions/getPermissions']
-)
-
 // Step's content data (connectionType)
-const connectionType = ref<string>(
-  globalPermissions.value === undefined
-    ? '0'
-    : !globalPermissions.value?.['Networks.CreateSysx'] &&
-      !globalPermissions.value?.['Networks.CreatePortGroup']
-    ? '2'
-    : !globalPermissions.value?.['Networks.CreateSysx']
-    ? '1'
-    : '0'
-)
+const connectionType = ref<string>('0')
 
 const connectionTypeLocal = computed<string>({
   get() {
@@ -291,11 +278,7 @@ const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus): void => {
 }
 
 // Step's content data and changers (targetDevice)
-const targetDevice = ref<UI_I_TargetDevice>(
-  useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
-  )
-)
+const targetDevice = ref<UI_I_TargetDevice>(useDeepCopy(targetDeviceInitial))
 const mtuFromSwitch = ref<number>(1500)
 
 const onChangeTargetDevice = (newTargetDevice: UI_I_TargetDevice): void => {
@@ -386,11 +369,7 @@ watch(
         ? (targetDevice.value.selected = '1')
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
-      newCT === '2' &&
-        (globalPermissions.value === undefined ||
-        globalPermissions.value?.['Networks.UpdateSwitch']
-          ? (targetDevice.value.selected = '2')
-          : (targetDevice.value.selected = '3'))
+      newCT === '2' && (targetDevice.value.selected = '2')
     }
     if (newCT === '0') {
       ;(newTD.selected === '0' || newTD.selected === '1') &&
@@ -517,9 +496,7 @@ watch(
 const reset = (): void => {
   wizard.reset()
   connectionTypeLocal.value = '0'
-  targetDevice.value = useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
-  )
+  targetDevice.value = useDeepCopy(targetDeviceInitial)
   connectionSettings.value = useDeepCopy(connectionSettingsInitial)
   portProperties.value = useDeepCopy(portPropertiesInitial)
   ipFourSettings.value = useDeepCopy(ipFourSettingsInitial)

package/components/common/wizards/network/add/lib/config/config.ts

@@ -18,7 +18,7 @@ export const {
 export const {
   servicesInitial,
   vlanIdSelectData,
-  targetDeviceInitialFunc,
+  targetDeviceInitial,
   portPropertiesInitial,
   ipFourSettingsInitial,
   connectionSettingsInitial,

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -22,16 +22,13 @@ export const servicesInitial: UI_I_Services = {
   nVMeOverRDMA: false,
 }
 
-export const targetDeviceInitialFunc = (
-  updateSwitchPermission: boolean
-): UI_I_TargetDevice => ({
-  selected:
-    updateSwitchPermission === undefined || updateSwitchPermission ? '1' : '3',
+export const targetDeviceInitial: UI_I_TargetDevice = {
+  selected: '1',
   network: '',
   switch: '',
   standardSwitch: '',
   mtu: 1500,
-})
+}
 
 export const portPropertiesInitial: UI_I_PortProperties = {
   networkLabel: '',

package/components/common/wizards/network/add/lib/config/selectConnectionTypeStep.ts

@@ -27,6 +27,5 @@ export const selectConnectionTypeFunc = (
     value: '2',
     testId: 'physical-adapter-radio',
     id: 'physical-adapter',
-    permission: 'Networks.UpdateSwitch Networks.CreateSwitch',
   },
 ]