bfg-common 1.5.69 → 1.5.71

package/components/common/vm/actions/common/select/os/Old.vue

@@ -0,0 +1,152 @@
+<template>
+  <div class="select-os">
+    <p class="select-os-block">
+      {{ localization.common.identifyingGuestSystemInstallation }}
+    </p>
+    <div class="select-os-block os-select-wrap table-row">
+      <label for="machine-type-select" class="table-cell"
+        >{{ localization.common.machineType }}:</label
+      >
+
+      <atoms-tooltip-error
+        :has-error="!!props.apiErrorMachineType"
+        selector="#vm-wizard-machine-type-select"
+        @remove="emits('remove-error-by-title', 'machine_type')"
+      >
+        <template #elem>
+          <select
+            id="vm-wizard-machine-type-select"
+            v-model="machineType"
+            data-id="vm-wizard-machine-type-select"
+            class="table-cell"
+          >
+            <option
+              v-for="item in props.machineTypeOptions"
+              :key="item.value"
+              :value="item"
+            >
+              {{ item.text }}
+            </option>
+          </select>
+        </template>
+        <template #content>{{ props.apiErrorMachineType }}</template>
+      </atoms-tooltip-error>
+    </div>
+    <div class="select-os-block os-select-wrap table-row">
+      <label for="os-select" class="table-cell"
+        >{{ localization.common.guestOsFamily }}:</label
+      >
+
+      <atoms-tooltip-error
+        :has-error="!!props.apiErrorGuestOsFamily"
+        selector="#vm-wizard-os-select"
+        @remove="emits('remove-error-by-title', 'guest_os_family')"
+      >
+        <template #elem>
+          <select
+            id="vm-wizard-os-select"
+            v-model="guestOsFamily"
+            data-id="vm-wizard-os-select"
+            class="table-cell"
+            @change="emits('change-os')"
+          >
+            <option
+              v-for="item in props.osOptions"
+              :key="item.value"
+              :value="item"
+            >
+              {{ item.text }}
+            </option>
+          </select>
+        </template>
+        <template #content>{{ props.apiErrorGuestOsFamily }}</template>
+      </atoms-tooltip-error>
+    </div>
+    <div class="select-os-block os-select-wrap table-row">
+      <label for="os-version-select" class="table-cell"
+        >{{ localization.common.guestOsVersion }}:</label
+      >
+
+      <atoms-tooltip-error
+        :has-error="!!props.apiErrorGuestOsVersion"
+        selector="#vm-wizard-os-version-select"
+        @remove="emits('remove-error-by-title', 'guest_os_version')"
+      >
+        <template #elem>
+          <select
+            id="vm-wizard-os-version-select"
+            v-model="guestOsVersion"
+            data-id="vm-wizard-os-version-select"
+            class="table-cell"
+          >
+            <option
+              v-for="item in props.versionsOptions"
+              :key="item.value"
+              :value="item"
+            >
+              {{ item.text }}
+            </option>
+          </select>
+        </template>
+        <template #content>{{ props.apiErrorGuestOsVersion }}</template>
+      </atoms-tooltip-error>
+    </div>
+  </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'
+
+const machineType = defineModel<UI_I_OptionItem | null>('machine-type', {
+  required: true,
+})
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
+  required: true,
+})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
+  required: true,
+})
+
+const props = defineProps<{
+  apiErrorMachineType: string
+  machineTypeOptions: UI_I_OptionItem[]
+  apiErrorGuestOsFamily: string
+  osOptions: UI_I_OptionItem[]
+  apiErrorGuestOsVersion: string
+  versionsOptions: UI_I_OptionItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'remove-error-by-title', value: string): void
+  (event: 'change-os'): void
+}>()
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.select-os {
+  .select-os-block {
+    label:not(.windows-virtualization-label) {
+      padding: 0 5px 5px 0;
+    }
+
+    .windows-virtualization-label {
+      padding: 0 4px;
+    }
+  }
+}
+
+#os-select-help-icon {
+  h3 {
+    margin-top: 7px;
+    font-size: 22px;
+    color: #565656;
+  }
+  p {
+    width: 310px;
+    margin-top: 24px;
+    font-size: 14px;
+    color: #565656;
+  }
+}
+</style>

package/components/common/vm/actions/common/select/os/Os.vue

