bfg-common 1.4.113 → 1.4.115

package/assets/scss/common/icons/icons-5.scss

@@ -133,10 +133,12 @@
 .icon-calendar-years {
   background-position: 0 73.4%;
 }
-.icon-folder-warning {
+.icon-folder-warning,
+.vsphere-icon-folder-warning {
   background-position: 0 74.6%;
 }
-.icon-folder-error {
+.icon-folder-error,
+.vsphere-icon-folder-error {
   background-position: 0 75.9%;
 }
 .icon-file {
@@ -166,15 +168,19 @@
 .icon-log-file-error {
   background-position: 0 87.3%;
 }
-.vx-icon-memory-warning {
+.vx-icon-memory-warning,
+.icon-vSphere-dsVmNvram-warning {
   background-position: 0 88.6%;
 }
-.vx-icon-memory-error {
+.vx-icon-memory-error
+.icon-vSphere-dsVmNvram-error {
   background-position: 0 89.8%;
 }
+.icon-vSphere-dsIsoImage-warning,
 .icon-ds-iso-image-warning {
   background-position: 0 91.1%;
 }
+.icon-vSphere-dsIsoImage-error,
 .icon-ds-iso-image-error {
   background-position: 0 92.4%;
 }
@@ -243,6 +249,8 @@
 .icon-calendar-years,
 .icon-folder-warning,
 .icon-folder-error,
+.vsphere-icon-folder-warning,
+.vsphere-icon-folder-error,
 .icon-file,
 .icon-file-warning,
 .icon-file-error,
@@ -254,6 +262,10 @@
 .icon-log-file-error,
 .vx-icon-memory-warning,
 .vx-icon-memory-error,
+.icon-vSphere-dsVmNvram-warning,
+.icon-vSphere-dsVmNvram-error,
+.icon-vSphere-dsIsoImage-warning,
+.icon-vSphere-dsIsoImage-error,
 .icon-ds-iso-image-warning,
 .icon-ds-iso-image-error,
 .icon-temporary-file,
@@ -314,6 +326,8 @@
 .active .icon-calendar-years,
 .active .icon-folder-warning,
 .active .icon-folder-error,
+.active .vsphere-icon-folder-warning,
+.active .vsphere-icon-folder-error,
 .active .icon-file,
 .active .icon-file-warning,
 .active .icon-file-error,
@@ -325,6 +339,10 @@
 .active .icon-log-file-error,
 .active .vx-icon-memory-warning,
 .active .vx-icon-memory-error,
+.active .icon-vSphere-dsVmNvram-warning,
+.active .icon-vSphere-dsVmNvram-error,
+.active .icon-vSphere-dsIsoImage-warning,
+.active .icon-vSphere-dsIsoImage-error,
 .active .icon-ds-iso-image-warning,
 .active .icon-ds-iso-image-error,
 .active .icon-temporary-file,
@@ -387,6 +405,8 @@
 .icon-calendar-years,
 .icon-folder-warning,
 .icon-folder-error,
+.vsphere-icon-folder-warning,
+.vsphere-icon-folder-error,
 .icon-file,
 .icon-file-warning,
 .icon-file-error,
@@ -398,6 +418,10 @@
 .icon-log-file-error,
 .vx-icon-memory-warning,
 .vx-icon-memory-error,
+.icon-vSphere-dsVmNvram-warning,
+.icon-vSphere-dsVmNvram-error,
+.icon-vSphere-dsIsoImage-warning,
+.icon-vSphere-dsIsoImage-error,
 .icon-ds-iso-image-warning,
 .icon-ds-iso-image-error,
 .icon-temporary-file,

package/components/common/layout/theHeader/TheHeaderNew.vue

@@ -29,7 +29,11 @@
               </button>
             </div>
           </template>
-          <template #content> {{ localization.common.menu }} </template>
+          <template #content>
+            <span class="header-tooltip-text">{{
+              localization.common.menu
+            }}</span>
+          </template>
         </ui-tooltip>
         <nuxt-link
           id="header-shortcuts-link"
@@ -77,7 +81,9 @@
             </div>
           </template>
           <template #content>
-            {{ localization.common.refresh }}
+            <span class="header-tooltip-text">
+              {{ localization.common.refresh }}
+            </span>
           </template>
         </ui-tooltip>
         <div class="divider" />
@@ -193,6 +199,10 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     display: flex;
     justify-content: space-between;
 
+    .header-tooltip-text {
+      font-size: 12px;
+      font-weight: 500;
+    }
     .left-content {
       display: flex;
       align-items: center;

package/components/common/layout/theHeader/ThemeSwitch.vue

@@ -22,7 +22,7 @@
       </div>
     </template>
     <template #content>
-      <span class="text-nowrap">
+      <span class="text-nowrap header-tooltip-text">
         {{ tooltipText }}
       </span>
     </template>
@@ -57,3 +57,10 @@ const tooltipText = computed<string>(() =>
     : localization.value.layout.lightMode
 )
 </script>
+
+<style scoped lang="scss">
+.header-tooltip-text {
+  font-size: 12px;
+  font-weight: 500;
+}
+</style>

package/components/common/layout/theHeader/helpMenu/helpMenuNew/HelpMenuNew.vue

@@ -20,7 +20,7 @@
           >
             <span class="help-icon-container">
               <ui-icon-main-navigation-panel
-                name="icon-help"
+                name="icon-help-2"
                 width="24"
                 height="24"
               />
@@ -32,7 +32,9 @@
         </div>
       </template>
       <template #content>
-        {{ localization.mainNavigation.help }}
+        <span class="header-tooltip-text">{{
+          localization.mainNavigation.help
+        }}</span>
       </template>
     </ui-tooltip>
   </div>
@@ -114,6 +116,10 @@ const onSelectDropdown = (value: string): void => {
 
 <style scoped lang="scss">
 .help-menu-content {
+  .header-tooltip-text {
+    font-size: 12px;
+    font-weight: 500;
+  }
   .help-menu-dropdown-toggle {
     border: unset;
     padding: 0;

package/components/common/layout/theHeader/userMenu/userMenuNew/UserMenuNew.vue

@@ -29,7 +29,9 @@
         </div>
       </template>
       <template #content>
-        {{ localization.layout.myAccount }}
+        <span class="header-tooltip-text">{{
+          localization.layout.myAccount
+        }}</span>
       </template>
     </ui-tooltip>
   </div>
@@ -98,6 +100,10 @@ const onSelectDropdown = (value: string): void => {
 
 <style lang="scss">
 .user-menu-content {
+  .header-tooltip-text {
+    font-size: 12px;
+    font-weight: 500;
+  }
   .user-menu-dropdown-toggle {
     border: unset;
     padding: 0;

package/components/common/wizards/datastore/add/nfs/configuration/Configuration.vue

@@ -90,9 +90,9 @@
         >
           <div class="flex-align-center input-action-wrapper">
             <input
-              id="configuration-folder-input"
+              id="configuration-server-input"
               v-model="model.server"
-              data-id="configuration-folder-input"
+              data-id="configuration-server-input"
               type="text"
               class="clr-input"
               @blur="initValidation(true, ['server'])"
@@ -124,13 +124,14 @@ import type {
 } from '~/lib/models/interfaces'
 import type { UI_I_ErrorFields } from '~/components/atoms/wizard/lib/models/interfaces'
 import type { UI_I_InitialValidationFields } from '~/components/common/wizards/datastore/add/nfs/configuration/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
   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/vmNew/migrate/Migrate.vue

@@ -26,7 +26,7 @@
           v-model="form"
           :submit="selectComputeResourceSubmit"
           :get-compute-resource-data="props.getComputeResourceData"
-          :migrate-type="vmMigrateType"
+          :migrate-type="form.migrate_type"
           :compute-resource-data="props.computeResourceTableData"
           :compute-resource-tree="props.computeResourceTree"
         />
@@ -75,7 +75,6 @@ import {
   stepsFunc,
   stepsSchemeInitial,
 } from '~/components/common/wizards/vmNew/migrate/lib/config/steps'
-
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type {
@@ -107,7 +106,7 @@ const props = defineProps<{
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
-  (event: 'finish'): void
+  (event: 'finish', value: UI_I_MigrateFormLocal): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -124,6 +123,10 @@ const form = ref<UI_I_MigrateFormLocal>({
   migrate_type: props.project === 'procurator' ? 'storage' : 'resource',
   disk_format: 0,
   storage: null,
+  configure: {
+    type: 'batch-configure',
+    disks: [],
+  },
 })
 
 const validationFunc = async (
@@ -184,19 +187,12 @@ const selectComputeResourceSubmit = ref<number>(0)
 
 const selectedVMotionPriority = ref<UI_T_SelectVMotionPriority>('high')
 
-const vmMigrateType = ref<UI_T_VmMigrateType>(
-  props.project === 'procurator' ? 'storage' : 'resource'
-)
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
 
 const dataReadyView = computed<UI_I_TableInfoItem>(() =>
-  constructDataReadyViewFunc(
-    vmMigrateType.value,
-    props.vmName,
-    dataFormLocal.value
-  )
+  constructDataReadyViewFunc(props.vmName, form.value, dataFormLocal.value)
 )
 
 const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
@@ -210,7 +206,7 @@ const dataFormLocal = ref<UI_I_CollectedDataFormLocal>({
 })
 const onFinish = (): void => {
   loading.value = true
-  emits('finish')
+  emits('finish', form.value)
   loading.value = false
 }
 

package/components/common/wizards/vmNew/migrate/lib/config/constructDataReady.ts

@@ -1,26 +1,22 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/lib/models/types'
+import type { UI_I_MigrateReadyBlockData } from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
+import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vmNew/migrate/lib/models/interfaces'
 import { UI_E_VmMigrationType } from '~/components/common/wizards/vm/migrate/lib/models/enums'
-import type {
-  UI_I_CollectedDataFormLocal,
-  UI_I_MigrateReadyBlockData,
-} from '~/components/common/wizards/vm/migrate/lib/models/interfaces'
 import { UI_E_SelectStorageDiskFormat } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/enums'
-// import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
 import { vmDiskFormatOptions } from '~/components/common/wizards/vm/migrate/select/storage/diskFormat/lib/config/formatOptions'
 
 const storageDetailsFunc = (
   localization: UI_I_Localization,
   migrationType: string,
   name: string,
-  event: UI_I_CollectedDataFormLocal
+  form: UI_I_MigrateFormLocal
 ): UI_I_MigrateReadyBlockData[] => {
-  const { selectStorage } = event
+  const { disk_format, configure, storage } = form
 
-  const isActivePerDiskTab: boolean = selectStorage.tab === 'configure-disk'
+  const isActivePerDiskTab: boolean = configure.type === 'configure-disk'
 
   const diskFormat = vmDiskFormatOptions().find(
-    (file) => file.value === selectStorage.vmDiskFormat
+    (file) => file.value === disk_format
   )!
 
   let result: UI_I_MigrateReadyBlockData[] = [
@@ -36,7 +32,7 @@ const storageDetailsFunc = (
     },
     {
       label: localization.common.storage,
-      value: selectStorage.storage?.name,
+      value: storage?.name,
       permissions: ['batch-configure'],
     },
     {
@@ -51,9 +47,9 @@ const storageDetailsFunc = (
     },
   ]
 
-  if (isActivePerDiskTab && selectStorage.configureDisks) {
-    const perDiskItems: UI_I_MigrateReadyBlockData[] =
-      selectStorage.configureDisks.map((disk) => {
+  if (isActivePerDiskTab && configure.disks) {
+    const perDiskItems: UI_I_MigrateReadyBlockData[] = configure.disks.map(
+      (disk) => {
         const isConfigurationFile = disk.file === 'Configuration file'
         const diskFormat = UI_E_SelectStorageDiskFormat[disk.disk_format]
 
@@ -67,34 +63,21 @@ const storageDetailsFunc = (
           permissions: ['configure-disk'],
           isProperty: true,
         }
-      })
+      }
+    )
     result = result.concat(perDiskItems)
   }
 
-  return result.filter((option) =>
-    option.permissions.includes(selectStorage.tab)
-  )
+  return result.filter((option) => option.permissions.includes(configure.type))
 }
 export const constructDataReadyViewFunc = (
-  type: UI_T_VmMigrateType,
   name: string,
-  data: UI_I_CollectedDataFormLocal
+  data: UI_I_MigrateFormLocal
 ): UI_I_MigrateReadyBlockData[] => {
   const localization: UI_I_Localization = useLocal()
 
-  // const details = {
-  //   storage: storageDetailsFunc,
-  //   'resource-storage': storageDetailsFunc, //  временно чтобы не было ошибка при исползоване сфере
-  // }
-
-  const migrationType = localization.common[UI_E_VmMigrationType[type]]
+  const migrationType =
+    localization.common[UI_E_VmMigrationType[data.migrate_type]]
 
   return storageDetailsFunc(localization, migrationType, name, data)
-
-  // return details[type as keyof typeof details](
-  //   localization,
-  //   migrationType,
-  //   name,
-  //   data
-  // )
 }

package/components/common/wizards/vmNew/migrate/lib/models/interfaces.ts

@@ -4,11 +4,17 @@ import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm
 import type { UI_T_SelectVMotionPriority } from '~/components/common/wizards/vm/migrate/select/priority/lib/models/types'
 import type { UI_I_ComputeResourceDataLocal } from '~/components/common/wizards/vm/migrate/select/computeResource/lib/models/interfaces'
 import type { UI_T_VmMigrateType } from '~/components/common/wizards/vmNew/migrate/select/type/lib/models/types'
+import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
 
 export interface UI_I_MigrateFormLocal {
   migrate_type: UI_T_VmMigrateType
   disk_format: number
   storage: any
+
+  configure: {
+    type: UI_T_VmMigrateSelectStorageTab
+    disks: UI_I_StorageConfigurePerDiskItem[]
+  }
 }
 
 export interface UI_I_ChangeStepsSchemes {

package/components/common/wizards/vmNew/migrate/select/storage/Storage.vue

@@ -11,14 +11,14 @@
     <common-wizards-vm-migrate-select-storage-selected-per-disk
       v-if="isShowSelectedPerDisks"
       v-model="isShowSelectedPerDisks"
-      v-model:active-tab="activeTab"
+      v-model:active-tab="model.configure.type"
       v-model:connected-storage-id-local="connectedStorageIdLocal"
       :data="selectedPerDisks"
     />
 
     <atoms-tabs
       v-else
-      v-model="activeTab"
+      v-model="model.configure.type"
       test-id="migrate-select-storage-tabs"
       :items="selectStorageTabs"
       size="small"
@@ -27,7 +27,7 @@
     />
 
     <common-wizards-vm-new-migrate-select-storage-configure-batch
-      v-show="activeTab === 'batch-configure'"
+      v-show="model.configure.type === 'batch-configure'"
       v-model="model"
       :get-datastore-table-func="props.getDatastoreTableFunc"
       :datastore="props.datastore"
@@ -46,11 +46,11 @@
     </common-wizards-vm-new-migrate-select-storage-configure-batch>
 
     <common-wizards-vm-new-migrate-select-storage-configure-disk
-      v-show="activeTab === 'configure-disk'"
+      v-show="model.configure.type === 'configure-disk'"
       v-model="isShowSelectedPerDisks"
       v-model:selected-per-disk-keys="selectedPerDiskKeys"
-      v-model:active-tab="activeTab"
-      :configure-per-disks="configurePerDisksLocal"
+      v-model:active-tab="model.configure.type"
+      :configure-per-disks="model.configure.disks"
       @update-selected-per-disks="onChangePerDiskStorage"
     />
 
@@ -67,7 +67,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
 import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
 import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
 import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vm/migrate/select/storage/table/disk/lib/models/interfaces'
 import type { UI_I_SelectStorageReadyData } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/interfaces'
 import type { UI_I_MigrateFormLocal } from '~/components/common/wizards/vmNew/migrate/lib/models/interfaces'
@@ -89,7 +88,6 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const activeTab = ref<UI_T_VmMigrateSelectStorageTab>('batch-configure')
 const selectStorageTabs = computed<UI_I_CollapseNavItem[]>(() =>
   vmMigrateSelectStorageTabsFunc(localization.value)
 )
@@ -99,10 +97,6 @@ const isShowSelectedPerDisks = ref<boolean>(false)
 const selectedPerDiskKeys = ref<number[]>([])
 const selectedPerDisks = ref<UI_I_StorageConfigurePerDiskItem[]>([])
 
-const configurePerDisksLocal = ref<UI_I_StorageConfigurePerDiskItem[]>(
-  props.configurePerDisks
-)
-
 const connectedStorageIdLocal = ref<string>('')
 const connectedStorageId = computed<string | null>(
   () => connectedStorageIdLocal.value || props.connectedStorageIdDefault
@@ -124,7 +118,7 @@ const onChangePerDiskStorage = (
 
 const onApplyChanges = (): void => {
   /* TODO сделать рефакторинг потом */
-  configurePerDisksLocal.value.forEach((disk) => {
+  model.value.configure.disks.forEach((disk) => {
     const selectedDisk = selectedPerDisks.value.find(
       (selected) =>
         selected.virtual_machine === disk.virtual_machine &&
@@ -143,7 +137,7 @@ const onApplyChanges = (): void => {
   })
 
   isShowSelectedPerDisks.value = false
-  activeTab.value = 'configure-disk'
+  model.value.configure.type = 'configure-disk'
   selectedPerDisks.value = []
   selectedPerDiskKeys.value = []
 }
@@ -161,13 +155,13 @@ const checkValidityBlock = (): boolean => {
     return false
   }
 
-  const isActivePerDiskTab = activeTab.value === 'configure-disk'
+  const isActivePerDiskTab = model.value.configure.type === 'configure-disk'
   emits('next-step', {
     ...model.value,
-    tab: activeTab.value,
+    tab: model.value.configure.type,
     // ...(isActivePerDiskTab && { configureDisks: props.configurePerDisks }),
     configureDisks: isActivePerDiskTab
-      ? configurePerDisksLocal.value
+      ? model.value.configure.disks
       : props.configurePerDisks,
   })
   return true
@@ -176,8 +170,9 @@ const checkValidityBlock = (): boolean => {
 watch(
   () => props.configurePerDisks,
   (newValue: UI_I_StorageConfigurePerDiskItem) => {
-    configurePerDisksLocal.value = newValue
-  }
+    model.value.configure.disks = newValue
+  },
+  { immediate: true }
 )
 watch(
   () => props.submit,

package/components/common/wizards/vmNew/migrate/select/storage/selectedPerDisk/SelectedPerDisk.vue

@@ -30,40 +30,32 @@
 
 <script lang="ts" setup>
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vm/migrate/select/storage/lib/models/types'
+import type { UI_T_VmMigrateSelectStorageTab } from '~/components/common/wizards/vmNew/migrate/select/storage/lib/models/types'
+import type { UI_I_StorageConfigurePerDiskItem } from '~/components/common/wizards/vmNew/migrate/select/storage/configure/disk/table/lib/models/interfaces'
 
 const props = defineProps<{
-  modelValue: boolean
-  activeTab: UI_T_VmMigrateSelectStorageTab
-  connectedStorageIdLocal: string
-  data: any[]
-}>()
-const emits = defineEmits<{
-  (event: 'update:model-value', value: boolean): void
-  (event: 'update:active-tab', value: UI_T_VmMigrateSelectStorageTab): void
-  (event: 'update:connected-storage-id-local', value: string): void
+  data: UI_I_StorageConfigurePerDiskItem[]
 }>()
+const modelShowSelectedPerDisks = defineModel<boolean>()
+const modelConnectedStorageIdLocal = defineModel<string>(
+  'connectedStorageIdLocal'
+)
+const modelActiveTab = defineModel<UI_T_VmMigrateSelectStorageTab>('activeTab')
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const normalizedData = computed<string[]>(() =>
-  props.data.map((item) => `${item.virtual_machine} | ${item.file}`)
+  props.data.map(
+    (disk: UI_I_StorageConfigurePerDiskItem) =>
+      `${disk.virtual_machine} | ${disk.file}`
+  )
 )
 
 const onGoBack = (): void => {
-  emits('update:model-value', false)
-  emits('update:connected-storage-id-local', '')
-  activeTabValue.value = 'configure-disk'
+  modelShowSelectedPerDisks.value = false
+  modelConnectedStorageIdLocal.value = ''
+  modelActiveTab.value = 'configure-disk'
 }
-
-const activeTabValue = computed<UI_T_VmMigrateSelectStorageTab>({
-  get() {
-    return props.activeTab
-  },
-  set(newValue: UI_T_VmMigrateSelectStorageTab) {
-    emits('update:active-tab', newValue)
-  },
-})
 </script>
 
 <style lang="scss" scoped>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.113",
+  "version": "1.4.115",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.15",
-    "bfg-uikit": "1.0.96",
+    "bfg-uikit": "1.0.97",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }