bfg-common 1.3.486 → 1.3.488

package/store/main/lib/interfaces.ts

@@ -1,9 +1,9 @@
-import type { UI_I_Options } from '~/lib/models/composables/useMyFetch/interfaces'
-
-export interface UI_I_RefreshStack {
-  key: string
-  // method: () => void | any
-  url: string
-  options: UI_I_Options
-  paused?: boolean
-}
+import type { UI_I_Options } from '~/lib/models/composables/useMyFetch/interfaces'
+
+export interface UI_I_RefreshStack {
+  key: string
+  // method: () => void | any
+  url: string
+  options: UI_I_Options
+  paused?: boolean
+}

package/store/tasks/actions.ts

@@ -1,133 +1,133 @@
-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 } = payload
-
-    const query: UI_I_TableQuery = {
-      page_size: pageSize,
-      page,
-    }
-
-    if (sortBy) query.sortBy = sortBy
-
-    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 { data, error } = await useMyFetch<
-      API_UI_I_RecentTask<string>,
-      API_UI_I_Error
-    >('/ui/rtasks', {
-      query,
-      method: 'GET',
-      initialCache: false,
-    })
-
-    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,
-    // })
-  },
-
-  // Вызывается в 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 } = payload
+
+    const query: UI_I_TableQuery = {
+      page_size: pageSize,
+      page,
+    }
+
+    if (sortBy) query.sortBy = sortBy
+
+    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 { data, error } = await useMyFetch<
+      API_UI_I_RecentTask<string>,
+      API_UI_I_Error
+    >('/ui/rtasks', {
+      query,
+      method: 'GET',
+      initialCache: false,
+    })
+
+    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,
+    // })
+  },
+
+  // Вызывается в 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/getters.ts

