bfg-common 1.5.708 → 1.5.709

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/qrcode/Qrcode.vue

@@ -1,56 +0,0 @@
-<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>