bfg-common 1.4.363 → 1.4.365

package/components/common/vm/actions/common/customizeHardware/CustomizeHardware.vue

@@ -202,8 +202,8 @@ const navItems = computed<UI_I_CollapseNavItem[]>(() =>
 const selectedNavItem = ref<number>(0)
 watch(
   () => props.selectedNavItem,
-  (n) => {
-    selectedNavItem.value = n
+  (newValue) => {
+    selectedNavItem.value = newValue
   }
 )
 

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/NewHardDisk.vue

@@ -28,7 +28,7 @@
         <div class="flex-align-center flex-space-between mr-1">
           <template v-if="props.type === 'removed'">
             <span>{{ localization.common.deviceWillRemoved }}</span>
-            <div @click.stop class="flex-align-center">
+            <div class="flex-align-center" @click.stop>
               <input
                 :id="`hard-disk-delete-files-from-datastore-${props.index}`"
                 v-model="deleteFilesFromDatastore"
@@ -355,7 +355,7 @@ watch(
     cache,
     bus,
     deleteFilesFromDatastore,
-    () => props.type,
+    (): void => props.type,
   ],
   () => {
     const limitIopsLocal =

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/{Location.vue → location/Location.vue}

@@ -1,173 +1,172 @@
-<template>
-  <div class="">
-    <atoms-stack-block :has-children="false">
-      <template #stackBlockKey>
-        {{ localization.common.location }}
-      </template>
-      <template #stackBlockContent>
-        <atoms-tooltip-error
-          :has-error="!!apiError"
-          :selector="`.vm-wizard-disk-device-target-field-${props.index}`"
-          @remove="onRemoveValidationError"
-        >
-          <template #elem>
-            <div class="select">
-              <select
-                :id="`vm-wizard-disk-device-target-field-${props.index}`"
-                v-model="selectedLocation"
-                :data-id="`vm-wizard-disk-device-target-field-${props.index}`"
-                :class="`vm-wizard-disk-device-target-field-${props.index}`"
-                @change="changeLocation"
-              >
-                <option
-                  v-for="(item, key) in locationOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-          <template #content>{{ apiError }}</template>
-        </atoms-tooltip-error>
-      </template>
-    </atoms-stack-block>
-
-    <Teleport to="body">
-      <atoms-modal
-        class="storage-modal"
-        :show="storageModalIsShow"
-        :title="localization.common.selectStorage"
-        @submit="onSubmitStorageModal"
-        @hide="onHideStorageModal"
-      >
-        <template #modalBody>
-          <span>{{
-            localization.common.followingDatastoresAccessibleDestinationResourceThatSelected
-          }}</span>
-          <common-vm-actions-common-select-storage
-            :storage-submit="storageSubmit"
-            :datastore="props.datastore"
-            :get-datastore-table-func="props.getDatastoreTableFunc"
-            hide-compatibility
-            @submit="changeStorage"
-          />
-        </template>
-      </atoms-modal>
-    </Teleport>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
-import type {
-  UI_I_Localization,
-  UI_I_HTMLSelectElement,
-} from '~/lib/models/interfaces'
-import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
-import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  location: UI_I_DatastoreTableItem | null
-  index: number
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  datastore: UI_I_DatastoreTableItem[]
-  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
-}>()
-const emits = defineEmits<{
-  (event: 'change', value: UI_I_DatastoreTableItem): void
-  (event: 'remove-error-by-title', value: string): void
-}>()
-
-const selectedLocation = ref<string>(props.location?.id || '')
-
-const storages = ref<UI_I_DatastoreTableItem[]>([])
-const addStorage = (storage: UI_I_DatastoreTableItem): void => {
-  const hasStorage = storages.value.some((item) => item.id === storage.id)
-  if (hasStorage) {
-    return
-  }
-
-  storages.value.push(storage)
-}
-const locationOptions = ref<UI_I_OptionItem[]>([])
-
-watch(
-  () => props.location,
-  (newValue) => {
-    if (locationOptions.value.length || !newValue) {
-      return
-    }
-
-    locationOptions.value = [
-      { text: localization.value.common.storeWithVirtualMachine, value: newValue.id },
-      { text: `${localization.value.common.browse}...`, value: -1 },
-    ]
-    selectedLocation.value = newValue.id
-    storages.value.push(newValue)
-    addStorage(newValue)
-  },
-  { immediate: true }
-)
-
-const storageSubmit = ref<number>(0)
-const onSubmitStorageModal = (): void => {
-  storageSubmit.value++
-}
-const storageModalIsShow = ref<boolean>(false)
-const changeStorage = (storage: UI_I_DatastoreTableItem): void => {
-  locationOptions.value = [
-    locationOptions.value[0],
-    { text: storage.name, value: storage.id },
-    // @ts-ignore
-    locationOptions.value.at(-1),
-  ]
-
-  selectedLocation.value = storage.id
-  emits('change', storage)
-  addStorage(storage)
-  onHideStorageModal()
-}
-const onHideStorageModal = (): void => {
-  storageModalIsShow.value = false
-}
-const changeLocation = (event: UI_I_HTMLSelectElement): void => {
-  const value = +event.target.value
-  if (value === -1) {
-    storageModalIsShow.value = true
-    return
-  }
-
-  selectedLocation.value = event.target.value
-  const storage = storages.value.find((item) => item.id === event.target.value)
-  storage && emits('change', storage)
-}
-
-const typeError = computed<string>(
-  () => `disk_devices[${props.index}].location`
-)
-
-const apiError = computed<string>(() => {
-  return (
-    props.errorValidationFields?.find(
-      (message) => message.field === typeError.value
-    )?.error_message || ''
-  )
-})
-
-const onRemoveValidationError = (): void => {
-  emits('remove-error-by-title', typeError.value)
-}
-</script>
-
-<style scoped lang="scss">
-.storage-modal {
-  :deep(.modal-dialog) {
-    width: 864px;
-  }
-}
-</style>
+<template>
+  <div class="">
+    <atoms-stack-block :has-children="false">
+      <template #stackBlockKey>
+        {{ localization.common.location }}
+      </template>
+      <template #stackBlockContent>
+        <atoms-tooltip-error
+          :has-error="!!apiError"
+          :selector="`.vm-wizard-disk-device-target-field-${props.index}`"
+          @remove="onRemoveValidationError"
+        >
+          <template #elem>
+            <div class="select">
+              <select
+                :id="`vm-wizard-disk-device-target-field-${props.index}`"
+                v-model="selectedLocation"
+                :data-id="`vm-wizard-disk-device-target-field-${props.index}`"
+                :class="`vm-wizard-disk-device-target-field-${props.index}`"
+                @change="changeLocation"
+              >
+                <option
+                  v-for="(item, key) in locationOptions"
+                  :key="key"
+                  :value="item.value"
+                >
+                  {{ item.text }}
+                </option>
+              </select>
+            </div>
+          </template>
+          <template #content>{{ apiError }}</template>
+        </atoms-tooltip-error>
+      </template>
+    </atoms-stack-block>
+
+    <Teleport to="body">
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-storage-modal-new
+        v-if="isNewView"
+        :storage-modal-is-show="storageModalIsShow"
+        :datastore="props.datastore"
+        @change-storage="onChangeStorage"
+        @hide="onHideStorageModal"
+        @submit="onSubmitStorageModal"
+      />
+      <common-vm-actions-common-customize-hardware-virtual-hardware-new-hard-disk-location-storage-modal-old
+        v-else
+        :storage-modal-is-show="storageModalIsShow"
+        :storage-submit="storageSubmit"
+        :datastore="props.datastore"
+        :get-datastore-table-func="props.getDatastoreTableFunc"
+        @change-storage="onChangeStorage"
+        @hide="onHideStorageModal"
+        @submit="onSubmitStorageModal"
+      />
+    </Teleport>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type {
+  UI_I_HTMLSelectElement,
+  UI_I_Localization,
+} from '~/lib/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_ErrorValidationField } from '~/lib/models/store/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  location: UI_I_DatastoreTableItem | null
+  index: number
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  datastore: UI_I_DatastoreTableItem[]
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+}>()
+const emits = defineEmits<{
+  (event: 'change', value: UI_I_DatastoreTableItem): void
+  (event: 'remove-error-by-title', value: string): void
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const selectedLocation = ref<string>(props.location?.id || '')
+
+const storages = ref<UI_I_DatastoreTableItem[]>([])
+const addStorage = (storage: UI_I_DatastoreTableItem): void => {
+  const hasStorage = storages.value.some((item) => item.id === storage.id)
+  if (hasStorage) {
+    return
+  }
+
+  storages.value.push(storage)
+}
+const locationOptions = ref<UI_I_OptionItem[]>([])
+
+watch(
+  () => props.location,
+  (newValue) => {
+    if (locationOptions.value.length || !newValue) {
+      return
+    }
+
+    locationOptions.value = [
+      {
+        text: localization.value.common.storeWithVirtualMachine,
+        value: newValue.id,
+      },
+      { text: `${localization.value.common.browse}...`, value: -1 },
+    ]
+    selectedLocation.value = newValue.id
+    storages.value.push(newValue)
+    addStorage(newValue)
+  },
+  { immediate: true }
+)
+
+const storageSubmit = ref<number>(0)
+const onSubmitStorageModal = (): void => {
+  storageSubmit.value++
+}
+const storageModalIsShow = ref<boolean>(false)
+const onHideStorageModal = (): void => {
+  storageModalIsShow.value = false
+}
+const onChangeStorage = (storage: UI_I_DatastoreTableItem): void => {
+  locationOptions.value = [
+    locationOptions.value[0],
+    { text: storage.name, value: storage.id },
+    // @ts-ignore
+    locationOptions.value.at(-1),
+  ]
+
+  selectedLocation.value = storage.id
+  emits('change', storage)
+  addStorage(storage)
+  onHideStorageModal()
+}
+const changeLocation = (event: UI_I_HTMLSelectElement): void => {
+  const value = +event.target.value
+  if (value === -1) {
+    storageModalIsShow.value = true
+    return
+  }
+
+  selectedLocation.value = event.target.value
+  const storage = storages.value.find((item) => item.id === event.target.value)
+  storage && emits('change', storage)
+}
+
+const typeError = computed<string>(
+  () => `disk_devices[${props.index}].location`
+)
+
+const apiError = computed<string>(() => {
+  return (
+    props.errorValidationFields?.find(
+      (message) => message.field === typeError.value
+    )?.error_message || ''
+  )
+})
+
+const onRemoveValidationError = (): void => {
+  emits('remove-error-by-title', typeError.value)
+}
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/StorageModalOld.vue

@@ -0,0 +1,52 @@
+<template>
+  <atoms-modal
+    class="storage-modal-old"
+    :show="props.storageModalIsShow"
+    :title="localization.common.selectStorage"
+    @submit="emits('submit')"
+    @hide="emits('hide')"
+  >
+    <template #modalBody>
+      <span>{{
+        localization.common
+          .followingDatastoresAccessibleDestinationResourceThatSelected
+      }}</span>
+      <common-vm-actions-common-select-storage
+        :storage-submit="props.storageSubmit"
+        :datastore="props.datastore"
+        :get-datastore-table-func="props.getDatastoreTableFunc"
+        hide-compatibility
+        @submit="emits('change-storage', $event)"
+      />
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_TablePayload } from '~/lib/models/table/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  storageModalIsShow: boolean
+  storageSubmit: number
+  datastore: UI_I_DatastoreTableItem[]
+  getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-storage', value: UI_I_DatastoreTableItem): void
+  (event: 'submit'): void
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+</script>
+
+<style scoped lang="scss">
+.storage-modal-old {
+  :deep(.modal-dialog) {
+    width: 864px;
+  }
+}
+</style>

package/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/storageModalNew/StorageModalNew.vue

@@ -0,0 +1,175 @@
+<template>
+  <ui-modal
+    v-if="props.storageModalIsShow"
+    show
+    :title="localization.common.selectStorage"
+    :texts="texts"
+    test-id="storage-modal-new"
+    size="md"
+    @hide="emits('hide')"
+    @submit="onSubmit"
+  >
+    <template #content>
+      <div class="select-storage-modal-container">
+        <span class="description-text">{{
+          localization.common
+            .followingDatastoresAccessibleDestinationResourceThatSelected
+        }}</span>
+        <ui-data-table
+          test-id="select-storage-data-table"
+          :data="data"
+          :options="tableOptions"
+          :loading="loading"
+          server-off
+          :default-layout="false"
+          @select-row="onSelectRow"
+        />
+      </div>
+    </template>
+    <template #footerLeftContent>
+      <span></span>
+    </template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
+import type { UI_I_DataTable } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_I_DatastoreTableItem } from '~/lib/models/store/storage/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { datastoreLocalizationByState } from '~/components/common/lib/config/states'
+import {
+  tableDataFunc,
+  tableOptions,
+} from '~/components/common/vm/actions/common/customizeHardware/virtualHardware/newHardDisk/location/storageModalNew/lib/config/table'
+
+const props = defineProps<{
+  storageModalIsShow: boolean
+  // storageSubmit: number
+  datastore: UI_I_DatastoreTableItem[]
+  // getDatastoreTableFunc: (payload: UI_I_TablePayload) => Promise<void>
+}>()
+
+const emits = defineEmits<{
+  (event: 'change-storage', value: UI_I_DatastoreTableItem): void
+  (event: 'submit'): void
+  (event: 'hide'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const texts = ref<UI_I_ModalTexts>({
+  button2: localization.value.common.select,
+})
+
+const loading = ref<boolean>(true)
+
+const data = ref<UI_I_DataTable>(tableDataFunc(localization.value))
+
+watch(
+  () => props.datastore,
+  (newValue) => {
+    if (!newValue.length || data.value.body.length) return
+
+    const { $binary } = useNuxtApp()
+
+    newValue.forEach((item, key) => {
+      const state =
+        localization.value.inventorySummary[
+          datastoreLocalizationByState[item.state]
+        ]
+      data.value.body.push({
+        row: key,
+        collapse: false,
+        isHiddenCollapse: false,
+        collapseToggle: false,
+        data: [
+          {
+            key: item.id,
+            col: 0,
+            text: item.name,
+          },
+          {
+            col: 1,
+            text: state,
+          },
+          { col: 2, text: $binary.round(item.capacity.capacity_mb) },
+          {
+            col: 3,
+            text: $binary.round(item.capacity.provisioned_mb.toString()),
+          },
+          {
+            col: 4,
+            text: $binary.round(item.capacity.free_mb.toString()),
+          },
+          {
+            col: 5,
+            text: $binary.round(item.capacity.used_mb.toString()),
+          },
+          {
+            col: 6,
+            text: item.type_text,
+          },
+          {
+            col: 7,
+            text: item.thin_provisioning
+              ? localization.value.common.yes
+              : localization.value.common.no,
+          },
+          {
+            col: 8,
+            text: item.access_mode,
+          },
+          {
+            col: 9,
+            text: item.hardware_acceleration,
+          },
+          {
+            col: 10,
+            text: item.drive_type,
+          },
+          {
+            col: 11,
+            text: item.device,
+          },
+          {
+            col: 12,
+            text: item.storage_io_control,
+          },
+        ],
+      })
+    })
+    loading.value = false
+  },
+  { immediate: true, deep: true }
+)
+
+const onSelectRow = (selectedData: UI_I_DataTable): void => {
+  const selectedId = selectedData[0]?.data[0]?.key
+  const selectedItem = props.datastore.find((item) => (item.id = selectedId))
+
+  selectedItem && emits('change-storage', selectedItem)
+}
+
+const onSubmit = (): void => {
+  emits('submit')
+  emits('hide')
+}
+</script>
+
+<style scoped lang="scss">
+.select-storage-modal-container {
+  display: flex;
+  flex-direction: column;
+  grid-gap: 12px;
+  padding-left: 32px;
+  padding-bottom: 5px;
+
+  .description-text {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 14.52px;
+    color: #9da6ad;
+  }
+}
+</style>