@@ -0,0 +1,139 @@
+<template>
+  <common-vm-actions-common-select-os-new
+    v-if="isNewView"
+    v-model:machine-type="machineType"
+    v-model:guest-os-family="guestOsFamily"
+    v-model:guest-os-version="guestOsVersion"
+    :api-error-machine-type="apiErrorMachineType"
+    :machine-type-options="machineTypeOptions"
+    :api-error-guest-os-family="apiErrorGuestOsFamily"
+    :os-options="osOptions"
+    :api-error-guest-os-version="apiErrorGuestOsVersion"
+    :versions-options="versionsOptions"
+    @change-os="onChangeOs"
+    @remove-error-by-title="onRemoveValidationError"
+  />
+  <common-vm-actions-common-select-os-old
+    v-else
+    v-model:machine-type="machineType"
+    v-model:guest-os-family="guestOsFamily"
+    v-model:guest-os-version="guestOsVersion"
+    :api-error-machine-type="apiErrorMachineType"
+    :machine-type-options="machineTypeOptions"
+    :api-error-guest-os-family="apiErrorGuestOsFamily"
+    :os-options="osOptions"
+    :api-error-guest-os-version="apiErrorGuestOsVersion"
+    :versions-options="versionsOptions"
+    @change-os="onChangeOs"
+    @remove-error-by-title="onRemoveValidationError"
+  />
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_ArbitraryObject,
+} 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 machineType = defineModel<UI_I_OptionItem | null>('machine-type', {
+  required: true,
+})
+const guestOsFamily = defineModel<UI_I_OptionItem | null>('guest-os-family', {
+  required: true,
+})
+const guestOsVersion = defineModel<UI_I_OptionItem | null>('guest-os-version', {
+  required: true,
+})
+
+const props = defineProps<{
+  familiesOptions: UI_I_OptionItem[]
+  machineTypesOptions: UI_I_OptionItem[]
+  versionsOptions: UI_I_ArbitraryObject<UI_I_OptionItem[]>
+  errorValidationFields: UI_I_ErrorValidationField[]
+}>()
+const emits = defineEmits<{
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const machineTypeOptions = ref<UI_I_OptionItem[]>(props.machineTypesOptions)
+watch(
+  () => props.machineTypesOptions,
+  (newValue) => {
+    machineTypeOptions.value = [...newValue]
+    if (machineType.value) return
+
+    const q35MachineIndex = newValue.findIndex((item) =>
+      item.value.toLowerCase().includes('q35')
+    )
+    if (q35MachineIndex === -1) {
+      machineType.value = newValue[0]
+    } else {
+      machineType.value = newValue[q35MachineIndex]
+    }
+  },
+  { immediate: true }
+)
+
+const osOptions = ref<UI_I_OptionItem[]>(props.familiesOptions)
+watch(
+  () => props.familiesOptions,
+  (newValue) => {
+    osOptions.value = [...newValue]
+    if (guestOsFamily.value) return
+    guestOsFamily.value = newValue[0]
+  },
+  { immediate: true }
+)
+const onChangeOs = (): void => {
+  guestOsVersion.value = versionsOptions.value[0]
+}
+
+const versionsOptions = computed<UI_I_OptionItem[]>(() => {
+  if (!guestOsFamily.value) return []
+
+  return props.versionsOptions[guestOsFamily.value.value] || []
+})
+watch(
+  versionsOptions,
+  () => {
+    if (guestOsVersion.value) return
+
+    guestOsVersion.value = versionsOptions.value[0]
+  },
+  { immediate: true }
+)
+
+const apiErrorMachineType = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'machine_type'
+    )?.error_message || ''
+  )
+})
+
+const apiErrorGuestOsFamily = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'guest_os_family'
+    )?.error_message || ''
+  )
+})
+
+const apiErrorGuestOsVersion = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === 'guest_os_version'
+    )?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (type: string): void => {
+  emits('remove-error-by-title', type)
+}
+</script>
+
+<style scoped lang="scss"></style>

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

@@ -236,12 +236,12 @@ const { height: height4 } = useElementSize(subTitleBlock4)
 // const datastoreType = ref<UI_T_DatastoreTypeCode>(
 //   props.project === 'procurator' ? 'local' : 'shared-storm'
 // )
