bfg-common 1.5.707 → 1.5.708

package/store/tasks/mappers/recentTasks.ts

@@ -1,123 +1,123 @@
-import {
-  UI_E_RecentTaskStatus,
-  UI_E_IconNameByRecentTaskStatus,
-} from '~/lib/models/store/tasks/enums'
-import type {
-  API_UI_I_RecentTask,
-  UI_I_RecentTask,
-  UI_T_TaskStatusDetails,
-} from '~/lib/models/store/tasks/interfaces'
-import { base64 } from '~/lib/utils/base64'
-import {
-  UI_E_RecentTaskStatusIcon,
-  UI_E_RecentTaskStatusIconNewView,
-} from '~/store/tasks/lib/models/enums'
-
-export const recentTasks = (
-  data: API_UI_I_RecentTask<string>
-): UI_I_RecentTask<string> => {
-  const { $store }: any = useNuxtApp()
-
-  const isNewView = $store.getters['main/getIsNewView']
-
-  const items =
-    data.items
-      ?.sort((a, b) => {
-        return b.start_time - a.start_time
-      })
-      .map((task) => {
-        let args: any = {}
-        try {
-          args = base64.decode(task.args)
-        } catch (error) {
-          args = {}
-        }
-
-        let completion: string = task.completion + '' || '--'
-        let execution: string | number = Math.abs(
-          task.start_time - task.completion
-        )
-        let queuedFor: number = task.start_time - task.creation_time
-        let startTime: string = task.start_time + '' || '--'
-        // Обрабатываем данные когда задачка в ожидании
-        if (task.status === 0) {
-          completion = '--'
-          execution = '--'
-          queuedFor = 0
-          startTime = Date.now() / 1000 + ''
-          // Обрабатываем данные когда задачка в работе или когда в статусе retry
-        } else if (task.status === 1 || task.status === 5) {
-          completion = '--'
-          execution = '--'
-        }
-
-        const { upd_operations } = task.extra
-        const operations: UI_T_TaskStatusDetails[] =
-          upd_operations?.operations?.map(
-            (operation: UI_T_TaskStatusDetails) => {
-              return {
-                ...operation,
-                iconClassName: isNewView
-                  ? UI_E_RecentTaskStatusIconNewView[operation.status]
-                  : UI_E_RecentTaskStatusIcon[operation.status],
-                testId: operation.operation_type.replaceAll(' ', '-'),
-              }
-            }
-          ) || []
-
-        // TODO
-        let statusIcon = 'help-icon'
-        switch (task.status) {
-          case 0:
-            statusIcon = 'help-icon'
-            break
-          case 1:
-            statusIcon = 'green-play'
-            break
-          case 2:
-            statusIcon = 'success-circle'
-            break
-          case 3:
-          case 4:
-            statusIcon = 'error-outline'
-            break
-          case 5:
-            statusIcon = 'warning-outline'
-            break
-        }
-
-        const targetName = task.extra.target_name || '--'
-        const targetType = task.extra.target_type || task.target_type
-
-        return {
-          args,
-          completion,
-          execution,
-          queuedFor,
-          startTime,
-          statusIcon,
-          progress: task.progress,
-          details: task.details,
-          error: task.error,
-          initiator: task.initiator,
-          server: task.server,
-          // statusIcon: UI_E_IconNameByRecentTaskStatus[task.status],
-          statusText: task.error || UI_E_RecentTaskStatus[task.status],
-          status: task.status,
-          statusDetails: operations,
-          target: task.target,
-          targetName,
-          targetType,
-          // targetType: task.target_type,
-          taskName: task.task_name,
-          id: task.id,
-          zone: task.zone,
-          extra: task.extra,
-          isCanceled: task.status === 4
-        }
-      }) || []
-  return {
-    items,
-    last: data.last,
-  }
-}
+import {
+  UI_E_RecentTaskStatus,
+  UI_E_IconNameByRecentTaskStatus,
+} from '~/lib/models/store/tasks/enums'
+import type {
+  API_UI_I_RecentTask,
+  UI_I_RecentTask,
+  UI_T_TaskStatusDetails,
+} from '~/lib/models/store/tasks/interfaces'
+import { base64 } from '~/lib/utils/base64'
+import {
+  UI_E_RecentTaskStatusIcon,
+  UI_E_RecentTaskStatusIconNewView,
+} from '~/store/tasks/lib/models/enums'
+
+export const recentTasks = (
+  data: API_UI_I_RecentTask<string>
+): UI_I_RecentTask<string> => {
+  const { $store }: any = useNuxtApp()
+
+  const isNewView = $store.getters['main/getIsNewView']
+
+  const items =
+    data.items
+      ?.sort((a, b) => {
+        return b.start_time - a.start_time
+      })
+      .map((task) => {
+        let args: any = {}
+        try {
+          args = base64.decode(task.args)
+        } catch (error) {
+          args = {}
+        }
+
+        let completion: string = task.completion + '' || '--'
+        let execution: string | number = Math.abs(
+          task.start_time - task.completion
+        )
+        let queuedFor: number = task.start_time - task.creation_time
+        let startTime: string = task.start_time + '' || '--'
+        // Обрабатываем данные когда задачка в ожидании
+        if (task.status === 0) {
+          completion = '--'
+          execution = '--'
+          queuedFor = 0
+          startTime = Date.now() / 1000 + ''
+          // Обрабатываем данные когда задачка в работе или когда в статусе retry
+        } else if (task.status === 1 || task.status === 5) {
+          completion = '--'
+          execution = '--'
+        }
+
+        const { upd_operations } = task.extra
+        const operations: UI_T_TaskStatusDetails[] =
+          upd_operations?.operations?.map(
+            (operation: UI_T_TaskStatusDetails) => {
+              return {
+                ...operation,
+                iconClassName: isNewView
+                  ? UI_E_RecentTaskStatusIconNewView[operation.status]
+                  : UI_E_RecentTaskStatusIcon[operation.status],
+                testId: operation.operation_type.replaceAll(' ', '-'),
+              }
+            }
+          ) || []
+
+        // TODO
+        let statusIcon = 'help-icon'
+        switch (task.status) {
+          case 0:
+            statusIcon = 'help-icon'
+            break
+          case 1:
+            statusIcon = 'green-play'
+            break
+          case 2:
+            statusIcon = 'success-circle'
+            break
+          case 3:
+          case 4:
+            statusIcon = 'error-outline'
+            break
+          case 5:
+            statusIcon = 'warning-outline'
+            break
+        }
+
+        const targetName = task.extra.target_name || '--'
+        const targetType = task.extra.target_type || task.target_type
+
+        return {
+          args,
+          completion,
+          execution,
+          queuedFor,
+          startTime,
+          statusIcon,
+          progress: task.progress,
+          details: task.details,
+          error: task.error,
+          initiator: task.initiator,
+          server: task.server,
+          // statusIcon: UI_E_IconNameByRecentTaskStatus[task.status],
+          statusText: task.error || UI_E_RecentTaskStatus[task.status],
+          status: task.status,
+          statusDetails: operations,
+          target: task.target,
+          targetName,
+          targetType,
+          // targetType: task.target_type,
+          taskName: task.task_name,
+          id: task.id,
+          zone: task.zone,
+          extra: task.extra,
+          isCanceled: task.status === 4
+        }
+      }) || []
+  return {
+    items,
+    last: data.last,
+  }
+}

