bfg-common 1.6.95 → 1.6.97

package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/systemLogTable.ts

@@ -8,8 +8,8 @@ import {
   constructHeadItem,
   constructColumnKey,
 } from '~/components/atoms/table/dataGrid/lib/utils/constructDataTable'
-import type { UI_I_HardwareHealthSystemLog } from '~/components/common/pages/hardwareHealth/tableView/lib/models/interfaces'
-import { hardwareHealthSystemLogTableKeys } from '~/components/common/pages/hardwareHealth/tableView/lib/config/tableKeys'
+import type { UI_I_HardwareHealthSystemLog } from '~/components/common/pages/hardwareHealth/tableView/old/lib/models/interfaces'
+import { hardwareHealthSystemLogTableKeys } from '~/components/common/pages/hardwareHealth/tableView/old/lib/config/tableKeys'
 
 const getItems = (
   localization: UI_I_Localization

package/components/common/pages/hardwareHealth/tableView/{lib → old/lib}/config/tableKeys.ts

@@ -4,7 +4,7 @@ import type {
   UI_T_HardwareHealthAlertWarningTableItemTuple,
   UI_T_HardwareHealthSystemLogTableItemTuple,
   UI_T_HardwareHealthSensorsGraphTableItemTuple,
-} from '~/components/common/pages/hardwareHealth/tableView/lib/models/types'
+} from '~/components/common/pages/hardwareHealth/tableView/old/lib/models/types'
 
 export const hardwareHealthSensorTableKeys: UI_T_HardwareHealthSensorsTableItemTuple =
   ['name', 'status', 'reading', 'category', 'lastUpdated', 'path']

package/components/common/pages/hardwareHealth/tableView/{modal → old/modal}/SensorWarning.vue

