bfg-common 1.6.23 → 1.6.25

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

@@ -1,8 +1,9 @@
 export type UI_T_TasksStateLoading = 'tasks' | 'recentTasks'
 export type UI_T_TaskStatus =
-    0 | // queued
-    1 | // running
-    2 | // completed
-    3 | // failed
-    4 | // canceled
-    5 // retrying
+  | 0 // queued
+  | 1 // running
+  | 2 // completed
+  | 3 // failed
+  | 4 // canceled
+  | 5 // retrying
+  | 6 // warning

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.6.23",
+  "version": "1.6.25",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.1.9",
+    "bfg-uikit": "1.1.25",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/store/tasks/actions.ts

@@ -18,6 +18,7 @@ import type {
 } 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 type { UI_T_Project } from '~/lib/models/types'
 import { tasksConstructor } from '~/store/tasks/mappers/tasks'
 import { recentTasks } from '~/store/tasks/mappers/recentTasks'
 
@@ -28,9 +29,13 @@ export default {
       state: UI_I_TasksState
       dispatch: <T>(arg0: string, arg1: T, arg2: UI_I_CommitOptions) => void
     },
-    payload: UI_I_DataTableQuery
+    payload: {
+      data: UI_I_DataTableQuery
+      project: UI_T_Project
+    }
   ): Promise<API_UI_I_Error | void> {
-    const { page, pageSize, sortBy, filter } = payload
+    const { data, project } = payload
+    const { page, pageSize, sortBy, filter } = data
 
     const query: UI_I_TableQuery = {
       page_size: pageSize,
@@ -38,7 +43,21 @@ export default {
     }
 
     if (sortBy) query.sortBy = sortBy
-    if (filter) query.filter = filter
+    if (filter) {
+      if (project === 'procurator') {
+        query.filter = filter
+      } else {
+        const filters = filter.split(',')
+        filters.forEach((item) => {
+          const [field, value] = item.split('.')
+
+          if (field && value) {
+            // @ts-ignore
+            query[field] = value
+          }
+        })
+      }
+    }
 
     const queryJson: string = JSON.stringify({ type: 'tasks', ...query })
     const lastQuery: string = context.state.taskQuery || ''
@@ -63,7 +82,9 @@ export default {
           value: true,
         })
       },
-      onResponse({ response }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
+      onResponse({
+        response,
+      }: API_UI_I_Response<API_UI_I_Task<string> | null>) {
         const tasks = tasksConstructor(response._data)
 
         context.commit('M_SET_TASKS_LIST', tasks)
@@ -140,10 +161,7 @@ export default {
     payload: string
   ): Promise<void> {
     // Скрываем кнопку cancel
-    context.commit(
-      'M_HIDE_CANCEL_RECENT_TASK_BY_ID',
-      payload
-    )
+    context.commit('M_HIDE_CANCEL_RECENT_TASK_BY_ID', payload)
     const { error } = await useMyFetch<
       API_UI_I_RecentTask<string>,
       API_UI_I_Error

package/store/tasks/mappers/recentTasks.ts

@@ -82,6 +82,7 @@ export const recentTasks = (
             statusIcon = 'error-outline'
             break
           case 5:
+          case 6:
             statusIcon = 'warning-outline'
             break
         }