bfg-common 1.5.773 → 1.5.775

package/components/common/pages/home/widgets/hosts/lib/config/items.ts

@@ -1,23 +1,23 @@
-import type {
-  UI_I_Card,
-  UI_I_Hosts,
-} from '~/components/common/pages/home/lib/models/interfaces'
-
-export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
-  {
-    value: hosts.connected,
-    text: 'connected',
-    icon: 'vsphere-icon-Host_Connect',
-  },
-  {
-    value: hosts.disconnected,
-    text: 'disconnected',
-    icon: 'vsphere-icon-Host_Disconnect',
-  },
-
-  {
-    value: hosts.maintenance,
-    text: 'maintenance',
-    icon: 'vsphere-icon-host-maintenance',
-  },
-]
+import type {
+  UI_I_Card,
+  UI_I_Hosts,
+} from '~/components/common/pages/home/lib/models/interfaces'
+
+export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
+  {
+    value: hosts.connected,
+    text: 'connected',
+    icon: 'vsphere-icon-Host_Connect',
+  },
+  {
+    value: hosts.disconnected,
+    text: 'disconnected',
+    icon: 'vsphere-icon-Host_Disconnect',
+  },
+
+  {
+    value: hosts.maintenance,
+    text: 'maintenance',
+    icon: 'vsphere-icon-host-maintenance',
+  },
+]

package/components/common/pages/home/widgets/vms/VmsOld.vue

