bfg-common 1.5.676 → 1.5.677

package/components/common/layout/bottomPanel/recentTasks/old/lib/config/recentTaskTable.ts

@@ -0,0 +1,240 @@
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_BodyItem,
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
+import type { UI_I_DataTargetForTable } from '~/components/common/layout/bottomPanel/recentTasks/lib/models/interfaces'
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_T_SelectedStatus } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
+import { UI_E_NodeIconsByState } from '~/lib/models/enums'
+import { UI_E_TabsByTypeEnum } from '~/components/common/pages/home/widgets/warnings/table/lib/models/enums'
+import { UI_E_LocatorByRecentTaskStatus } from '~/lib/models/store/tasks/enums'
+import { recentTaskTableKeys } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/config/tableKeys'
+import {
+  constructColumnKey,
+  constructHeadItem,
+} from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.tasks.taskName, true, '120px', recentTaskTableKeys[0]],
+    [localization.common.target, true, '180px', recentTaskTableKeys[1]],
+    [localization.common.status, true, '180px', recentTaskTableKeys[2]],
+    [localization.common.details, true, '180px', recentTaskTableKeys[3]],
+    [localization.common.initiator, true, '180px', recentTaskTableKeys[4]],
+    [localization.common.queuedFor, true, '180px', recentTaskTableKeys[5]],
+    [localization.common.startTime, true, '180px', recentTaskTableKeys[6]],
+    [localization.common.completionTime, true, '180px', recentTaskTableKeys[7]],
+    [localization.common.executionTime, true, '180px', recentTaskTableKeys[8]],
+    [localization.common.server, true, '180px', recentTaskTableKeys[9]],
+    [localization.common.zone, true, '180px', recentTaskTableKeys[10]],
+  ]
+}
+
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  const result: UI_I_ColumnKey[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 1 || i === 2 || i === 10 ? 'icon' : `col${i}`
+    result.push(constructColumnKey(col, item[0], item[1]))
+  })
+  return result
+}
+
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  const result: UI_I_HeadItem[] = []
+  getItems(localization).forEach((item, i) => {
+    const col = i === 1 || i === 2 || i === 10 ? 'icon' : `col${i}`
+    result.push(
+      constructHeadItem(
+        col,
+        item[0],
+        item[3],
+        true,
+        item[2],
+        '',
+        `recent-task-${item[3]}`
+      )
+    )
+  })
+  return result
+}
+
+export const bodyItems = (
+  data: UI_I_RecentTaskItem<UI_T_NodeType>[],
+  status: UI_T_SelectedStatus
+): UI_I_BodyItem[][] => {
+  const localization = useLocal()
+  const { $formattedDatetime, $time }: any = useNuxtApp()
+
+  const currentLanguage:
+    | 'en_US'
+    | 'ru_RU'
+    | 'hy_AM'
+    | 'be_BY'
+    | 'kk_KZ'
+    | 'zh_CHS' = useLocalStorage('lang') || 'en_US'
+
+  const bodyItems: UI_I_BodyItem[][] = []
+
+  data.forEach((recent: UI_I_RecentTaskItem<UI_T_NodeType>, key) => {
+    if (status !== -1 && recent.status !== status) return
+
+    const iconClassName = UI_E_NodeIconsByState[`${recent.targetType}_Normal`]
+    const id = recent.extra?.created_id || recent.target
+    const name =
+      recent.extra?.created_name || recent.args?.cloned_name || recent.target
+    const targetData: UI_I_DataTargetForTable = {
+      iconClassName,
+      id,
+      // id: recent.target,
+      nav: UI_E_TabsByTypeEnum[recent.targetType],
+      type: recent.targetType,
+      isLink: !!iconClassName,
+      testId: `${recent.targetType}-item-${name}`,
+    }
+
+    const statusData = {
+      iconClassName: recent.statusIcon,
+      isIconSvg: true,
+      testId: `${recent.taskName}-${
+        UI_E_LocatorByRecentTaskStatus[recent.status]
+      }-progress`,
+      operations: recent.statusDetails,
+      isShowStatusDetails: false,
+    }
+
+    const zoneData: UI_I_DataTargetForTable = {
+      iconClassName: 'vsphere-icon-vcenter',
+      id: recent.zone,
+      nav: 'v', // неважно
+      type: 'vm', // неважно
+      isLink: false,
+      testId: `${recent.zone}-item-${name}`,
+    }
+
+    const startTime = recent[recentTaskTableKeys[6]]
+    const formattedStartTime =
+      startTime === '--'
+        ? '--'
+        : $formattedDatetime(+startTime * 1000, {
+            hasSeconds: true,
+          })
+
+    const completionTime = recent[recentTaskTableKeys[7]]
+    const formattedCompletionTime =
+      completionTime === '--'
+        ? '--'
+        : $formattedDatetime(+completionTime * 1000, {
+            hasSeconds: true,
+          })
+
+    // const queuedFor = `${recent[recentTaskTableKeys[5]]} ms`
+    // const executionTime =
+    //   recent[recentTaskTableKeys[8]] === '--'
+    //     ? '--'
+    //     : `${recent[recentTaskTableKeys[8]]} ms`
+    const queuedFor = $time.formatTime(
+      recent[recentTaskTableKeys[5]],
+      currentLanguage
+    )
+    const executionTime =
+      recent[recentTaskTableKeys[8]] === '--'
+        ? '--'
+        : $time.formatTime(recent[recentTaskTableKeys[8]], currentLanguage)
+
+    bodyItems.push([
+      {
+        key: 'col0',
+        text: recent[recentTaskTableKeys[0]],
+        id: key,
+        dataId: recent.id,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'icon',
+        text: recent[recentTaskTableKeys[1]],
+        data: targetData,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'icon',
+        text:
+          localization.common[recent[recentTaskTableKeys[2]]] ||
+          recent[recentTaskTableKeys[2]],
+        data: statusData,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'col3',
+        text: recent[recentTaskTableKeys[3]],
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'col4',
+        text: recent[recentTaskTableKeys[4]],
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'col5',
+        text: queuedFor,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+        data: {
+          sortValue: recent[recentTaskTableKeys[5]],
+        },
+      },
+      {
+        key: 'col6',
+        text: formattedStartTime,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+        data: {
+          sortValue: recent[recentTaskTableKeys[6]],
+        },
+      },
+      {
+        key: 'col7',
+        text: formattedCompletionTime,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+        data: {
+          sortValue: recent[recentTaskTableKeys[7]],
+        },
+      },
+      {
+        key: 'col8',
+        text: executionTime,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+        data: {
+          sortValue: recent[recentTaskTableKeys[8]],
+        },
+      },
+      {
+        key: 'col9',
+        text: recent[recentTaskTableKeys[9]],
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+      {
+        key: 'icon',
+        text: recent[recentTaskTableKeys[10]],
+        data: zoneData,
+        id: key,
+        testId: `table-item-${recent.id}-${name}`,
+      },
+    ])
+  })
+
+  return bodyItems
+}

package/components/common/layout/bottomPanel/recentTasks/old/lib/config/tableKeys.ts

@@ -0,0 +1,15 @@
+import type { UI_T_RecentTaskTableKeys } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
+
+export const recentTaskTableKeys: UI_T_RecentTaskTableKeys[] = [
+  'taskName',
+  'target',
+  'statusText',
+  'details',
+  'initiator',
+  'queuedFor',
+  'startTime',
+  'completion',
+  'execution',
+  'server',
+  'zone',
+]

package/components/common/layout/bottomPanel/recentTasks/old/lib/models/types.ts

@@ -0,0 +1,14 @@
+export type UI_T_RecentTaskTableKeys =
+  | 'taskName'
+  | 'target'
+  | 'statusText'
+  | 'details'
+  | 'initiator'
+  | 'queuedFor'
+  | 'startTime'
+  | 'completion'
+  | 'execution'
+  | 'server'
+  | 'zone'
+
+export type UI_T_SelectedStatus = -1 | 1 | 3

package/components/common/pages/auth/TheFooter.vue

@@ -1,104 +1,104 @@
-<template>
-  <div
-    id="footer"
-    class="footer flex justify-between items-center fixed left-0 right-0 bottom-0"
-  >
-    <div class="content flex items-center gap-4">
-      <span class="company-info"
-        >{{ currentYear }} ©
-        <span class="company-name">{{ companyName }}</span></span
-      >
-
-      <span class="dote-divider">•</span>
-
-      <a
-        :href="supportLink"
-        data-id="support-link"
-        class="support-link"
-        target="_blank"
-      >
-        <ui-icon name="support" width="18" height="18" />
-        <span class="support-text">{{
-          localization.common.technicalSupport
-        }}</span></a
-      >
-    </div>
-
-    <div class="app-version-wrap flex-justify-end flex-align-center">
-      <span class="app-version"> {{ version }} </span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-const { version } = useAppVersion()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const currentYear = new Date().getFullYear()
-
-const config = useRuntimeConfig()
-
-const companyName = computed<string>(
-  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`] as string
-)
-
-const supportLink = computed<string>(() => {
-  return config.public.SUPPORT_SITE
-})
-</script>
-
-<style scoped lang="scss">
-.footer {
-  position: fixed;
-  background-color: #e9ebed;
-  padding: 11px 44px;
-
-  .content {
-    .company-info {
-      font-size: 14px;
-      line-height: 18px;
-      color: #9da6ad;
-      font-weight: 400;
-
-      .company-name {
-        font-weight: 300;
-      }
-    }
-
-    .dote-divider {
-      color: #9da6ad;
-    }
-
-    .support-link {
-      display: inline-flex;
-      align-items: center;
-      gap: 8px;
-      color: #9da6ad;
-      text-decoration: none;
-      font-weight: 500;
-      font-size: 14px;
-      line-height: 18px;
-
-      &:hover {
-        color: #008fd6;
-      }
-
-      .support-text {
-        margin-top: 4px;
-      }
-    }
-  }
-
-  .app-version-wrap {
-    .app-version {
-      font-size: 14px;
-      line-height: 18px;
-      color: #9da6ad;
-      margin-right: 8px;
-    }
-  }
-}
-</style>
+<template>
+  <div
+    id="footer"
+    class="footer flex justify-between items-center fixed left-0 right-0 bottom-0"
+  >
+    <div class="content flex items-center gap-4">
+      <span class="company-info"
+        >{{ currentYear }} ©
+        <span class="company-name">{{ companyName }}</span></span
+      >
+
+      <span class="dote-divider">•</span>
+
+      <a
+        :href="supportLink"
+        data-id="support-link"
+        class="support-link"
+        target="_blank"
+      >
+        <ui-icon name="support" width="18" height="18" />
+        <span class="support-text">{{
+          localization.common.technicalSupport
+        }}</span></a
+      >
+    </div>
+
+    <div class="app-version-wrap flex-justify-end flex-align-center">
+      <span class="app-version"> {{ version }} </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const { version } = useAppVersion()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const currentYear = new Date().getFullYear()
+
+const config = useRuntimeConfig()
+
+const companyName = computed<string>(
+  () => config.public[`COMPANY_NAME_${useEnvLanguage()}`] as string
+)
+
+const supportLink = computed<string>(() => {
+  return config.public.SUPPORT_SITE
+})
+</script>
+
+<style scoped lang="scss">
+.footer {
+  position: fixed;
+  background-color: #e9ebed;
+  padding: 11px 44px;
+
+  .content {
+    .company-info {
+      font-size: 14px;
+      line-height: 18px;
+      color: #9da6ad;
+      font-weight: 400;
+
+      .company-name {
+        font-weight: 300;
+      }
+    }
+
+    .dote-divider {
+      color: #9da6ad;
+    }
+
+    .support-link {
+      display: inline-flex;
+      align-items: center;
+      gap: 8px;
+      color: #9da6ad;
+      text-decoration: none;
+      font-weight: 500;
+      font-size: 14px;
+      line-height: 18px;
+
+      &:hover {
+        color: #008fd6;
+      }
+
+      .support-text {
+        margin-top: 4px;
+      }
+    }
+  }
+
+  .app-version-wrap {
+    .app-version {
+      font-size: 14px;
+      line-height: 18px;
+      color: #9da6ad;
+      margin-right: 8px;
+    }
+  }
+}
+</style>

package/lib/models/enums.ts

@@ -18,6 +18,70 @@ export enum UI_E_NodeIconsByState {
   'network_Error' = 'vsphere-icon-network-error',
   'network_Warning' = 'vsphere-icon-network-warning',
   'network_connected' = 'vsphere-icon-network',
+
+  // Для Прокуратор
+
+  'network-error' = 'vsphere-icon-network-error',
+  'network' = 'vsphere-icon-network',
+  'network-warning' = 'vsphere-icon-network-warning',
+
+  'folder_Normal' = 'vsphere-icon-folder',
+  'folder_Error' = 'vsphere-icon-folder-error',
+  'folder_Warning' = 'vsphere-icon-folder-warning',
+  'folder_connected' = 'vsphere-icon-folder',
+
+  'file_Normal' = 'vsphere-icon-file',
+  'file_Error' = 'vsphere-icon-file-error',
+  'file_Warning' = 'vsphere-icon-file-warning',
+  'file_connected' = 'vsphere-icon-file',
+
+  // Для Сфер
+  'zone_Normal' = 'vsphere-icon-vcenter',
+  'zone_Error' = 'vsphere-icon-vcenter',
+  'zone_Warning' = 'vsphere-icon-vcenter',
+  'zone_connected' = 'vsphere-icon-vcenter',
+
+  'zone_dir_Normal' = 'vsphere-icon-folder',
+  'zone_dir_Error' = 'vsphere-icon-folder',
+  'zone_dir_Warning' = 'vsphere-icon-folder',
+  'zone_dir_connected' = 'vsphere-icon-folder',
+  'dc_hc_dir_Normal' = 'vsphere-icon-folder',
+  'dc_hc_dir_Error' = 'vsphere-icon-folder',
+  'dc_hc_dir_Warning' = 'vsphere-icon-folder',
+  'dc_hc_dir_connected' = 'vsphere-icon-folder',
+  'dc_net_dir_Normal' = 'vsphere-icon-folder',
+  'dc_net_dir_Error' = 'vsphere-icon-folder',
+  'dc_net_dir_Warning' = 'vsphere-icon-folder',
+  'dc_net_dir_connected' = 'vsphere-icon-folder',
+  'dc_ds_dir_Normal' = 'vsphere-icon-folder',
+  'dc_ds_dir_Error' = 'vsphere-icon-folder',
+  'dc_ds_dir_Warning' = 'vsphere-icon-folder',
+  'dc_ds_dir_connected' = 'vsphere-icon-folder',
+  'dc_vmt_dir_Normal' = 'vsphere-icon-folder',
+  'dc_vmt_dir_Error' = 'vsphere-icon-folder',
+  'dc_vmt_dir_Warning' = 'vsphere-icon-folder',
+  'dc_vmt_dir_connected' = 'vsphere-icon-folder',
+  'dc_backup_dir_Normal' = 'vsphere-icon-folder',
+  'dc_backup_dir_Error' = 'vsphere-icon-folder',
+  'dc_backup_dir_Warning' = 'vsphere-icon-folder',
+  'dc_backup_dir_connected' = 'vsphere-icon-folder',
+
+  'datacenter_Normal' = 'vsphere-icon-datacenter',
+  'datacenter_Error' = 'vsphere-icon-datacenter-error',
+  'datacenter_Warning' = 'vsphere-icon-datacenter-warning',
+  'datacenter_connected' = 'vsphere-icon-datacenter',
+
+  'cluster_Normal' = 'vsphere-icon-cluster',
+  'cluster_Error' = 'vsphere-icon-cluster-error',
+  'cluster_Warning' = 'vsphere-icon-cluster-warning',
+  'cluster_connected' = 'vsphere-icon-cluster',
+
+  'host_Maintenance' = 'vsphere-icon-host-maintenance',
+
+  'vmtemplate_Normal' = 'vsphere-icon-vm-template',
+  'vmtemplate_Error' = 'vsphere-icon-vm-template',
+  'vmtemplate_Warning' = 'vsphere-icon-vm-template',
+  'vmtemplate_connected' = 'vsphere-icon-vm-template',
 }
 
 export enum UI_E_State {
@@ -41,5 +105,5 @@ export enum UI_E_DatastoreState {
   UNHEALTHY,
   MAINTENANCE,
   INACCESSIBLE,
-  UNMOUNTED  ,
+  UNMOUNTED,
 }

package/package.json

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