bfg-common 1.5.774 → 1.5.775

package/components/common/pages/backups/modals/restore/types/{New.vue → TypesNew.vue}

@@ -1,95 +1,95 @@
-<template>
-  <section class="datastore-type">
-    <div class="datastore-type__radio-container flex flex-col gap-3">
-      <ui-radio
-        v-for="(option, key) in props.backupTypes"
-        :key="key"
-        v-model="model.restore_code"
-        :label="option.text"
-        :test-id="option.testId"
-        :value="option.value"
-        size="md"
-      >
-        <template #description>
-          <span class="datastore-type__radio-description">
-            {{ optionsDescription[option.value - 1] }}
-          </span>
-        </template>
-      </ui-radio>
-    </div>
-  </section>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const props = defineProps<{
-  backupTypes: UI_I_OptionItem[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const optionsDescription = ref<string[]>([
-  localization.value.common.restoreDiskOnlyDescription,
-  localization.value.common.restoreExistingDescription,
-  localization.value.common.restoreAsNewDescription,
-  localization.value.common.restoreAsNewAndCopyDescription,
-])
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins.scss';
-
-.datastore-type {
-  container-type: inline-size;
-  margin-top: 16px;
-
-  &__radio {
-    &-description {
-      color: #9da6ad;
-      line-height: 18px;
-    }
-
-    &-container {
-      :deep(.radio-label__text) {
-        padding-top: 1px;
-      }
-    }
-  }
-
-  :deep(input[type='radio']) {
-    & ~ .radio-label {
-      width: 100%;
-      height: 100%;
-      background-color: var(--select-bg);
-      border-radius: 8px;
-      padding: 12px;
-      box-shadow: inset 0 0 0 1px var(--line-color);
-      transition: box-shadow 0.1s ease-in-out;
-    }
-
-    &:not(:checked) {
-      & ~ .radio-label:hover {
-        box-shadow: inset 0 0 0 1px var(--select-border);
-      }
-    }
-
-    &:checked {
-      & ~ .radio-label {
-        background-color: var(--radio-btn-active-label-bg-color);
-        box-shadow: inset 0 0 0 1.5px var(--radio-btn-active-label-border-color);
-      }
-    }
-  }
-}
-
-@container (max-width:600px) {
-  .datastore-type__radio-container {
-    grid-template-columns: 1fr;
-  }
-}
-</style>
+<template>
+  <section class="datastore-type">
+    <div class="datastore-type__radio-container flex flex-col gap-3">
+      <ui-radio
+        v-for="(option, key) in backupTypes"
+        :key="key"
+        v-model="model.restore_code"
+        :label="option.text"
+        :test-id="option.testId"
+        :value="option.value"
+        size="md"
+      >
+        <template #description>
+          <span class="datastore-type__radio-description">
+            {{ optionsDescription[option.value - 1] }}
+          </span>
+        </template>
+      </ui-radio>
+    </div>
+  </section>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+
+const model = defineModel<UI_I_RestoreForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
+
+const optionsDescription = computed<string[]>(() => {
+  return [
+    localization.value.common.restoreDiskOnlyDescription,
+    localization.value.common.restoreExistingDescription,
+    localization.value.common.restoreAsNewDescription,
+  ]
+})
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins.scss';
+
+.datastore-type {
+  container-type: inline-size;
+  margin-top: 16px;
+
+  &__radio {
+    &-description {
+      color: #9da6ad;
+      line-height: 18px;
+    }
+
+    &-container {
+      :deep(.radio-label__text) {
+        padding-top: 1px;
+      }
+    }
+  }
+
+  :deep(input[type='radio']) {
+    & ~ .radio-label {
+      width: 100%;
+      height: 100%;
+      background-color: var(--select-bg);
+      border-radius: 8px;
+      padding: 12px;
+      box-shadow: inset 0 0 0 1px var(--line-color);
+      transition: box-shadow 0.1s ease-in-out;
+    }
+
+    &:not(:checked) {
+      & ~ .radio-label:hover {
+        box-shadow: inset 0 0 0 1px var(--select-border);
+      }
+    }
+
+    &:checked {
+      & ~ .radio-label {
+        background-color: var(--radio-btn-active-label-bg-color);
+        box-shadow: inset 0 0 0 1.5px var(--radio-btn-active-label-border-color);
+      }
+    }
+  }
+}
+
+@container (max-width:600px) {
+  .datastore-type__radio-container {
+    grid-template-columns: 1fr;
+  }
+}
+</style>

package/components/common/pages/backups/modals/restore/types/{Old.vue → TypesOld.vue}

@@ -1,62 +1,61 @@
-<template>
-  <div class="select-restore-type flex">
-    <atoms-list-select-list
-      v-model="model.restore_code"
-      :items="props.backupTypes"
-      class="select"
-    />
-    <p class="description">
-      {{ description }}
-    </p>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const props = defineProps<{
-  backupTypes: UI_I_OptionItem[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const description = computed<string>(
-  () => descriptionsFunc(localization.value)[model.value.restore_code - 1]
-)
-</script>
-
-<style>
-:root {
-  --type-list-border-color: #ccc;
-}
-
-:root.dark-theme {
-  --type-list-border-color: #000;
-}
-</style>
-<style scoped lang="scss">
-.select-restore-type {
-  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>
+<template>
+  <div class="select-restore-type flex">
+    <atoms-list-select-list
+      v-model="model.restore_code"
+      :items="backupTypes"
+      class="select"
+    />
+    <p class="description">
+      {{ description }}
+    </p>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
+import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
+
+const model = defineModel<UI_I_RestoreForm>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
+
+const description = computed<string>(
+  () => descriptionsFunc(localization.value)[model.value.restore_code - 1]
+)
+</script>
+
+<style>
+:root {
+  --type-list-border-color: #ccc;
+}
+
+:root.dark-theme {
+  --type-list-border-color: #000;
+}
+</style>
+<style scoped lang="scss">
+.select-restore-type {
+  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>

package/components/common/pages/backups/modals/restore/types/lib/config/descriptions.ts

@@ -4,6 +4,5 @@ export const descriptionsFunc = (localization: UI_I_Localization): string[] => [
   localization.common.restoreDiskOnlyDescription,
   localization.common.restoreExistingDescription,
   localization.common.restoreAsNewDescription,
-  localization.common.restoreAsNewAndCopyDescription,
 ]
 

package/components/common/pages/hardwareHealth/historyTestimony/tools/Tools.vue

@@ -166,12 +166,7 @@ const emits = defineEmits<{
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-
-const { $store, $formattedDatetime }: any = useNuxtApp()
-
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
+const { $formattedDatetime }: any = useNuxtApp()
 
 const periodOptions = computed<UI_I_OptionItem[]>(() =>
   periodFunc(localization.value, props.selectedTimespanType)
@@ -268,7 +263,7 @@ const onUpdateTools = (): void => {
 }
 
 const chartTitleDate = computed<string>(() => {
-  if (!props.startDate || !updateTimeFormatAndInterfaceLang.value) return ''
+  if (!props.startDate) return ''
 
   const start = $formattedDatetime(props.startDate, { hasSeconds: true })
   const end = $formattedDatetime(props.endDate, { hasSeconds: true })

package/components/common/pages/hardwareHealth/tableView/TableView.vue

@@ -89,9 +89,6 @@ const props = defineProps<{
   tableMode: UI_T_HardwareHealthTabMode
 }>()
 const selectedRow = defineModel<number[]>('selectedRow')
-
-const { $store }: any = useNuxtApp()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const table: any = {
@@ -121,12 +118,7 @@ const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.tableMode].headItems(localization.value)
 )
 
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
-
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
-  if (!updateTimeFormatAndInterfaceLang.value) return []
   // const tableData = ['sensor'].includes(props.tableMode) ? props.dataTable : [] // TODO временно так
   let tableData = props.dataTable
 

package/components/common/pages/hardwareHealth/tableView/lib/config/sensorTable.ts

@@ -89,9 +89,6 @@ export const bodyItems = (
   localization: UI_I_Localization
 ): UI_I_BodyItem[][] => {
   const bodyItems: UI_I_BodyItem[][] = []
-
-  const { $formattedDatetime }: any = useNuxtApp()
-
   data.forEach((sensor: UI_I_HardwareHealthSensors, key) => {
     const statusData = {
       iconClassName: sensorsIconByStatus[sensor.status],
@@ -99,15 +96,6 @@ export const bodyItems = (
       warning: sensor.warning,
     }
 
-    const lastUpdate = sensor[hardwareHealthSensorTableKeys[4]]
-    const currentLastUpdate =
-      typeof lastUpdate === 'number'
-        ? $formattedDatetime(lastUpdate, {
-            hasSeconds: true,
-            separator: ', ',
-          })
-        : lastUpdate
-
     bodyItems.push([
       // {
       //   data,
@@ -151,7 +139,7 @@ export const bodyItems = (
       },
       {
         key: 'col4',
-        text: currentLastUpdate,
+        text: sensor[hardwareHealthSensorTableKeys[4]],
         id: key,
       },
       {

package/components/common/pages/hardwareHealth/toolsPanel/lib/config/actionsPanel.ts

@@ -11,24 +11,24 @@ export const hardwareHealthActionsFunc = (
       text: localization.common.refresh,
       type: 'refresh',
       disabled: false,
-      allowed: ['sensor', 'storage-sensor', 'alert-warning', 'system-log'],
+      permission: ['sensor', 'storage-sensor', 'alert-warning', 'system-log'],
       testId: 'hardware-health-refresh',
     },
     {
       text: localization.common.exportToXml,
       type: 'export-to-xml',
       disabled: true,
-      allowed: ['sensor'],
+      permission: ['sensor'],
       testId: 'hardware-health-export-to-xml',
     },
     {
       text: localization.common.resetEventLog,
       type: 'reset-event-log',
       disabled: true,
-      allowed: ['system-log'],
+      permission: ['system-log'],
       testId: 'hardware-health-reset-event-log',
     },
   ]
 
-  return tabs.filter((tab) => tab.allowed.includes(<string>selectedTab))
+  return tabs.filter((tab) => tab.permission.includes(<string>selectedTab))
 }

package/components/common/pages/home/widgets/warnings/lib/config/config.ts

@@ -5,7 +5,7 @@ import type {
   UI_I_DataTableHeader,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 import type { UI_I_Alert } from '~/components/common/pages/home/lib/models/interfaces'
-import { UI_E_TabsByType } from '~/lib/models/enums'
+import { UI_E_TabsByTypeEnum } from '~/components/common/pages/home/widgets/warnings/table/lib/models/enums'
 import { UI_E_NodeIconsByState } from '~/lib/models/enums'
 
 export const getHeaderDataFunc = (
@@ -69,7 +69,7 @@ export const getBodyDataFunc = (
     const targetData = {
       id: alert.id,
       icon: iconClassName,
-      nav: UI_E_TabsByType[alert.type],
+      nav: UI_E_TabsByTypeEnum[alert.type],
       type: alert.type,
       isLink: true,
       testId: `${alert.type}-item`,

package/components/common/pages/home/widgets/warnings/table/lib/config/config.ts

@@ -6,7 +6,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Alert } from '~/components/common/pages/home/lib/models/interfaces'
 import type { UI_T_WarningsTableKeysTuple } from '~/components/common/pages/home/widgets/warnings/table/lib/models/types'
 import type { UI_I_AlertData } from '~/components/common/pages/home/widgets/warnings/table/lib/models/interfaces'
-import { UI_E_TabsByType } from '~/lib/models/enums'
+import { UI_E_TabsByTypeEnum } from '~/components/common/pages/home/widgets/warnings/table/lib/models/enums'
 import { constructHeadItem } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
 
 export const alertsTableKeys: UI_T_WarningsTableKeysTuple = [
@@ -54,7 +54,7 @@ export const bodyItems = (data: UI_I_Alert[]): UI_I_BodyItem[][] => {
     const alertData: UI_I_AlertData = {
       iconClassName: 'vsphere-icon-folder',
       id: alert.id,
-      nav: UI_E_TabsByType[alert.type],
+      nav: UI_E_TabsByTypeEnum[alert.type],
       type: alert.type,
       isLink: true,
     }

package/components/common/pages/home/widgets/warnings/table/lib/models/enums.ts

@@ -0,0 +1,12 @@
+export enum UI_E_TabsByTypeEnum { // TODO если есть другой такой interface удалить этоть
+  'zone' = 'h',
+  'datacenter' = 'h',
+  'folder' = 'h',
+  'cluster' = 'h',
+  'zonedir' = 'h',
+  // для прокуратор
+  'host' = 'h',
+  'vm' = 'v',
+  'datastore' = 's',
+  'network' = 'n',
+}

package/components/common/pages/scheduledTasks/table/Table.vue

@@ -18,6 +18,7 @@
       hide-page-size
       off-select-by-row
       server-off
+      @row-detail="onGetRowDetails"
     >
       <template #icon="{ item }">
         <atoms-the-icon :name="item.data.iconClassName" class="icon" />
@@ -26,9 +27,9 @@
         </span>
       </template>
 
-      <template #toggleBlock="{ item }">
-        <common-pages-scheduled-tasks-table-expand-details
-          :data="item[0].data.expandData"
+      <template #toggleBlock>
+        <common-pages-scheduled-tasks-table-details-list
+          :details-list="detailsList"
         />
       </template>
     </atoms-table-data-grid>
@@ -44,6 +45,8 @@ import { itemsPerPage } from '~/components/atoms/table/dataGrid/lib/config/items
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import type { UI_I_ScheduleTableRowDetails } from '~/components/common/pages/scheduledTasks/table/lib/models/interfaces'
+import { detailsListFunc } from '~/components/common/pages/scheduledTasks/table/detailsList/lib/config/tasksRowDetails'
 import * as scheduledTaskTable from '~/components/common/pages/scheduledTasks/table/lib/config/scheduledTasksTable'
 
 const props = defineProps<{
@@ -67,6 +70,11 @@ const headItems = computed<UI_I_HeadItem[]>(() =>
 const bodyItems = computed<UI_I_BodyItem[][]>(() => {
   return scheduledTaskTable.bodyItems(props.dataTable || [])
 })
+
+const detailsList = ref<UI_I_ScheduleTableRowDetails[]>([])
+const onGetRowDetails = (key: number): void => {
+  detailsList.value = detailsListFunc(props.dataTable[key], localization.value)
+}
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/scheduledTasks/table/{expandDetails/Old.vue → detailsList/DetailsList.vue}

@@ -1,7 +1,7 @@
 <template>
   <div class="details-list w-full">
     <div
-      v-for="(item, key) in props.expandData"
+      v-for="(item, key) in props.detailsList"
       :key="key"
       :class="[
         'clr-row details-list__row',
@@ -33,7 +33,7 @@
           <span v-else>{{ item.value }}</span>
         </template>
 
-        <common-pages-scheduled-tasks-table-expand-details-history-run
+        <common-pages-scheduled-tasks-table-details-list-table
           v-else
           :data-table="item.value"
           :total-items="item.value.length"
@@ -46,14 +46,11 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_DataTableBodyData } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-// import type { UI_I_Localization } from '~/node_modules/bfg-common/lib/models/interfaces'
+import type { UI_I_ScheduleTableRowDetails } from '~/components/common/pages/scheduledTasks/table/lib/models/interfaces'
 
 const props = defineProps<{
-  expandData: UI_I_DataTableBodyData[]
+  detailsList: UI_I_ScheduleTableRowDetails
 }>()
-
-// const localization = computed<UI_I_Localization>(() => useLocal())
 </script>
 
 <style lang="scss" scoped>

package/components/common/pages/scheduledTasks/table/{expandDetails/historyRun/HistoryRun.vue → detailsList/Table.vue}

@@ -1,6 +1,5 @@
 <template>
   <atoms-table-data-grid
-    :selected-row="null"
     :page-size="1"
     :page="1"
     :head-items="headItems"
@@ -8,8 +7,8 @@
     :total-items="props.totalItems"
     :total-pages="props.totalPages"
     :loading="false"
-    test-id="scheduled-tasks-history-runs-table"
-    class="history-runs-table"
+    test-id="events-table"
+    class="scheduled-tasks-history-runs-table"
     off-select-by-row
     hide-footer
   >
@@ -23,13 +22,10 @@
 </template>
 
 <script setup lang="ts">
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-} from '~/components/atoms/table/compact/lib/models/interfaces'
+import type { UI_I_HeadItem , UI_I_BodyItem} from '~/components/atoms/table/compact/lib/models/interfaces'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import * as historyRunTable from '~/components/common/pages/scheduledTasks/table/expandDetails/historyRun/lib/config/historyRunsTable'
+import * as historyRunTable from '~/components/common/pages/scheduledTasks/table/detailsList/lib/config/historyRunsTable'
 
 const props = defineProps<{
   dataTable: UI_I_ScheduledTasksTableItem['last_5_run']
@@ -48,7 +44,7 @@ const bodyItems = computed<UI_I_BodyItem[][]>(() => {
 </script>
 
 <style lang="scss" scoped>
-.history-runs-table {
+.data-table {
   height: inherit;
   :deep(.datagrid-outer-wrapper) {
     height: inherit;

package/components/common/pages/scheduledTasks/table/{expandDetails/historyRun → detailsList}/lib/config/historyRunsTable.ts

@@ -9,7 +9,7 @@ import {
   UI_E_RecentTaskStatus,
 } from '~/lib/models/store/tasks/enums'
 import type { UI_I_ScheduledTasksTableItem } from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import { historyLastRunTableKeys } from '~/components/common/pages/scheduledTasks/table/expandDetails/historyRun/lib/config/tableKeys'
+import { historyLastRunTableKeys } from '~/components/common/pages/scheduledTasks/table/detailsList/lib/config/tableKeys'
 import { schedulerRunStatus } from '~/components/common/pages/scheduledTasks/table/lib/config/schedulerStatus'
 
 const getItems = (
@@ -53,9 +53,7 @@ export const bodyItems = (
   const bodyItems: UI_I_BodyItem[][] = []
   data.forEach((event): void => {
     const startTime = event[historyLastRunTableKeys[0]]
-    const formattedStartTime = $formattedDatetime(+startTime * 1000, {
-      hasSeconds: true,
-    })
+    const formattedStartTime = $formattedDatetime(+startTime * 1000, { hasSeconds: true })
 
     const endTime = event[historyLastRunTableKeys[2]]
     const formattedEndTime =

package/components/common/pages/scheduledTasks/table/{expandDetails/historyRun → detailsList}/lib/config/tableKeys.ts

@@ -1,4 +1,4 @@
-import type { UI_T_HistoryLastRunTableTuple } from '~/components/common/pages/scheduledTasks/table/expandDetails/historyRun/lib/models/types'
+import type { UI_T_HistoryLastRunTableTuple } from '~/components/common/pages/scheduledTasks/table/detailsList/lib/models/types'
 
 export const historyLastRunTableKeys: UI_T_HistoryLastRunTableTuple = [
   'start',

package/components/common/pages/scheduledTasks/table/{expandDetails/lib/config/expandDetails.ts → detailsList/lib/config/tasksRowDetails.ts}

@@ -37,9 +37,7 @@ export const detailsListFunc = (
     {
       id: 5,
       text: localization.common.lastModified,
-      value: $formattedDatetime(data.last_modified * 1000, {
-        hasSeconds: true,
-      }),
+      value: $formattedDatetime(data.last_modified * 1000, { hasSeconds: true }),
       testId: 'scheduled-tasks-last-modified',
     },
 

package/components/common/pages/scheduledTasks/table/lib/config/scheduledTasksTable.ts

@@ -95,9 +95,6 @@ export const bodyItems = (
         key: 'col0',
         text: task[scheduledTaskTableItemsKeys[0]],
         id: task.rid,
-        data: {
-          expandData: task,
-        },
         isShowToggleIcon: true,
         testId: `adapter-table-${key}-row-item`,
       },