bfg-common 1.4.700 → 1.4.702

package/store/tasks/mappers/tasks.ts

@@ -1,44 +1,42 @@
-import type {
-  API_UI_I_Task,
-  UI_I_TaskItem,
-  UI_I_Task,
-  API_UI_I_TaskItem,
-} from '~/lib/models/store/tasks/interfaces'
-import {
-  UI_E_TaskStatus,
-  UI_E_IconNameByTaskStatus,
-} from '~/lib/models/store/tasks/enums'
-
-export const tasksConstructor = (
-  data: API_UI_I_Task<string>
-): UI_I_Task<string> => {
-  const items: UI_I_TaskItem<string>[] =
-    data.items?.map((task: API_UI_I_TaskItem<string>) => {
-      return {
-        // relatedEvents: task?.RelatedEvents || '',
-        relatedEvents: '',
-        args: task?.args || '',
-        extra: task?.extra || '',
-        completion: task.completion || '--',
-        queuedFor: task.start_time - task.creation_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_IconNameByTaskStatus[task.status],
-        statusText: task.error || UI_E_TaskStatus[task.status],
-        status: task.status,
-        target: task.target,
-        targetType: task.target_type,
-        taskName: task.task_name,
-        id: task.id,
-        zone: task.zone,
-      }
-    }) || []
-  return {
-    ...data,
-    items,
-  }
-}
+import type {
+  API_UI_I_Task,
+  UI_I_TaskItem,
+  UI_I_Task,
+  API_UI_I_TaskItem,
+} from '~/lib/models/store/tasks/interfaces'
+import {
+  UI_E_TaskStatus,
+  UI_E_IconNameByTaskStatus,
+} from '~/lib/models/store/tasks/enums'
+
+export const tasksConstructor = (
+  data: API_UI_I_Task<string>
+): UI_I_Task<string> => {
+  const items: UI_I_TaskItem<string>[] =
+    data.items?.map((task: API_UI_I_TaskItem<string>) => {
+      return {
+        // relatedEvents: task?.RelatedEvents || '',
+        relatedEvents: '',
+        completion: task.completion || '--',
+        queuedFor: task.start_time - task.creation_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_IconNameByTaskStatus[task.status],
+        statusText: task.error || UI_E_TaskStatus[task.status],
+        status: task.status,
+        target: task.target,
+        targetType: task.target_type,
+        taskName: task.task_name,
+        id: task.id,
+        zone: task.zone,
+      }
+    }) || []
+  return {
+    ...data,
+    items,
+  }
+}

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

package/store/tasks/store.ts

@@ -1,12 +1,12 @@
-import state from './state'
-import actions from './actions'
-import mutations from './mutations'
-import getters from './getters'
-
-export default {
-  namespaced: true,
-  state,
-  getters,
-  mutations,
-  actions,
-}
+import state from './state'
+import actions from './actions'
+import mutations from './mutations'
+import getters from './getters'
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
+}

package/tsconfig.json

@@ -1,4 +1,4 @@
-{
-  // https://nuxt.com/docs/guide/concepts/typescript
-  "extends": "./.nuxt/tsconfig.json"
-}
+{
+  // https://nuxt.com/docs/guide/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json"
+}

package/components/common/pages/tasks/Tasks.vue