-const datastoreType = ref<UI_T_DatastoreTypeCode>('shared-storm')
+const datastoreType = ref<UI_T_DatastoreTypeCode>(2)
 const form = ref<UI_I_CreateDatastoreForm>({
   name: 'Datastore',
   lunDisk: [],
   hosts: props.hostId ? [props?.hostId] : [],
-  type_code: E_DatastoreTypeKode[datastoreType.value],
+  type_code: 2,
   nfsVersion: 'nfs-4.1',
   readonly: false,
   server: '',

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

@@ -61,7 +61,6 @@ import type { UI_T_DatastoreTypeCode } from '~/components/common/wizards/datasto
 import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
 import type { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
 import type { UI_I_CreateDatastoreHosts } from '~/components/common/wizards/datastore/add/nfs/accessibility/tablesView/lib/models/interfaces'
-import { E_DatastoreTypeKode } from '~/components/common/wizards/datastore/add/lib/models/enums'
 import { constructDataReadyViewFunc } from '~/components/common/wizards/datastore/add/readyComplete/lib/config/propertiesDetails'
 import { dynamicSteps } from '~/components/common/wizards/datastore/add/lib/config/steps'
 
@@ -89,12 +88,12 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 // const datastoreType = ref<UI_T_DatastoreTypeCode>(
 //   props.project === 'procurator' ? 'local' : 'shared-storm'
 // )
-const datastoreType = ref<UI_T_DatastoreTypeCode>('shared-storm')
+const datastoreType = ref<UI_T_DatastoreTypeCode>(2)
 const form = ref<UI_I_CreateDatastoreForm>({
   name: 'Datastore',
   lunDisk: [],
   hosts: props.hostId ? [props?.hostId] : [],
-  type_code: E_DatastoreTypeKode[datastoreType.value],
+  type_code: 2,
   nfsVersion: 'nfs-4.1',
   readonly: false,
   server: '',

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

@@ -15,7 +15,7 @@
 <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'
-import { datastoreTypesFunc } from '~/components/common/wizards/datastore/add/types/lib/config/typeOptions'
+import { datastoreTypesFunc } from '~/components/common/wizards/datastore/add/steps/typeMode/lib/config/typeOptions'
 
 const formDatastoreTypeMode = defineModel<number>({ required: true })
 

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

@@ -15,6 +15,46 @@
             {{ option.description }}
           </span>
         </template>
+
+        <template #tooltip>
+          <ui-icon
+            :id="`${option.testId}-info-icon-trigger`"
+            name="info"
+            width="16"
+            height="16"
+            class="headline__icon pointer"
+            :class="isShowInfo && 'active'"
+            @click="isShowInfo = !isShowInfo"
+          />
+
+          <ui-popup-window
+            v-model="isShowInfo"
+            width="232px"
+            :elem-id="`${option.testId}-info-icon-trigger`"
+          >
+            <div class="common-widget-info">
+              <div class="flex justify-between">
+                <div class="flex">
+                  <ui-icon name="info-2" width="16px" height="16px" />
+                  <span class="title">
+                    {{ localization.common.information }}
+                  </span>
+                </div>
+                <ui-icon
+                  name="close"
+                  class="pointer hide-icon"
+                  width="16px"
+                  height="16px"
+                  @click="isShowInfo = false"
+                />
+              </div>
+
+              <div class="common-widget-info-description">
+                {{ option.tooltipContent }}
+              </div>
+            </div>
+          </ui-popup-window>
+        </template>
       </ui-radio>
     </div>
   </section>
@@ -30,6 +70,8 @@ const props = defineProps<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowInfo = ref<boolean>(false)
 </script>
 
 <style>
@@ -43,6 +85,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 }
 </style>
 <style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
 .datastore-type {
   container-type: inline-size;
   margin-top: 16px;
@@ -50,7 +93,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   &__radio {
     &-container {
       display: grid;
-      grid-template-columns: 1fr 1fr 1fr;
+      grid-template-columns: 1fr 1fr;
       gap: 12px;
     }
     &-description {
@@ -80,10 +123,54 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       }
     }
   }
+
+  .headline {
+    @include flex($align: center);
+    margin: 32px 0 16px;
+
+    &__icon {
+      color: var(--feedback-tooltip-trigger-color);
+      &:hover {
+        color: var(--feedback-tooltip-hover-trigger-color);
+      }
+      &.active {
+        color: var(--feedback-tooltip-acctive-trigger-color);
+      }
+    }
+    &__label {
+      line-height: 19.36px;
+      font-size: 16px;
+      font-weight: 500;
+      color: var(--feedback-text-color);
+      margin-right: 8px;
+    }
+    .common-widget-info {
+      padding: 16px;
+      .title {
+        font-size: 14px;
+        font-weight: 500;
+        line-height: 16.94px;
+        color: var(--feedback-text-color);
+        margin-left: 8px;
+      }
+
+      .common-widget-info-description {
+        font-size: 13px;
+        line-height: 15.73px;
+        color: var(--feedback-text-color);
+        margin-top: 12px;
+      }
+
+      svg {
+        color: var(--feedback-tooltip-close-color);
+        min-width: 16px;
+      }
+    }
+  }
 }
 
 @container (max-width:600px) {
-  .lockdown-mode__radio-container {
+  .datastore-type__radio-container {
     grid-template-columns: 1fr;
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.69",
+  "version": "1.5.71",
   "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.22",
-    "bfg-uikit": "1.0.403",
+    "bfg-uikit": "1.0.410",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }