bfg-common 1.6.65 → 1.6.67

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

@@ -2,7 +2,7 @@
   <ui-tooltip
     id="tooltip-theme-mode-toggle-button"
     test-id="tooltip-theme-mode-toggle-button"
-    size="md"
+    size="sm"
     position="bottom"
     position-by-tooltip="center"
   >

package/components/common/layout/theHeader/modals/reconnect/New.vue

@@ -1,37 +1,35 @@
 <template>
-  <div class="reconnect-modal-container">
-    <ui-modal
-        :title="props.title"
-        :texts="modalTexts"
-        test-id="reconnect-modal"
-        size="sm"
-        width="560px"
-        show
-        @hide="emits('logout')"
-        @submit="emits('reconnect')"
-    >
-      <template #content>
-        <div class="reconnect-content">
-          <div class="icon-content flex items-center gap-2">
-            <span class="icon-sessions"></span>
-            <span class="description-text">{{
-                localization.common.reconnectDesc
-              }}</span>
-          </div>
-          <div class="timer-block mt-4">
-            <common-countdown-timer
-                :timer="props.timer"
-                :total-time="props.totalTime"
-                is-hide-seconds-text
-            />
-          </div>
+  <ui-modal
+    :title="props.title"
+    :texts="modalTexts"
+    test-id="reconnect-modal"
+    size="sm"
+    width="560px"
+    show
+    @hide="emits('logout')"
+    @submit="emits('reconnect')"
+  >
+    <template #content>
+      <div class="reconnect-content">
+        <div class="icon-content flex items-center gap-2">
+          <span class="icon-sessions"></span>
+          <span class="description-text">{{
+            localization.common.reconnectDesc
+          }}</span>
         </div>
-      </template>
-      <template #footerLeftContent>
-        <span></span>
-      </template>
-    </ui-modal>
-  </div>
+        <div class="timer-block mt-4">
+          <common-countdown-timer
+            :timer="props.timer"
+            :total-time="props.totalTime"
+            is-hide-seconds-text
+          />
+        </div>
+      </div>
+    </template>
+    <template #footerLeftContent>
+      <span></span>
+    </template>
+  </ui-modal>
 </template>
 
 <script lang="ts" setup>
