bfg-common 1.4.799 → 1.4.800

package/components/common/pages/packages/lib/models/types.ts

@@ -0,0 +1,8 @@
+export type UI_T_Action =
+  | 'update'
+  | 'refresh'
+  | 'enable'
+  | 'disable'
+  | 'on'
+  | 'off'
+  | 'remove'

package/components/common/pages/packages/tableView/TableView.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="packages-table">
+    <atoms-table-data-grid
+      v-model:selected-row="selectedRowLocal"
+      v-model:column-keys="columnKeys"
+      v-model:page-size="paginationLocal.pageSize"
+      v-model:page="paginationLocal.page"
+      type="radio"
+      class="data-table"
+      test-id="packages-table"
+      :head-items="headItems"
+      :body-items="bodyItems"
+      :total-items="props.totalItems"
+      :total-pages="props.totalPages"
+      :loading="props.loading"
+      hide-footer
+      @filtering="onFiltering"
+      @sorting="onSorting"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_T_SelectedRow } from '~/components/atoms/table/dataGrid/lib/models/types'
+import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
+import * as table from '~/components/common/pages/packages/tableView/lib/config/configTable'
+
+const props = defineProps<{
+  dataTable: any[]
+  totalItems: number
+  totalPages: number
+  pagination: UI_I_Pagination
+  loading: boolean
+}>()
+const emits = defineEmits<{
+  (event: 'pagination', value: UI_I_Pagination): void
+  (event: 'sort', value: string): void
+}>()
+const selectedRowLocal = defineModel<UI_T_SelectedRow>({ required: true })
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const paginationLocal = ref<UI_I_Pagination>(props.pagination)
+watch(
+  () => props.pagination,
+  (newValue) => {
+    paginationLocal.value = newValue
+  }
+)
+watch(
+  paginationLocal,
+  (newValue) => {
+    if (!newValue) return
+
+    emits('pagination', newValue)
+  },
+  { deep: true, immediate: true }
+)
+
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+const headItems = computed<UI_I_HeadItem[]>(() =>
+  table.headItems(localization.value)
+)
+
+const bodyItems = ref<UI_I_BodyItem[][]>([])
+watch(
+  () => props.dataTable,
+  (newValue) => {
+    if (!newValue?.length) {
+      bodyItems.value = []
+      return
+    }
+    bodyItems.value = table.bodyItems(newValue, localization.value)
+  }
+)
+
+const { $store }: any = useNuxtApp()
+
+const timeFormat = computed<UI_T_TimeValue>(
+  () => $store.getters['main/getTimeFormat']
+)
+
+watch([localization, timeFormat], () => {
+  bodyItems.value = table.bodyItems(props.dataTable, localization.value)
+})
+
+const onSorting = (data: [number, boolean]): void => {
+  const [column, status] = data
+  const direction = status ? 'desc' : 'asc'
+
+  const sort = `${column}.${direction}`
+
+  emits('sort', sort)
+}
+
+const onFiltering = (): void => {
+  console.log('onFiltering')
+}
+</script>
+
+<style scoped lang="scss">
+.packages-table {
+  height: inherit;
+
+  .data-table {
+    height: inherit;
+
+    :deep(.datagrid-outer-wrapper) {
+      height: inherit;
+    }
+  }
+}
+</style>

package/components/common/pages/packages/tableView/lib/config/configTable.ts

