bfg-common 1.5.679 → 1.5.682

package/store/tasks/mutations.ts

@@ -1,82 +1,82 @@
-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_ABORT_CONTROLLER(
-    state: UI_I_TasksState,
-    payload: AbortController
-  ): void {
-    state.abortController = payload
-  },
-  M_CANCEL_RECENT_TASKS(state: UI_I_TasksState): void {
-    state.abortController && state.abortController.abort()
-  },
-  M_HIDE_CANCEL_RECENT_TASK_BY_ID(
-    state: UI_I_TasksState,
-    payload: string
-  ): void {
-    if (!state.recentTaskList) return
-    state.recentTaskList.items = state.recentTaskList.items.map((task) => {
-      if (task.id === payload) {
-        task.isCanceled = true
-      }
-      return task
-    })
-  },
-  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_ABORT_CONTROLLER(
+    state: UI_I_TasksState,
+    payload: AbortController
+  ): void {
+    state.abortController = payload
+  },
+  M_CANCEL_RECENT_TASKS(state: UI_I_TasksState): void {
+    state.abortController && state.abortController.abort()
+  },
+  M_HIDE_CANCEL_RECENT_TASK_BY_ID(
+    state: UI_I_TasksState,
+    payload: string
+  ): void {
+    if (!state.recentTaskList) return
+    state.recentTaskList.items = state.recentTaskList.items.map((task) => {
+      if (task.id === payload) {
+        task.isCanceled = true
+      }
+      return task
+    })
+  },
+  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/components/common/layout/bottomPanel/BottomPanel.vue

@@ -1,68 +0,0 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:selected-tab="activeTabModel"
-    v-model:status-filter="statusFilter"
-    :panel-collapsed-model="panelCollapsedModel"
-    :tab-list="props.tabList"
-    :data-table-recent-tasks="props.dataTableRecentTasks"
-    :total-items-recent-tasks="props.totalItemsRecentTasks"
-    :total-pages-recent-tasks="props.totalPagesRecentTasks"
-    :pagination-recent-tasks="props.paginationRecentTasks"
-    :loading-recent-tasks="props.loadingRecentTasks"
-    @collapse-panel="onCollapseBottomPanel"
-    @sort-recent-task="emits('sort-recent-task', $event)"
-    @pagination-recent-task="emits('pagination-recent-task', $event)"
-  >
-    <template #alarms>
-      <slot name="alarms" />
-    </template>
-  </component>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_T_BottomPanelTabType } from '~/components/common/layout/bottomPanel/lib/models/types'
-import type { UI_T_SelectedStatus } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
-
-const panelCollapsedModel = defineModel<boolean>('panelCollapsed', {
-  required: true,
-})
-const activeTabModel = defineModel<UI_T_BottomPanelTabType>('selectedTab', {
-  required: true,
-})
-const props = defineProps<{
-  tabList: UI_I_CollapseNavItem[]
-  dataTableRecentTasks: UI_I_RecentTaskItem<UI_T_NodeType>[]
-  totalItemsRecentTasks: number
-  totalPagesRecentTasks: number
-  paginationRecentTasks: UI_I_Pagination
-  loadingRecentTasks: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'sort-recent-task', value: string): void
-  (event: 'pagination-recent-task', value: UI_I_Pagination | null): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-const onCollapseBottomPanel = (): void => {
-  panelCollapsedModel.value = !panelCollapsedModel.value
-}
-
-const statusFilter = ref<UI_T_SelectedStatus>(-1)
-</script>
-
-<style scoped lang="scss"></style>

package/components/common/layout/bottomPanel/New.vue

