bfg-common 1.5.632 → 1.5.634

package/store/tasks/actions.ts

@@ -1,165 +1,165 @@
-import type {
-  API_UI_I_Error,
-  API_UI_I_Response,
-  UI_I_CommitOptions,
-} from '~/lib/models/store/interfaces'
-import type {
-  UI_I_DataTableQuery,
-  UI_I_TableQuery,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_Options } from '~/lib/models/composables/useMyFetch/interfaces'
-import type {
-  API_UI_I_RecentTask,
-  UI_I_RTaskQuery,
-  UI_I_TasksLoadingPayload,
-  UI_I_RawRecentTask,
-  UI_I_RecentTask,
-  API_UI_I_Task,
-} from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
-import type { UI_I_RefreshStack } from '~/store/main/lib/interfaces'
-import { tasksConstructor } from '~/store/tasks/mappers/tasks'
-import { recentTasks } from '~/store/tasks/mappers/recentTasks'
-
-export default {
-  async A_GET_TASKS(
-    context: {
-      commit: <T>(arg0: string, arg1: T) => void
-      state: UI_I_TasksState
-      dispatch: <T>(arg0: string, arg1: T, arg2: UI_I_CommitOptions) => void
-    },
-    payload: UI_I_DataTableQuery
-  ): Promise<API_UI_I_Error | void> {
-    const { page, pageSize, sortBy, filter } = payload
-
-    const query: UI_I_TableQuery = {
-      page_size: pageSize,
-      page,
-    }
-
-    if (sortBy) query.sortBy = sortBy
-    if (filter) query.filter = filter
-
-    const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
-    const lastQuery: string = context.state.taskQuery || ''
-
-    if (queryJson === lastQuery) {
-      // Снимаем с паузы сам запрос, для глобального обновления
-      context.dispatch<string>('main/A_CONTINUE_GLOBAL_REFRESH', queryJson, {
-        root: true,
-      })
-      return
-    }
-    context.commit('M_SET_TASKS_LAST_QUERY', queryJson)
-
-    const url = '/ui/tasks'
-    const options: UI_I_Options = {
-      query,
-      method: 'GET',
-      key: Date.now().toString(),
-      onRequest() {
-        context.commit<UI_I_TasksLoadingPayload>('M_SET_LOADING', {
-          prop: 'tasks',
-          value: true,
-        })
-      },
-      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string>>) {
-        const tasks = tasksConstructor(response._data)
-
-        context.commit('M_SET_TASKS_LIST', tasks)
-        context.commit<UI_I_TasksLoadingPayload>('M_SET_LOADING', {
-          prop: 'tasks',
-          value: false,
-        })
-      },
-    }
-    const { error } = await useMyFetch<API_UI_I_Task<string>, API_UI_I_Error>(
-      url,
-      options
-    )
-
-    if (error.value?.data?.error_code)
-      throw new Error(error.value.data.error_message)
-
-    context.dispatch<UI_I_RefreshStack>(
-      'main/A_ADD_IN_GLOBAL_REFRESH',
-      { key: queryJson, url, options },
-      { root: true }
-    )
-  },
-  async A_GET_RECENT_TASKS(
-    context: {
-      commit: <T>(arg0: string, arg1: T) => void
-      state: UI_I_TasksState
-    },
-    payload: string
-  ): Promise<void> {
-    const query: UI_I_RTaskQuery = {
-      last: context.state.recentTaskList?.last || 0,
-    }
-    if (payload) query.sortBy = payload
-
-    // Создаем контроллер для возможности отмены
-    const abortController = new AbortController()
-    context.commit('M_SET_ABORT_CONTROLLER', abortController)
-
-    const { data, error } = await useMyFetch<
-      API_UI_I_RecentTask<string>,
-      API_UI_I_Error
-      // >('/ui/tasks/watch', {
-    >('/ui/rtasks', {
-      query,
-      method: 'GET',
-      initialCache: false,
-      signal: abortController.signal,
-    })
-
-    if (error.value?.data?.error_code)
-      throw new Error(error.value.data.error_message)
-
-    context.commit<UI_I_RecentTask<string>>(
-      'M_SET_RECENT_TASKS_LIST',
-      recentTasks(data.value)
-    )
-    context.commit<UI_I_RawRecentTask<string>>(
-      'M_SET_UPDATED_RECENT_TASKS_LIST',
-      data.value
-    )
-    // context.commit<I_TasksLoadingPayload>('M_SET_LOADING', {
-    //   prop: 'recentTasks',
-    //   value: false,
-    // })
-  },
-  A_CANCEL_RECENT_TASKS(context: { commit: (arg0: string) => void }): void {
-    context.commit('M_CANCEL_RECENT_TASKS')
-  },
-  async M_HIDE_CANCEL_RECENT_TASK_BY_ID(
-    context: {
-      commit: (arg0: string, arg1: string) => void
-    },
-    payload: string
-  ): Promise<void> {
-    // Скрываем кнопку cancel
-    context.commit(
-      'A_HIDE_CANCEL_RECENT_TASK_BY_ID',
-      payload
-    )
-    const { error } = await useMyFetch<
-      API_UI_I_RecentTask<string>,
-      API_UI_I_Error
-    >(`/ui/tasks/${payload}/cancel`, {
-      method: 'POST',
-      initialCache: false,
-    })
-
-    if (error.value?.data?.error_code)
-      throw new Error(error.value.data.error_message)
-  },
-
-  // Вызывается в useMyFetch когда получаем первый ответ от запроса с url tasks
-  // и default.vue когда срабатывает watch на recentTasks
-  // Нужно для того чтобы не обрабатывали те таски которые были сделаны перед загрузкой страницы
-  A_SET_FIRST_TASK(context: { commit: (arg0: string) => void }): void {
-    context.commit('M_SET_FIRST_TASK')
-  },
-}
+import type {
+  API_UI_I_Error,
+  API_UI_I_Response,
+  UI_I_CommitOptions,
+} from '~/lib/models/store/interfaces'
+import type {
+  UI_I_DataTableQuery,
+  UI_I_TableQuery,
+} from '~/lib/models/table/interfaces'
+import type { UI_I_Options } from '~/lib/models/composables/useMyFetch/interfaces'
+import type {
+  API_UI_I_RecentTask,
+  UI_I_RTaskQuery,
+  UI_I_TasksLoadingPayload,
+  UI_I_RawRecentTask,
+  UI_I_RecentTask,
+  API_UI_I_Task,
+} from '~/lib/models/store/tasks/interfaces'
+import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
+import type { UI_I_RefreshStack } from '~/store/main/lib/interfaces'
+import { tasksConstructor } from '~/store/tasks/mappers/tasks'
+import { recentTasks } from '~/store/tasks/mappers/recentTasks'
+
+export default {
+  async A_GET_TASKS(
+    context: {
+      commit: <T>(arg0: string, arg1: T) => void
+      state: UI_I_TasksState
+      dispatch: <T>(arg0: string, arg1: T, arg2: UI_I_CommitOptions) => void
+    },
+    payload: UI_I_DataTableQuery
+  ): Promise<API_UI_I_Error | void> {
+    const { page, pageSize, sortBy, filter } = payload
+
+    const query: UI_I_TableQuery = {
+      page_size: pageSize,
+      page,
+    }
+
+    if (sortBy) query.sortBy = sortBy
+    if (filter) query.filter = filter
+
+    const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
+    const lastQuery: string = context.state.taskQuery || ''
+
+    if (queryJson === lastQuery) {
+      // Снимаем с паузы сам запрос, для глобального обновления
+      context.dispatch<string>('main/A_CONTINUE_GLOBAL_REFRESH', queryJson, {
+        root: true,
+      })
+      return
+    }
+    context.commit('M_SET_TASKS_LAST_QUERY', queryJson)
+
+    const url = '/ui/tasks'
+    const options: UI_I_Options = {
+      query,
+      method: 'GET',
+      key: Date.now().toString(),
+      onRequest() {
+        context.commit<UI_I_TasksLoadingPayload>('M_SET_LOADING', {
+          prop: 'tasks',
+          value: true,
+        })
+      },
+      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string>>) {
+        const tasks = tasksConstructor(response._data)
+
+        context.commit('M_SET_TASKS_LIST', tasks)
+        context.commit<UI_I_TasksLoadingPayload>('M_SET_LOADING', {
+          prop: 'tasks',
+          value: false,
+        })
+      },
+    }
+    const { error } = await useMyFetch<API_UI_I_Task<string>, API_UI_I_Error>(
+      url,
+      options
+    )
+
+    if (error.value?.data?.error_code)
+      throw new Error(error.value.data.error_message)
+
+    context.dispatch<UI_I_RefreshStack>(
+      'main/A_ADD_IN_GLOBAL_REFRESH',
+      { key: queryJson, url, options },
+      { root: true }
+    )
+  },
+  async A_GET_RECENT_TASKS(
+    context: {
+      commit: <T>(arg0: string, arg1: T) => void
+      state: UI_I_TasksState
+    },
+    payload: string
+  ): Promise<void> {
+    const query: UI_I_RTaskQuery = {
+      last: context.state.recentTaskList?.last || 0,
+    }
+    if (payload) query.sortBy = payload
+
+    // Создаем контроллер для возможности отмены
+    const abortController = new AbortController()
+    context.commit('M_SET_ABORT_CONTROLLER', abortController)
+
+    const { data, error } = await useMyFetch<
+      API_UI_I_RecentTask<string>,
+      API_UI_I_Error
+      // >('/ui/tasks/watch', {
+    >('/ui/rtasks', {
+      query,
+      method: 'GET',
+      initialCache: false,
+      signal: abortController.signal,
+    })
+
+    if (error.value?.data?.error_code)
+      throw new Error(error.value.data.error_message)
+
+    context.commit<UI_I_RecentTask<string>>(
+      'M_SET_RECENT_TASKS_LIST',
+      recentTasks(data.value)
+    )
+    context.commit<UI_I_RawRecentTask<string>>(
+      'M_SET_UPDATED_RECENT_TASKS_LIST',
+      data.value
+    )
+    // context.commit<I_TasksLoadingPayload>('M_SET_LOADING', {
+    //   prop: 'recentTasks',
+    //   value: false,
+    // })
+  },
+  A_CANCEL_RECENT_TASKS(context: { commit: (arg0: string) => void }): void {
+    context.commit('M_CANCEL_RECENT_TASKS')
+  },
+  async A_CANCEL_RECENT_TASK_BY_ID(
+    context: {
+      commit: (arg0: string, arg1: string) => void
+    },
+    payload: string
+  ): Promise<void> {
+    // Скрываем кнопку cancel
+    context.commit(
+      'M_HIDE_CANCEL_RECENT_TASK_BY_ID',
+      payload
+    )
+    const { error } = await useMyFetch<
+      API_UI_I_RecentTask<string>,
+      API_UI_I_Error
+    >(`/ui/tasks/${payload}/cancel`, {
+      method: 'POST',
+      initialCache: false,
+    })
+
+    if (error.value?.data?.error_code)
+      throw new Error(error.value.data.error_message)
+  },
+
+  // Вызывается в useMyFetch когда получаем первый ответ от запроса с url tasks
+  // и default.vue когда срабатывает watch на recentTasks
+  // Нужно для того чтобы не обрабатывали те таски которые были сделаны перед загрузкой страницы
+  A_SET_FIRST_TASK(context: { commit: (arg0: string) => void }): void {
+    context.commit('M_SET_FIRST_TASK')
+  },
+}

package/store/tasks/mappers/recentTasks.ts

@@ -1,118 +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 + ''
-          // Обрабатываем данные когда задачка в работе
-        } else if (task.status === 1) {
-          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
-        }
-
-        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,
-          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,
+  }
+}