bfg-common 1.5.59 → 1.5.60

package/components/common/vm/actions/common/lib/utils/capabilities.ts

@@ -1,52 +1,52 @@
-import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
-import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
-
-export const mapCapabilities = (
-  capabilitiesFromApi: UI_I_Capabilities
-): void => {
-  if (!capabilitiesFromApi) return
-  const { $binary } = useNuxtApp()
-
-  // Machine Types
-  capabilities.machineTypes = Object.keys(
-    capabilitiesFromApi.machine_types
-  ).map((key) => {
-    return {
-      text: capabilitiesFromApi.machine_types[key],
-      value: key,
-    }
-  })
-  // CPU Models
-  capabilities.cpuModels = Object.keys(capabilitiesFromApi.cpu_models).map(
-    (key) => {
-      return {
-        text: capabilitiesFromApi.cpu_models[key],
-        value: key,
-      }
-    }
-  )
-
-  Object.keys(capabilitiesFromApi.bus_types).forEach((key) => {
-    capabilities.bus[key] = Object.keys(capabilitiesFromApi.bus_types[key]).map(
-      (key2) => {
-        return {
-          text: capabilitiesFromApi.bus_types[key][key2],
-          value: key2,
-        }
-      }
-    )
-  })
-  Object.keys(capabilitiesFromApi.cdrom_bus_type).forEach((key) => {
-    capabilities.cdromBus[key] = Object.keys(
-      capabilitiesFromApi.cdrom_bus_type[key]
-    ).map((key2) => {
-      return {
-        text: capabilitiesFromApi.cdrom_bus_type[key][key2],
-        value: key2,
-      }
-    })
-  })
-
-  capabilities.maxCpus = capabilitiesFromApi.max_vcpus
-  capabilities.maxMemory = $binary.kbToMb(capabilitiesFromApi.max_mem_kib)
-}
+import type { UI_I_Capabilities } from '~/components/common/vm/actions/common/lib/models/interfaces'
+import { capabilities } from '~/components/common/vm/actions/common/lib/config/capabilities'
+
+export const mapCapabilities = (
+  capabilitiesFromApi: UI_I_Capabilities
+): void => {
+  if (!capabilitiesFromApi) return
+  const { $binary } = useNuxtApp()
+
+  // Machine Types
+  capabilities.machineTypes = Object.keys(
+    capabilitiesFromApi.machine_types
+  ).map((key) => {
+    return {
+      text: capabilitiesFromApi.machine_types[key],
+      value: key,
+    }
+  })
+  // CPU Models
+  capabilities.cpuModels = Object.keys(capabilitiesFromApi.cpu_models).map(
+    (key) => {
+      return {
+        text: capabilitiesFromApi.cpu_models[key],
+        value: key,
+      }
+    }
+  )
+
+  Object.keys(capabilitiesFromApi.bus_types).forEach((key) => {
+    capabilities.bus[key] = Object.keys(capabilitiesFromApi.bus_types[key]).map(
+      (key2) => {
+        return {
+          text: capabilitiesFromApi.bus_types[key][key2],
+          value: key2,
+        }
+      }
+    )
+  })
+  Object.keys(capabilitiesFromApi.cdrom_bus_type).forEach((key) => {
+    capabilities.cdromBus[key] = Object.keys(
+      capabilitiesFromApi.cdrom_bus_type[key]
+    ).map((key2) => {
+      return {
+        text: capabilitiesFromApi.cdrom_bus_type[key][key2],
+        value: key2,
+      }
+    })
+  })
+
+  capabilities.maxCpus = capabilitiesFromApi.max_vcpus
+  capabilities.maxMemory = $binary.kbToMb(capabilitiesFromApi.max_mem_kib)
+}

package/components/common/vm/actions/common/select/compatibility/Compatibility.vue