@@ -1,98 +0,0 @@
-<template>
-  <div class="tasks">
-    <div class="tasks__headline">
-      {{ localization.mainNavigation.tasks }}
-    </div>
-
-    <common-pages-tasks-table
-      :table-data="tasksList?.items || []"
-      :loading="isLoading"
-      :project="props.project"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_Pagination,
-  UI_I_DataTableQuery,
-} from '~/lib/models/table/interfaces'
-import type { UI_I_Task } from '~/lib/models/store/tasks/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const props = defineProps<{
-  project: UI_T_Project
-}>()
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const sort = ref<string | null>(null)
-
-const pauseGlobalRefresh = (): void => {
-  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
-}
-
-const tasksList = computed<UI_I_Task>(() => $store.getters['tasks/getTaskList'])
-
-// const onClickButton = (status: string): void => {
-//   if (status === 'next') {
-//     pagination.value.page += 1
-//     return
-//   }
-//
-//   pagination.value.page -= 1
-// }
-
-const getTasks = async (): Promise<void> => {
-  pauseGlobalRefresh()
-
-  const payload: UI_I_DataTableQuery = {
-    ...pagination.value,
-    sortBy: sort.value || '',
-  }
-  await $store.dispatch('tasks/A_GET_TASKS', payload)
-}
-getTasks()
-
-// const onUpdatePagination = (event: UI_I_Pagination): void => {
-//   pagination.value = event
-//   getTasks()
-// }
-
-// const onSortTable = (event: string): void => {
-//   sort.value = event
-//   getTasks()
-// }
-
-const isLoading = computed<boolean>(() =>
-  $store.getters['tasks/getLoading']('tasks')
-)
-
-onUnmounted(() => {
-  pauseGlobalRefresh()
-})
-</script>
-
-<style lang="scss" scoped>
-.tasks {
-  display: flex; // TODO надо удалить потом (clr style)
-  flex-direction: column; // TODO надо удалить потом (clr style)
-  height: inherit;
-  padding: 10px 16px 30px;
-  &__headline {
-    font-family: Inter, sans-serif;
-    font-weight: 400;
-    font-size: 22px;
-    line-height: 26.63px;
-    color: var(--title-form-first-color);
-    margin-bottom: 22px;
-  }
-}
-</style>

package/components/common/pages/tasks/table/Table.vue