@@ -58,12 +56,6 @@ const modalTexts = ref<UI_I_ModalTexts>({
 </script>
 
 <style lang="scss" scoped>
-.reconnect-modal-container {
-  :deep(.modal), :deep(.modal-background) {
-    z-index: calc(var(--z-modal) + 3);
-  }
-}
-
 .reconnect-content {
   padding: 8px 32px 8px 32px;
 

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

@@ -107,23 +107,24 @@ const passwordErrorText = computed<string>(() => {
 const newPasswordErrorText = computed<string>(() => {
   if (!initValidationFields.value.newPassword) return ''
 
-  // const { current_password, new_password, confirm_password } = modelLocal.value
-  const { current_password, new_password } = modelLocal.value
+  const { current_password, new_password, confirm_password } = modelLocal.value
 
   const validateText = validateField(
     localization.value,
     current_password,
     new_password
   )
-  // const mismatchError = getPasswordMismatchError(
-  //   localization.value,
-  //   new_password,
-  //   confirm_password
-  // )
+  const mismatchError = getPasswordMismatchError(
+    localization.value,
+    new_password,
+    confirm_password
+  )
   if (!new_password) {
     return localization.value.common.fieldRequired
   } else if (validateText) {
     return validateText
+  } else if (mismatchError) {
+    return mismatchError
   } else return ''
 })
 const confirmPasswordErrorText = computed<string>(() => {
@@ -165,7 +166,7 @@ const onHideModal = (): void => {
       color: #9da6ad;
       font-size: 12px;
       font-weight: 400;
-      line-height: 18px;
+      line-height: 14.52px;
       margin-bottom: 20px;
     }
     &__alert {

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

@@ -15,7 +15,6 @@
           <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>
 
@@ -24,7 +23,6 @@
             :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)"
           />
@@ -34,7 +32,6 @@
           <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>
 
@@ -58,7 +55,6 @@
             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>

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

@@ -19,7 +19,6 @@
         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
@@ -27,7 +26,6 @@
         :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)"
       />
@@ -42,7 +40,6 @@
         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
@@ -149,12 +146,8 @@ 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, UI_T_Project } from '~/lib/models/types'
+import type { UI_T_LangValue } 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,7 +24,6 @@ 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
 }>()
 
@@ -42,15 +41,12 @@ const currentComponent = computed(() =>
     : defineAsyncComponent(() => import('./Old.vue'))
 )
 
-/* 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 description = computed<string>(() => {
+  return localization.value.common.languageDesc.replaceAll(
+    '{trademark}',
+    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+  )
+})
 
 const radioOptions = readonly<UI_I_RadioItemLang[]>(
   radioOptionsFunc(localization.value)

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

@@ -8,13 +8,11 @@
 
 <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
 }>()
 
@@ -26,11 +24,7 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-/* TODO SC-2104 */
 const consoleOptions = readonly<UI_I_RadioItemConsole[]>(
-  consoleOptionsFunc(
-    localization.value,
-    props.newView && props.project === 'sphere'
-  )
+  consoleOptionsFunc(localization.value)
 )
 </script>

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

@@ -2,17 +2,14 @@ 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,
-  isSphereNewView: boolean
+  localization: UI_I_Localization
 ): UI_I_RadioItemConsole[] => {
   const config = useRuntimeConfig()
 
-  const remoteConsole = isSphereNewView
-    ? localization.common.remoteConsoleVmrc1
-    : localization.common.remoteConsoleVmrc.replaceAll(
-        '{trademark}',
-        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-      )
+  const remoteConsole = localization.common.remoteConsoleVmrc.replaceAll(
+    '{trademark}',
+    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+  )
 
   return [
     {

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

@@ -12,13 +12,12 @@ 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'))
@@ -29,14 +28,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const config = useRuntimeConfig()
 
-/* TODO SC-2104 */
 const description = computed<string>(() =>
-  props.project === 'sphere'
-    ? localization.value.common.timeFormatDesc1
-    : localization.value.common.timeFormatDesc.replaceAll(
-        '{trademark}',
-        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-      )
+  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.automatic,
+      label: localization.common.languageDefault,
       value: 'DEFAULT',
       testId: 'default-type',
     },

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

@@ -15,9 +15,13 @@
       />
     </div>
 
-    <div class="flex-align-center second-description">
+    <div class="description second-description">
+      {{ localization.myPreferences.showNotificationDescription }}
+    </div>
+
+    <div class="flex-align-center">
       <label for="show-notification">{{
-        localization.myPreferences.showNotificationDescription
+        localization.myPreferences.showNotification
       }}</label>
       <input
         id="show-notification"
@@ -59,10 +63,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

@@ -30,13 +30,10 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-/* 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()}`])
-      )
-)
+const description = computed<string>(() => {
+  return 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-fixed) + 2);
+      z-index: calc(var(--z-default) + 1);
     }
   }
   &:not(.pinned) {
@@ -177,8 +177,6 @@ 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="props.subtitle"
+    :second-title="name"
     :loading="props.isLoading"
     width="576px"
     class="rename"
@@ -68,14 +68,12 @@ 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/monitor/advanced/table/tableOld/TableOld.vue

@@ -1,93 +1,93 @@
-<template>
-  <div class="chart-legend">
-    <span class="title">{{
-      localization.inventoryMonitor.performanceChartLegend
-    }}</span>
-    <client-only>
-      <atoms-table-data-grid
-        v-model:selected-row="selectedRow"
-        v-model:column-keys="columnKeys"
-        v-model:page-size="pageSize"
-        v-model:page="page"
-        :head-items="headAInfo"
-        :body-items="dataBody"
-        :total-items="dataBody.length"
-        :total-pages="1"
-        type="checkbox"
-        class="data-table"
-        test-id="advances-table"
-        hide-page-size
-      >
-        <template #col1="{ item }">
-          <div
-            :style="[{ backgroundColor: item.data.color }]"
-            class="datagrid-column-color-block"
-          ></div>
-        </template>
-      </atoms-table-data-grid>
-    </client-only>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type {
-  UI_I_HeadItem,
-  UI_I_BodyItem,
-  UI_I_ColumnKey,
-} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
-import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
-import * as table from '~/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable'
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const props = defineProps<{
-  data: UI_I_PerformanceItem[]
-}>()
-const emits = defineEmits<{
-  (event: 'select', value: number[]): void
-}>()
-
-const selectedRow = ref<number[]>([])
-const pageSize = ref<number>(100)
-const page = ref<number>(1)
-const headAInfo = computed<UI_I_HeadItem[]>(() =>
-  table.headItems(localization.value)
-)
-const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
-watch(localization, () => {
-  columnKeys.value = table.columnKeys(localization.value)
-})
-const dataBody = ref<UI_I_BodyItem[][]>([])
-
-watch(
-  () => props.data,
-  (newValue) => {
-    if (!newValue) return
-
-    dataBody.value = table.bodyItems(newValue)
-  },
-  { immediate: true }
-)
-watch(
-  selectedRow,
-  (newValue) => {
-    emits('select', newValue)
-  },
-  { deep: true }
-)
-</script>
-
-<style scoped lang="scss">
-.chart-legend {
-  .title {
-    font-weight: 700;
-    height: 20px;
-  }
-
-  .datagrid-column-color-block {
-    width: 16px;
-    height: 16px;
-  }
-}
-</style>
+<template>
+  <div class="chart-legend">
+    <span class="title">{{
+      localization.inventoryMonitor.performanceChartLegend
+    }}</span>
+    <client-only>
+      <atoms-table-data-grid
+        v-model:selected-row="selectedRow"
+        v-model:column-keys="columnKeys"
+        v-model:page-size="pageSize"
+        v-model:page="page"
+        :head-items="headAInfo"
+        :body-items="dataBody"
+        :total-items="dataBody.length"
+        :total-pages="1"
+        type="checkbox"
+        class="data-table"
+        test-id="advances-table"
+        hide-page-size
+      >
+        <template #col1="{ item }">
+          <div
+            :style="[{ backgroundColor: item.data.color }]"
+            class="datagrid-column-color-block"
+          ></div>
+        </template>
+      </atoms-table-data-grid>
+    </client-only>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type {
+  UI_I_HeadItem,
+  UI_I_BodyItem,
+  UI_I_ColumnKey,
+} from '~/components/atoms/table/dataGrid/lib/models/interfaces'
+import type { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/lib/models/interfaces'
+import * as table from '~/components/common/monitor/advanced/table/tableOld/lib/config/performanceDatatable'
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const props = defineProps<{
+  data: UI_I_PerformanceItem[]
+}>()
+const emits = defineEmits<{
+  (event: 'select', value: number[]): void
+}>()
+
+const selectedRow = ref<number[]>([])
+const pageSize = ref<number>(100)
+const page = ref<number>(1)
+const headAInfo = computed<UI_I_HeadItem[]>(() =>
+  table.headItems(localization.value)
+)
+const columnKeys = ref<UI_I_ColumnKey[]>(table.columnKeys(localization.value))
+watch(localization, () => {
+  columnKeys.value = table.columnKeys(localization.value)
+})
+const dataBody = ref<UI_I_BodyItem[][]>([])
+
+watch(
+  () => props.data,
+  (newValue) => {
+    if (!newValue) return
+
+    dataBody.value = table.bodyItems(newValue)
+  },
+  { immediate: true }
+)
+watch(
+  selectedRow,
+  (newValue) => {
+    emits('select', newValue)
+  },
+  { deep: true }
+)
+</script>
+
+<style scoped lang="scss">
+.chart-legend {
+  .title {
+    font-weight: 700;
+    height: 20px;
+  }
+
+  .datagrid-column-color-block {
+    width: 16px;
+    height: 16px;
+  }
+}
+</style>