bfg-common 1.5.759 → 1.5.761

package/components/common/pages/backups/modals/createBackup/configuration/strategy/Strategy.vue

@@ -1,38 +1,38 @@
-<template>
-  <atoms-stack-block
-      :has-children="false"
-      test-id="backup-strategy-stack-block"
-  >
-    <template #stackBlockKey>
-      <span>{{ localization.common.strategy }}</span>
-    </template>
-    <template #stackBlockContent>
-      <common-select-input
-        v-model="model.strategy"
-        :data="strategyOptions"
-        test-id="backup-strategy"
-      />
-    </template>
-  </atoms-stack-block>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
-import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
-
-const model = defineModel<UI_I_CreateBackupForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const strategyOptions = ref<UI_I_SelectInputItem[]>(
-  strategyOptionsFunc(localization.value)
-)
-</script>
-
-<style lang="scss" scoped>
-#backup-transaction-logs {
-  margin: 4px 4px 0 0;
-}
-</style>
+<template>
+  <atoms-stack-block
+      :has-children="false"
+      test-id="backup-strategy-stack-block"
+  >
+    <template #stackBlockKey>
+      <span>{{ localization.common.strategy }}</span>
+    </template>
+    <template #stackBlockContent>
+      <common-select-input
+        v-model="model.strategy"
+        :data="strategyOptions"
+        test-id="backup-strategy"
+      />
+    </template>
+  </atoms-stack-block>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateBackupForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
+import { strategyOptionsFunc } from '~/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions'
+
+const model = defineModel<UI_I_CreateBackupForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const strategyOptions = ref<UI_I_SelectInputItem[]>(
+  strategyOptionsFunc(localization.value)
+)
+</script>
+
+<style lang="scss" scoped>
+#backup-transaction-logs {
+  margin: 4px 4px 0 0;
+}
+</style>

package/components/common/pages/backups/modals/createBackup/datastores/tableView/new/lib/config/table.ts

@@ -7,7 +7,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type {
   UI_I_BackupDatastore,
 } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import {backupStorageIconByState, datastoreLocalizationByState} from '~/components/common/lib/config/states'
+import { backupStorageIconByState, datastoreLocalizationByState } from '~/components/common/lib/config/states'
 import type {
   I_BackupDatastoreChipStatus
 } from "~/components/common/pages/backups/modals/createBackup/datastores/tableView/new/lib/models/interfaces";

package/components/common/pages/backups/modals/createBackup/lib/config/strategyOptions.ts