package/store/tasks/mutations.ts

@@ -1,82 +1,82 @@
-import type {
-  UI_I_RawRecentTask,
-  UI_I_TasksLoadingPayload,
-  UI_I_RecentTask,
-  UI_I_Task,
-} from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
-
-export default {
-  M_SET_RECENT_TASKS_LIST(
-    state: UI_I_TasksState,
-    payload: UI_I_RecentTask<string>
-  ): void {
-    if (state.recentTaskList) {
-      state.recentTaskList.last = payload.last
-
-      // Заменяем которые уже имеются и удаляем их из payload.items
-      state.recentTaskList.items = state.recentTaskList.items.map((task) => {
-        let changedTask = null
-        payload.items = payload.items.filter((task2) => {
-          if (task2.id === task.id) changedTask = task2
-          return task2.id !== task.id
-        })
-
-        return changedTask || task
-      })
-
-      // Делаем слияние новых и старых tasks
-      state.recentTaskList.items = [
-        ...payload.items,
-        ...state.recentTaskList.items,
-      ]
-      return
-    }
-
-    state.recentTaskList = payload
-  },
-  M_SET_ABORT_CONTROLLER(
-    state: UI_I_TasksState,
-    payload: AbortController
-  ): void {
-    state.abortController = payload
-  },
-  M_CANCEL_RECENT_TASKS(state: UI_I_TasksState): void {
-    state.abortController && state.abortController.abort()
-  },
-  M_HIDE_CANCEL_RECENT_TASK_BY_ID(
-    state: UI_I_TasksState,
-    payload: string
-  ): void {
-    if (!state.recentTaskList) return
-    state.recentTaskList.items = state.recentTaskList.items.map((task) => {
-      if (task.id === payload) {
-        task.isCanceled = true
-      }
-      return task
-    })
-  },
-  M_SET_TASKS_LAST_QUERY(state: UI_I_TasksState, payload: string): void {
-    state.taskLastRequestType = payload
-  },
-  M_SET_TASKS_LIST(state: UI_I_TasksState, payload: UI_I_Task<string>): void {
-    state.taskList = payload
-  },
-  M_SET_UPDATED_RECENT_TASKS_LIST(
-    state: UI_I_TasksState,
-    payload: UI_I_RawRecentTask<string>
-  ): void {
-    state.updatedTaskList = payload.items
-  },
-  M_SET_FIRST_TASK(state: UI_I_TasksState): void {
-    state.hasFirstTask = true
-  },
-
-  M_SET_LOADING(
-    state: UI_I_TasksState,
-    payload: UI_I_TasksLoadingPayload
-  ): void {
-    const { prop, value } = payload
-    state.loading[prop] = value
-  },
-}
+import type {
+  UI_I_RawRecentTask,
+  UI_I_TasksLoadingPayload,
+  UI_I_RecentTask,
+  UI_I_Task,
+} from '~/lib/models/store/tasks/interfaces'
+import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
+
+export default {
+  M_SET_RECENT_TASKS_LIST(
+    state: UI_I_TasksState,
+    payload: UI_I_RecentTask<string>
+  ): void {
+    if (state.recentTaskList) {
+      state.recentTaskList.last = payload.last
+
+      // Заменяем которые уже имеются и удаляем их из payload.items
+      state.recentTaskList.items = state.recentTaskList.items.map((task) => {
+        let changedTask = null
+        payload.items = payload.items.filter((task2) => {
+          if (task2.id === task.id) changedTask = task2
+          return task2.id !== task.id
+        })
+
+        return changedTask || task
+      })
+
+      // Делаем слияние новых и старых tasks
+      state.recentTaskList.items = [
+        ...payload.items,
+        ...state.recentTaskList.items,
+      ]
+      return
+    }
+
+    state.recentTaskList = payload
+  },
+  M_SET_ABORT_CONTROLLER(
+    state: UI_I_TasksState,
+    payload: AbortController
+  ): void {
+    state.abortController = payload
+  },
+  M_CANCEL_RECENT_TASKS(state: UI_I_TasksState): void {
+    state.abortController && state.abortController.abort()
+  },
+  M_HIDE_CANCEL_RECENT_TASK_BY_ID(
+    state: UI_I_TasksState,
+    payload: string
+  ): void {
+    if (!state.recentTaskList) return
+    state.recentTaskList.items = state.recentTaskList.items.map((task) => {
+      if (task.id === payload) {
+        task.isCanceled = true
+      }
+      return task
+    })
+  },
+  M_SET_TASKS_LAST_QUERY(state: UI_I_TasksState, payload: string): void {
+    state.taskLastRequestType = payload
+  },
+  M_SET_TASKS_LIST(state: UI_I_TasksState, payload: UI_I_Task<string>): void {
+    state.taskList = payload
+  },
+  M_SET_UPDATED_RECENT_TASKS_LIST(
+    state: UI_I_TasksState,
+    payload: UI_I_RawRecentTask<string>
+  ): void {
+    state.updatedTaskList = payload.items
+  },
+  M_SET_FIRST_TASK(state: UI_I_TasksState): void {
+    state.hasFirstTask = true
+  },
+
+  M_SET_LOADING(
+    state: UI_I_TasksState,
+    payload: UI_I_TasksLoadingPayload
+  ): void {
+    const { prop, value } = payload
+    state.loading[prop] = value
+  },
+}

