bfg-common 1.3.232 → 1.3.233

package/components/common/pages/Tasks.vue

@@ -1,120 +1,120 @@
-<template>
-  <div class="tasks">
-    <common-headline
-      :headline="localization.taskConsole"
-      class="tasks__headline"
-    />
-
-    <div class="btn-group">
-      <button
-        id="task-previous-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === 1"
-        @click="onClickButton('previous')"
-      >
-        {{ localization.previous }}
-      </button>
-
-      <button
-        id="task-next-button"
-        class="btn btn-sm btn-link nav-link"
-        :disabled="pagination.page === tasksList?.total_pages"
-        @click="onClickButton('next')"
-      >
-        {{ localization.next }}
-      </button>
-    </div>
-
-    <templates-tasks-table-view
-      :data-table="tasksList?.items || []"
-      :total-items="tasksList?.total_items || 0"
-      :total-pages="tasksList?.total_pages || 1"
-      :pagination="pagination"
-      :loading="isLoading"
-      @pagination="onUpdatePagination"
-      @sort="onSortTable"
-    />
-  </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'
-
-definePageMeta({
-  middleware: ['auth'],
-})
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $store }: any = useNuxtApp()
-
-const pagination = ref<UI_I_Pagination>({
-  page: 1,
-  pageSize: 100,
-})
-const sort = ref<string | null>(null)
-
-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)
-}
-
-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')
-)
-const pauseGlobalRefresh = (): void => {
-  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
-  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
-}
-onUnmounted(() => {
-  pauseGlobalRefresh()
-})
-</script>
-
-<style lang="scss">
-@import '~/node_modules/bfg-common/assets/scss/common/mixins';
-.tasks {
-  @include flex($dir: column);
-  height: 100%;
-  padding-left: 10px;
-  &__headline {
-    padding-left: 10px;
-    margin-bottom: 0.6rem;
-  }
-  .btn {
-    text-transform: uppercase;
-  }
-}
-</style>
+<template>
+  <div class="tasks">
+    <common-headline
+      :headline="localization.taskConsole"
+      class="tasks__headline"
+    />
+
+    <div class="btn-group">
+      <button
+        id="task-previous-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === 1"
+        @click="onClickButton('previous')"
+      >
+        {{ localization.previous }}
+      </button>
+
+      <button
+        id="task-next-button"
+        class="btn btn-sm btn-link nav-link"
+        :disabled="pagination.page === tasksList?.total_pages"
+        @click="onClickButton('next')"
+      >
+        {{ localization.next }}
+      </button>
+    </div>
+
+    <templates-tasks-table-view
+      :data-table="tasksList?.items || []"
+      :total-items="tasksList?.total_items || 0"
+      :total-pages="tasksList?.total_pages || 1"
+      :pagination="pagination"
+      :loading="isLoading"
+      @pagination="onUpdatePagination"
+      @sort="onSortTable"
+    />
+  </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'
+
+definePageMeta({
+  middleware: ['auth'],
+})
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $store }: any = useNuxtApp()
+
+const pagination = ref<UI_I_Pagination>({
+  page: 1,
+  pageSize: 100,
+})
+const sort = ref<string | null>(null)
+
+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)
+}
+
+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')
+)
+const pauseGlobalRefresh = (): void => {
+  const tasksLastRequestType = $store.getters['tasks/getTasksLastRequestType']
+  $store.dispatch('main/A_PAUSE_GLOBAL_REFRESH', tasksLastRequestType)
+}
+onUnmounted(() => {
+  pauseGlobalRefresh()
+})
+</script>
+
+<style lang="scss">
+@import '~/node_modules/bfg-common/assets/scss/common/mixins';
+.tasks {
+  @include flex($dir: column);
+  height: 100%;
+  padding-left: 10px;
+  &__headline {
+    padding-left: 10px;
+    margin-bottom: 0.6rem;
+  }
+  .btn {
+    text-transform: uppercase;
+  }
+}
+</style>

package/components/common/recursionTree/RecursionTree.vue

