bfg-common 1.4.637 → 1.4.639

package/components/common/layout/theHeader/TheHeader.vue

@@ -64,13 +64,16 @@
     @update-vm-clusters="emits('update-vm-clusters', $event)"
     @submit-preferences="emits('submit-preferences')"
   />
+
+  <common-layout-the-header-modals-reconnect />
+  <!--  <common-layout-the-header-modals-redirect-login />-->
 </template>
 
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-import { checkIsTokenExpired } from '~/lib/utils/token'
+// import { checkIsTokenExpired } from '~/lib/utils/token'
 
 const props = defineProps<{
   isShowMainMenu: boolean
@@ -114,7 +117,7 @@ const emits = defineEmits<{
 }>()
 
 const inactivityTimer = ref<NodeJS.Timeout | undefined>(undefined)
-const inactivityTimeout = ref<number>(20 * 60 * 1000)
+const inactivityTimeout = ref<number>(10 * 60 * 1000)
 
 const startInactivityTimer = (): void => {
   inactivityTimer.value = setTimeout(() => {
@@ -125,17 +128,18 @@ const startInactivityTimer = (): void => {
       return
     }
 
-    const expireTime =
-      props.expireTimeFromState || useLocalStorage('accessTokenExpiredTime')
-
-    const isExpiredToken = checkIsTokenExpired(expireTime)
-
-    isExpiredToken && emits('show-redirect-login-modal', true)
-
-    if (!isExpiredToken) {
-      emits('show-reconnect-modal', true)
-      startInactivityTimer()
-    }
+    // const expireTime =
+    //   props.expireTimeFromState || useCookie('token-expired-time')
+    //
+    // const isExpiredToken = checkIsTokenExpired(expireTime)
+    //
+    //
+    // isExpiredToken && emits('show-redirect-login-modal', true)
+    //
+    // if (!isExpiredToken) {
+    emits('show-reconnect-modal', true)
+    startInactivityTimer()
+    // }
 
     console.log('Пользователь бездействует!')
   }, inactivityTimeout.value)

package/components/common/monitor/overview/filters/Filters.vue

@@ -194,10 +194,14 @@ watch(
   flex-shrink: 0;
   padding-top: 5px;
 
-  .select select {
-    height: 20px;
-    margin: 5px;
-    color: var(--global-font-color);
+  .select {
+    position: relative;
+
+    select {
+      height: 20px;
+      margin: 5px;
+      color: var(--global-font-color);
+    }
   }
   .single-option {
     margin-left: 5px;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.637",
+  "version": "1.4.639",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/store/tasks/mappers/recentTasks.ts

@@ -1,52 +1,64 @@
-import {
-  UI_E_RecentTaskStatus,
-  UI_E_IconNameByRecentTaskStatus,
-} from '~/lib/models/store/tasks/enums'
-import type {
-  API_UI_I_RecentTask,
-  UI_I_RecentTask,
-} from '~/lib/models/store/tasks/interfaces'
-import { base64 } from '~/lib/utils/base64'
-
-export const recentTasks = (
-  data: API_UI_I_RecentTask<string>
-): UI_I_RecentTask<string> => {
-  const items =
-    data.items
-      ?.sort((a, b) => {
-        return b.start_time - a.start_time
-      })
-      .map((task) => {
-        let args: any = {}
-        try {
-          args = base64.decode(task.args)
-        } catch (error) {
-          args = {}
-        }
-
-        return {
-          args,
-          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_IconNameByRecentTaskStatus[task.status],
-          statusText: task.error || UI_E_RecentTaskStatus[task.status],
-          status: task.status,
-          target: task.target,
-          targetType: task.target_type,
-          taskName: task.task_name,
-          id: task.id,
-          zone: task.zone,
-          extra: task.extra,
-        }
-      }) || []
-  return {
-    items,
-    last: data.last,
-  }
-}
+import {
+  UI_E_RecentTaskStatus,
+  UI_E_IconNameByRecentTaskStatus,
+} from '~/lib/models/store/tasks/enums'
+import type {
+  API_UI_I_RecentTask,
+  UI_I_RecentTask,
+} from '~/lib/models/store/tasks/interfaces'
+import { base64 } from '~/lib/utils/base64'
+
+export const recentTasks = (
+  data: API_UI_I_RecentTask<string>
+): UI_I_RecentTask<string> => {
+  const items =
+    data.items
+      ?.sort((a, b) => {
+        return b.start_time - a.start_time
+      })
+      .map((task) => {
+        let args: any = {}
+        try {
+          args = base64.decode(task.args)
+        } catch (error) {
+          args = {}
+        }
+
+        let completion: string = task.completion + '' || '--'
+        let execution: string | number = Math.abs(task.start_time - task.completion)
+        let queuedFor: number = task.start_time - task.creation_time
+        let startTime: string = task.start_time + '' || '--'
+        // Обрабатываем данные когда задачка в ожидании
+        if (task.status === 0) {
+          completion = '--'
+          execution = '--'
+          queuedFor = 0
+          startTime = (Date.now() / 1000) + ''
+        }
+
+        return {
+          args,
+          completion,
+          execution,
+          queuedFor,
+          startTime,
+          details: task.details,
+          error: task.error,
+          initiator: task.initiator,
+          server: task.server,
+          statusIcon: UI_E_IconNameByRecentTaskStatus[task.status],
+          statusText: task.error || UI_E_RecentTaskStatus[task.status],
+          status: task.status,
+          target: task.target,
+          targetType: task.target_type,
+          taskName: task.task_name,
+          id: task.id,
+          zone: task.zone,
+          extra: task.extra,
+        }
+      }) || []
+  return {
+    items,
+    last: data.last,
+  }
+}