package/components/common/certificate/Certificate.vue

@@ -1,27 +0,0 @@
-<template>
-  <atoms-loader v-show="props.loading" test-id="certificate-spinner" />
-  <div class="certificate flex flex-col h-full">
-    <common-certificate-tools @renew-certificate="emits('renew-certificate')" />
-
-    <common-certificate-info :certificate-data="props.certificateData" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Certificate } from '~/components/common/certificate/lib/models/interfaces'
-
-const props = defineProps<{
-  loading: boolean
-  certificateData: UI_I_Certificate | {}
-}>()
-
-const emits = defineEmits<{
-  (event: 'renew-certificate'): void
-}>()
-</script>
-
-<style lang="scss" scoped>
-.certificate {
-  padding-left: 10px;
-}
-</style>

package/components/common/certificate/CertificateInfo.vue

@@ -1,139 +0,0 @@
-<template>
-  <div class="stack-view">
-    <atoms-stack-block
-      :has-children="false"
-      test-id="certificate-subject-stack-block"
-    >
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span data-id="certificate-subject">{{
-            localization.common.subject
-          }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent
-        ><span data-id="certificate-subject-value">{{
-          props.certificateData.subject
-        }}</span></template
-      >
-    </atoms-stack-block>
-    <atoms-stack-block
-      :has-children="false"
-      test-id="certificate-issuer-stack-block"
-    >
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span data-id="certificate-issuer">{{
-            localization.common.issuer
-          }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent
-        ><span data-id="certificate-issuer-value">{{
-          props.certificateData.issuer
-        }}</span></template
-      >
-    </atoms-stack-block>
-    <atoms-stack-block
-      :has-children="false"
-      test-id="certificate-valid-from-stack-block"
-    >
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span data-id="certificate-valid-from">{{
-            localization.common.validFrom
-          }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent
-        ><span data-id="certificate-valid-from-value">{{
-          validFrom
-        }}</span></template
-      >
-    </atoms-stack-block>
-    <atoms-stack-block
-      :has-children="false"
-      test-id="certificate-valid-to-stack-block"
-    >
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span data-id="certificate-valid-to">{{
-            localization.common.validTo
-          }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent
-        ><span data-id="certificate-valid-to-value">{{
-          validTo
-        }}</span></template
-      >
-    </atoms-stack-block>
-    <atoms-stack-block
-      :has-children="false"
-      test-id="certificate-status-stack-block"
-    >
-      <template #stackBlockKey>
-        <div class="flex-align-center">
-          <span data-id="certificate-status">{{
-            localization.common.status
-          }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent
-        ><span data-id="certificate-status-value">{{
-          props.certificateData.status
-        }}</span></template
-      >
-    </atoms-stack-block>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Certificate } from '~/components/common/certificate/lib/models/interfaces'
-
-const props = defineProps<{
-  certificateData: UI_I_Certificate | {}
-}>()
-
-const { $store, $formattedDatetime }: any = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const updateTimeFormatAndInterfaceLang = computed<number>(
-  () => $store.getters['main/getUpdateTimeFormatAndInterfaceLang']
-)
-
-const validFrom = computed<string>(() =>
-  updateTimeFormatAndInterfaceLang.value
-    ? $formattedDatetime(props.certificateData.valid_from, {
-        hasSeconds: true,
-      })
-    : ''
-)
-const validTo = computed<string>(() =>
-  updateTimeFormatAndInterfaceLang.value
-    ? $formattedDatetime(props.certificateData.valid_to, {
-        hasSeconds: true,
-      })
-    : ''
-)
-
-onUnmounted(() => {
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', 'hostCertificate')
-})
-</script>
-
-<style lang="scss" scoped>
-:deep(.stack-block:hover) {
-  border-bottom: 1px solid #ddd;
-
-  &:last-child {
-    border-bottom: unset;
-  }
-
-  .stack-block-label {
-    background-color: unset;
-  }
-}
-</style>

package/components/common/certificate/Tools.vue

@@ -1,59 +0,0 @@
-<template>
-  <div class="certificate-headline">
-    <common-headline :headline="localization.common.certificate">
-      <template #action>
-        <atoms-tabs
-          :items="tabs"
-          test-id="certificate-tabs"
-          size="small"
-          @change="onShowModal"
-        />
-      </template>
-    </common-headline>
-  </div>
-
-  <common-certificate-modals-renew
-    v-if="isShowModal"
-    :mode="mode"
-    @hide="onHideModal"
-    @renew-certificate="emits('renew-certificate')"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_T_ModeModal } from '~/components/common/certificate/lib/models/types'
-import { certificateTabsFunc } from '~/components/common/certificate/lib/config/tabsPannel'
-
-const emits = defineEmits<{
-  (event: 'renew-certificate'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const tabs = computed<UI_I_CollapseNavItem[]>(() =>
-  certificateTabsFunc(localization.value)
-)
-
-const isShowModal = ref<boolean>(false)
-const mode = ref<UI_T_ModeModal>('renew')
-const onShowModal = (value: UI_T_ModeModal): void => {
-  mode.value = value
-  isShowModal.value = true
-}
-const onHideModal = (): void => {
-  isShowModal.value = false
-}
-</script>
-
-<style lang="scss" scoped>
-.certificate-headline {
-  :deep(.heading-block__actions) {
-    .nav {
-      margin-top: 0;
-      align-items: flex-start;
-    }
-  }
-}
-</style>

package/components/common/certificate/lib/config/tabsPannel.ts

@@ -1,22 +0,0 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-
-export const certificateTabsFunc = (
-  localization: UI_I_Localization
-): UI_I_CollapseNavItem[] => {
-  return [
-    {
-      text: localization.common.renew,
-      value: 'renew',
-      disabled: false,
-      testId: 'certificate-renew',
-    },
-    {
-      text: localization.common.certificateRefreshTitle,
-      value: 'refreshCaCertificates',
-      disabled: true,
-      testId: 'certificate-refresh',
-      development: true,
-    },
-  ]
-}

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

@@ -1,9 +0,0 @@
-export interface UI_API_I_Certificate {
-  subject: string
-  issuer: string
-  valid_from: string
-  valid_to: string
-  status: string
-}
-
-export interface UI_I_Certificate extends UI_API_I_Certificate {}

package/components/common/certificate/lib/models/types.ts

@@ -1 +0,0 @@
-export type UI_T_ModeModal = 'renew' | 'refreshCaCertificates'