bfg-common 1.5.544 → 1.5.546

package/components/common/wizards/vm/migrate/Migrate.vue

@@ -99,21 +99,21 @@ const props = withDefaults(
     getComputeResourceData: (payload: UI_I_TablePayload) => Promise<void>
     datastore: UI_I_DatastoreTableItem[]
     configurePerDisks: UI_I_StorageConfigurePerDiskItem[]
+    vmOrigin?: UI_I_VmOrigin // нужно только для сферы
     computeResourceTableData?: any
     computeResourceTree?: UI_I_TreeNode | null
     vmState?: number
     vmInfo?: any | null
     networks?: any
-    vmOrigin?: UI_I_VmOrigin | null
     defaultMigrateType?: UI_T_VmMigrateType
   }>(),
   {
+    vmOrigin: undefined,
     computeResourceTableData: undefined,
     computeResourceTree: null,
     vmState: undefined,
     vmInfo: undefined,
     networks: undefined,
-    vmOrigin: null,
     defaultMigrateType: undefined,
   }
 )
@@ -276,8 +276,6 @@ watch(
   { immediate: true, deep: true }
 )
 
-const loading = ref<boolean>(false)
-
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )
@@ -286,11 +284,8 @@ const dataReadyView = computed<UI_I_TableInfoItem>(() =>
   constructDataReadyViewFunc(props.vmName, form.value)
 )
 const onMigrateVm = (): void => {
-  loading.value = true
   emits('finish', form.value)
-  loading.value = false
 }
-
 const onHideModal = (): void => {
   emits('hide')
 }

package/components/common/wizards/vm/migrate/MigrateNew.vue

@@ -13,7 +13,7 @@
   >
     <template #content="{ selectedStep, isLoading }">
       <ui-wizard-block
-        v-if="selectedStep.id === dynamicSteps.type"
+        v-if="selectedStep.id === dynamicSteps.selectMigrationType"
         :sub-title-height="height0"
       >
         <template #subTitle>
@@ -22,6 +22,7 @@
               <ui-wizard-subtitle :sub-title="selectedStep.subTitle" />
 
               <common-wizards-vm-migrate-vm-origin
+                v-if="props.vmOrigin"
                 :vm-origin="props.vmOrigin"
               />
             </div>
@@ -56,9 +57,7 @@
             </div>
           </div>
         </template>
-        <template #content>
-          Content
-        </template>
+        <template #content> Content </template>
       </ui-wizard-block>
 
       <ui-wizard-block
@@ -81,9 +80,7 @@
             </div>
           </div>
         </template>
-        <template #content>
-          content
-        </template>
+        <template #content> content </template>
       </ui-wizard-block>
 
       <ui-wizard-block
@@ -108,9 +105,7 @@
             </div>
           </div>
         </template>
-        <template #content>
-          Content
-        </template>
+        <template #content> Content </template>
       </ui-wizard-block>
 
       <ui-wizard-block
@@ -124,9 +119,7 @@
             </div>
           </div>
         </template>
-        <template #content>
-          Content
-        </template>
+        <template #content> Content </template>
       </ui-wizard-block>
     </template>
   </ui-wizard>
@@ -155,11 +148,9 @@ const props = withDefaults(
     alertMessages: string[][]
     selectedNode: UI_I_TreeNode
     title: string
-    vmOrigin?: UI_I_VmOrigin | null
+    vmOrigin: UI_I_VmOrigin | undefined
   }>(),