@@ -1,162 +1,162 @@
-<template>
-  <div class="select-compatibility">
-    <p class="select-compatibility-block">
-      {{ description }}
-    </p>
-    <div class="select-compatibility-block version-select-wrap">
-      <label for="version-select"
-        >{{ localization.common.compatibleWith }}:</label
-      >
-
-      <atoms-tooltip-error
-        :has-error="!!apiError"
-        selector="#vm-wizard-version-select"
-        @remove="onRemoveValidationError"
-      >
-        <template #elem>
-          <select
-            id="vm-wizard-version-select"
-            v-model="selectedVersion"
-            data-id="vm-wizard-version-select"
-          >
-            <option v-for="(item, key) in versions" :key="key" :value="item">
-              {{ item.text }}
-            </option>
-          </select>
-        </template>
-        <template #content>{{ apiError }}</template>
-      </atoms-tooltip-error>
-      <!--      <div id="version-select-help-icon" class="flex-align-center relative">-->
-      <!--        <atoms-the-icon-->
-      <!--          fill="#0072a3"-->
-      <!--          width="24px"-->
-      <!--          height="24px"-->
-      <!--          name="info-circle"-->
-      <!--          @click="isShowHelp = !isShowHelp"-->
-      <!--        />-->
-      <!--        <atoms-tooltip-signpost-->
-      <!--          v-if="isShowHelp"-->
-      <!--          elem-id="version-select-help-icon"-->
-      <!--          @hide="isShowHelp = false"-->
-      <!--        >-->
-      <!--          <h3 class="help-title">{{ localization.common.help }}</h3>-->
-
-      <!--          <p>-->
-      <!--            {{-->
-      <!--              localization.common.eachVirtualMachineCompatibilitySettingIncludesHardwareAvailableVirtualMachine-->
-      <!--            }}-->
-      <!--          </p>-->
-
-      <!--          <a id="more-information-link" class="pointer">{{-->
-      <!--            localization.common.moreInformation-->
-      <!--          }}</a>-->
-      <!--        </atoms-tooltip-signpost>-->
-      <!--      </div>-->
-    </div>
-    <p class="select-compatibility-block">
-      {{ versionDescription }}
-    </p>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const props = defineProps<{
-  options: UI_I_OptionItem[]
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-}>()
-const emits = defineEmits<{
-  (event: 'change', value: UI_I_OptionItem): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const versions = ref<UI_I_OptionItem[]>(props.options)
-const selectedVersion = ref<UI_I_OptionItem | null>(null)
-watch(
-  () => props.options,
-  (newValue) => {
-    versions.value = [...newValue]
-    selectedVersion.value = newValue[0]
-  },
-  { immediate: true }
-)
-
-const config = useRuntimeConfig()
-const description = computed<string>(() => {
-  return localization.value.common.hostSupportsMoreVirtualMachineVersionSelectCompatibilityVirtualMachine.replaceAll(
-    '{trademark}',
-    config.public[`TRADEMARK_${useEnvLanguage()}`]
-  )
-})
-const versionDescription = computed<string>(() => {
-  if (!selectedVersion.value) return ''
-
-  const version = selectedVersion.value.value.split('-')[1]
-  const text = selectedVersion.value.text
-
-  if (selectedVersion.value === versions.value.at(-1)) {
-    return localization.value.common.virtualMachineUsesHardwareVersionAvailable
-      .replace('{0}', version)
-      .replace('{1}', text)
-  }
-
-  return localization.value.common.virtualMachineUsesHardwareVersionUnavailable
-    .replace('{0}', version)
-    .replace('{1}', text)
-})
-
-watch(
-  selectedVersion,
-  (newValue) => {
-    if (!newValue) return
-    emits('change', newValue)
-  },
-  { immediate: true }
-)
-
-// const isShowHelp = ref(false)
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === 'compatibility'
-    )?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', 'compatibility')
-}
-</script>
-
-<style scoped lang="scss">
-.select-compatibility-block {
-  margin-top: 12px;
-  font-size: 13px;
-
-  &.version-select-wrap {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-
-    //#version-select-help-icon {
-    //  .help-title {
-    //    font-size: 22px;
-    //  }
-    //
-    //  p {
-    //    width: 200px;
-    //  }
-    //
-    //  a {
-    //    color: #0072a3;
-    //  }
-    //}
-  }
-}
-</style>
+<template>
+  <div class="select-compatibility">
+    <p class="select-compatibility-block">
+      {{ description }}
+    </p>
+    <div class="select-compatibility-block version-select-wrap">
+      <label for="version-select"
+        >{{ localization.common.compatibleWith }}:</label
+      >
+
+      <atoms-tooltip-error
+        :has-error="!!apiError"
+        selector="#vm-wizard-version-select"
+        @remove="onRemoveValidationError"
+      >
+        <template #elem>
+          <select
+            id="vm-wizard-version-select"
+            v-model="selectedVersion"
+            data-id="vm-wizard-version-select"
+          >
+            <option v-for="(item, key) in versions" :key="key" :value="item">
+              {{ item.text }}
+            </option>
+          </select>
+        </template>
+        <template #content>{{ apiError }}</template>
+      </atoms-tooltip-error>
+      <!--      <div id="version-select-help-icon" class="flex-align-center relative">-->
+      <!--        <atoms-the-icon-->
+      <!--          fill="#0072a3"-->
+      <!--          width="24px"-->
+      <!--          height="24px"-->
+      <!--          name="info-circle"-->
+      <!--          @click="isShowHelp = !isShowHelp"-->
+      <!--        />-->
+      <!--        <atoms-tooltip-signpost-->
+      <!--          v-if="isShowHelp"-->
+      <!--          elem-id="version-select-help-icon"-->
+      <!--          @hide="isShowHelp = false"-->
+      <!--        >-->
+      <!--          <h3 class="help-title">{{ localization.common.help }}</h3>-->
+
+      <!--          <p>-->
+      <!--            {{-->
+      <!--              localization.common.eachVirtualMachineCompatibilitySettingIncludesHardwareAvailableVirtualMachine-->
+      <!--            }}-->
+      <!--          </p>-->
+
+      <!--          <a id="more-information-link" class="pointer">{{-->
+      <!--            localization.common.moreInformation-->
+      <!--          }}</a>-->
+      <!--        </atoms-tooltip-signpost>-->
+      <!--      </div>-->
+    </div>
+    <p class="select-compatibility-block">
+      {{ versionDescription }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const props = defineProps<{
+  options: UI_I_OptionItem[]
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+}>()
+const emits = defineEmits<{
+  (event: 'change', value: UI_I_OptionItem): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const versions = ref<UI_I_OptionItem[]>(props.options)
+const selectedVersion = ref<UI_I_OptionItem | null>(null)
+watch(
+  () => props.options,
+  (newValue) => {
+    versions.value = [...newValue]
+    selectedVersion.value = newValue[0]
+  },
+  { immediate: true }
+)
+
+const config = useRuntimeConfig()
+const description = computed<string>(() => {
+  return localization.value.common.hostSupportsMoreVirtualMachineVersionSelectCompatibilityVirtualMachine.replaceAll(
+    '{trademark}',
+    config.public[`TRADEMARK_${useEnvLanguage()}`]
+  )
+})
+const versionDescription = computed<string>(() => {
+  if (!selectedVersion.value) return ''
+
+  const version = selectedVersion.value.value.split('-')[1]
+  const text = selectedVersion.value.text
+
+  if (selectedVersion.value === versions.value.at(-1)) {
+    return localization.value.common.virtualMachineUsesHardwareVersionAvailable
+      .replace('{0}', version)
+      .replace('{1}', text)
+  }
+
+  return localization.value.common.virtualMachineUsesHardwareVersionUnavailable
+    .replace('{0}', version)
+    .replace('{1}', text)
+})
+
+watch(
+  selectedVersion,
+  (newValue) => {
+    if (!newValue) return
+    emits('change', newValue)
+  },
+  { immediate: true }
+)
+
+// const isShowHelp = ref(false)
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'compatibility'
+    )?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', 'compatibility')
+}
+</script>
+
+<style scoped lang="scss">
+.select-compatibility-block {
+  margin-top: 12px;
+  font-size: 13px;
+
+  &.version-select-wrap {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+
+    //#version-select-help-icon {
+    //  .help-title {
+    //    font-size: 22px;
+    //  }
+    //
+    //  p {
+    //    width: 200px;
+    //  }
+    //
+    //  a {
+    //    color: #0072a3;
+    //  }
+    //}
+  }
+}
+</style>