@@ -1,227 +0,0 @@
-<template>
-  <div
-    :class="[
-      'bottom-panel flex flex-col h-full',
-      { collapsed: props.panelCollapsedModel },
-    ]"
-  >
-    <div class="bottom-panel__tab-list flex">
-      <div class="bottom-panel__collapse relative">
-        <button
-          id="bottom-panel-collapse"
-          data-id="bottom-panel-toggle-button"
-          class="btn-collapse flex items-center"
-          @click="emits('collapse-panel')"
-        >
-          <ui-icon class="collapse-icon" name="arrow" />
-        </button>
-      </div>
-      <ui-tabs
-        v-model="activeTabModel"
-        :tabs="tabListLocal"
-        test-id="bottom-panel-tab-list"
-        type="underline"
-        class="bottom-panel__tab"
-      />
-
-      <div
-        v-show="isShowRecentTasksActions"
-        class="actions flex items-center gap-4 pr-4"
-      >
-        <ui-select
-          v-model="statusFilter"
-          :items="statusFilterItems"
-          test-id="status-filter"
-          class="status-filter-select"
-        />
-        <ui-button
-          test-id="more-tasks-button"
-          variant="primary"
-          type="text"
-          class="more-tasks-button"
-          is-without-sizes
-          @click="onNavigateToTasksPage"
-        >
-          {{ localization.tasks.moreTasks }}
-        </ui-button>
-      </div>
-    </div>
-    <div
-      v-show="!props.panelCollapsedModel"
-      class="bottom-panel__table-wrapper overflow-hidden"
-    >
-      <common-layout-bottom-panel-recent-tasks
-        v-show="activeTabModel === 'recentTask'"
-        v-model:status-filter="statusFilter"
-        :data-table="props.dataTableRecentTasks"
-        :total-items="props.totalItemsRecentTasks"
-        :total-pages="props.totalPagesRecentTasks"
-        :pagination="props.paginationRecentTasks"
-        :loading="props.loadingRecentTasks"
-        @sort="emits('sort-recent-task', $event)"
-        @pagination="emits('pagination-recent-task', $event)"
-      />
-
-      <slot name="alarms" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_TabItem } from '~/node_modules/bfg-uikit/components/ui/tabs/models/interfaces'
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_BottomPanelTabType } from '~/components/common/layout/bottomPanel/lib/models/types'
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_T_SelectedStatus } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
-import { statusFilterItemsFunc } from '~/components/common/layout/bottomPanel/lib/config/statusFilter'
-
-const activeTabModel = defineModel<UI_T_BottomPanelTabType>('selectedTab', {
-  required: true,
-})
-const statusFilter = defineModel<UI_T_SelectedStatus>('statusFilter', {
-  required: true,
-})
-
-const props = defineProps<{
-  panelCollapsedModel: boolean
-  tabList: UI_I_CollapseNavItem[]
-  dataTableRecentTasks: UI_I_RecentTaskItem<UI_T_NodeType>[]
-  totalItemsRecentTasks: number
-  totalPagesRecentTasks: number
-  paginationRecentTasks: UI_I_Pagination
-  loadingRecentTasks: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'collapse-panel'): void
-  (event: 'sort-recent-task', value: string): void
-  (event: 'pagination-recent-task', value: UI_I_Pagination | null): void
-}>()
-
-const tabListLocal = computed<UI_I_TabItem[]>(() =>
-  props.tabList.map(({ value, text: name, testId, development }) => ({
-    name,
-    development,
-    value: value + '',
-    testId: testId + '',
-  }))
-)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const statusFilterItems = ref<UI_I_Dropdown[]>(
-  statusFilterItemsFunc(localization.value)
-)
-
-const onNavigateToTasksPage = (): void => {
-  const router = useRouter()
-  router.push('/tasks')
-}
-
-const isShowRecentTasksActions = computed<boolean>(
-  () => activeTabModel.value === 'recentTask' && !props.panelCollapsedModel
-)
-</script>
-
-<style>
-:root {
-  --bottom-pannel-bg-color: #fff;
-  --bottom-pannel-border-color: #e9ebed;
-  --bottom-pannel-rtask-link-text: #008fd6;
-  --bottom-pannel-rtask-link-hover-text: #0081c1;
-  --bottom-pannel-divider-color: #e9ebeda3;
-  --bottom-pannel-collapse-button-icon: #213444;
-}
-:root.dark-theme {
-  --bottom-pannel-bg-color: #213444;
-  --bottom-pannel-border-color: #e9ebed1f;
-  --bottom-pannel-rtask-link-text: #2ba2de;
-  --bottom-pannel-rtask-link-hover-text: #008fd6;
-  --bottom-pannel-divider-color: #e9ebed1f;
-  --bottom-pannel-collapse-button-icon: #e9eaec;
-}
-</style>
-<style scoped lang="scss">
-@import '~/assets/scss/common/mixins';
-.bottom-panel {
-  background-color: var(--bottom-pannel-bg-color);
-
-  &__tab-list {
-    border-bottom: 1px solid var(--bottom-pannel-border-color);
-  }
-  &__tab {
-    align-items: flex-end;
-    margin-left: 16px;
-
-    &.tabs-wrapper.is-link:before {
-      display: none;
-    }
-    .collapsed &.tabs-wrapper.is-link {
-      :deep(.tab-item.active.tab-underline) {
-        border-bottom: 3px solid transparent;
-      }
-    }
-  }
-  &__table-wrapper {
-    height: inherit;
-  }
-
-  .btn-collapse {
-    border: 0;
-    outline: none;
-    background-color: transparent;
-    cursor: pointer;
-
-    .collapse-icon {
-      width: 20px;
-      height: 20px;
-      transform: rotate(180deg);
-      color: var(--bottom-pannel-collapse-button-icon);
-
-      .collapsed & {
-        transform: rotate(0deg);
-      }
-    }
-  }
-  &__collapse {
-    padding: 12px 16px;
-
-    &:before {
-      content: '';
-      position: absolute;
-      top: 8px;
-      right: 0;
-      bottom: 8px;
-      width: 1px;
-      background-color: var(--bottom-pannel-divider-color);
-    }
-  }
-
-  .actions {
-    flex: 1;
-    justify-content: flex-end;
-
-    .more-tasks-button {
-      width: auto;
-    }
-
-    :deep(.ui-select-toggle-button) {
-      height: 24px;
-      min-width: 80px;
-      padding: 4px 4px 4px 8px;
-      border-radius: 6px;
-    }
-    :deep(.ui-popup-window) {
-      border-radius: 6px;
-      width: unset !important;
-    }
-  }
-}
-
-:deep(.table-container.default-layout) {
-  border-radius: 0;
-}
-</style>