-  {
-    vmOrigin: null,
-  }
+  {}
 )
 const emits = defineEmits<{
   (event: 'change-steps', value: UI_I_WizardStep[]): void

package/components/common/wizards/vm/migrate/MigrateOld.vue

@@ -120,6 +120,7 @@ const props = withDefaults(
     alertMessages: string[][]
     title: string
     isScheduledTasks: boolean
+    vmOrigin: UI_I_VmOrigin | undefined
     vmSettings: UI_I_VmSettings | null
     vmName: string
     getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
@@ -131,7 +132,6 @@ const props = withDefaults(
     vmState?: number
     vmInfo?: any | null
     networks?: any
-    vmOrigin?: UI_I_VmOrigin | null
     defaultMigrateType?: UI_T_VmMigrateType
   }>(),
   {
@@ -140,7 +140,6 @@ const props = withDefaults(
     vmState: undefined,
     vmInfo: undefined,
     networks: undefined,
-    vmOrigin: null,
     defaultMigrateType: undefined,
   }
 )
@@ -196,8 +195,6 @@ watch(
   { immediate: true, deep: true }
 )
 
-const loading = ref<boolean>(false)
-
 const connectedStorageIdOnVm = computed<string>(
   () => props.vmSettings?.storage.id || ''
 )

package/components/common/wizards/vm/migrate/vmOrigin/VmOrigin.vue

@@ -1,45 +1,15 @@
 <template>
-  <div class="vm-origin-info-tooltip">
-    <div
-      id="vm-origin-trigger"
-      class="tooltip-trigger-block flex items-center"
-      data-id="vm-origin-trigger-btn"
-      @click="isShowTooltip = !isShowTooltip"
-    >
-      <span>{{ localization.common.vmOrigin }}</span>
-      <atoms-the-icon
-        name="info-circle"
-        width="16px"
-        height="16px"
-        fill="#0072a3"
-      />
-    </div>
-
-    <atoms-tooltip-signpost
-      v-if="isShowTooltip"
-      elem-id="vm-origin-trigger"
-      test-id="vm-origin"
-      @hide="isShowTooltip = false"
-    >
-      <slot name="content">
-        <div class="vm-origin-info-tooltip-block">
-          <template v-for="item in itemsArray" :key="item.key">
-            <div v-if="item.value.length" class="item-row">
-              <span class="title-row">{{ item.key }}</span>
-              <div
-                v-for="item2 in item.value"
-                :key="item2.name"
-                class="flex items-center"
-              >
-                <span :class="item2.iconName"></span>
-                <span class="item-name">{{ item2.name }}</span>
-              </div>
-            </div>
-          </template>
-        </div>
-      </slot>
-    </atoms-tooltip-signpost>
-  </div>
+  <common-wizards-vm-migrate-vm-origin-new
+    v-if="isNewView"
+    v-model="isShowTooltip"
+    :vm-origin="normalizedVmOriginToArray"
+  />
+
+  <common-wizards-vm-migrate-vm-origin-old
+    v-else
+    v-model="isShowTooltip"
+    :vm-origin="normalizedVmOriginToArray"
+  />
 </template>
 
 <script setup lang="ts">
@@ -50,47 +20,18 @@ import type {
 } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/models/interfaces'
 import { constructOriginItems } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/utils/constructItems'
 
-const props = withDefaults(
-  defineProps<{
-    vmOrigin?: UI_I_VmOrigin | null
-  }>(),
-  {
-    vmOrigin: null,
-  }
-)
+const props = defineProps<{
+  vmOrigin: UI_I_VmOrigin | null
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
-const itemsArray = computed<UI_I_VmOriginArrayItem[]>(() =>
+const normalizedVmOriginToArray = computed<UI_I_VmOriginArrayItem[]>(() =>
   constructOriginItems(props.vmOrigin, localization.value)
 )
 
 const isShowTooltip = ref<boolean>(false)
 </script>
-
-<style scoped lang="scss">
-.vm-origin-info-tooltip {
-  :deep(.tooltip-content) {
-    background-color: #ffffff;
-  }
-  .tooltip-trigger-block {
-    cursor: pointer;
-    color: #0072a3;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-
-  .vm-origin-info-tooltip-block {
-    .title-row {
-      font-weight: 700;
-      color: #565656;
-      margin-bottom: 5px;
-    }
-    .item-name {
-      margin-left: 5px;
-    }
-  }
-}
-</style>

package/components/common/wizards/vm/migrate/vmOrigin/VmOriginNew.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="vm-origin-info-tooltip">
+    <div
+      id="vm-origin-trigger"
+      class="tooltip-trigger-block flex items-center"
+      data-id="vm-origin-trigger-btn"
+      @click="isShowTooltipLocal = !isShowTooltipLocal"
+    >
+      <span>{{ localization.common.vmOrigin }}</span>
+      <atoms-the-icon
+        name="info-circle"
+        width="16px"
+        height="16px"
+        fill="#0072a3"
+      />
+    </div>
+
+    <atoms-tooltip-signpost
+      v-if="isShowTooltipLocal"
+      elem-id="vm-origin-trigger"
+      test-id="vm-origin"
+      @hide="isShowTooltipLocal = false"
+    >
+      <slot name="content">
+        <div class="vm-origin-info-tooltip-block">
+          <template v-for="item in props.vmOrigin" :key="item.key">
+            <div v-if="item.value.length" class="item-row">
+              <span class="title-row">{{ item.key }}</span>
+              <div
+                v-for="item2 in item.value"
+                :key="item2.name"
+                class="flex items-center"
+              >
+                <span :class="item2.iconName"></span>
+                <span class="item-name">{{ item2.name }}</span>
+              </div>
+            </div>
+          </template>
+        </div>
+      </slot>
+    </atoms-tooltip-signpost>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_VmOriginArrayItem } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/models/interfaces'
+
+const isShowTooltipLocal = defineModel<boolean>({ required: true })
+const props = defineProps<{
+  vmOrigin: UI_I_VmOriginArrayItem[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/wizards/vm/migrate/vmOrigin/VmOriginOld.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="vm-origin-info-tooltip">
+    <div
+      id="vm-origin-trigger"
+      class="tooltip-trigger-block flex items-center"
+      data-id="vm-origin-trigger-btn"
+      @click="isShowTooltipLocal = !isShowTooltipLocal"
+    >
+      <span>{{ localization.common.vmOrigin }}</span>
+      <atoms-the-icon
+        name="info-circle"
+        width="16px"
+        height="16px"
+        fill="#0072a3"
+      />
+    </div>
+
+    <atoms-tooltip-signpost
+      v-if="isShowTooltipLocal"
+      elem-id="vm-origin-trigger"
+      test-id="vm-origin"
+      @hide="isShowTooltipLocal = false"
+    >
+      <slot name="content">
+        <div class="vm-origin-info-tooltip-block">
+          <template v-for="item in props.vmOrigin" :key="item.key">
+            <div v-if="item.value.length" class="item-row">
+              <span class="title-row">{{ item.key }}</span>
+              <div
+                v-for="item2 in item.value"
+                :key="item2.name"
+                class="flex items-center"
+              >
+                <span :class="item2.iconName"></span>
+                <span class="item-name">{{ item2.name }}</span>
+              </div>
+            </div>
+          </template>
+        </div>
+      </slot>
+    </atoms-tooltip-signpost>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_VmOriginArrayItem } from '~/components/common/wizards/vm/migrate/vmOrigin/lib/models/interfaces'
+
+const isShowTooltipLocal = defineModel<boolean>({ required: true })
+const props = defineProps<{
+  vmOrigin: UI_I_VmOriginArrayItem[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.vm-origin-info-tooltip {
+  :deep(.tooltip-content) {
+    background-color: #ffffff;
+  }
+  .tooltip-trigger-block {
+    cursor: pointer;
+    color: #0072a3;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .vm-origin-info-tooltip-block {
+    .title-row {
+      font-weight: 700;
+      color: #565656;
+      margin-bottom: 5px;
+    }
+    .item-name {
+      margin-left: 5px;
+    }
+  }
+}
+</style>

package/package.json

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

package/components/common/wizards/vm/migrate/select/type/Type.vue

@@ -1,27 +0,0 @@
-<template>
-  <common-select-radio-group
-    v-model="selectedMigrateTypeLocal"
-    :options="vmMigrationTypes"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vm/migrate/select/type/lib/models/interfaces'
-import type { UI_T_VmMigrateType } from '~/components/common/wizards/vm/migrate/select/type/lib/models/types'
-import { vmMigrateTypesFunc } from '~/components/common/wizards/vm/migrate/select/type/lib/config/typeOptions'
-
-const props = defineProps<{
-  project: UI_T_Project
-}>()
-const selectedMigrateTypeLocal = defineModel<UI_T_VmMigrateType>({
-  required: true,
-})
-const localization = computed<any>(() => useLocal())
-
-const vmMigrationTypes = ref<UI_I_VmMigrateTypeOption[]>(
-  vmMigrateTypesFunc(localization.value, props.project)
-)
-</script>
-
-<style lang="scss" scoped></style>

package/components/common/wizards/vm/migrate/select/type/lib/config/typeOptions.ts

@@ -1,49 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_VmMigrateTypeOption } from '~/components/common/wizards/vm/migrate/select/type/lib/models/interfaces'
-
-export const vmMigrateTypesFunc = (
-  localization: UI_I_Localization,
-  project: UI_T_Project
-): UI_I_VmMigrateTypeOption[] => {
-  const options: UI_I_VmMigrateTypeOption[] = [
-    {
-      label: localization.common.changeComputeResourceOnly,
-      value: 'resource',
-      disabled: false,
-      description: localization.common.changeComputeResourceOnlyDesc,
-      permissions: ['sphere'],
-      permission: 'VirtualMachines.MigrateHost',
-      testId: 'change-compute-resource-option',
-    },
-    {
-      label: localization.common.changeStorageOnly,
-      value: 'storage',
-      disabled: false,
-      description: localization.common.changeStorageOnlyDesc,
-      permissions: ['sphere', 'procurator'],
-      permission: 'VirtualMachines.MigrateDatastore',
-      testId: 'change-storage-option',
-    },
-    // TODO 700
-    // {
-    //   label: localization.common.changeBothComputeResourceStorage,
-    //   value: 'resource-storage',
-    //   disabled: true,
-    //   description: localization.common.changeBothComputeResourceStorageDesc,
-    //   permissions: ['sphere'],
-    //   testId: 'change-both-compute-resource-storage-option',
-    // },
-    // TODO 700
-    // {
-    //   label: localization.common.crossVCenterServerExport,
-    //   value: 'server',
-    //   disabled: true,
-    //   description: localization.common.crossVCenterServerExportDesc,
-    //   permissions: ['sphere'],
-    //   testId: 'cross-vcenter-server-export-option',
-    // },
-  ]
-
-  return options.filter((option) => option.permissions.includes(project))
-}

package/components/common/wizards/vm/migrate/select/type/lib/models/interfaces.ts

@@ -1,6 +0,0 @@
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-
-export interface UI_I_VmMigrateTypeOption extends UI_I_RadioOption {
-  permissions: string[]
-  permission?: string // Global permission
-}

package/components/common/wizards/vm/migrate/select/type/lib/models/types.ts

@@ -1,5 +0,0 @@
-export type UI_T_VmMigrateType =
-  | 'resource'
-  | 'storage'
-  | 'resource-storage'
-  | 'server'