package/components/common/vm/actions/common/select/createType/CreateType.vue

@@ -1,38 +1,74 @@
-<template>
-  <common-vm-actions-common-select-create-type-new
-    v-if="isNewView"
-    v-model="model"
-    :items="items"
-    :import-from-v-m-warev-sphere="props.importFromVMWarevSphere"
-  />
-  <common-vm-actions-common-select-create-type-old
-    v-else
-    v-model="model"
-    :items="items"
-    :import-from-v-m-warev-sphere="props.importFromVMWarevSphere"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import { itemsFunc } from '~/components/common/vm/actions/common/select/createType/lib/config/items'
-
-const model = defineModel<string>()
-
-const props = defineProps<{
-  importFromVMWarevSphere: string
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const items = computed<UI_I_OptionItem[]>(() =>
-  itemsFunc(localization.value, props.importFromVMWarevSphere)
-)
-</script>
-
-<style scoped lang="scss">
-</style>
+<template>
+  <div class="select-create-type">
+    <atoms-list-select-list
+      v-model="model"
+      class="select"
+      :items="items"
+    />
+    <p class="description">
+      {{ description }}
+    </p>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import { itemsFunc } from '~/components/common/vm/actions/common/select/createType/lib/config/items'
+
+const model = defineModel<string>()
+
+const props = defineProps<{
+  importFromVMWarevSphere: string
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const items = computed<UI_I_OptionItem[]>(() =>
+  itemsFunc(localization.value, props.importFromVMWarevSphere)
+)
+const description = computed<string>(() => {
+  let result = ''
+  switch (model.value) {
+    case '0':
+      result = localization.value.common.newVmCreateDescription
+      break
+    case '1':
+      result = localization.value.vmWizard.deployFromTemplateDescription
+      break
+  }
+  return result
+})
+</script>
+
+<style scoped lang="scss">
+.select-create-type {
+  display: flex;
+  padding-top: 12px;
+
+  .description {
+    color: #333333;
+    font-size: 13px;
+  }
+
+  .description,
+  .select {
+    flex: 1 1 100%;
+    margin-right: 5px;
+  }
+
+  :deep(select) {
+    background-color: transparent;
+    border-color: var(--type-list-border-color);
+  }
+}
+</style>
+
+<style>
+:root {
+  --type-list-border-color: #ccc;
+}
+:root.dark-theme {
+  --type-list-border-color: #000;
+}
+</style>

package/components/common/vm/actions/common/select/createType/lib/config/items.ts

@@ -1,47 +1,27 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_VmCreateTypeOption
-} from "~/components/common/vm/actions/common/select/createType/lib/models/interfaces";
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const itemsFunc = (
     localization: UI_I_Localization,
     importFromVMWarevSphere: string
-): UI_I_VmCreateTypeOption[] => {
+): UI_I_OptionItem[] => {
   return [
     {
       text: localization.common.createNewVirtualMachine,
       value: '0',
       disabled: false,
-      testId: 'create-new-vm',
-      description: localization.common.newVmCreateDescription
-    },
-    {
-      text: localization.vmWizard.deployFromTemplate,
-      value: '1',
-      disabled: false,
-      testId: 'deploy-from-template',
-      description: localization.vmWizard.deployFromTemplateDescription
-    },
-    {
-      text: localization.common.deployVmFromOVF,
-      value: '2',
-      disabled: true,
-      testId: 'deploy-from-ovf',
-      description: ''
     },
+    { text: localization.vmWizard.deployFromTemplate, value: '1', disabled: false },
+    { text: localization.common.deployVmFromOVF, value: '2', disabled: true },
     {
       text: importFromVMWarevSphere,
       value: '3',
       disabled: true,
-      testId: 'import-from-vmware-vsphere',
-      description: ''
     },
     {
       text: localization.common.importFromGorizontVS,
       value: '4',
       disabled: true,
-      testId: 'import-from-gorizont-vs',
-      description: ''
     },
   ]
 }