@@ -1,247 +0,0 @@
-<template>
-  <ui-data-table
-    test-id="task-table"
-    :data="data"
-    :options="options"
-    :loading="props.loading"
-    server-off
-    show-selected-rows
-    class="task-table"
-    @sorting="onSorting"
-  >
-    <template #icon="{ item }">
-      <span class="flex-align-center">
-        <span :class="['icon', item.data.icon]" />
-
-        <span
-          :data-id="`rtask-${item.data.testId}`"
-          :class="item.data.isLink && 'target-link'"
-          @click.stop="onSelectNodeOfTree(item.data)"
-        >
-          {{ item.text }}
-        </span>
-      </span>
-    </template>
-
-    <template #status="{ item }">
-      <ui-chip :test-id="item.data.testId" :color="item.data.chipColor" rounded>
-        <ui-icon
-          :name="item.data.icon"
-          width="14px"
-          height="14px"
-          class="chip-icon"
-        ></ui-icon>
-        {{ item.text }}
-      </ui-chip>
-
-      <common-pages-tasks-table-error-info
-        v-if="item.data.error"
-        :id="item.data.testId"
-        :error="item.data.error"
-      />
-    </template>
-
-    <template #default-actions="{ item }">
-      <div class="actions">
-        <ui-button
-          variant="text"
-          :test-id="`resent-task-item-${item.data.id}-action`"
-          is-without-height
-          is-without-sizes
-          @click.stop="onToggleActions(item.data.id)"
-        >
-          <span
-            :class="['action-icon', { active: actionsIsShow[item.data.id] }]"
-          >
-            <ui-icon name="vertical-dotes" width="20" height="20" />
-          </span>
-        </ui-button>
-        <ui-dropdown
-          :show="actionsIsShow[item.data.id]"
-          :test-id="`resent-task-item-action-${item.data.id}`"
-          :items="actions"
-          :elem-id="`resent-task-item-${item.data.id}-action`"
-          left
-          width="max-content"
-          @select="onSelectAction(item.data.target, $event, item.data.id)"
-          @hide="onHideActionsDropdown(item.data.id)"
-        >
-          <template #row="{ item: dropMenu }">
-            <ui-icon
-              v-if="dropMenu.iconName === 'hide'"
-              name="password-hide"
-              width="16"
-              height="16"
-            />
-            <span class="action-text">
-              {{ dropMenu.text }}
-            </span>
-          </template>
-        </ui-dropdown>
-      </div>
-    </template>
-
-    <template #expand="{ item }">
-      <common-pages-tasks-table-expand-details :data="item.data" />
-    </template>
-  </ui-data-table>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type {
-  UI_I_DataTable,
-  UI_I_DataTableHeader,
-  UI_I_DataTableBody,
-} from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
-import type { UI_T_Project, UI_T_ProcuratorTypeNodes } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_TaskItem } from '~/lib/models/store/tasks/interfaces'
-import {
-  options,
-  getTargetActionsFunc,
-  getHeaderDataFunc,
-  getBodyDataFunc,
-} from '~/components/common/pages/tasks/table/lib/config/config'
-
-const props = defineProps<{
-  project: UI_T_Project
-  tableData: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]
-  loading: boolean
-}>()
-const emits = defineEmits<{
-  (event: 'sort', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const actionsIsShow = ref<boolean[]>([])
-
-const data = computed<UI_I_DataTable>(() => ({
-  id: 'tasks-table',
-  header: taskHeadItems.value,
-  body: taskBodyItems.value,
-}))
-
-const taskHeadItems = computed<UI_I_DataTableHeader[]>(() =>
-  getHeaderDataFunc(localization.value)
-)
-
-const taskBodyItems = ref<UI_I_DataTableBody[]>([])
-watch(
-  () => props.tableData,
-  (newValue: UI_I_TaskItem<UI_T_ProcuratorTypeNodes>[]) => {
-    if (!newValue?.length) {
-      taskBodyItems.value = []
-      return
-    }
-
-    taskBodyItems.value = getBodyDataFunc(newValue, localization.value)
-  },
-  { deep: true, immediate: true }
-)
-const onSorting = (value: string): void => {
-  emits('sort', value)
-}
-
-const actions = computed<UI_I_Dropdown[]>(() =>
-  getTargetActionsFunc(localization.value, props.project)
-)
-const onToggleActions = (id: number): void => {
-  actionsIsShow.value[id] = !actionsIsShow.value[id]
-}
-const onSelectAction = (
-  data: any,
-  action: 'view-target' | 'view-zone',
-  actionId: number
-): void => {
-  switch (action) {
-    case 'view-target':
-      onSelectNodeOfTree(data)
-      break
-    case 'view-zone':
-      onSelectNodeOfTree({ ...data, type: 'zone', nav: 'h' })
-      break
-  }
-  onHideActionsDropdown(actionId)
-}
-const onHideActionsDropdown = (id: number): void => {
-  actionsIsShow.value[id] = false
-}
-
-const onSelectNodeOfTree = (data: any): void => {
-  if (!data.isLink) return
-
-  const { type, id, nav } = data
-
-  const node = {
-    id,
-    type,
-  }
-
-  const path = `/inventory/type=${type};nav=${nav};id=${id}/summary`
-  navigateTo(path)
-
-  $store.dispatch('inventory/A_SELECT_NODE', { node, type })
-}
-</script>
-
-<style>
-/*TODO move up*/
-:root {
-  --actions-icon-color: #4d5d69;
-  --actions-icon-hover-color: #213444;
-  --actions-icon-icative-color: #008fd6;
-}
-:root.dark-theme {
-  --actions-icon-color: #e9eaec;
-  --actions-icon-hover-color: #ffffff;
-  --actions-icon-icative-color: #2ba2de;
-}
-</style>
-<style scoped lang="scss">
-.task-table {
-  height: inherit;
-
-  .target-link {
-    font-family: Inter, serif;
-    font-size: 13px;
-    color: var(--bottom-pannel-rtask-link-text);
-    font-weight: 400;
-    line-height: 15.73px;
-    cursor: pointer;
-    &:hover {
-      color: var(--bottom-pannel-rtask-link-hover-text);
-    }
-  }
-  .chip-icon {
-    min-width: 14px;
-    margin-right: 6px;
-  }
-  .icon {
-    margin-right: 4px;
-  }
-
-  .actions {
-    width: 100%;
-
-    .action-icon {
-      width: 16px;
-      height: 16px;
-      color: var(--actions-icon-color);
-
-      &:hover {
-        color: var(--actions-icon-hover-color);
-      }
-      &.active {
-        color: var(--actions-icon-icative-color);
-      }
-    }
-
-    .action-text {
-      margin-left: 8px;
-    }
-  }
-}
-</style>