@@ -1,35 +1,35 @@
-<template>
-  <div :class="classes">
-    <div class="entity-status">
-      <common-pages-home-card
-        :title="localization.common.vms"
-        :count="props.vms.total"
-        icon-name="vsphere-icon-vm"
-      >
-        <common-pages-home-status-content :items="props.vms" />
-      </common-pages-home-card>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-const props = defineProps<{
-  vms: UI_I_Vms
-  project?: UI_T_Project
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const classes = computed<string>(() => {
-  let classes = 'clr-col-md-6 clr-col-sm-12'
-  if (props.project === 'procurator') {
-    classes = 'clr-col-md-12 clr-col-sm-12'
-  }
-  return classes
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div :class="classes">
+    <div class="entity-status">
+      <common-pages-home-card
+        :title="localization.common.vms"
+        :count="props.vms.total"
+        icon-name="vsphere-icon-vm"
+      >
+        <common-pages-home-status-content :items="props.vms" />
+      </common-pages-home-card>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+const props = defineProps<{
+  vms: UI_I_Vms
+  project?: UI_T_Project
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const classes = computed<string>(() => {
+  let classes = 'clr-col-md-6 clr-col-sm-12'
+  if (props.project === 'procurator') {
+    classes = 'clr-col-md-12 clr-col-sm-12'
+  }
+  return classes
+})
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/home/widgets/vms/lib/config/items.ts

@@ -1,20 +1,20 @@
-import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
-
-export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
-  {
-    value: vms.powered_on,
-    text: 'powered_on',
-    icon: 'vsphere-icon-vm-on',
-  },
-  {
-    value: vms.powered_off,
-    text: 'powered_off',
-    icon: 'icon-vm-power-off',
-  },
-
-  {
-    value: vms.suspended,
-    text: 'suspended',
-    icon: 'vsphere-icon-vm-suspended',
-  },
+import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
+
+export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
+  {
+    value: vms.powered_on,
+    text: 'powered_on',
+    icon: 'vsphere-icon-vm-on',
+  },
+  {
+    value: vms.powered_off,
+    text: 'powered_off',
+    icon: 'icon-vm-power-off',
+  },
+
+  {
+    value: vms.suspended,
+    text: 'suspended',
+    icon: 'vsphere-icon-vm-suspended',
+  },
 ]

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/lib/utils/utils.ts

@@ -1,84 +1,84 @@
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_SendTaskParams,
-} from '~/lib/models/interfaces'
-import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import { base64 } from '~/lib/utils/base64'
-import type {
-  UI_I_CreateScheduledTaskArgs,
-  UI_I_ScheduledTasksTableItem,
-} from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import type { UI_T_ScheduledTasksActionsType } from '~/components/common/pages/scheduledTasks/lib/models/types'
-
-export const defineScheduleTaskModalTitle = (
-  type: UI_T_ScheduledTasksActionsType,
-  isEdit: boolean
-): string => {
-  const localization: UI_I_Localization = useLocal()
-  const { scheduleNewTasks, scheduleTaskEdit } = localization.common
-
-  const typeTitleMap: Partial<Record<UI_T_ScheduledTasksActionsType, string>> =
-    {
-      'power-on': localization.common.powerOn,
-      'power-off': localization.common.powerOff,
-      'shut-down-guest-os': localization.common.shutDownGuestOs,
-      'restart-guest-os': localization.common.restartGuestOs,
-      suspend: localization.common.suspend,
-      reset: localization.common.reset,
-      'take-snapshot': localization.common.takeSnapshot,
-    }
-
-  const title = typeTitleMap[type]
-  const modalMode = isEdit ? scheduleTaskEdit : scheduleNewTasks
-
-  return `${modalMode} (${title})`
-}
-export const scheduledTasks = (
-  form: UI_I_ScheduleNewTasksForm,
-  args: UI_I_SendTaskParams,
-  target: string,
-  isEdit: boolean,
-  data: UI_I_ScheduledTasksTableItem,
-  project: UI_T_Project
-): UI_I_SendTaskParams => {
-  const methodArgs = {
-    method: args.method,
-    params: {
-      target: args.target,
-      args: args.args ? base64.encode(args.args) : '',
-    },
-  }
-
-  let method = ''
-  switch (project) {
-    case 'sphere':
-      method = isEdit
-        ? 'VirtualMachines.UpdateScheduledTask'
-        : 'VirtualMachines.CreateScheduledTask'
-      break
-    case 'procurator':
-      method = isEdit ? 'vm.update_sched_task' : 'vm.create_sched_task'
-      break
-  }
-
-  const taskArgs: UI_I_CreateScheduledTaskArgs = {
-    target,
-    name: form.task_name,
-    description: form.description,
-    toggle: form.toggle,
-    cron_2: form.cron,
-    notify_emails: form.ntfn_target,
-    args: base64.encode(methodArgs),
-    ...(isEdit && {
-      rid: data.rid,
-      last_modified: data.last_modified,
-    }),
-  }
-
-  return {
-    method,
-    target,
-    args: taskArgs,
-  }
-}
+import type { UI_T_Project } from '~/lib/models/types'
+import type {
+  UI_I_Localization,
+  UI_I_SendTaskParams,
+} from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import { base64 } from '~/lib/utils/base64'
+import type {
+  UI_I_CreateScheduledTaskArgs,
+  UI_I_ScheduledTasksTableItem,
+} from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import type { UI_T_ScheduledTasksActionsType } from '~/components/common/pages/scheduledTasks/lib/models/types'
+
+export const defineScheduleTaskModalTitle = (
+  type: UI_T_ScheduledTasksActionsType,
+  isEdit: boolean
+): string => {
+  const localization: UI_I_Localization = useLocal()
+  const { scheduleNewTasks, scheduleTaskEdit } = localization.common
+
+  const typeTitleMap: Partial<Record<UI_T_ScheduledTasksActionsType, string>> =
+    {
+      'power-on': localization.common.powerOn,
+      'power-off': localization.common.powerOff,
+      'shut-down-guest-os': localization.common.shutDownGuestOs,
+      'restart-guest-os': localization.common.restartGuestOs,
+      suspend: localization.common.suspend,
+      reset: localization.common.reset,
+      'take-snapshot': localization.common.takeSnapshot,
+    }
+
+  const title = typeTitleMap[type]
+  const modalMode = isEdit ? scheduleTaskEdit : scheduleNewTasks
+
+  return `${modalMode} (${title})`
+}
+export const scheduledTasks = (
+  form: UI_I_ScheduleNewTasksForm,
+  args: UI_I_SendTaskParams,
+  target: string,
+  isEdit: boolean,
+  data: UI_I_ScheduledTasksTableItem,
+  project: UI_T_Project
+): UI_I_SendTaskParams => {
+  const methodArgs = {
+    method: args.method,
+    params: {
+      target: args.target,
+      args: args.args ? base64.encode(args.args) : '',
+    },
+  }
+
+  let method = ''
+  switch (project) {
+    case 'sphere':
+      method = isEdit
+        ? 'VirtualMachines.UpdateScheduledTask'
+        : 'VirtualMachines.CreateScheduledTask'
+      break
+    case 'procurator':
+      method = isEdit ? 'vm.update_sched_task' : 'vm.create_sched_task'
+      break
+  }
+
+  const taskArgs: UI_I_CreateScheduledTaskArgs = {
+    target,
+    name: form.task_name,
+    description: form.description,
+    toggle: form.toggle,
+    cron_2: form.cron,
+    notify_emails: form.ntfn_target,
+    args: base64.encode(methodArgs),
+    ...(isEdit && {
+      rid: data.rid,
+      last_modified: data.last_modified,
+    }),
+  }
+
+  return {
+    method,
+    target,
+    args: taskArgs,
+  }
+}

package/components/common/pages/tasks/Tasks.vue

@@ -10,7 +10,6 @@
       :total-items="tasksList?.total_items || 0"
       :loading="isLoading"
       :project="props.project"
-      :config="props.config"
       @pagination="onUpdatePagination"
       @sort="onSortTable"
       @col-search="onColSearching"
@@ -27,11 +26,9 @@ import type {
 } from '~/lib/models/table/interfaces'
 import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_TaskConfig } from '~/components/common/pages/tasks/table/lib/models/interfaces'
 
 const props = defineProps<{
   project: UI_T_Project
-  config: UI_I_TaskConfig
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())

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

@@ -132,7 +132,6 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_TaskItem } from '~/lib/models/store/tasks/interfaces'
 import type { UI_I_TableTarget } from '~/lib/models/table/interfaces'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-import type { UI_I_TaskConfig } from '~/components/common/pages/tasks/table/lib/models/interfaces'
 import {
   options,
   getTargetActionsFunc,
@@ -147,7 +146,6 @@ const props = defineProps<{
   totalPages: number
   totalItems: number
   loading: boolean
-  config: UI_I_TaskConfig
 }>()
 const emits = defineEmits<{
   (event: 'sort', value: string): void
@@ -216,8 +214,7 @@ watch(
     taskBodyItems.value = getBodyDataFunc(
       newValue[0],
       localization.value,
-      props.project,
-      props.config
+      props.project
     )
   },
   { deep: true, immediate: true }

package/components/common/pages/tasks/table/expandDetails/ExpandDetails.vue

@@ -42,7 +42,7 @@
             status="error"
             dropdown-width="232px"
             dropdown-left
-            dropdown-bottom
+            dropdown-top
           />
         </div>
       </span>

package/components/common/pages/tasks/table/lib/config/config.ts

@@ -5,18 +5,14 @@ import type {
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
 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_T_Project,
-  UI_T_LangValue,
-  UI_T_AllTypeNodes,
-} from '~/lib/models/types'
+import type { UI_T_Project, UI_T_ProcuratorTypeNodes } from '~/lib/models/types'
 import type { UI_I_TaskItem } from '~/lib/models/store/tasks/interfaces'
 import { UI_E_RecentTaskStatus } from '~/lib/models/store/tasks/enums'
 import {
   UI_E_RTaskChipColor,
   UI_E_RTaskStatusIcon,
 } from '~/components/common/pages/tasks/table/lib/models/enums'
-import type { UI_I_TaskConfig } from '~/components/common/pages/tasks/table/lib/models/interfaces'
+import * as taskConfig from '~/components/templates/tasks/lib/config/taskConfig' // url из ( sphere, procurator )
 
 export const getHeaderDataFunc = (
   localization: UI_I_Localization
@@ -183,18 +179,17 @@ export const options: UI_I_DataTableOptions = {
 }
 
 export const getBodyDataFunc = (
-  tasks: UI_I_TaskItem<UI_T_AllTypeNodes>[],
+  bodyData: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[],
   localization: UI_I_Localization,
-  project: UI_T_Project,
-  config: UI_I_TaskConfig
+  project: UI_T_Project
 ): UI_I_DataTableBody[] => {
-  const { $formattedDatetime, $time } = useNuxtApp() as any
+  const { $formattedDatetime } = useNuxtApp() as any
 
-  return tasks.map((task, index: number) => {
-    const iconClassName = config.iconFunc(task.targetType)
-    const id = config.idFunc(task)
-    const nav = config.navFunc(task.targetType)
-    const type = config.typeFunc(task.targetType)
+  return bodyData.map((task, index: number) => {
+    const iconClassName = taskConfig.iconFunc(task.targetType)
+    const id = taskConfig.idFunc(task)
+    const nav = taskConfig.navFunc(task.targetType)
+    const type = taskConfig.typeFunc(task.targetType)
 
     const targetData = {
       id,
@@ -231,10 +226,6 @@ export const getBodyDataFunc = (
         ? '--'
         : $formattedDatetime(+task.completion * 1000, { hasSeconds: true })
 
-    const currentLanguage: UI_T_LangValue = useLocalStorage('lang') || 'en_US'
-    const queuedFor = $time.formatTime(task.queuedFor, currentLanguage)
-    const executionTime = $time.formatTime(task.execution, currentLanguage)
-
     return {
       row: index,
       collapse: true,
@@ -254,12 +245,12 @@ export const getBodyDataFunc = (
           text: localization.common[UI_E_RecentTaskStatus[task.status]],
           data: statusData,
         },
-        { col: 'col3', text: task.details || task.error || '--' }, // PC-2874
+        { col: 'col3', text: task.details || '--' },
         { col: 'col4', text: task.initiator || '--' },
-        { col: 'col5', text: queuedFor },
+        { col: 'col5', text: `${task.queuedFor} ms` },
         { col: 'col6', text: formattedStartTime },
         { col: 'col7', text: formattedCompletionTime },
-        { col: 'col8', text: executionTime },
+        { col: 'col8', text: `${task.execution} ms` },
         { col: 'col9', text: task.server || '--' },
         {
           key: 'icon',

package/components/common/qrcode/Qrcode.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="qrcode">
+    <img v-if="qrDataUrl" :src="qrDataUrl" alt="QR Code" class="qr-image" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import QRCode from 'qrcode'
+
+const props = defineProps<{
+  qrCodeUrl: string
+}>()
+
+const qrDataUrl = ref<string>('')
+const generateQRCode = async (): Promise<void> => {
+  try {
+    qrDataUrl.value = await QRCode.toDataURL(props.qrCodeUrl, {
+      width: 150,
+      margin: 2,
+    })
+  } catch (error) {
+    console.error('Error generating QR code:', error)
+  }
+}
+
+watch(
+  () => props.qrCodeUrl,
+  (newValue) => {
+    newValue && generateQRCode()
+  },
+  { immediate: true }
+)
+</script>
+
+<style scoped lang="scss">
+.qr-code-display {
+  text-align: center;
+  max-width: 400px;
+  margin: 0 auto;
+}
+
+.qr-wrapper {
+  margin: 20px 0;
+  padding: 20px;
+  background: white;
+  border-radius: 12px;
+  border: 1px solid #e0e0e0;
+  display: inline-block;
+}
+
+.qr-canvas,
+.qr-image {
+  width: 150px;
+  height: 150px;
+}
+</style>

package/components/common/readyToComplete/ReadyToComplete.vue

@@ -1,17 +1,17 @@
-<template>
-  <common-ready-to-complete-new v-if="isNewView" :data="props.data" />
-  <common-ready-to-complete-old v-else :data="props.data" />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-
-const props = defineProps<{
-  data: UI_I_TableInfoItem[]
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-ready-to-complete-new v-if="isNewView" :data="props.data" />
+  <common-ready-to-complete-old v-else :data="props.data" />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+
+const props = defineProps<{
+  data: UI_I_TableInfoItem[]
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>