@@ -0,0 +1,136 @@
+import type {
+  UI_I_ColumnKey,
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import * as defaultSettings from '~/components/atoms/table/dataGrid/lib/config/settingsTable'
+import { systemPackagesTableKeys } from '~/components/common/pages/packages/tableView/lib/config/tableKey'
+
+const getItems = (
+  localization: UI_I_Localization
+): [string, boolean, string, string][] => {
+  return [
+    [localization.common.name, true, '180px', systemPackagesTableKeys[0]],
+    [localization.common.version, true, '180px', systemPackagesTableKeys[1]],
+    [
+      localization.common.installedAt,
+      true,
+      '180px',
+      systemPackagesTableKeys[2],
+    ],
+    [localization.common.startedAt, true, '180px', systemPackagesTableKeys[3]],
+    [localization.common.stoppedAt, true, '180px', systemPackagesTableKeys[4]],
+    [localization.common.status, true, '180px', systemPackagesTableKeys[5]],
+    [localization.common.required, true, '180px', systemPackagesTableKeys[6]],
+    [localization.common.enabled, true, '180px', systemPackagesTableKeys[7]],
+    [
+      localization.common.notRunnable,
+      true,
+      '180px',
+      systemPackagesTableKeys[8],
+    ],
+    [localization.common.failCount, true, '180px', systemPackagesTableKeys[9]],
+  ]
+}
+
+export const columnKeys = (
+  localization: UI_I_Localization
+): UI_I_ColumnKey[] => {
+  return defaultSettings.defaultColumnKeys(getItems(localization))
+}
+export const headItems = (localization: UI_I_Localization): UI_I_HeadItem[] => {
+  return defaultSettings.defaultHeadItems(getItems(localization))
+}
+export const bodyItems = (
+  data: any[],
+  localization: UI_I_Localization
+): UI_I_BodyItem[][] => {
+  const { $formattedDatetime }: any = useNuxtApp()
+
+  const bodyItems: UI_I_BodyItem[][] = []
+  data.forEach((item: any, key) => {
+    const installedAt = item[systemPackagesTableKeys[2]]
+    const formattedInstalledAt =
+      installedAt && $formattedDatetime(+installedAt * 1000, '', true)
+
+    const startedAt = item[systemPackagesTableKeys[3]]
+    const formattedStartedAt =
+      startedAt && $formattedDatetime(+startedAt * 1000, '', true)
+
+    const stoppedAt = item[systemPackagesTableKeys[4]]
+    const formattedStoppedAt =
+      stoppedAt && $formattedDatetime(+stoppedAt * 1000, '', true)
+
+    const onOffText = item[systemPackagesTableKeys[5]]
+      ? localization.common.on3
+      : localization.common.off
+
+    const requiredText = item[systemPackagesTableKeys[6]]
+      ? localization.common.yes
+      : localization.common.no
+
+    const enabledText = item[systemPackagesTableKeys[7]]
+      ? localization.common.yes
+      : localization.common.no
+
+    const notRunnableText = item[systemPackagesTableKeys[8]]
+      ? localization.common.yes
+      : localization.common.no
+
+    const failCount = item[systemPackagesTableKeys[9]] ?? 0
+    bodyItems.push([
+      {
+        key: 'col0',
+        text: item[systemPackagesTableKeys[0]],
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col1',
+        text: item[systemPackagesTableKeys[1]],
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col2',
+        text: formattedInstalledAt || '-',
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col3',
+        text: formattedStartedAt || '-',
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col4',
+        text: formattedStoppedAt || '-',
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      { key: 'col5', text: onOffText, id: key, testId: `package-item-${key}` },
+      {
+        key: 'col6',
+        text: requiredText,
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col7',
+        text: enabledText,
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      {
+        key: 'col8',
+        text: notRunnableText,
+        id: key,
+        testId: `package-item-${key}`,
+      },
+      { key: 'col9', text: failCount, id: key, testId: `package-item-${key}` },
+    ])
+  })
+  return bodyItems
+}

package/components/common/pages/packages/tableView/lib/config/tableKey.ts

@@ -0,0 +1,14 @@
+import type { UI_T_SystemPackagesTableItemTuple } from '~/components/common/pages/packages/tableView/lib/models/types'
+
+export const systemPackagesTableKeys: UI_T_SystemPackagesTableItemTuple = [
+  'name',
+  'version',
+  'installed_at',
+  'started_at',
+  'stopped_at',
+  'on',
+  'required',
+  'enabled',
+  'not_runnable',
+  'fail_count',
+]

package/components/common/pages/packages/tableView/lib/models/types.ts

@@ -0,0 +1,12 @@
+export type UI_T_SystemPackagesTableItemTuple = [
+  'name',
+  'version',
+  'installed_at',
+  'started_at',
+  'stopped_at',
+  'on',
+  'required',
+  'enabled',
+  'not_runnable',
+  'fail_count'
+]

package/components/common/pages/shortcuts/Shortcuts.vue

@@ -33,7 +33,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   height: 100%;
   overflow: auto;
   &.new {
-    background: var(--bottom-pannel-bg-color);
+    background: var(--background-color);
     padding: 16px;
     margin: 0;
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="tasks">
+  <div class="tasks table-container-tasks-table">
     <div class="tasks__headline">
       {{ localization.mainNavigation.tasks }}
     </div>
@@ -11,6 +11,8 @@
       :loading="isLoading"
       :project="props.project"
       @pagination="onUpdatePagination"
+      @sort="onSortTable"
+      @col-search="onColSearching"
     />
   </div>
 </template>
@@ -23,6 +25,7 @@ import type {
 } 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'
+import { useOnline } from '@vueuse/core'
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
@@ -36,7 +39,7 @@ const pagination = ref<UI_I_Pagination>({
   pageSize: 100,
 })
 const sort = ref<string | null>(null)
-
+const filter = ref<string | null>(null)
 const pauseGlobalRefresh = (): void => {
   const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
   $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
@@ -50,6 +53,7 @@ const getTasks = async (): Promise<void> => {
   const payload: UI_I_DataTableQuery = {
     ...pagination.value,
     sortBy: sort.value || '',
+    filter: filter.value || '',
   }
   await $store.dispatch('tasks/A_GET_TASKS', payload)
 }
@@ -59,16 +63,26 @@ const onUpdatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event
   getTasks()
 }
-
-// const onSortTable = (event: string): void => {
-//   sort.value = event
-//   getTasks()
-// }
+const onSortTable = (event: string): void => {
+  sort.value = event
+  getTasks()
+}
+const onColSearching = (value: string): void => {
+  filter.value = value
+  getTasks()
+}
 
 const isLoading = computed<boolean>(() =>
   $store.getters['tasks/getLoading']('tasks')
 )
 
+const isOnline = useOnline()
+watch(isOnline, (newValue: boolean) => {
+  if (newValue) {
+    getTasks()
+  }
+})
+
 onUnmounted(() => {
   pauseGlobalRefresh()
 })
@@ -79,6 +93,7 @@ onUnmounted(() => {
   display: flex; // TODO надо удалить потом (clr style)
   flex-direction: column; // TODO надо удалить потом (clr style)
   height: inherit;
+  background-color: var(--background-color);
   padding: 10px 16px 30px;
   &__headline {
     font-family: Inter, sans-serif;
@@ -89,7 +104,7 @@ onUnmounted(() => {
     margin-bottom: 22px;
   }
   :deep(.data-table-header) {
-    z-index: 1050 !important; // TODO надо удалить потом (clr style)
+    z-index: 1000 !important; // TODO надо удалить потом (clr style)
   }
 }
 </style>

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

@@ -6,9 +6,11 @@
     :loading="props.loading"
     :total-pages="props.totalPages"
     :total-items="props.totalItems"
+    :texts="texts"
     class="task-table"
-    @sorting="onSorting"
+    @sort="onSorting"
     @pagination="onPagination"
+    @column-filter="onColumnFilter"
   >
     <template #icon="{ item }">
       <span class="flex-align-center">
@@ -39,6 +41,8 @@
         v-if="item.data.error"
         :id="item.data.testId"
         :error="item.data.error"
+        :opened-error="openedError"
+        @toggle-error="onToggleError"
       />
     </template>
 
@@ -46,26 +50,26 @@
       <div class="actions">
         <ui-button
           variant="text"
-          :test-id="`resent-task-item-${item.data.id}-action`"
+          :test-id="`data-table-task-action-${item.data.id}`"
           is-without-height
           is-without-sizes
           @click.stop="onToggleActions(item.data.id)"
         >
           <span
-            :class="['action-icon', { active: actionsIsShow[item.data.id] }]"
+            :class="['action-icon', { active: actionsShowId === 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}`"
+          :show="actionsShowId === item.data.id"
+          :test-id="`data-table-task-dropdown-${item.data.id}`"
           :items="actions"
-          :elem-id="`resent-task-item-${item.data.id}-action`"
+          :elem-id="`data-table-task-action-${item.data.id}`"
           left
           width="max-content"
-          @select="onSelectAction(item.data.target, $event, item.data.id)"
-          @hide="onHideActionsDropdown(item.data.id)"
+          @select="onSelectAction(item.data.target, $event)"
+          @hide="onHideActionsDropdown"
         >
           <template #row="{ item: dropMenu }">
             <ui-icon
@@ -95,7 +99,9 @@ import type {
   UI_I_DataTableHeader,
   UI_I_DataTableBody,
   UI_I_Pagination,
+  UI_I_TableTexts,
 } from '~/node_modules/bfg-uikit/components/ui/dataTable/models/interfaces'
+import type { UI_T_ArbitraryObject } from '~/node_modules/bfg-uikit/models/types'
 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'
@@ -106,6 +112,7 @@ import {
   getHeaderDataFunc,
   getBodyDataFunc,
 } from '~/components/common/pages/tasks/table/lib/config/config'
+import { useDebounceFn } from '@vueuse/core'
 
 const props = defineProps<{
   project: UI_T_Project
@@ -117,12 +124,27 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'sort', value: string): void
   (event: 'pagination', value: UI_I_Pagination): void
+  (event: 'col-search', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 const { $store }: any = useNuxtApp()
 
-const actionsIsShow = ref<boolean[]>([])
+const texts = computed<UI_I_TableTexts>(() => ({
+  searchHere: localization.value.common.searchHere,
+  rowsPerPage: localization.value.common.rowsPerPage,
+  of: localization.value.common.of,
+  selected: localization.value.common.selected,
+  columns: localization.value.common.columns,
+  previous: localization.value.common.previous,
+  next: localization.value.common.next,
+  noItemsFound: localization.value.common.noItemsFound,
+  exportAll: localization.value.common.exportAll,
+  exportSelected: localization.value.common.exportSelected,
+  all: localization.value.common.all,
+}))
+
+const actionsShowId = ref<number>(-1)
 
 const data = computed<UI_I_DataTable>(() => ({
   id: 'tasks-table',
@@ -147,23 +169,52 @@ watch(
   },
   { deep: true, immediate: true }
 )
+
+const openedError = ref<string>('')
+
+const onToggleError = (value: string): void => {
+  if (!value || value === openedError.value) {
+    openedError.value = ''
+  } else {
+    openedError.value = value
+  }
+}
+
 const onSorting = (value: string): void => {
   emits('sort', value)
 }
 const onPagination = (value: UI_I_Pagination): void => {
   emits('pagination', value)
 }
+const sendFilter = useDebounceFn((searchText: string) => {
+  emits('col-search', searchText)
+}, 1000)
+const onColumnFilter = (obj: UI_T_ArbitraryObject<string>): void => {
+  let searchText = ''
+
+  for (const [key, value] of Object.entries(obj)) {
+    const currentFilter = searchText
+      ? ',' + key + '.' + value
+      : key + '.' + value
+
+    searchText = searchText + (value ? currentFilter : '')
+  }
+  sendFilter(searchText)
+}
 
 const actions = computed<UI_I_Dropdown[]>(() =>
   getTargetActionsFunc(localization.value, props.project)
 )
 const onToggleActions = (id: number): void => {
-  actionsIsShow.value[id] = !actionsIsShow.value[id]
+  if (actionsShowId.value === id) {
+    actionsShowId.value = -1
+  } else {
+    actionsShowId.value = id
+  }
 }
 const onSelectAction = (
   data: UI_I_TableTarget<typeof props.project>,
-  action: 'view-target' | 'view-zone',
-  actionId: number
+  action: 'view-target' | 'view-zone'
 ): void => {
   switch (action) {
     case 'view-target':
@@ -173,10 +224,10 @@ const onSelectAction = (
       onSelectNodeOfTree({ ...data, type: 'zone', nav: 'h' })
       break
   }
-  onHideActionsDropdown(actionId)
+  onHideActionsDropdown()
 }
-const onHideActionsDropdown = (id: number): void => {
-  actionsIsShow.value[id] = false
+const onHideActionsDropdown = (): void => {
+  actionsShowId.value = -1
 }
 
 const onSelectNodeOfTree = (
@@ -228,7 +279,6 @@ const onSelectNodeOfTree = (
   }
   .chip-icon {
     min-width: 14px;
-    margin-right: 6px;
   }
   .icon {
     margin-right: 4px;

package/components/common/pages/tasks/table/errorInfo/ErrorInfo.vue

@@ -1,19 +1,20 @@
 <template>
   <div class="error-info">
     <ui-icon
-      :id="`resent-task-error-info-icon-${props.id}`"
+      :id="`task-error-info-icon-${props.id}`"
       name="info"
       width="16px"
       height="16px"
       :class="['info-icon pointer', { show: isShowInfo }]"
-      @click.stop="isShowInfo = !isShowInfo"
+      @click.stop="emits('toggle-error', props.id)"
     />
     <ui-popup-window
       v-model="isShowInfo"
-      width="232px"
+      max-width="232px"
+      min-width="232px"
       top
       left
-      :elem-id="`resent-task-error-info-icon-${props.id}`"
+      :elem-id="`task-error-info-icon-${props.id}`"
     >
       <div class="common-widget-info">
         <div class="headline justify-between flex-align-center">
@@ -26,7 +27,7 @@
             class="pointer hide-icon"
             width="16px"
             height="16px"
-            @click.stop="isShowInfo = false"
+            @click.stop="emits('toggle-error', '')"
           />
         </div>
 
@@ -39,16 +40,28 @@
 </template>
 
 <script lang="ts" setup>
-import type { UI_I_Localization } from '~/node_modules/bfg-common/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const props = defineProps<{
   id: string
   error: string
+  openedError: string
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const isShowInfo = ref<boolean>(false)
+const emits = defineEmits<{
+  (event: 'toggle-error', value: string): void
+}>()
+
+const isShowInfo = computed<boolean>({
+  get() {
+    return props.openedError === props.id
+  },
+  set() {
+    emits('toggle-error', '')
+  },
+})
 </script>
 
 <style lang="scss" scoped>
@@ -58,13 +71,13 @@ const isShowInfo = ref<boolean>(false)
   margin-left: 8px;
 
   .info-icon {
-    color: #9da6ad;
+    color: var(--form-icon-color);
 
     &:hover {
-      color: #4d5d69;
+      color: var(--close-icon);
     }
     &.show {
-      color: #008fd6;
+      color: var(--switch-bg-checked-reverse);
     }
   }
 
@@ -79,6 +92,10 @@ const isShowInfo = ref<boolean>(false)
       margin-left: 8px;
     }
 
+    .hide-icon {
+      color: var(--alert-icon);
+    }
+
     .common-widget-info-description {
       font-size: 13px;
       line-height: 15.73px;