package/components/common/layout/bottomPanel/Old.vue

@@ -1,144 +0,0 @@
-<template>
-  <div
-    :class="[
-      'bottom-panel flex flex-col h-full',
-      { collapsed: props.panelCollapsedModel },
-    ]"
-  >
-    <div class="flex">
-      <div class="bottom-panel__trigger">
-        <button
-          id="bottom-panel-trigger"
-          data-id="bottom-panel-toggle-button"
-          class="btn-trigger flex items-center"
-          @click="emits('collapse-panel')"
-        >
-          <atoms-the-icon class="trigger-icon" name="angle" />
-        </button>
-      </div>
-      <atoms-nav-bar
-        v-model="activeTabModel"
-        :items="props.tabList"
-        :class="[
-          'bottom-panel__tabs',
-          props.panelCollapsedModel && 'collapsed',
-        ]"
-        test-id="bottom-panel-nav-bar"
-      />
-    </div>
-    <div
-      v-show="!props.panelCollapsedModel"
-      class="bottom-panel__table-wrapper overflow-hidden"
-    >
-      <common-layout-bottom-panel-recent-tasks
-        v-show="activeTabModel === 'recentTask'"
-        v-model:status-filter="statusFilter"
-        :data-table="props.dataTableRecentTasks"
-        :total-items="props.totalItemsRecentTasks"
-        :total-pages="props.totalPagesRecentTasks"
-        :pagination="props.paginationRecentTasks"
-        :loading="props.loadingRecentTasks"
-        @sort="emits('sort-recent-task', $event)"
-        @pagination="emits('pagination-recent-task', $event)"
-      />
-
-      <slot name="alarms" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_T_BottomPanelTabType } from '~/components/common/layout/bottomPanel/lib/models/types'
-import type { UI_T_SelectedStatus } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
-
-const statusFilter = defineModel<UI_T_SelectedStatus>('statusFilter', {
-  required: true,
-})
-const activeTabModel = defineModel<UI_T_BottomPanelTabType>('selectedTab', {
-  required: true,
-})
-
-const props = defineProps<{
-  panelCollapsedModel: boolean
-  tabList: UI_I_CollapseNavItem[]
-  dataTableRecentTasks: UI_I_RecentTaskItem<UI_T_NodeType>[]
-  totalItemsRecentTasks: number
-  totalPagesRecentTasks: number
-  paginationRecentTasks: UI_I_Pagination
-  loadingRecentTasks: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'collapse-panel'): void
-  (event: 'sort-recent-task', value: string): void
-  (event: 'pagination-recent-task', value: UI_I_Pagination | null): void
-}>()
-</script>
-
-<style scoped lang="scss">
-@import '~/assets/scss/common/mixins';
-.bottom-panel {
-  background-color: var(--pannel-bg-color);
-  & > div:first-child {
-    height: 36px;
-  }
-  &__table-wrapper {
-    height: inherit;
-    :deep(.datagrid-outer-wrapper) {
-      padding-top: 0;
-      .datagrid {
-        border-radius: 0;
-        margin-top: 0;
-      }
-    }
-  }
-  &__tabs {
-    &.collapsed {
-      :deep(button.nav-link) {
-        box-shadow: none;
-      }
-    }
-  }
-
-  &.collapsed {
-    .btn-trigger {
-      .trigger-icon {
-        transform: rotate(0deg);
-      }
-    }
-  }
-  .btn-trigger {
-    height: 31px;
-    border: 0;
-    outline: none;
-    background-color: transparent;
-    padding-left: 15px;
-    cursor: pointer;
-    .trigger-icon {
-      width: 16px;
-      height: 16px;
-      fill: var(--triger-icon-color);
-      transform: rotate(180deg);
-    }
-  }
-  &__trigger {
-    padding-right: 15px;
-    margin-right: 15px;
-    border-right: 0.05rem solid #ccc;
-    box-shadow: inset 0 -0.05rem 0 var(--nav-panel-border-color);
-  }
-}
-</style>
-
-<style>
-:root {
-  --pannel-bg-color: #fafafa;
-}
-:root.dark-theme {
-  --pannel-bg-color: #1b2a32;
-}
-</style>