@@ -1,25 +1,25 @@
-import type { UI_T_TasksStateLoading } from '~/lib/models/store/tasks/types'
-import type {
-  UI_I_RawRecentTaskItem,
-  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 {
-  getFirstTask: (state: UI_I_TasksState): boolean => state.hasFirstTask,
-  getTaskList: (state: UI_I_TasksState): UI_I_Task<string> | null =>
-    state.taskList,
-  getTasksLastRequestType: (state: UI_I_TasksState): string | null =>
-    state.taskLastRequestType,
-  getRecentTaskList: (
-    state: UI_I_TasksState
-  ): UI_I_RecentTask<string> | null => state.recentTaskList,
-  getUpdatedRecentTasks: (
-    state: UI_I_TasksState
-  ): UI_I_RawRecentTaskItem<string>[] | null => state.updatedTaskList,
-  getLoading:
-    (state: UI_I_TasksState) =>
-    (type: UI_T_TasksStateLoading): boolean =>
-      state.loading[type],
-}
+import type { UI_T_TasksStateLoading } from '~/lib/models/store/tasks/types'
+import type {
+  UI_I_RawRecentTaskItem,
+  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 {
+  getFirstTask: (state: UI_I_TasksState): boolean => state.hasFirstTask,
+  getTaskList: (state: UI_I_TasksState): UI_I_Task<string> | null =>
+    state.taskList,
+  getTasksLastRequestType: (state: UI_I_TasksState): string | null =>
+    state.taskLastRequestType,
+  getRecentTaskList: (
+    state: UI_I_TasksState
+  ): UI_I_RecentTask<string> | null => state.recentTaskList,
+  getUpdatedRecentTasks: (
+    state: UI_I_TasksState
+  ): UI_I_RawRecentTaskItem<string>[] | null => state.updatedTaskList,
+  getLoading:
+    (state: UI_I_TasksState) =>
+    (type: UI_T_TasksStateLoading): boolean =>
+      state.loading[type],
+}

package/store/tasks/lib/models/interfaces.ts

@@ -1,18 +1,18 @@
-import type {
-  UI_I_Task,
-  UI_I_RecentTask,
-  UI_I_RawRecentTaskItem,
-} from '~/lib/models/store/tasks/interfaces'
-
-export interface UI_I_TasksState {
-  hasFirstTask: boolean
-  taskList: UI_I_Task<string> | null
-  taskLastRequestType: string
-  taskQuery: string
-  recentTaskList: UI_I_RecentTask<string> | null
-  updatedTaskList: UI_I_RawRecentTaskItem<string>[] | null
-  loading: {
-    tasks: boolean
-    recentTasks: boolean
-  }
-}
+import type {
+  UI_I_Task,
+  UI_I_RecentTask,
+  UI_I_RawRecentTaskItem,
+} from '~/lib/models/store/tasks/interfaces'
+
+export interface UI_I_TasksState {
+  hasFirstTask: boolean
+  taskList: UI_I_Task<string> | null
+  taskLastRequestType: string
+  taskQuery: string
+  recentTaskList: UI_I_RecentTask<string> | null
+  updatedTaskList: UI_I_RawRecentTaskItem<string>[] | null
+  loading: {
+    tasks: boolean
+    recentTasks: boolean
+  }
+}

package/store/tasks/mappers/recentTasks.ts

@@ -1,43 +1,45 @@
-import {
-  UI_E_RecentTaskStatus,
-  UI_E_IconNameByRecentTaskStatus,
-} from '~/lib/models/store/tasks/enums'
-import type {
-  API_UI_I_RecentTask,
-  UI_I_RecentTask,
-} from '~/lib/models/store/tasks/interfaces'
-
-export const recentTasks = (
-  data: API_UI_I_RecentTask<string>
-): UI_I_RecentTask<string> => {
-  const items =
-    data.items
-      ?.sort((a, b) => {
-        return b.start_time - a.start_time
-      })
-      .map((task) => {
-        return {
-          completion: task.completion + '' || '-',
-          queuedFor: task.creation_time - task.start_time,
-          execution: Math.abs(task.start_time - task.completion),
-          details: task.details,
-          error: task.error,
-          initiator: task.initiator,
-          server: task.server,
-          startTime: task.start_time + '' || '-',
-          statusIcon: UI_E_IconNameByRecentTaskStatus[task.status],
-          statusText: task.error || UI_E_RecentTaskStatus[task.status],
-          status: task.status,
-          target: task.target,
-          targetType: task.target_type,
-          taskName: task.task_name,
-          id: task.id,
-          zone: task.zone,
-          extra: task.extra,
-        }
-      }) || []
-  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,
+} from '~/lib/models/store/tasks/interfaces'
+import { base64 } from '~/lib/utils/base64'
+
+export const recentTasks = (
+  data: API_UI_I_RecentTask<string>
+): UI_I_RecentTask<string> => {
+  const items =
+    data.items
+      ?.sort((a, b) => {
+        return b.start_time - a.start_time
+      })
+      .map((task) => {
+        return {
+          args: base64.decode(task.args),
+          completion: task.completion + '' || '-',
+          queuedFor: task.creation_time - task.start_time,
+          execution: Math.abs(task.start_time - task.completion),
+          details: task.details,
+          error: task.error,
+          initiator: task.initiator,
+          server: task.server,
+          startTime: task.start_time + '' || '-',
+          statusIcon: UI_E_IconNameByRecentTaskStatus[task.status],
+          statusText: task.error || UI_E_RecentTaskStatus[task.status],
+          status: task.status,
+          target: task.target,
+          targetType: task.target_type,
+          taskName: task.task_name,
+          id: task.id,
+          zone: task.zone,
+          extra: task.extra,
+        }
+      }) || []
+  return {
+    items,
+    last: data.last,
+  }
+}

package/store/tasks/mutations.ts

@@ -1,58 +1,58 @@
-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_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_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/store/tasks/state.ts

@@ -1,16 +1,16 @@
-import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
-
-const state: UI_I_TasksState = {
-  hasFirstTask: false,
-  recentTaskList: null,
-  updatedTaskList: null,
-  taskLastRequestType: '',
-  taskQuery: '',
-  taskList: null,
-  loading: {
-    tasks: false,
-    recentTasks: false,
-  },
-}
-
-export default state
+import type { UI_I_TasksState } from '~/store/tasks/lib/models/interfaces'
+
+const state: UI_I_TasksState = {
+  hasFirstTask: false,
+  recentTaskList: null,
+  updatedTaskList: null,
+  taskLastRequestType: '',
+  taskQuery: '',
+  taskList: null,
+  loading: {
+    tasks: false,
+    recentTasks: false,
+  },
+}
+
+export default state