@@ -2,24 +2,21 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_SelectInputItem } from '~/components/common/select/input/lib/models/interfaces'
 
 export const strategyOptionsFunc = (
-    localization: UI_I_Localization
+  localization: UI_I_Localization
 ): UI_I_SelectInputItem[] => {
   const { $text } = useNuxtApp()
   const isLangEn = useLocalStorage('lang') === 'en_US'
 
-  let labels = [
+  const labels = [
     { label: localization.common.fullBackup, value: 0 },
     { label: localization.common.incrementalBackup, value: 1 },
     { label: localization.common.differentialBackup, value: 2 },
   ]
 
-  if(isLangEn) {
-    labels = labels.map((item) => ({
-      ...item,
-      label: $text.toCapitalizeEveryWord(item.label)
-    }))
-  }
-
-  return labels
+  return isLangEn
+    ? labels.map((item) => ({
+        ...item,
+        label: $text.toCapitalizeEveryWord(item.label),
+      }))
+    : labels
 }
-

package/components/common/pages/backups/modals/createBackup/lib/models/interfaces.ts

@@ -1,8 +1,8 @@
-export interface UI_I_DynamicSteps {
-  general: number
-  disks: number
-  datastores: number
-  configuration: number
-  readyComplete: number
-  schedulingOptions: number
-}
+export interface UI_I_DynamicSteps {
+  general: number
+  disks: number
+  datastores: number
+  configuration: number
+  readyComplete: number
+  schedulingOptions: number
+}

package/components/common/vm/snapshots/new/New.vue

@@ -227,6 +227,7 @@
 </template>
 
 <script setup lang="ts">
+import { useTemplateRef } from 'vue'
 import { useElementSize } from '@vueuse/core'
 import type { UI_I_InfoBlock } from '~/node_modules/bfg-uikit/components/ui/infoBlock/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
@@ -268,19 +269,14 @@ const onSelectContextMenuItem = (actionType: UI_T_SnapshotActionType): void => {
   emits('show-modal', actionType)
 }
 
-const detailsScrollBlock = ref<HTMLElement | null>(null)
-const { height } = useElementSize(detailsScrollBlock)
-const hasScroll = ref<boolean>(false)
-const checkScroll = (): void => {
-  const element = detailsScrollBlock.value
-  if (element) {
-    hasScroll.value = element.scrollHeight > element.clientHeight
-  }
-}
+const detailsElement = useTemplateRef<HTMLDivElement>('detailsScrollBlock')
+const { height } = useElementSize(detailsElement)
 
-watch(height, () => {
-  checkScroll()
-})
+const hasScroll = computed<boolean>(
+  () =>
+    height.value &&
+    detailsElement.value?.scrollHeight > detailsElement.value?.clientHeight
+)
 </script>
 
 <style>
@@ -433,6 +429,9 @@ watch(height, () => {
       line-height: 18px;
       text-align: right;
     }
+    :deep(.ui-main-info-block-item) {
+      grid-column-gap: 10px;
+    }
     :deep(.ui-main-info-block-item-right) {
       white-space: unset !important;
       max-width: 50%;

package/components/common/vm/snapshots/new/Skeleton.vue

@@ -19,7 +19,7 @@
       <ui-skeleton-item width="96" height="20" class="ml-auto" />
     </div>
     <div class="right-content grid p-4">
-      <div class="flex justify-between gap-4 flex-wrap top-container">
+      <div class="flex justify-between gap-4 pr-4 flex-wrap top-container">
         <ui-skeleton-item width="80" height="20" />
         <div class="actions-block flex">
           <ui-skeleton-item width="20" height="20" />
@@ -29,7 +29,13 @@
           <ui-skeleton-item width="20" height="20" />
         </div>
       </div>
-      <div class="details-block flex flex-col my-6">
+      <div
+        ref="detailsScrollBlock"
+        :class="[
+          'details-block flex flex-col my-6',
+          { 'has-scroll': hasScroll },
+        ]"
+      >
         <div
           v-for="index in detailsItemsCount"
           :key="index"
@@ -45,7 +51,19 @@
 </template>
 
 <script setup lang="ts">
+import { useTemplateRef } from 'vue'
+import { useElementSize } from '@vueuse/core'
+
 const detailsItemsCount = ref<number>(6)
+
+const detailsElement = useTemplateRef<HTMLDivElement>('detailsScrollBlock')
+const { height } = useElementSize(detailsElement)
+
+const hasScroll = computed<boolean>(
+  () =>
+    height.value &&
+    detailsElement.value?.scrollHeight > detailsElement.value?.clientHeight
+)
 </script>
 
 <style>
@@ -84,6 +102,8 @@ const detailsItemsCount = ref<number>(6)
     }
   }
   .right-content {
+    padding-right: 0;
+
     .top-container {
       .actions-block {
         grid-column-gap: 10px;
@@ -98,6 +118,10 @@ const detailsItemsCount = ref<number>(6)
       grid-row-gap: 10px;
       overflow: auto;
 
+      &:not(.has-scroll) {
+        padding-right: 16px;
+      }
+
       .details-block-item {
         background-color: var(--snapshots-right-skeleton-item-bg-color);
         border-radius: 6px;

package/components/common/wizards/network/add/Add.vue

@@ -251,10 +251,12 @@ const globalPermissions = computed<any>(
 
 // Step's content data (connectionType)
 const connectionType = ref<string>(
-  !globalPermissions.value['Networks.CreateSysx'] &&
-    !globalPermissions.value['Networks.CreatePortGroup']
+  globalPermissions.value === undefined
+    ? '0'
+    : !globalPermissions.value?.['Networks.CreateSysx'] &&
+      !globalPermissions.value?.['Networks.CreatePortGroup']
     ? '2'
-    : !globalPermissions.value['Networks.CreateSysx']
+    : !globalPermissions.value?.['Networks.CreateSysx']
     ? '1'
     : '0'
 )
@@ -291,7 +293,7 @@ const onChangeAdapterStatus = (adapterStatusNew: UI_I_AdapterStatus): void => {
 // Step's content data and changers (targetDevice)
 const targetDevice = ref<UI_I_TargetDevice>(
   useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
+    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
   )
 )
 const mtuFromSwitch = ref<number>(1500)
@@ -385,7 +387,8 @@ watch(
         : (targetDevice.value.selected = '0')
       newCT === '1' && (targetDevice.value.selected = '1')
       newCT === '2' &&
-        (globalPermissions.value['Networks.UpdateSwitch']
+        (globalPermissions.value === undefined ||
+        globalPermissions.value?.['Networks.UpdateSwitch']
           ? (targetDevice.value.selected = '2')
           : (targetDevice.value.selected = '3'))
     }
@@ -515,7 +518,7 @@ const reset = (): void => {
   wizard.reset()
   connectionTypeLocal.value = '0'
   targetDevice.value = useDeepCopy(
-    targetDeviceInitialFunc(globalPermissions.value['Networks.UpdateSwitch'])
+    targetDeviceInitialFunc(globalPermissions.value?.['Networks.UpdateSwitch'])
   )
   connectionSettings.value = useDeepCopy(connectionSettingsInitial)
   portProperties.value = useDeepCopy(portPropertiesInitial)

package/components/common/wizards/network/add/lib/config/initialData.ts

@@ -25,7 +25,8 @@ export const servicesInitial: UI_I_Services = {
 export const targetDeviceInitialFunc = (
   updateSwitchPermission: boolean
 ): UI_I_TargetDevice => ({
-  selected: updateSwitchPermission ? '1' : '3',
+  selected:
+    updateSwitchPermission === undefined || updateSwitchPermission ? '1' : '3',
   network: '',
   switch: '',
   standardSwitch: '',

package/lib/models/interfaces.ts

@@ -61,6 +61,7 @@ export interface UI_I_Localization {
   files: UI_I_ArbitraryObject<string>
   myPreferences: UI_I_ArbitraryObject<string>
   cacheConfiguration: UI_I_ArbitraryObject<string>
+  configureSecurityProfile: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

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