package/components/common/layout/bottomPanel/lib/config/statusFilter.ts

@@ -1,19 +0,0 @@
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const statusFilterItemsFunc = (
-  localization: UI_I_Localization
-): UI_I_Dropdown[] => [
-  {
-    text: localization.common.all,
-    value: -1,
-  },
-  {
-    text: localization.common.running,
-    value: 1,
-  },
-  {
-    text: localization.common.failed,
-    value: 3,
-  },
-]

package/components/common/layout/bottomPanel/lib/models/types.ts

@@ -1 +0,0 @@
-export type UI_T_BottomPanelTabType = 'recentTask' | 'alarms'

package/components/common/layout/bottomPanel/recentTasks/RecentTasks.vue

@@ -1,49 +0,0 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:status-filter="statusFilter"
-    :data-table="props.dataTable"
-    :total-items="props.totalItems"
-    :total-pages="props.totalPages"
-    :pagination="props.pagination"
-    :loading="props.loading"
-    @pagination="emits('pagination', $event)"
-    @sort="emits('sort', $event)"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_I_RecentTaskItem } from '~/lib/models/store/tasks/interfaces'
-import type { UI_I_Pagination } from '~/lib/models/table/interfaces'
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_T_SelectedStatus } from '~/components/common/layout/bottomPanel/recentTasks/old/lib/models/types'
-
-const statusFilter = defineModel<UI_T_SelectedStatus>('statusFilter', {
-  required: true,
-})
-
-const props = defineProps<{
-  dataTable: UI_I_RecentTaskItem<UI_T_NodeType>[]
-  totalItems: number
-  totalPages: number
-  pagination: UI_I_Pagination
-  loading: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'pagination', value: UI_I_Pagination | null): void
-  (event: 'sort', value: string): void
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const currentComponent = computed(() =>
-  isNewView.value
-    ? defineAsyncComponent(() => import('./new/New.vue'))
-    : defineAsyncComponent(() => import('./old/Old.vue'))
-)
-</script>
-
-<style scoped lang="scss"></style>

package/components/common/layout/bottomPanel/recentTasks/lib/models/interfaces.ts

@@ -1,14 +0,0 @@
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_T_NavNodes } from '~/lib/models/types'
-
-interface UI_I_TargetData {
-  id: string
-  type: UI_T_NodeType
-}
-
-export interface UI_I_DataTargetForTable extends UI_I_TargetData {
-  nav: UI_T_NavNodes
-  isLink: boolean
-  iconClassName: string
-  testId?: string
-}