bfg-common 1.6.49 → 1.6.50

package/components/common/pages/hardwareHealth/historyTestimony/tools/ToolsOld.vue

@@ -83,6 +83,7 @@
     :valid-date-end="props.validDateEnd"
     :format-date="props.formatDate"
     :selected-host-name="props.selectedHostName"
+    :project="props.project"
     @hide="emits('hide-chart-modal')"
     @select-metric-local="emits('select-metric-local', $event)"
     @power-selected-rows-local="emits('power-selected-rows-local', $event)"
@@ -91,21 +92,19 @@
     "
     @update-period-type="emits('update-period-type', $event)"
     @delete-option="emits('delete-option')"
-    @save-option-name="onSaveOptionName"
+    @save-option-name="emits('save-option-name')"
     @submit-options="emits('submit-options', $event)"
   />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_HardwareHealthSensorsGraph } from '~/components/common/pages/hardwareHealth/historyTestimony/lib/models/interfaces'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 import type { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/interfaces'
 import type { UI_T_Chart } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/types'
-import {
-  getCurrentOptionsStorageFunc,
-  viewFunc,
-} from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar'
+import { viewFunc } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar'
 
 const selectedView = defineModel<string>('selectedView', { required: true })
 const selectedPeriod = defineModel<string>('selectedPeriod', { required: true })
@@ -135,6 +134,8 @@ const props = defineProps<{
   chartTitleDate: string
   periodOptions: UI_I_OptionItem[]
   selectedHostName: string
+  optionsNames: string[]
+  project: UI_T_Project
 }>()
 
 const emits = defineEmits<{
@@ -151,16 +152,15 @@ const emits = defineEmits<{
     value: UI_I_HardwareHealthSensorsGraph[]
   ): void
   (event: 'update-period-type', value: string): void
-  (event: 'delete-option'): void
   (event: 'submit-options', value: UI_I_OptionsForm): void
+  (event: 'save-option-name'): void
+  (event: 'delete-option'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const optionsNames = ref<string[]>([])
-
 const viewOptions = computed<UI_I_OptionItem[]>(() =>
-  viewFunc(localization.value, optionsNames.value)
+  viewFunc(localization.value, props.optionsNames)
 )
 
 watch(
@@ -170,7 +170,7 @@ watch(
     if (newValue) currentValue = newValue
     else if (
       selectedView.value &&
-      optionsNames.value.includes(selectedView.value)
+      props.optionsNames.includes(selectedView.value)
     )
       currentValue = selectedView.value
     else currentValue = selectedView.value || viewOptions.value[0]?.value
@@ -179,15 +179,6 @@ watch(
   },
   { immediate: true }
 )
-
-const onSaveOptionName = (): void => {
-  optionsNames.value = getCurrentOptionsStorageFunc()
-}
-
-onMounted(() => {
-  optionsNames.value = getCurrentOptionsStorageFunc()
-  emits('update-tools')
-})
 </script>
 
 <style scoped lang="scss">

package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -87,6 +87,7 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_VerticalTabs } from '~/components/atoms/tabs/lib/models/interfaces'
 import type { UI_T_Chart } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/types'
 import type { UI_I_OptionsForm } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/models/interfaces'
@@ -94,7 +95,11 @@ import type { UI_I_HardwareHealthSensorsGraph } from '~/components/common/pages/
 import { metricsFunc } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/lib/config/optionsMetrics'
 import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/lib/config/dateChecker'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/lib/config/getValidDateByOption'
-import { getCurrentOptionsStorageFunc } from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar'
+import {
+  getCurrentOptionsStorageFunc,
+  removeSelectedOptionsFromStorageFunc,
+  getSelectedOptionsValueFromStorageFunc,
+} from '~/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar'
 
 const props = defineProps<{
   selectedChartOptionName: string
@@ -117,6 +122,7 @@ const props = defineProps<{
   validDateEnd: number
   formatDate: string
   selectedHostName: string
+  project: UI_T_Project
 }>()
 
 const emits = defineEmits<{
@@ -141,6 +147,7 @@ const { $store }: any = useNuxtApp()
 const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
 
 const routeType = '' + useRoute().params.type
+const routeId = '' + useRoute().params.id
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
@@ -389,6 +396,8 @@ const onSaveOptions = (name: string): void => {
     chartType,
     counters,
     metric: selectedMetric.value,
+    validShowName: name,
+    nodeId: routeId,
     timespan: {
       periodType: localTimespanPeriodType.value,
       units: localCustomTime.value,
@@ -396,8 +405,8 @@ const onSaveOptions = (name: string): void => {
       type: timespanType.value,
     },
   }
-  useLocalStorage(`${name}ChartOptionsSensors`, saveOptionsData)
-  optionsNames.value = getCurrentOptionsStorageFunc()
+  useLocalStorage(`ChartOptionsSensors${name}`, saveOptionsData)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
   localSelectedChartOptionName.value = name
   emits('save-option-name')
 }
@@ -418,7 +427,10 @@ const setDefaultOptions = (): void => {
 }
 
 const setCustomOptions = (name: string): void => {
-  const selectedValue = useLocalStorage(name + 'ChartOptionsSensors', undefined)
+  const selectedValue = getSelectedOptionsValueFromStorageFunc(
+    name,
+    props.project
+  )
 
   if (selectedValue.routeType !== routeType) return
 
@@ -462,8 +474,8 @@ watch(
 )
 
 const onDeleteChartName = (name: string): void => {
-  window.localStorage.removeItem(name + 'ChartOptionsSensors')
-  optionsNames.value = getCurrentOptionsStorageFunc()
+  removeSelectedOptionsFromStorageFunc(name, props.project)
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
   setSelectOptions()
   emits('delete-option')
 }
@@ -481,7 +493,7 @@ watch(
 )
 
 onMounted(() => {
-  optionsNames.value = getCurrentOptionsStorageFunc()
+  optionsNames.value = getCurrentOptionsStorageFunc(props.project)
 })
 </script>
 

package/components/common/pages/hardwareHealth/historyTestimony/tools/chartOptionsModal/actions/ActionsNew.vue

@@ -135,7 +135,7 @@ const onSaveNewName = (): void => {
     &:disabled {
       color: var(--chart-options-name-actions-delete-disabled-text-color);
 
-      :deep(.button-icon) {
+      :deep(span) {
         color: #bdc3c7;
         opacity: 0.44;
       }

package/components/common/pages/hardwareHealth/historyTestimony/tools/lib/config/toolbar.ts

@@ -1,4 +1,5 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
 
 export const periodFunc = (
@@ -69,14 +70,76 @@ export const viewFunc = (
   return result
 }
 
-export const getCurrentOptionsStorageFunc = (): string[] => {
+export const getCurrentOptionsStorageFunc = (
+  project: UI_T_Project
+): string[] => {
+  const routeId = useRoute().params.id
+  const routeType = useRoute().params.type
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
   const optionsNames = []
   for (const key of Object.entries(localStorage)) {
-    if (key[0].includes('ChartOptionsSensors')) {
-      if (key[0].includes('ChartOptionsSensors')) {
-        optionsNames.push(key[0].replace('ChartOptionsSensors', ''))
-      }
+    if (
+      key[0].includes('ChartOptionsSensors') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      const values = JSON.parse(key[1])
+
+      if (
+        values.value.routeType === routeType &&
+        values.value.nodeId === routeId
+      )
+        optionsNames.push(values.value.validShowName)
     }
   }
   return optionsNames
 }
+
+export const removeSelectedOptionsFromStorageFunc = (
+  selectedName: string,
+  project: UI_T_Project
+): void => {
+  const routeId = useRoute().params.id
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
+  for (const key of Object.entries(localStorage)) {
+    if (
+      key[0].includes('ChartOptionsSensors') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      let values = JSON.parse(key[1])
+
+      if (
+        values.value.validShowName === selectedName &&
+        values.value.nodeId === routeId
+      )
+        window.localStorage.removeItem(key[0])
+    }
+  }
+}
+
+export const getSelectedOptionsValueFromStorageFunc = (
+  selectedName: string,
+  project: UI_T_Project
+): any => {
+  const routeId = useRoute().params.id
+  const localStoragePrefix = project === 'sphere' ? getLocalStoragePrefix() : ''
+
+  let result = null
+
+  for (const key of Object.entries(localStorage)) {
+    if (
+      key[0].includes('ChartOptionsSensors') &&
+      key[0].includes(localStoragePrefix)
+    ) {
+      let values = JSON.parse(key[1])
+
+      if (
+        values.value.validShowName === selectedName &&
+        values.value.nodeId === routeId
+      )
+        result = values.value
+    }
+  }
+  return result
+}

package/components/common/pages/scheduledTasks/table/lib/models/enums.ts

@@ -2,3 +2,12 @@ export enum UI_E_SchedulerRunStatus {
   RUNNING = 'this task has been started',
   SUCCESS = 'success',
 }
+
+export enum E_SchedulerFrequencyModeLocale {
+  Once = 'once',
+  Startup = 'afterVCenterStartup',
+  Hourly = 'hourly',
+  Daily = 'daily',
+  Weekly = 'weekly',
+  Monthly = 'monthly',
+}

package/components/common/pages/scheduledTasks/table/new/New.vue

@@ -82,16 +82,18 @@
               <ui-icon name="vertical-dotes" width="20" height="20" />
             </span>
           </ui-button>
-          <ui-dropdown
-            :show="actionsShowId === item.data.id"
-            :test-id="`event-table-action-dropdown-${item.data.id}`"
-            :items="schedulerDropActions"
-            :elem-id="`event-table-action-${item.data.id}`"
-            width="max-content"
-            left
-            @select="onSelectAction"
-            @hide="onHideActionsDropdown"
-          />
+          <Teleport to="body">
+            <ui-dropdown
+              :show="actionsShowId === item.data.id"
+              :test-id="`event-table-action-dropdown-${item.data.id}`"
+              :items="schedulerDropActions"
+              :elem-id="`event-table-action-${item.data.id}`"
+              width="max-content"
+              left
+              @select="onSelectAction"
+              @hide="onHideActionsDropdown"
+            />
+          </Teleport>
         </div>
       </template>
 

package/components/common/pages/tasks/Tasks.vue

@@ -58,7 +58,10 @@ const getTasks = async (): Promise<void> => {
     sortBy: sort.value || '',
     filter: filter.value || '',
   }
-  await $store.dispatch('tasks/A_GET_TASKS', payload)
+  await $store.dispatch('tasks/A_GET_TASKS', {
+    data: payload,
+    project: props.project,
+  })
 }
 const onUpdatePagination = (event: UI_I_Pagination): void => {
   pagination.value = event

package/components/common/pages/tasks/table/Table.vue

@@ -67,28 +67,30 @@
             <ui-icon name="vertical-dotes" width="20" height="20" />
           </span>
         </ui-button>
-        <ui-dropdown
-          :show="actionsShowId === item.data.id"
-          :test-id="`data-table-task-dropdown-${item.data.id}`"
-          :items="actions"
-          :elem-id="`data-table-task-action-${item.data.id}`"
-          width="max-content"
-          left
-          @select="onSelectAction(item.data.target, $event)"
-          @hide="onHideActionsDropdown"
-        >
-          <template #row="{ item: dropMenu }">
-            <ui-icon
-              v-if="dropMenu.iconName === 'hide'"
-              name="password-hide"
-              width="16"
-              height="16"
-            />
-            <span class="action-text">
-              {{ dropMenu.text }}
-            </span>
-          </template>
-        </ui-dropdown>
+        <Teleport to="body">
+          <ui-dropdown
+            :show="actionsShowId === item.data.id"
+            :test-id="`data-table-task-dropdown-${item.data.id}`"
+            :items="actions"
+            :elem-id="`data-table-task-action-${item.data.id}`"
+            width="max-content"
+            left
+            @select="onSelectAction(item.data.target, $event)"
+            @hide="onHideActionsDropdown"
+          >
+            <template #row="{ item: dropMenu }">
+              <ui-icon
+                v-if="dropMenu.iconName === 'hide'"
+                name="password-hide"
+                width="16"
+                height="16"
+              />
+              <span class="action-text">
+                {{ dropMenu.text }}
+              </span>
+            </template>
+          </ui-dropdown>
+        </Teleport>
       </div>
     </template>
 
@@ -162,7 +164,7 @@ const texts = computed<UI_I_TableTexts>(() => ({
   searchHere: localization.value.common.searchHere,
   rowsPerPage: localization.value.common.rowsPerPage,
   of: localization.value.common.of,
-  selected: localization.value.common.selected,
+  selected: localization.value.common.selected2,
   columns: localization.value.common.columns,
   previous: localization.value.common.previous,
   next: localization.value.common.next,

package/components/common/readyToComplete/New.vue

@@ -74,6 +74,7 @@ const dataLocal = computed<UI_I_TableInfoItem[]>(() => {
   row-gap: 12px;
   column-gap: 24px;
   margin-top: 16px;
+  padding-bottom: 16px;
 
   &.lang-ru {
     .details-item {

package/components/common/split/vertical/New.vue

@@ -3,13 +3,22 @@
     :id="props.elementId"
     :class="['fill-parent vertical', { dragging: props.isDrag }]"
   >
-    <div :style="props.topPanelStyle" class="vui-horizontal-panel firstPanel">
+    <div
+      :style="props.topPanelStyle"
+      :class="[
+        'vui-horizontal-panel firstPanel',
+        {
+          'hidden-second': !props.bottomPermission,
+        },
+      ]"
+    >
       <div class="vui-horizontal-panel sec-nav-container">
         <slot name="firstPanel" />
       </div>
     </div>
 
     <div
+      v-if="props.bottomPermission"
       :id="`gutter-${props.elementId}`"
       class="gutter gutter-vertical"
       tabindex="0"
@@ -20,7 +29,16 @@
       <div class="gutter-vertical-handler"></div>
     </div>
 
-    <div :style="props.bottomPanelStyle" class="secondPanel bottom">
+    <div
+      v-if="props.bottomPermission"
+      :style="props.bottomPanelStyle"
+      :class="[
+        'secondPanel bottom',
+        {
+          hidden: !props.bottomPermission,
+        },
+      ]"
+    >
       <slot name="secondPanel" />
     </div>
   </div>
@@ -37,6 +55,7 @@ const props = defineProps<{
   isDrag: boolean
   topPanelStyle: UI_I_SplitVerticalStyle
   bottomPanelStyle: UI_I_SplitVerticalStyle
+  bottomPermission: boolean
 }>()
 </script>
 
@@ -52,10 +71,14 @@ const props = defineProps<{
 </style>
 
 <style scoped lang="scss">
-.fill-parent {
+.vertical {
   &.dragging {
     .gutter-vertical.gutter {
-      background-color: var(--gutter-active-bg-color);
+      background-color: var(--new-gutter-active-bg-color);
+
+      &::before {
+        background-color: var(--new-gutter-active-before-bg-color);
+      }
     }
   }
 
@@ -63,6 +86,11 @@ const props = defineProps<{
     max-height: calc(100% - 36px);
     height: calc(100vh - 36px);
 
+    &.hidden-second {
+      max-height: 100%;
+      height: 100% !important;
+    }
+
     .sec-nav-container {
       width: 100%;
       height: 100%;
@@ -95,11 +123,11 @@ const props = defineProps<{
     //}
 
     &:hover {
-      background-color: var(--gutter-hover-bg-color);
+      background-color: var(--new-gutter-hover-bg-color);
       cursor: row-resize;
 
       &:before {
-        background-color: var(--gutter-handler-active-bg-color);
+        background-color: var(--new-gutter-active-before-bg-color);
       }
     }
 
@@ -112,8 +140,9 @@ const props = defineProps<{
       transition-duration: 0.25s;
       width: 24px;
       height: 2px;
-      left: calc(50% - 12px);
-      top: calc(50% - 1px);
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
       border-radius: 4px;
     }
   }
@@ -122,6 +151,11 @@ const props = defineProps<{
     overflow: hidden;
     flex: 1;
     box-shadow: var(--second-panel-box-shadow);
+
+    &.hidden {
+      display: none;
+      height: 0;
+    }
     //z-index: calc(var(--z-default) + 1);
   }
 }

package/components/common/split/vertical/Old.vue

@@ -3,13 +3,22 @@
     :id="props.elementId"
     :class="['fill-parent vertical', { dragging: props.isDrag }]"
   >
-    <div :style="props.topPanelStyle" class="vui-horizontal-panel firstPanel">
+    <div
+      :style="props.topPanelStyle"
+      :class="[
+        'vui-horizontal-panel firstPanel',
+        {
+          'hidden-second': !props.bottomPermission,
+        },
+      ]"
+    >
       <div class="vui-horizontal-panel sec-nav-container">
         <slot name="firstPanel" />
       </div>
     </div>
 
     <div
+      v-if="props.bottomPermission"
       :id="`gutter-${props.elementId}`"
       class="gutter gutter-vertical"
       tabindex="0"
@@ -20,7 +29,16 @@
       <div class="gutter-vertical-handler"></div>
     </div>
 
-    <div :style="props.bottomPanelStyle" class="secondPanel bottom">
+    <div
+      v-if="props.bottomPermission"
+      :style="props.bottomPanelStyle"
+      :class="[
+        'secondPanel bottom',
+        {
+          hidden: !props.bottomPermission,
+        },
+      ]"
+    >
       <slot name="secondPanel" />
     </div>
   </div>
@@ -37,6 +55,7 @@ const props = defineProps<{
   isDrag: boolean
   topPanelStyle: UI_I_SplitVerticalStyle
   bottomPanelStyle: UI_I_SplitVerticalStyle
+  bottomPermission: boolean
 }>()
 </script>
 
@@ -52,6 +71,11 @@ const props = defineProps<{
     max-height: calc(100% - 36px);
     height: calc(100vh - 36px);
 
+    &.hidden-second {
+      max-height: 100%;
+      height: 100% !important;
+    }
+
     .sec-nav-container {
       width: 100%;
       height: 100%;
@@ -109,6 +133,11 @@ const props = defineProps<{
     height: auto;
     overflow: hidden;
     flex: 1;
+
+    &.hidden {
+      display: none;
+      height: 0;
+    }
   }
 }
 </style>

package/components/common/split/vertical/Vertical.vue

@@ -7,6 +7,7 @@
     :is-drag="isDrag"
     :top-panel-style="topPanelStyle"
     :bottom-panel-style="bottomPanelStyle"
+    :bottom-permission="props.bottomPermission"
   >
     <template #firstPanel>
       <slot name="firstPanel" />
@@ -25,6 +26,7 @@
     :is-drag="isDrag"
     :top-panel-style="topPanelStyle"
     :bottom-panel-style="bottomPanelStyle"
+    :bottom-permission="props.bottomPermission"
   >
     <template #firstPanel>
       <slot name="firstPanel" />
@@ -46,12 +48,14 @@ const props = withDefaults(
     topPanelH?: number
     topPanelMinHeight?: number
     bottomPanelMinHeight?: number
+    bottomPermission?: boolean
   }>(),
   {
     topPanelMinHeight: 200, // 200px
     bottomPanelMinHeight: 200, // 200px
     topPanelHForce: '',
     topPanelH: undefined,
+    bottomPermission: true,
   }
 )
 const emits = defineEmits<{

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

@@ -55,13 +55,13 @@
           <div ref="subTitleBlockName">
             <div class="subtitle-block">
               <div
-                  id="name-alert-wrapper"
-                  :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
+                id="name-alert-wrapper"
+                :class="[{ 'mb-4': !isNameAlertWrapperEmpty }]"
               ></div>
               <ui-wizard-subtitle
-                  :sub-title="
-                localization.vmWizard.specifyUniqueNameAndTargetLocationForVm
-              "
+                :sub-title="
+                  localization.vmWizard.specifyUniqueNameAndTargetLocationForVm
+                "
               />
             </div>
           </div>
@@ -153,7 +153,8 @@
             :datastore="props.datastore"
             :is-datastore-loading="props.isDatastoreLoading"
             :get-datastore-table-func="props.getDatastoreTableFunc"
-            :storage="props.vmtSettings?.storage"
+            :storage="storageLocal"
+            @change-storage="setSelectedStorageIdLocal"
             @submit="emits('change-storage', $event)"
             @has-errors="isStorageAlertWrapperEmpty = $event"
           />
@@ -593,6 +594,20 @@ const isNameAlertWrapperEmpty = ref<boolean>(false)
 // const isComputeResourceAlertWrapperEmpty = ref<boolean>(false)
 const isStorageAlertWrapperEmpty = ref<boolean>(false)
 const isCompatibilityAlertWrapperEmpty = ref<boolean>(false)
+
+const storageLocal = computed<UI_I_DatastoreTableItem | undefined>(() => {
+  return selectedStorageLocal.value ?? props.vmtSettings?.storage
+})
+
+/* TODO: В дальнейшем необходимо вынести все данные наружу и передавать его через v-model */
+// рефакторинг. При возврате на шаг выбора хранилища ранее выбранное хранилище не отображается как выбранное.
+// Для хранилища в v-model необходимо сохранять ID хранилища, а не ключ индекса.
+const selectedStorageLocal = ref<UI_I_DatastoreTableItem | null>(null)
+const setSelectedStorageIdLocal = (datastore: UI_I_DatastoreTableItem) => {
+  selectedStorageLocal.value = {
+    id: datastore.id,
+  } as UI_I_DatastoreTableItem
+}
 </script>
 
 <style>