@@ -47,15 +47,18 @@ const onCloseModal = (): void => {
 
 <style lang="scss" scoped>
 @import 'assets/scss/common/mixins.scss';
+
 .feedback-field {
   &__body {
     @include flex($align: center);
   }
+
   &__icon {
     min-width: 40px;
     height: 40px;
     margin-right: 20px;
   }
+
   &__text {
     @include text($fs: 14px, $fw: 300);
   }

package/components/common/pages/hardwareHealth/tooltip/Tooltip.vue

@@ -0,0 +1,73 @@
+<template>
+  <div class="tooltip-info">
+    <ui-tooltip-info
+      :id="`tooltip-${props.id}`"
+      :title="props.title"
+      :test-id="`tooltip-${props.id}`"
+      :text="props.text"
+      position="top"
+      position-by-tooltip="right"
+      show-type="variant-3"
+      info="warning"
+      type="click"
+      width="320"
+      :margin-between-trigger="8"
+      @open="isShowTooltip = true"
+      @close="isShowTooltip = false"
+    />
+    <div :id="`tooltip-${props.id}`" class="popped tooltip inline-block w-max">
+      <ui-icon
+        test-id="tooltip-button"
+        name="info"
+        width="16"
+        height="16"
+        :class="['tooltip-info__icon pointer', { active: isShowTooltip }]"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+const props = defineProps<{
+  id: number
+  text: string
+  title: string
+}>()
+
+const isShowTooltip = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss">
+.tooltip-info {
+  :deep(.tooltip) {
+    min-width: 320px;
+  }
+  :deep(.tooltip.popped) {
+    min-width: max-content;
+  }
+
+  :deep(.tooltip:not(.variant-2).md .tooltip-info-header span) {
+    font-size: 14px;
+  }
+  :deep(.tooltip:not(.variant-2).md .tooltip-info-body span) {
+    font-size: 13px;
+    font-weight: 400;
+  }
+  :deep(.tooltip-info-close) {
+    position: static;
+    margin-left: auto;
+  }
+
+  &__icon {
+    color: var(--form-icon-color);
+
+    &:hover {
+      color: var(--close-icon);
+    }
+
+    &.active {
+      color: var(--btn-primary-fill-bg-color);
+    }
+  }
+}
+</style>

package/components/common/pages/licensing/listView/lib/config/list.ts

@@ -24,7 +24,7 @@ export const systemLicenseViewFunc = (
     },
     {
       label: localization.common.product,
-      value: data.product,
+      value: localization.common[data.product],
       icon: '',
       items: [],
     },

package/components/common/pages/scheduledTasks/lib/models/interfaces.ts

@@ -1,9 +1,12 @@
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import type { UI_I_TreeNode } from '~/components/common/recursionTree/lib/models/interfaces'
+import type { API_UI_I_DataTable } from '~/lib/models/table/interfaces'
 
 export interface UI_I_ModalPayloadSchedulerData<T = UI_I_ScheduleNewTasksForm> {
   isSchedulerTask: false
   editTask: false
   data: T
+  selectedNode: UI_I_TreeNode
 }
 
 export interface API_UI_I_ScheduledTasksTableItem {
@@ -31,6 +34,9 @@ export interface API_UI_I_ScheduledTasksTableItem {
 export interface UI_I_ScheduledTasksTableItem
   extends API_UI_I_ScheduledTasksTableItem {}
 
+export interface UI_I_ScheduledTasks
+  extends API_UI_I_DataTable<UI_I_ScheduledTasksTableItem[]> {}
+
 export interface UI_I_CreateScheduledTaskArgs {
   name: string
   description: string

package/components/common/pages/scheduledTasks/modals/common/frequency/Frequency.vue

@@ -1,43 +1,61 @@
 <template>
-  <div class="frequency">
-    <common-pages-scheduled-tasks-modals-common-frequency-after-startup
-      v-if="props.type === 'after-startup'"
-      v-model="model"
-    />
-
-    <common-pages-scheduled-tasks-modals-common-frequency-interval
-      v-if="showTimeInterval"
-      v-model="model"
-      :type="props.type"
-    />
-
-    <common-pages-scheduled-tasks-modals-common-frequency-on
-      v-if="showTimeOn"
-      v-model="model"
-      :type="props.type"
-    />
-
-    <common-pages-scheduled-tasks-modals-common-frequency-start-on
-      v-if="showTimeInterval"
-      v-model="model"
-    />
-
-    <common-pages-scheduled-tasks-modals-common-frequency-end
-      v-if="showTimeInterval"
-      v-model="model"
-      :type="props.type"
-    />
-  </div>
-</template>
+  <common-pages-scheduled-tasks-modals-common-frequency-after-startup
+    v-if="props.type === 'after-startup'"
+    v-model="model"
+    :template-view-mode="props.templateViewMode"
+  />
+
+  <common-pages-scheduled-tasks-modals-common-frequency-interval
+    v-if="showTimeInterval"
+    v-model="model"
+    :type="props.type"
+    :template-view-mode="props.templateViewMode"
+  />
+
+  <common-pages-scheduled-tasks-modals-common-frequency-on
+    v-if="showTimeOn"
+    v-model="model"
+    :type="props.type"
+    :template-view-mode="props.templateViewMode"
+  />
+
+  <common-pages-scheduled-tasks-modals-common-frequency-start-on
+    v-if="showTimeInterval"
+    v-model="model"
+    :template-view-mode="props.templateViewMode"
+  />
 
+  <common-pages-scheduled-tasks-modals-common-frequency-end
+    v-if="showTimeInterval"
+    v-model="model"
+    :type="props.type"
+    :template-view-mode="props.templateViewMode"
+  />
+</template>
+<!-- -->
 <script lang="ts" setup>
 // import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
 
-const props = defineProps<{
-  type: string
-}>()
 const model = defineModel<UI_I_ScheduleNewTasksForm>({ required: true })
+const props = withDefaults(
+  defineProps<{
+    type: string
+    /**
+     * Режим отображения шаблона в новом интерфейсе.
+     *
+     * 'vertical' — используется при отображении компонента в модальном окне.
+     * Контент располагается вертикально (label над полем).
+     *
+     * 'horizontal' — используется в режиме визарда.
+     * Контент располагается горизонтально (label и поле в одной строке).
+     */
+    templateViewMode?: 'horizontal' | 'vertical'
+  }>(),
+  { templateViewMode: 'vertical' }
+)
+
+// асдлкйайдадлйдлкайдлкйклайд
 
 // const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -48,12 +66,3 @@ const showTimeOn = computed<boolean>(() => {
   return ['once', 'week', 'month'].includes(props.type)
 })
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.frequency {
-  width: 100%;
-  &__interval {
-  }
-}
-</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/AfterStartup.vue

@@ -1,32 +1,12 @@
 <template>
-  <div class="after-startup clr-col-6 pl-0">
-    <span class="after-startup__prefix">
-      {{ localization.scheduledTasks.with }}
-    </span>
-
-    <label
-      :class="timeIntervalErrorText && 'invalid'"
-      for="minute-delay-field"
-      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
-    >
-      <input
-        id="minute-delay-field"
-        v-model="modelFrequencyLocal.frg_after_startup"
-        data-id="edit-lockout-policy-time-interval-input"
-        type="text"
-        @input="onInitTimeIntervalValidation"
-        @blur="onInitTimeIntervalValidation"
-      />
-
-      <span class="tooltip-content">
-        {{ timeIntervalErrorText }}
-      </span>
-    </label>
-
-    <span class="after-startup__suffix">
-      {{ localization.scheduledTasks.minuteDelay }}
-    </span>
-  </div>
+  <!-- Аргумент (:template-view-mode) используется только для нового интерфейса -->
+  <component
+    :is="currentComponent"
+    v-model="modelFrequencyLocal.frg_after_startup"
+    :time-interval-error-text="timeIntervalErrorText"
+    :template-view-mode="props.templateViewMode"
+    @init-validation="onInitValidation"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -37,11 +17,22 @@ import { validateField } from '~/components/common/pages/scheduledTasks/modals/c
 const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
   required: true,
 })
+const props = defineProps<{
+  templateViewMode: 'horizontal' | 'vertical'
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+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 isInitTimeIntervalValidation = ref<boolean>(false)
-const onInitTimeIntervalValidation = (): void => {
+const onInitValidation = (): void => {
   isInitTimeIntervalValidation.value = true
 }
 
@@ -61,22 +52,3 @@ watch(
   { immediate: true }
 )
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.after-startup {
-  @include flex($align: center);
-  margin-top: 10px;
-  &__suffix {
-    white-space: nowrap;
-  }
-  .tooltip {
-    & > .tooltip-content {
-      width: 200px;
-    }
-  }
-  input {
-    width: 70px;
-  }
-}
-</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/New.vue

@@ -0,0 +1,73 @@
+<template>
+  <div
+    class="frequency-after-startup w-full"
+    :class="props.templateViewMode === 'horizontal' && 'horizontal'"
+  >
+    <h2>{{ localization.scheduledTasks.delayMinutes }}</h2>
+    <ui-input
+      id="ip-address"
+      v-model="afterStartupModel"
+      :error="props.timeIntervalErrorText"
+      :placeholder="localization.scheduledTasks.delayMinutes"
+      test-id="scheduler-frequency-delay-minute-field"
+      autocomplete="off"
+      type="number"
+      @input="onInitValidation"
+    ></ui-input>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const afterStartupModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+  templateViewMode: 'horizontal' | 'vertical'
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onInitValidation = (): void => emits('init-validation')
+</script>
+
+<style lang="scss" scoped>
+.frequency-after-startup {
+  h2 {
+    font-family: 'Inter', sans-serif;
+    color: var(--title-form-first-color);
+    font-size: 14px;
+    font-weight: 500;
+    margin-bottom: 12px;
+  }
+
+  // Когда форма scheduler используется в визарде,
+  // применяется горизонтальный режим отображения и меняются стили компонента.
+  &.horizontal {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    column-gap: 16px;
+
+    h2 {
+      font-family: 'Inter', sans-serif;
+      width: 100%;
+      max-width: 240px;
+      display: flex;
+      align-items: center;
+      column-gap: 8px;
+      color: var(--wizard-content-title);
+      font-size: 13px;
+      font-weight: 400;
+      line-height: 20px;
+      margin-bottom: 0;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/afterStartup/Old.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="after-startup clr-col-6 pl-0">
+    <span class="after-startup__prefix">
+      {{ localization.scheduledTasks.with }}
+    </span>
+
+    <label
+      :class="props.timeIntervalErrorText && 'invalid'"
+      for="minute-delay-field"
+      class="tooltip tooltip-validation tooltip-xs tooltip-top-left"
+    >
+      <input
+        id="minute-delay-field"
+        v-model="afterStartupModel"
+        data-id="edit-lockout-policy-time-interval-input"
+        type="text"
+        @input="onInitValidation"
+        @blur="onInitValidation"
+      />
+
+      <span class="tooltip-content">
+        {{ props.timeIntervalErrorText }}
+      </span>
+    </label>
+
+    <span class="after-startup__suffix">
+      {{ localization.scheduledTasks.minuteDelay }}
+    </span>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+const afterStartupModel = defineModel<number>({ required: true })
+const props = defineProps<{
+  timeIntervalErrorText: string
+}>()
+const emits = defineEmits<{
+  (event: 'init-validation'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const onInitValidation = (): void => emits('init-validation')
+</script>
+
+<style lang="scss" scoped>
+@import 'bfg-common/assets/scss/common/mixins.scss';
+.after-startup {
+  @include flex($align: center);
+  margin-top: 10px;
+  &__suffix {
+    white-space: nowrap;
+  }
+  .tooltip {
+    & > .tooltip-content {
+      width: 200px;
+    }
+  }
+  input {
+    width: 70px;
+  }
+}
+</style>

package/components/common/pages/scheduledTasks/modals/common/frequency/end/End.vue

@@ -1,38 +1,13 @@
 <template>
-  <div class="end-time">
-    <common-select-input
-      v-model="selectedFrequencyEndMode"
-      :label="localization.scheduledTasks.end"
-      :data="frequencyEndTimeOptions"
-      :class="[
-        'end-time__select-input',
-        selectedFrequencyEndMode === 'on' && 'enabled',
-      ]"
-      test-id="frequency-ent-time"
-    >
-      <template #options>
-        <label
-          v-if="selectedFrequencyEndMode === 'on'"
-          :class="[
-            'tooltip tooltip-validation tooltip-xs tooltip-top-left frequency-end-date',
-            schedulerEndDateErrorText && 'invalid',
-          ]"
-          for="frequency-end-date"
-        >
-          <input
-            id="frequency-end-date"
-            v-model.lazy="modelFrequencyLocal.frg_end_time"
-            data-id="frequency-end-date-input"
-            type="datetime-local"
-          />
-
-          <span class="tooltip-content">
-            {{ schedulerEndDateErrorText }}
-          </span>
-        </label>
-      </template>
-    </common-select-input>
-  </div>
+  <!-- Аргумент (:template-view-mode) используется только для нового интерфейса -->
+  <component
+    :is="currentComponent"
+    v-model="modelFrequencyLocal"
+    v-model:selected-end-mode="selectedFrequencyEndMode"
+    :end-options="frequencyEndTimeOptions"
+    :type="props.type"
+    :template-view-mode="props.templateViewMode"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -47,10 +22,18 @@ const modelFrequencyLocal = defineModel<UI_I_ScheduleNewTasksForm>({
 })
 const props = defineProps<{
   type: string
+  templateViewMode: 'horizontal' | 'vertical'
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
-// const { $store, $formattedDate, $isDate, $getUnixByDate }: any = useNuxtApp()
+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 frequencyEndTimeOptions = computed<UI_I_SelectInputItem[]>(() =>
   frequencyEndTimeFunc(localization.value)
@@ -79,37 +62,3 @@ watch(
   }
 )
 </script>
-
-<style lang="scss" scoped>
-@import 'bfg-common/assets/scss/common/mixins.scss';
-.end-time {
-  margin-top: 10px;
-  &__select-input {
-    &.enabled {
-      row-gap: 15px;
-      &.clr-flex-row {
-        flex-direction: column !important;
-        align-items: flex-start;
-      }
-      :deep(.select-input__inner) {
-        flex-direction: row;
-      }
-    }
-
-    :deep(.select-input__label) {
-      font-weight: 400;
-    }
-    :deep(.select) {
-      max-width: max-content !important;
-    }
-  }
-  .frequency-end-date {
-    margin-left: 15px;
-  }
-}
-.tooltip {
-  & > .tooltip-content {
-    width: 200px;
-  }
-}
-</style>