bfg-common 1.6.95 → 1.6.97

package/components/common/layout/theHeader/userMenu/modals/preferences/New.vue

@@ -15,6 +15,7 @@
           <common-layout-the-header-user-menu-modals-preferences-time-format
             v-model:time-format="timeFormat"
             :new-view="props.newView"
+            :project="props.project"
           />
         </ui-modal-block-form-standard>
 
@@ -23,6 +24,7 @@
             :new-view="props.newView"
             :selected-type="props.selectedLanguageType"
             :selected-language="props.selectedLanguage"
+            :project="props.project"
             @update-language="emits('update-language', $event)"
             @update-is-browser="emits('update-is-browser', $event)"
           />
@@ -32,6 +34,7 @@
           <common-layout-the-header-user-menu-modals-preferences-default-console
             v-model="consoleValue"
             :new-view="props.newView"
+            :project="props.project"
           />
         </ui-modal-block-form-standard>
 
@@ -55,6 +58,7 @@
             v-model:new-view-local="newViewLocal"
             v-model:is-show-notification="isShowNotification"
             :new-view="props.newView"
+            :project="props.project"
           />
         </ui-modal-block-form-standard>
       </ui-modal-block-standard>
@@ -113,4 +117,7 @@ const onHide = (): void => {
 :deep(.form-second-title) {
   line-height: normal;
 }
+:deep(.form-second-title) {
+  color: #9da6ad;
+}
 </style>

package/components/common/layout/theHeader/userMenu/modals/preferences/Old.vue

@@ -19,6 +19,7 @@
         v-if="selectedTab === 'time-tab'"
         v-model:time-format="timeFormat"
         :new-view="props.newView"
+        :project="props.project"
       />
 
       <common-layout-the-header-user-menu-modals-preferences-change-language
@@ -26,6 +27,7 @@
         :new-view="props.newView"
         :selected-type="props.selectedLanguageType"
         :selected-language="props.selectedLanguage"
+        :project="props.project"
         @update-language="emits('update-language', $event)"
         @update-is-browser="emits('update-is-browser', $event)"
       />
@@ -40,6 +42,7 @@
         v-if="selectedTab === 'console-tab' && isSphere"
         v-model="consoleValue"
         :new-view="props.newView"
+        :project="props.project"
       />
 
       <common-layout-the-header-user-menu-modals-preferences-security
@@ -55,6 +58,7 @@
         v-model:new-view-local="newViewLocal"
         v-model:is-show-notification="isShowNotification"
         :new-view="props.newView"
+        :project="props.project"
       />
     </template>
 
@@ -145,8 +149,12 @@ const isOn2FaImportant = ref<boolean>(false)
 watch(
   topNotifications,
   (newValue) => {
-    if (newValue === UI_E_TopNotificationActionId.on2Fa || newValue === UI_E_TopNotificationActionId.on2FaImportant) {
-      isOn2FaImportant.value = newValue === UI_E_TopNotificationActionId.on2FaImportant
+    if (
+      newValue === UI_E_TopNotificationActionId.on2Fa ||
+      newValue === UI_E_TopNotificationActionId.on2FaImportant
+    ) {
+      isOn2FaImportant.value =
+        newValue === UI_E_TopNotificationActionId.on2FaImportant
       selectedTab.value = 'security-tab'
       $store.dispatch('main/A_SET_TOP_NOTIFICATION_ACTION_ID', -1)
     }

package/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/ChangeLanguage.vue

@@ -11,7 +11,7 @@
 
 <script setup lang="ts">
 import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_T_LangValue } from '~/lib/models/types'
+import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
 import type { UI_T_SelectedRadio } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioItemLang } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/models/interfaces'
@@ -24,6 +24,7 @@ import { defineBrowserLangFunc } from '~/components/common/layout/theHeader/lib/
 const props = defineProps<{
   newView: boolean
   selectedType: UI_T_LangValue
+  project: UI_T_Project
   selectedLanguage: UI_I_Dropdown | UI_T_LangValue
 }>()
 
@@ -41,12 +42,15 @@ const currentComponent = computed(() =>
     : defineAsyncComponent(() => import('./Old.vue'))
 )
 
-const description = computed<string>(() => {
-  return localization.value.common.languageDesc.replaceAll(
-    '{trademark}',
-    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-  )
-})
+/* TODO SC-2104 */
+const description = computed<string>(() =>
+  props.project === 'sphere'
+    ? localization.value.common.languageDesc1
+    : localization.value.common.languageDesc.replaceAll(
+        '{trademark}',
+        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+      )
+)
 
 const radioOptions = readonly<UI_I_RadioItemLang[]>(
   radioOptionsFunc(localization.value)
@@ -64,7 +68,7 @@ const setPreferenceLang = (language: string): void => {
   let currentLang = language
 
   language === 'BROWSER' &&
-    (currentLang = findInLocals(defineBrowserLangFunc()).value)
+    (currentLang = findInLocals(defineBrowserLangFunc())) // PC-3178
 
   emits('update-language', currentLang)
 }

package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/DefaultConsole.vue

@@ -8,11 +8,13 @@
 
 <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_RadioItemConsole } from '~/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/models/interfaces'
 import { consoleOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/config/consoleOptions'
 
 const consoleValue = defineModel<string>()
 const props = defineProps<{
+  project: UI_T_Project
   newView: boolean
 }>()
 
@@ -24,7 +26,11 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+/* TODO SC-2104 */
 const consoleOptions = readonly<UI_I_RadioItemConsole[]>(
-  consoleOptionsFunc(localization.value)
+  consoleOptionsFunc(
+    localization.value,
+    props.newView && props.project === 'sphere'
+  )
 )
 </script>

package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/config/consoleOptions.ts

@@ -2,14 +2,17 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioItemConsole } from '~/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/models/interfaces'
 
 export const consoleOptionsFunc = (
-  localization: UI_I_Localization
+  localization: UI_I_Localization,
+  isSphereNewView: boolean
 ): UI_I_RadioItemConsole[] => {
   const config = useRuntimeConfig()
 
-  const remoteConsole = localization.common.remoteConsoleVmrc.replaceAll(
-    '{trademark}',
-    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-  )
+  const remoteConsole = isSphereNewView
+    ? localization.common.remoteConsoleVmrc1
+    : localization.common.remoteConsoleVmrc.replaceAll(
+        '{trademark}',
+        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+      )
 
   return [
     {

package/components/common/layout/theHeader/userMenu/modals/preferences/security/Security.vue

@@ -18,6 +18,7 @@
 
 <script setup lang="ts">
 import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+import { sendTask } from '~/lib/utils/sendTask'
 
 const security = defineModel<boolean>('security')
 
@@ -50,43 +51,62 @@ const otpDisabledErrorApiText = ref<string>('')
 const onConfirm = async (): Promise<void> => {
   otpErrorApiText.value = ''
   isOtpLoading.value = true
-  const { data, error } = await useMyFetch<any, any>('ui/auth/2fa/confirm', {
-    method: 'POST',
-    body: {
+
+  // IdentityProviders.UserTwoFactorConfirm
+
+  await sendTask({
+    method: 'IdentityProviders.UserTwoFactorConfirm',
+    target: 'UserTwoFactorConfirm',
+    args: {
       otp: otp.value,
     },
   })
+
+  // const { data, error } = await useMyFetch<any, any>('ui/auth/2fa/confirm', {
+  //   method: 'POST',
+  //   body: {
+  //     otp: otp.value,
+  //   },
+  // })
+
   isOtpLoading.value = false
-  otpErrorApiText.value = error.value.data
-  if (data.value) {
-    otpEnabledSuccess.value = true
-    otpDisabledSuccess.value = false
-    initialSecurity.value = true
-    otp.value = ''
-    emits('confirm', true)
-  }
+  // otpErrorApiText.value = error.value.data
+  // if (data.value) {
+  otpEnabledSuccess.value = true
+  otpDisabledSuccess.value = false
+  initialSecurity.value = true
+  otp.value = ''
+  emits('confirm', true)
+  // }
 }
 
 const otpDisabledSuccess = ref<boolean>(false)
 const onDisabled = async (): Promise<void> => {
   isOtpLoading.value = true
-  const { data, error } = await useMyFetch<any, I_ErrorResponse>(
-    'ui/auth/2fa/disable',
-    {
-      method: 'POST',
-      body: {
-        otp: otp.value,
-      },
-    }
-  )
-  otpDisabledErrorApiText.value = error.value.data
-  if (data.value) {
-    otpDisabledSuccess.value = true
-    otpEnabledSuccess.value = false
-    initialSecurity.value = false
-    otp.value = ''
-    emits('confirm', false)
-  }
+  // const { data, error } = await useMyFetch<any, I_ErrorResponse>(
+  //   'ui/auth/2fa/disable',
+  //   {
+  //     method: 'POST',
+  //     body: {
+  //       otp: otp.value,
+  //     },
+  //   }
+  // )
+  await sendTask({
+    method: 'IdentityProviders.UserTwoFactorDisable',
+    target: 'UserTwoFactorDisable',
+    args: {
+      otp: otp.value,
+    },
+  })
   isOtpLoading.value = false
+  // otpDisabledErrorApiText.value = error.value.data
+  // if (data.value) {
+  otpDisabledSuccess.value = true
+  otpEnabledSuccess.value = false
+  initialSecurity.value = false
+  otp.value = ''
+  emits('confirm', false)
+  // }
 }
 </script>

package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/TimeFormat.vue

@@ -12,12 +12,13 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioItem } from '~/components/common/layout/theHeader/userMenu/lib/models/interfaces'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
 import { formatOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 const props = defineProps<{
+  project: UI_T_Project
   newView: boolean
 }>()
-
 const currentComponent = computed(() =>
   props.newView
     ? defineAsyncComponent(() => import('./New.vue'))
@@ -28,11 +29,14 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const config = useRuntimeConfig()
 
+/* TODO SC-2104 */
 const description = computed<string>(() =>
-  localization.value.common.timeFormatDesc.replaceAll(
-    '{trademark}',
-    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-  )
+  props.project === 'sphere'
+    ? localization.value.common.timeFormatDesc1
+    : localization.value.common.timeFormatDesc.replaceAll(
+        '{trademark}',
+        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+      )
 )
 
 const formatOptions = readonly<UI_I_RadioItem[]>(

package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions.ts

@@ -7,7 +7,7 @@ export const formatOptionsFunc = (
   return [
     {
       id: 1,
-      label: localization.common.languageDefault,
+      label: localization.common.automatic,
       value: 'DEFAULT',
       testId: 'default-type',
     },

package/components/common/layout/theHeader/userMenu/modals/preferences/view/New.vue

@@ -16,26 +16,31 @@
         <div class="flex-align-center new-view-switch-container">
           <ui-switch
             v-model="newViewLocal"
-            :label="localization.common.newView"
+            :label="localization.common.newInterface"
             test-id="view-switch"
           />
         </div>
+
+        <div class="form-second-title mt-2">
+          {{ localization.myPreferences.switchInterfaceDescription }}
+        </div>
       </div>
     </div>
+    <div class="view-form-line"></div>
     <div class="flex mt-4">
-      <div style="width: 38px" class="mr-3"></div>
-      <div>
-        <div class="form-second-title">
-          {{ localization.myPreferences.showNotificationDescription }}
-        </div>
-
+      <div style="min-width: 50px"></div>
+      <div class="w-full">
         <div class="flex-align-center new-view-switch-container">
           <ui-switch
             v-model="isShowNotification"
-            :label="localization.myPreferences.showNotification"
+            :label="localization.myPreferences.notifications"
             test-id="show-notification-switch"
           />
         </div>
+
+        <div class="form-second-title last-title mt-2">
+          {{ localization.myPreferences.showNotificationDescription }}
+        </div>
       </div>
     </div>
   </form>
@@ -61,4 +66,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
     font-weight: 400;
   }
 }
+.view-form-line {
+  border-bottom: 1px solid var(--horizontal-line);
+  margin-left: 50px;
+}
+.last-title {
+  margin-bottom: 0;
+}
 </style>

package/components/common/layout/theHeader/userMenu/modals/preferences/view/Old.vue

@@ -15,14 +15,12 @@
       />
     </div>
 
-    <div class="description second-description">
-      {{ localization.myPreferences.showNotificationDescription }}
-    </div>
-
-    <div class="flex-align-center">
-      <label for="view">{{ localization.myPreferences.showNotification }}</label>
+    <div class="flex-align-center second-description">
+      <label for="show-notification">{{
+        localization.myPreferences.showNotificationDescription
+      }}</label>
       <input
-        id="view"
+        id="show-notification"
         v-model="isShowNotification"
         type="checkbox"
         class="switch"
@@ -33,17 +31,19 @@
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const newViewLocal = defineModel<boolean>()
 const isShowNotification = defineModel<boolean>('isShowNotification')
 
 const props = defineProps<{
   description: string
+  project: UI_T_Project
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const isDisabled = ref<boolean>(true)
+const isDisabled = ref<boolean>(props.project !== 'sphere') // TODO
 // @ts-ignore
 window.tools = new Proxy(
   {},
@@ -59,10 +59,10 @@ window.tools = new Proxy(
 <style lang="scss" scoped>
 .description {
   margin-bottom: 10px;
+}
 
-  &.second-description {
-    margin-top: 20px;
-  }
+.second-description {
+  margin-top: 20px;
 }
 
 label {

package/components/common/layout/theHeader/userMenu/modals/preferences/view/View.vue

@@ -3,18 +3,21 @@
     :is="currentComponent"
     v-model="newViewLocal"
     v-model:is-show-notification="isShowNotification"
+    :project="props.project"
     :description="description"
   />
 </template>
 
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const newViewLocal = defineModel<boolean>('newViewLocal')
 const isShowNotification = defineModel<boolean>('isShowNotification')
 
 const props = defineProps<{
   newView: boolean
+  project: UI_T_Project
 }>()
 
 const config = useRuntimeConfig()
@@ -27,10 +30,13 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const description = computed<string>(() => {
-  return localization.value.common.viewDesc.replaceAll(
-    '{trademark}',
-    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-  )
-})
+/* TODO SC-2104 */
+const description = computed<string>(() =>
+  props.project === 'sphere'
+    ? localization.value.common.viewDesc1
+    : localization.value.common.viewDesc.replaceAll(
+        '{trademark}',
+        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+      )
+)
 </script>

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -143,7 +143,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   &.pinned {
     .nav-context {
       position: relative;
-      z-index: calc(var(--z-default) + 1);
+      z-index: calc(var(--z-fixed) + 2);
     }
   }
   &:not(.pinned) {
@@ -177,6 +177,8 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       }
     }
     &:not(.collapsed) {
+      min-width: 240px;
+
       :deep(.tooltip-container-hover) {
         display: none;
       }

package/components/common/modals/Rename.vue

@@ -2,7 +2,7 @@
   <atoms-modal
     :test-id="`${props.testId}-rename`"
     :title="localization.common.rename"
-    :second-title="name"
+    :second-title="props.subtitle"
     :loading="props.isLoading"
     width="576px"
     class="rename"
@@ -68,12 +68,14 @@ const props = withDefaults(
   defineProps<{
     testId: string
     name: string
+    subtitle?: string
     label?: string
     regex?: string
     errorText?: string
     isLoading?: boolean
   }>(),
   {
+    subtitle: '',
     label: 'enterNewName',
     regex: undefined,
     errorText: undefined,

package/components/common/modals/newFolder/new/Location.vue

@@ -17,7 +17,24 @@
         <template #content="{ node }">
           <div v-if="node.type === 'parent'" class="flex-align-center">
             <span :class="['node-icon', node.iconClassName]"></span>
-            <span class="node-name">{{ node.name }}</span>
+            <ui-tooltip
+              :id="`create-${props.type}-location-tooltip`"
+              :test-id="`create-${props.type}-tooltip`"
+              size="md"
+              position="bottom"
+              position-by-tooltip="center"
+              show-type="variant-1"
+              class="text-ellipsis"
+            >
+              <template #target>
+                <span class="node-name text-ellipsis">
+                  {{ node.name }}
+                </span>
+              </template>
+              <template #content>
+                {{ node.name }}
+              </template>
+            </ui-tooltip>
           </div>
           <div
             v-if="node.type === 'child'"
@@ -130,6 +147,9 @@ const tooltipContentText = computed<string>(() => {
 
       .node-wrapper {
         --ui-tree-group-line-left: 11px; // переопределить значение CSS-переменной в нужном месте
+        .group-line {
+          height: 25px !important;
+        }
         .toggle-button {
           min-width: 16px;
 

package/components/common/monitor/advanced/Advanced.vue

@@ -23,14 +23,15 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
     :format-date="props.formatDate"
     :selected-table-row="selectedTableRow"
     :selected-node-name="props.selectedNodeName"
-    project="procurator"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @update-tools="emits('update-tools', $event)"
     @export-graph="onExporting"
     @open-advanced-page="emits('open-advanced-page')"
@@ -69,13 +70,14 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="totalCores"
     :host-id="props.hostId"
-    :selected-objects="props.selectedObjects"
     :objects-loading="props.objectsLoading"
     :objects-data="props.objectsData"
     :valid-date-end="props.validDateEnd"
     :format-date="props.formatDate"
     :selected-table-row="selectedTableRow"
-    project="procurator"
+    :project="props.project"
+    :power-data="props.powerData"
+    :temperature-data="props.temperatureData"
     @update-tools="emits('update-tools', $event)"
     @export-graph="onExporting"
     @open-advanced-page="emits('open-advanced-page')"
@@ -129,12 +131,13 @@ const props = withDefaults(
     customTimeFrom: string
     customTimeTo: string
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
     formatDate: string
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
     isEmpty?: boolean

package/components/common/monitor/advanced/AdvancedNew.vue

@@ -36,13 +36,14 @@
         :custom-time-to="props.customTimeTo"
         :total-cores="props.totalCores"
         :host-id="props.hostId"
-        :selected-objects="props.selectedObjects"
         :project="props.project"
         :objects-loading="props.objectsLoading"
         :objects-data="props.objectsData"
         :valid-date-end="props.validDateEnd"
         :format-date="props.formatDate"
         :selected-node-name="props.selectedNodeName"
+        :power-data="props.powerData"
+        :temperature-data="props.temperatureData"
         @update-tools="emits('update-tools', $event)"
         @exporting="emits('export-graph', $event)"
         @open-advanced-page="emits('open-advanced-page')"
@@ -117,13 +118,14 @@ const props = withDefaults(
     customTimeTo: string
     totalCores: number
     hostId: string
-    selectedObjects: string
     project: UI_T_Project
     objectsLoading: boolean
     objectsData: UI_I_ObjectItem[]
     validDateEnd: number
     formatDate: string
     selectedTableRow: number[]
+    powerData: UI_I_AdvancedCounterItem[]
+    temperatureData: UI_I_AdvancedCounterItem[]
     disabledPeriod?: boolean
     disabledView?: boolean
     isEmpty?: boolean