bfg-common 1.5.633 → 1.5.634

package/assets/scss/components/auth.scss

@@ -4,6 +4,7 @@
   @include flex($dir: column);
   height: calc(100vh - 44px);
   background-color: #fafafa;
+  overflow: auto;
   &__content {
     display: grid;
     grid-template-columns: 544px auto;

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

@@ -1,169 +1,169 @@
-<template>
-  <common-monitor-overview-filters-new
-    v-if="isNewView"
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :current-lang="props.currentLang"
-    :selected-node-name="props.selectedNodeName"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-  <common-monitor-overview-filters-old
-    v-else
-    v-model:selected-period="selectedPeriod"
-    v-model:selected-view="selectedView"
-    :disabled-period-options="disabledPeriodOptions"
-    :period-options="periodOptions"
-    :is-show-custom-interval-button="isShowCustomIntervalButton"
-    :chart-title-date="chartTitleDate"
-    :view-options="viewOptions"
-    :valid-date-end="props.validDateEnd"
-    :is-show-interval-modal="isShowIntervalModal"
-    :selected-periods="props.selectedPeriods"
-    :current-lang="props.currentLang"
-    :selected-node-name="props.selectedNodeName"
-    @submit-interval-modal="onSubmitIntervalModal"
-    @show-interval-modal="onShowIntervalModal"
-    @hide-interval-modal="onHideIntervalModal"
-  />
-</template>
-
-<script setup lang="ts">
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
-import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
-import {
-  periodFunc,
-  viewFunc,
-} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
-import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
-
-const { $formattedDatetime, $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-
-const props = withDefaults(
-  defineProps<{
-    startDate: number
-    endDate: number
-    chartType: 'spline' | 'pie'
-    view: UI_T_OverviewViewType
-    selectedPeriods: number[]
-    currentLang: string
-    validDateEnd: number
-    selectedNodeName: string
-    timeFormat?: string
-    project?: UI_T_Project
-  }>(),
-  {
-    timeFormat: '',
-    project: undefined,
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
-  (event: 'update-custom-date', value: number[]): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectedPeriod = ref<string>('')
-const periodOptions = computed<UI_I_OptionItem[]>(() =>
-  periodFunc(localization.value)
-)
-watch(
-  () => periodOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedPeriod.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const isShowCustomIntervalButton = computed<boolean>(
-  () => selectedPeriod.value === 'custom_interval'
-)
-
-const isShowIntervalModal = ref<boolean>(false)
-const onShowIntervalModal = (): void => {
-  isShowIntervalModal.value = true
-}
-const onHideIntervalModal = (): void => {
-  isShowIntervalModal.value = false
-}
-const onSubmitIntervalModal = (customDates: number[]): void => {
-  customDatesData.value = customDates
-  sendUpdatedFilters()
-  onHideIntervalModal()
-  emits('update-custom-date', customDates)
-}
-
-const chartTitleDate = computed<string>(() => {
-  const startValue = props.startDate
-  const endValue = props.endDate
-  if (!startValue && !endValue) return ''
-
-  const start = $formattedDatetime(startValue, {
-    hasSeconds: true,
-    timeFormat: props.timeFormat,
-  })
-
-  const end = $formattedDatetime(endValue, {
-    hasSeconds: true,
-    timeFormat: props.timeFormat,
-  })
-
-  return `${start} - ${end}`
-})
-
-// const disabledPeriodOptions = computed<boolean>(
-//   () => props.chartType === 'pie' || !chartTitleDate.value
-// )
-
-const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
-
-const selectedView = ref<string>('')
-const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, props.view, props.project)
-)
-watch(
-  () => viewOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedView.value = newValue[0].value
-  },
-  { immediate: true }
-)
-
-const customDatesData = ref<number[]>([])
-const sendUpdatedFilters = (): void => {
-  const currentPeriod =
-    selectedPeriod.value === 'custom_interval'
-      ? customDatesData.value
-      : getValidDateByOptionFunc(selectedPeriod.value)
-  const filters: UI_I_MonitorGraphPayload = {
-    period: currentPeriod,
-    view: selectedView.value,
-    periodName: selectedPeriod.value,
-  }
-
-  emits('update-filters', filters)
-}
-watch(
-  () => [selectedPeriod.value, selectedView.value],
-  () => {
-    sendUpdatedFilters()
-  }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <common-monitor-overview-filters-new
+    v-if="isNewView"
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+  <common-monitor-overview-filters-old
+    v-else
+    v-model:selected-period="selectedPeriod"
+    v-model:selected-view="selectedView"
+    :disabled-period-options="disabledPeriodOptions"
+    :period-options="periodOptions"
+    :is-show-custom-interval-button="isShowCustomIntervalButton"
+    :chart-title-date="chartTitleDate"
+    :view-options="viewOptions"
+    :valid-date-end="props.validDateEnd"
+    :is-show-interval-modal="isShowIntervalModal"
+    :selected-periods="props.selectedPeriods"
+    :current-lang="props.currentLang"
+    :selected-node-name="props.selectedNodeName"
+    @submit-interval-modal="onSubmitIntervalModal"
+    @show-interval-modal="onShowIntervalModal"
+    @hide-interval-modal="onHideIntervalModal"
+  />
+</template>
+
+<script setup lang="ts">
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_MonitorGraphPayload } from '~/components/common/monitor/lib/models/interfaces'
+import type { UI_T_OverviewViewType } from '~/components/common/monitor/overview/filters/lib/models/types'
+import {
+  periodFunc,
+  viewFunc,
+} from '~/components/common/monitor/overview/filters/lib/config/filterOptions'
+import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
+
+const { $formattedDatetime, $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+
+const props = withDefaults(
+  defineProps<{
+    startDate: number
+    endDate: number
+    chartType: 'spline' | 'pie'
+    view: UI_T_OverviewViewType
+    selectedPeriods: number[]
+    currentLang: string
+    validDateEnd: number
+    selectedNodeName: string
+    timeFormat?: string
+    project?: UI_T_Project
+  }>(),
+  {
+    timeFormat: '',
+    project: undefined,
+  }
+)
+
+const emits = defineEmits<{
+  (event: 'update-filters', value: UI_I_MonitorGraphPayload): void
+  (event: 'update-custom-date', value: number[]): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedPeriod = ref<string>('')
+const periodOptions = computed<UI_I_OptionItem[]>(() =>
+  periodFunc(localization.value)
+)
+watch(
+  () => periodOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedPeriod.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const isShowCustomIntervalButton = computed<boolean>(
+  () => selectedPeriod.value === 'custom_interval'
+)
+
+const isShowIntervalModal = ref<boolean>(false)
+const onShowIntervalModal = (): void => {
+  isShowIntervalModal.value = true
+}
+const onHideIntervalModal = (): void => {
+  isShowIntervalModal.value = false
+}
+const onSubmitIntervalModal = (customDates: number[]): void => {
+  customDatesData.value = customDates
+  sendUpdatedFilters()
+  onHideIntervalModal()
+  emits('update-custom-date', customDates)
+}
+
+const chartTitleDate = computed<string>(() => {
+  const startValue = props.startDate
+  const endValue = props.endDate
+  if (!startValue && !endValue) return ''
+
+  const start = $formattedDatetime(startValue, {
+    hasSeconds: true,
+    timeFormat: props.timeFormat,
+  })
+
+  const end = $formattedDatetime(endValue, {
+    hasSeconds: true,
+    timeFormat: props.timeFormat,
+  })
+
+  return `${start} - ${end}`
+})
+
+// const disabledPeriodOptions = computed<boolean>(
+//   () => props.chartType === 'pie' || !chartTitleDate.value
+// )
+
+const disabledPeriodOptions = computed<boolean>(() => props.chartType === 'pie')
+
+const selectedView = ref<string>('')
+const viewOptions = computed<UI_I_OptionItem[]>(() =>
+  viewFunc(localization.value, props.view, props.project)
+)
+watch(
+  () => viewOptions.value,
+  (newValue: UI_I_OptionItem[]) => {
+    if (newValue) selectedView.value = newValue[0].value
+  },
+  { immediate: true }
+)
+
+const customDatesData = ref<number[]>([])
+const sendUpdatedFilters = (): void => {
+  const currentPeriod =
+    selectedPeriod.value === 'custom_interval'
+      ? customDatesData.value
+      : getValidDateByOptionFunc(selectedPeriod.value)
+  const filters: UI_I_MonitorGraphPayload = {
+    period: currentPeriod,
+    view: selectedView.value,
+    periodName: selectedPeriod.value,
+  }
+
+  emits('update-filters', filters)
+}
+watch(
+  () => [selectedPeriod.value, selectedView.value],
+  () => {
+    sendUpdatedFilters()
+  }
+)
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/pages/home/widgets/warnings/table/lib/models/enums.ts

@@ -3,6 +3,7 @@ export enum UI_E_TabsByTypeEnum { // TODO если есть другой так
   'datacenter' = 'h',
   'folder' = 'h',
   'cluster' = 'h',
+  'zonedir' = 'h',
   // для прокуратор
   'host' = 'h',
   'vm' = 'v',

package/components/common/split/horizontal/{HorizontalNew.vue → New.vue}

@@ -337,6 +337,7 @@ onUnmounted(() => {
     background-color: var(--new-gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/horizontal/{HorizontalOld.vue → Old.vue}

@@ -289,6 +289,7 @@ onUnmounted(() => {
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/vertical/{VerticalNew.vue → New.vue}

@@ -76,6 +76,7 @@ const props = defineProps<{
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/split/vertical/{VerticalOld.vue → Old.vue}

@@ -65,6 +65,7 @@ const props = defineProps<{
     background-color: var(--gutter-bg-color);
     transition-delay: 0.25s;
     transition-duration: 0.25s;
+    user-select: none;
 
     &-handler {
       position: absolute;

package/components/common/vm/actions/register/New.vue

@@ -5,6 +5,7 @@
     :is-loading="props.wizard.wizardLoader.status"
     :title="localization.common.registerVm"
     :texts="texts"
+    :has-changes="hasChanges"
     test-id="register-wizard"
     show
     @change-steps="emits('change-steps', $event)"
@@ -74,7 +75,7 @@
               test-id="computed-resource-alert"
               type="error"
               size="md"
-              class="subtitle-block__alert"
+              class="subtitle-block__alert mb-4"
             />
             <ui-wizard-subtitle
               :sub-title="
@@ -131,6 +132,7 @@ import type {
   UI_I_WizardTexts,
 } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
 import Wizard from '~/node_modules/bfg-uikit/components/ui/wizard/lib/utils/utils'
+import { compare } from '~/node_modules/bfg-uikit/lib/utils/compare'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
@@ -208,8 +210,19 @@ const currentSubtitleSelectNameBlock = ref<string>(
     ? localization.value.vmWizard.specifyUniqueNameAndTargetLocationForVm
     : localization.value.common.specifyUniqueNameForVm
 )
+
+const initialCompare = compare(vmForm)
+const hasChanges = computed<boolean>(() => initialCompare.getDiff(vmForm.value))
 </script>
 
+<style>
+:root {
+  --select-name-border-color: #e9ebed;
+}
+:root.dark-theme {
+  --select-name-border-color: #e9ebed1f;
+}
+</style>
 <style scoped lang="scss">
 .subtitle-block {
   display: flex;
@@ -217,6 +230,9 @@ const currentSubtitleSelectNameBlock = ref<string>(
   border-bottom: 1px solid var(--wizard-line);
   padding-bottom: 12px;
 }
+:deep(.select-name .tree-view-wrap) {
+  border-color: var(--select-name-border-color);
+}
 .compute-resource-container {
   padding-bottom: 40px;
 

package/lib/models/store/tasks/interfaces.ts

@@ -75,6 +75,7 @@ export interface UI_I_RecentTaskItem<T, E = any> {
   statusText: string
   statusDetails: UI_T_TaskStatusDetails
   target: string
+  targetName: string
   targetType: T
   taskName: string
   id: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.633",
+  "version": "1.5.634",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -18,7 +18,7 @@
     "@vueuse/core": "10.1.2",
     "@vueuse/nuxt": "10.1.2",
     "bfg-nuxt-3-graph": "1.0.27",
-    "bfg-uikit": "1.0.531",
+    "bfg-uikit": "1.0.533",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-myrules": "file:./eslint",
     "nuxt": "3.11.2",

package/store/tasks/mappers/recentTasks.ts

@@ -45,8 +45,8 @@ export const recentTasks = (
           execution = '--'
           queuedFor = 0
           startTime = Date.now() / 1000 + ''
-          // Обрабатываем данные когда задачка в работе
-        } else if (task.status === 1) {
+          // Обрабатываем данные когда задачка в работе или когда в статусе retry
+        } else if (task.status === 1 || task.status === 5) {
           completion = '--'
           execution = '--'
         }
@@ -86,6 +86,9 @@ export const recentTasks = (
             break
         }
 
+        const targetName = task.extra.target_name || '--'
+        const targetType = task.extra.target_type || task.target_type
+
         return {
           args,
           completion,
@@ -103,7 +106,9 @@ export const recentTasks = (
           status: task.status,
           statusDetails: operations,
           target: task.target,
-          targetType: task.target_type,
+          targetName,
+          targetType,
+          // targetType: task.target_type,
           taskName: task.task_name,
           id: task.id,
           zone: task.zone,