bfg-common 1.5.773 → 1.5.775

package/components/common/backup/storage/actions/add/steps/typeMode/lib/config/typeOptions.ts

@@ -5,26 +5,26 @@ export const datastoreTypesFunc = (
   localization: UI_I_Localization
 ): UI_I_RadioOption[] => {
   return [
-    // {
-    //   id: 'datastore-type-nfs',
-    //   label: localization.common.nfs,
-    //   value: 2,
-    //   disabled: false,
-    //   description: localization.common.nfsDesc,
-    //   isTooltip: false,
-    //   tooltipContent: localization.common.nfsHelpDesc,
-    //   testId: 'datastore-type-nfs',
-    // },
-    // {
-    //   id: 'datastore-type-samba',
-    //   label: localization.common.samba,
-    //   value: 3,
-    //   disabled: false,
-    //   description: localization.common.sambaDesc,
-    //   isTooltip: false,
-    //   tooltipContent: localization.common.sambaHelpDesc,
-    //   testId: 'datastore-type-samba',
-    // },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 2,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+    {
+      id: 'datastore-type-samba',
+      label: localization.common.samba,
+      value: 3,
+      disabled: false,
+      description: localization.common.sambaDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.sambaHelpDesc,
+      testId: 'datastore-type-samba',
+    },
     {
       id: 'datastore-type-shared-storm',
       label: localization.common.stormSharedStorage,

package/components/common/backup/storage/actions/delete/Delete.vue

@@ -1,28 +1,29 @@
 <template>
   <common-modals-confirm-by-input
-    :title="localization.zabbix.deleteConfirmation"
+    :title="localization.common.confirmDeletionDatastoreTitle"
     :sub-title="props.datastore?.name || ''"
-    :modal-texts="modalTexts"
-    :placeholder="localization.backup.backupStorageName1"
-    test-id="backup-storage-delete"
-    width="480px"
+    test-id="datastore-delete"
+    width="576px"
     @hide="onHide"
     @confirm="onDelete"
   >
     <template #content>
       <p class="delete-group__text">
-        {{ modalDescription }}
+        {{ localization.common.confirmDeletionDatastoreBodyFirst }}
       </p>
 
-      <p v-if="isNewView" class="delete-group__text">
-        {{ modalConfirmText }}
+      <p class="delete-group__text">
+        {{ localization.common.confirmDeletionDatastoreBodySecond }}
+      </p>
+
+      <p class="delete-group__text">
+        {{ localization.common.confirmDeletionDatastoreBodyThird }}
       </p>
     </template>
   </common-modals-confirm-by-input>
 </template>
 
 <script setup lang="ts">
-import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_DeleteItem } from '~/components/common/backup/storage/actions/delete/lib/models/interfaces'
 import { getBackupTreeNodeIdByTypeFromRoute } from '~/components/common/pages/backups/lib/utils/getBackupOrBackupStorageId'
@@ -35,35 +36,11 @@ const emits = defineEmits<{
   (event: 'hide'): void
 }>()
 
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const modalTexts = ref<UI_I_ModalTexts>({
-  button1: localization.value.common.cancel,
-  button2: localization.value.common.delete,
-})
-
 const targetId = computed<string>(() =>
   getBackupTreeNodeIdByTypeFromRoute('last')
 )
-
-const modalDescription = computed<string>(() =>
-  localization.value.common.confirmDeleteBackupStorageDesc.replace(
-    '{0}',
-    props.datastore?.name || ''
-  )
-)
-
-const modalConfirmText = computed<string>(() =>
-  localization.value.common.toConfirmTypeFieldBelow.replace(
-    '{0}',
-    props.datastore?.name || ''
-  )
-)
-
 const onDelete = (): void => {
   emits('delete', targetId.value)
 }
@@ -74,13 +51,14 @@ const onHide = (): void => {
 
 <style lang="scss" scoped>
 @import '~/assets/scss/common/mixins.scss';
-
 .delete-group__text {
-  @include text($fs: 14px, $fw: 400, $lh: 18px, $c: #9da6ad, $align: center);
+  @include text($fs: 0.6rem);
+  font-size: 0.6rem;
   letter-spacing: normal;
+  line-height: 1rem;
 
-  &:last-of-type {
-    margin-top: 12px;
+  &:first-child {
+    margin-bottom: 1.2em;
   }
 }
 </style>

package/components/common/browse/blocks/contents/filesNew/Skeleton.vue

@@ -1,18 +1,18 @@
-<template>
-  <div class="skeleton-wrap">
-    <ui-skeleton-item height="18px" />
-    <ui-skeleton-item height="18px" />
-    <ui-skeleton-item height="18px" />
-    <ui-skeleton-item height="18px" />
-    <ui-skeleton-item height="18px" />
-  </div>
-</template>
-
-<script setup lang="ts"></script>
-
-<style scoped lang="scss">
-.skeleton-wrap {
-  display: grid;
-  grid-gap: 12px;
-}
-</style>
+<template>
+  <div class="skeleton-wrap">
+    <ui-skeleton-item height="18px" />
+    <ui-skeleton-item height="18px" />
+    <ui-skeleton-item height="18px" />
+    <ui-skeleton-item height="18px" />
+    <ui-skeleton-item height="18px" />
+  </div>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.skeleton-wrap {
+  display: grid;
+  grid-gap: 12px;
+}
+</style>

package/components/common/diagramMain/Header.vue

@@ -24,9 +24,6 @@
         <span class="vertical-separator"></span>
         <button
           id="add-networking-button"
-          v-permission="
-            'Networks.CreateSysx Networks.CreatePortGroup Networks.UpdateSwitch Networks.CreateSwitch'
-          "
           :data-id="`${props.testId}-add-networking-button`"
           type="button"
           @click="onShowModal('add-networking', props.diagramName)"
@@ -44,7 +41,6 @@
         </button>
         <button
           id="switch-manage-physical-adapters-button"
-          v-permission="'Networks.UpdateSwitch'"
           :data-id="`${props.testId}-manage-physical-adapters-button`"
           type="button"
           @click="onShowModal('switch-manage-physical-adapters')"

package/components/common/diagramMain/lib/models/interfaces.ts

@@ -237,8 +237,6 @@ export interface UI_I_ViewSettingsFields {
   id: number
   type: number
   separator?: boolean
-  slot?: string
-  data?: any
   rows: {
     name: string
     value?: string | string[] | undefined

package/components/common/diagramMain/modals/lib/config/vCenterModal.ts

@@ -1,48 +1,48 @@
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_ModalsInitialData } from '~/components/common/diagramMain/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-
-export const vCenterViewSettingsFunc = (
-  localization: UI_I_Localization,
-  initialData: UI_I_ModalsInitialData
-) => [
-  {
-    title: 'Network adapter 1',
-    id: 1,
-    type: 1,
-    rows: [
-      {
-        name: localization.common.macAddress,
-        value: initialData.macAddress,
-      },
-      {
-        name: localization.common.adapterType,
-        value: initialData.adapter,
-      },
-    ],
-  },
-]
-
-export const vCenterPopupFieldsFunc = (
-  localization: UI_I_Localization,
-  testId: string
-): UI_I_CollapseNavItem[] => [
-  {
-    text: localization.common.viewSettings,
-    value: 'v-center-view-settings',
-    testId: `${testId}-view`,
-  },
-]
-
-export const vCenterPopupFieldsNewFunc = (
-  localization: UI_I_Localization,
-  testId: string
-): UI_I_Dropdown[] => [
-  {
-    text: localization.common.viewSettings,
-    value: 'v-center-view-settings',
-    iconName: 'password-hide',
-    testId: `${testId}-view`,
-  },
-]
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_ModalsInitialData } from '~/components/common/diagramMain/lib/models/interfaces'
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+
+export const vCenterViewSettingsFunc = (
+  localization: UI_I_Localization,
+  initialData: UI_I_ModalsInitialData
+) => [
+  {
+    title: 'Network adapter 1',
+    id: 1,
+    type: 1,
+    rows: [
+      {
+        name: localization.common.macAddress,
+        value: initialData.macAddress,
+      },
+      {
+        name: localization.common.adapterType,
+        value: initialData.adapter,
+      },
+    ],
+  },
+]
+
+export const vCenterPopupFieldsFunc = (
+  localization: UI_I_Localization,
+  testId: string
+): UI_I_CollapseNavItem[] => [
+  {
+    text: localization.common.viewSettings,
+    value: 'v-center-view-settings',
+    testId: `${testId}-view`,
+  },
+]
+
+export const vCenterPopupFieldsNewFunc = (
+  localization: UI_I_Localization,
+  testId: string
+): UI_I_Dropdown[] => [
+  {
+    text: localization.common.viewSettings,
+    value: 'v-center-view-settings',
+    iconName: 'password-hide',
+    testId: `${testId}-view`,
+  },
+]

package/components/common/diagramMain/modals/viewSettings/info/Info.vue

@@ -17,11 +17,7 @@
     :full-mode="props.fullMode"
     :height="props.height"
     :with-collapse="props.withCollapse"
-  >
-    <template #dynamic="{ dynamicName, data }">
-      <slot :name="dynamicName" :data="data" />
-    </template>
-  </common-diagram-main-modals-view-settings-info-old>
+  />
 </template>
 
 <script setup lang="ts">

package/components/common/diagramMain/modals/viewSettings/info/InfoOld.vue

@@ -18,15 +18,7 @@
               v-for="viewSettingsField in viewSettingsTabContent(tab.value)"
               :key="viewSettingsField.id"
             >
-              <template v-if="viewSettingsField.slot">
-                <slot
-                  name="dynamic"
-                  :dynamic-name="viewSettingsField.slot"
-                  :data="viewSettingsField.data"
-                />
-              </template>
               <common-diagram-main-modals-view-settings-view-settings
-                v-else
                 :view-name="props.viewName"
                 :view-settings-field="viewSettingsField"
                 :with-collapse="props.withCollapse"
@@ -42,15 +34,7 @@
           v-for="viewSettingsField in props.viewSettingsFields"
           :key="viewSettingsField.id"
         >
-          <template v-if="viewSettingsField.slot">
-            <slot
-              name="dynamic"
-              :dynamic-name="viewSettingsField.slot"
-              :data="viewSettingsField.data"
-            />
-          </template>
           <common-diagram-main-modals-view-settings-view-settings
-            v-else
             :view-name="props.viewName"
             :view-settings-field="viewSettingsField"
           />