@@ -1,203 +1,203 @@
-<template>
-  <div class="recursion-tree">
-    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
-      <div
-        :id="`tree-node-${node.type}-${node.id}`"
-        class="clr-tree-node"
-        @click="selectNode(node)"
-      >
-        <button
-          v-if="node.hasNodes"
-          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
-          class="clr-treenode-caret"
-          @click.stop="getNodes({ node })"
-        >
-          <i
-            v-if="loading[`${node.id}_${node.type}`]"
-            class="fa clr-tree-node-caret-icon spinner spinner-sm"
-          />
-          <atoms-the-icon
-            v-else
-            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
-            name="angle"
-          />
-        </button>
-        <div
-          :class="[
-            'tree-node-text-drag',
-            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
-          ]"
-          @contextmenu.prevent="showContextMenuAndSelectNode($event, node)"
-        >
-          <div
-            :class="[
-              'clr-treenode-link tree-node-text',
-              { active: node.isActive },
-            ]"
-          >
-            <span :class="node.iconClassName" />
-            {{ node.name }}
-          </div>
-        </div>
-      </div>
-
-      <common-recursion-tree
-        v-if="node.nodesShow && node.nodes.length"
-        :nodes="node.nodes"
-        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
-        @get-nodes="getNodes($event)"
-        @select-node="selectNode($event)"
-        @contextmenu.prevent
-        @show-context-menu="showContextMenu"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
-
-const { $store } = useNuxtApp()
-
-interface UI_I_Loading {
-  [key: string]: boolean
-}
-
-const props = defineProps<{
-  nodes: UI_I_TreeNode[]
-}>()
-const emits = defineEmits<{
-  (event: 'get-nodes', value: any): void
-  (event: 'select-node', value: UI_I_TreeNode): void
-  (event: 'show-context-menu', value: any): void
-}>()
-
-const loading = ref<UI_I_Loading>({})
-watch(props.nodes, (nodes) => {
-  nodes.forEach((node) => {
-    loading.value[`${node.id}_${node.type}`] = false
-  })
-})
-
-const hasDarkMode = computed<boolean>(
-  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
-)
-
-const getNodes = (data: any): void => {
-  const node: UI_I_TreeNode = data.node
-  const cb: Function | undefined = data.cb
-
-  loading.value[`${node.id}_${node.type}`] = true
-  const collBack = () => {
-    loading.value[`${node.id}_${node.type}`] = false
-  }
-  emits('get-nodes', {
-    node,
-    cb: cb || collBack,
-  })
-}
-const selectNode = (node: UI_I_TreeNode): void => {
-  emits('select-node', node)
-}
-const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
-  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
-  if (event.node && event.event) {
-    emits('show-context-menu', { ...event })
-    return
-  }
-  emits('show-context-menu', { event, node })
-}
-const showContextMenuAndSelectNode = (
-  event: any,
-  node: UI_I_TreeNode
-): void => {
-  selectNode(node)
-
-  setTimeout(() => {
-    showContextMenu(event, node)
-  }, 0)
-}
-</script>
-
-<style scoped lang="scss">
-.recursion-tree {
-  .clr-tree-node {
-    width: 100%;
-    overflow: hidden;
-    display: flex;
-    flex: 1 1 0;
-    align-items: center;
-    margin-bottom: 1px;
-
-    .clr-treenode-caret {
-      outline: none;
-
-      .clr-tree-node-caret-icon {
-        position: static;
-        transform: rotate(90deg);
-        width: 11px;
-        height: 11px;
-        fill: var(--tree-node-caret-icon);
-
-        &.down {
-          transform: rotate(180deg);
-        }
-      }
-    }
-    .tree-node-text-drag {
-      width: 100%;
-      overflow: hidden;
-      display: flex;
-      cursor: grab;
-
-      &.no-child {
-        margin-left: 30px;
-      }
-      .tree-node-text {
-        width: 100%;
-        box-sizing: border-box;
-        text-overflow: ellipsis;
-        overflow: hidden;
-        white-space: nowrap;
-        padding: 0;
-        border-radius: 0;
-        border-bottom: 1px solid transparent;
-
-        &.active {
-          background: var(--vertical-nav-active-bg-color);
-          color: var(--vertical-nav-active-item-color);
-          border-bottom: 1px solid transparent;
-        }
-        &:hover {
-          border-color: var(--vertical-nav-hover-border-color);
-          &:not(.active) {
-            background: var(--vertical-nav-hover-bg-color);
-          }
-        }
-        span {
-          display: inline-block;
-          vertical-align: text-bottom;
-          margin: 1px 4px 0;
-        }
-      }
-    }
-  }
-}
-</style>
-
-<style>
-:root {
-  --vertical-nav-active-item-color: #fff;
-  --vertical-nav-active-bg-color: #29414e;
-  --vertical-nav-hover-bg-color: #e8e8e8;
-  --vertical-nav-hover-border-color: #666;
-  --tree-node-caret-icon: #666;
-}
-:root.dark-theme {
-  --vertical-nav-active-item-color: #000;
-  --vertical-nav-active-bg-color: #d8e3e9;
-  --vertical-nav-hover-bg-color: #324f61;
-  --vertical-nav-hover-border-color: #fff;
-  --tree-node-caret-icon: #acbac3;
-}
-</style>
+<template>
+  <div class="recursion-tree">
+    <div v-for="node in nodes" :key="`${node.type}_${node.id}`">
+      <div
+        :id="`tree-node-${node.type}-${node.id}`"
+        class="clr-tree-node"
+        @click="selectNode(node)"
+      >
+        <button
+          v-if="node.hasNodes"
+          :id="`tree-node-${node.type}-${node.id}-toggle-button`"
+          class="clr-treenode-caret"
+          @click.stop="getNodes({ node })"
+        >
+          <i
+            v-if="loading[`${node.id}_${node.type}`]"
+            class="fa clr-tree-node-caret-icon spinner spinner-sm"
+          />
+          <atoms-the-icon
+            v-else
+            :class="['clr-tree-node-caret-icon', { down: node.nodesShow }]"
+            name="angle"
+          />
+        </button>
+        <div
+          :class="[
+            'tree-node-text-drag',
+            { 'no-child': !node.hasNodes, 'dark-mode': hasDarkMode },
+          ]"
+          @contextmenu.prevent="showContextMenuAndSelectNode($event, node)"
+        >
+          <div
+            :class="[
+              'clr-treenode-link tree-node-text',
+              { active: node.isActive },
+            ]"
+          >
+            <span :class="node.iconClassName" />
+            {{ node.name }}
+          </div>
+        </div>
+      </div>
+
+      <common-recursion-tree
+        v-if="node.nodesShow && node.nodes.length"
+        :nodes="node.nodes"
+        :style="{ 'padding-left': node.nodesShow ? '20px' : '' }"
+        @get-nodes="getNodes($event)"
+        @select-node="selectNode($event)"
+        @contextmenu.prevent
+        @show-context-menu="showContextMenu"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+
+const { $store } = useNuxtApp()
+
+interface UI_I_Loading {
+  [key: string]: boolean
+}
+
+const props = defineProps<{
+  nodes: UI_I_TreeNode[]
+}>()
+const emits = defineEmits<{
+  (event: 'get-nodes', value: any): void
+  (event: 'select-node', value: UI_I_TreeNode): void
+  (event: 'show-context-menu', value: any): void
+}>()
+
+const loading = ref<UI_I_Loading>({})
+watch(props.nodes, (nodes) => {
+  nodes.forEach((node) => {
+    loading.value[`${node.id}_${node.type}`] = false
+  })
+})
+
+const hasDarkMode = computed<boolean>(
+  () => $store.getters['main/getInterfaceThemeMode'] === 'DARK'
+)
+
+const getNodes = (data: any): void => {
+  const node: UI_I_TreeNode = data.node
+  const cb: Function | undefined = data.cb
+
+  loading.value[`${node.id}_${node.type}`] = true
+  const collBack = () => {
+    loading.value[`${node.id}_${node.type}`] = false
+  }
+  emits('get-nodes', {
+    node,
+    cb: cb || collBack,
+  })
+}
+const selectNode = (node: UI_I_TreeNode): void => {
+  emits('select-node', node)
+}
+const showContextMenu = (event: any, node: UI_I_TreeNode): void => {
+  // Если данные приходят от потомка, то нужно так обработать, из-за рекурсии
+  if (event.node && event.event) {
+    emits('show-context-menu', { ...event })
+    return
+  }
+  emits('show-context-menu', { event, node })
+}
+const showContextMenuAndSelectNode = (
+  event: any,
+  node: UI_I_TreeNode
+): void => {
+  selectNode(node)
+
+  setTimeout(() => {
+    showContextMenu(event, node)
+  }, 0)
+}
+</script>
+
+<style scoped lang="scss">
+.recursion-tree {
+  .clr-tree-node {
+    width: 100%;
+    overflow: hidden;
+    display: flex;
+    flex: 1 1 0;
+    align-items: center;
+    margin-bottom: 1px;
+
+    .clr-treenode-caret {
+      outline: none;
+
+      .clr-tree-node-caret-icon {
+        position: static;
+        transform: rotate(90deg);
+        width: 11px;
+        height: 11px;
+        fill: var(--tree-node-caret-icon);
+
+        &.down {
+          transform: rotate(180deg);
+        }
+      }
+    }
+    .tree-node-text-drag {
+      width: 100%;
+      overflow: hidden;
+      display: flex;
+      cursor: grab;
+
+      &.no-child {
+        margin-left: 30px;
+      }
+      .tree-node-text {
+        width: 100%;
+        box-sizing: border-box;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        padding: 0;
+        border-radius: 0;
+        border-bottom: 1px solid transparent;
+
+        &.active {
+          background: var(--vertical-nav-active-bg-color);
+          color: var(--vertical-nav-active-item-color);
+          border-bottom: 1px solid transparent;
+        }
+        &:hover {
+          border-color: var(--vertical-nav-hover-border-color);
+          &:not(.active) {
+            background: var(--vertical-nav-hover-bg-color);
+          }
+        }
+        span {
+          display: inline-block;
+          vertical-align: text-bottom;
+          margin: 1px 4px 0;
+        }
+      }
+    }
+  }
+}
+</style>
+
+<style>
+:root {
+  --vertical-nav-active-item-color: #fff;
+  --vertical-nav-active-bg-color: #29414e;
+  --vertical-nav-hover-bg-color: #e8e8e8;
+  --vertical-nav-hover-border-color: #666;
+  --tree-node-caret-icon: #666;
+}
+:root.dark-theme {
+  --vertical-nav-active-item-color: #000;
+  --vertical-nav-active-bg-color: #d8e3e9;
+  --vertical-nav-hover-bg-color: #324f61;
+  --vertical-nav-hover-border-color: #fff;
+  --tree-node-caret-icon: #acbac3;
+}
+</style>

package/components/common/tools/Actions.vue

@@ -12,6 +12,7 @@
         </span>
         <input
           :id="`select-file-button-${key}`"
+          :data-id="button.testId"
           type="file"
           :disabled="button.disabled"
           :multiple="false"
@@ -23,6 +24,7 @@
       <button
         v-else
         :id="`actions-button-${key}`"
+        :data-id="button.testId"
         :class="[`btn btn-link ${props.size}`]"
         :disabled="button.disabled"
         @click="onClickButton(button.type)"
@@ -140,7 +142,6 @@ onMounted(() => {
   id.value = `tool-actions-${useUniqueId()}`
   setResizeObserve()
 })
-
 </script>
 
 <style lang="scss" scoped>

package/components/common/tools/lib/models/interfaces.ts

@@ -3,4 +3,5 @@ export interface UI_I_Button {
   type: string
   disabled: boolean
   uploaded?: boolean
+  testId?: string
 }