bfg-common 1.5.706 → 1.5.708

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

@@ -1,144 +1,144 @@
-<template>
-  <atoms-modal
-    :title="localization.common.preferences"
-    :modal-loading="isLoading || props.securityLoader"
-    test-id="user-preferences-modal"
-    width="580px"
-    height="420px"
-    show
-    @hide="onHide"
-  >
-    <template #modalBody>
-      <atoms-nav-bar
-        v-model="selectedTab"
-        :items="tabsItems"
-        test-id="user-preferences-nav-bar"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-time-format
-        v-if="selectedTab === 'time-tab'"
-        :new-view="props.newView"
-        :time-format="props.timeFormat"
-        @update-time-format="emits('update-time-format', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-change-language
-        v-if="selectedTab === 'language-tab'"
-        :new-view="props.newView"
-        :selected-type="props.selectedLanguageType"
-        :selected-language="props.selectedLanguage"
-        @update-language="emits('update-language', $event)"
-        @update-is-browser="emits('update-is-browser', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-inventory
-        v-if="selectedTab === 'inventory-tab' && isSphere"
-        :new-view="props.newView"
-        :vm-cluster="props.vmCluster"
-        @update-vm-clusters="emits('update-vm-clusters', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-default-console
-        v-if="selectedTab === 'console-tab' && isSphere"
-        :new-view="props.newView"
-        :remote-console="props.remoteConsole"
-        @update-remote-console="emits('update-remote-console', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-security
-        v-if="selectedTab === 'security-tab'"
-        v-model:security="security"
-        :recovery="props.recovery"
-        @confirm="emits('security-confirm', $event)"
-      />
-
-      <common-layout-the-header-user-menu-modals-preferences-view
-        v-if="selectedTab === 'view-tab'"
-        :new-view="props.newView"
-        :new-view-local="props.newViewLocal"
-        @update-is-new-view="emits('update-is-new-view', $event)"
-      />
-    </template>
-
-    <template #modalFooter>
-      <button
-        id="user-preferences-cancel-button"
-        data-id="user-preferences-cancel-button"
-        class="btn btn-outline"
-        @click="onHide"
-      >
-        {{ localization.common.cancel }}
-      </button>
-      <button
-        id="user-preferences-apply-button"
-        data-id="user-preferences-apply-button"
-        class="btn btn-primary"
-        @click="onSubmit"
-      >
-        {{ localization.common.save }}
-      </button>
-    </template>
-  </atoms-modal>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
-import type { UI_T_UserPreferenceTab } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types'
-import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
-import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
-import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
-
-const security = defineModel<boolean>('security')
-
-const props = defineProps<{
-  project: UI_T_Project
-  timeFormat: UI_T_TimeValue
-  selectedLanguage: UI_T_LangValue
-  selectedLanguageType: UI_T_LangValue
-  newView: boolean
-  newViewLocal: boolean
-  remoteConsole: string
-  vmCluster: boolean
-  securityLoader: boolean // для Сферы
-  recovery: UI_I_Recovery | null // для Сферы
-}>()
-const emits = defineEmits<{
-  (event: 'hide'): void
-  (event: 'update-time-format', value: UI_T_TimeValue): void
-  (event: 'update-language', value: string): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'update-is-new-view', value: boolean): void
-  (event: 'update-remote-console', value: string): void
-  (event: 'update-vm-clusters', value: boolean): void
-  (event: 'security-confirm', value: boolean): void
-  (event: 'submit'): void
-}>()
-
-// const { $store }: any = useNuxtApp()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isLoading = ref<boolean>(false)
-
-const isSphere = ref<boolean>(props.project === 'sphere')
-const selectedTab = ref<UI_T_UserPreferenceTab>('time-tab')
-
-const tabsItems = computed<UI_I_CollapseNavItem[]>(() =>
-  preferencesTabs(localization.value, props.project)
-)
-
-const onSubmit = (): void => {
-  isLoading.value = true
-  emits('submit')
-}
-
-const onHide = (): void => {
-  emits('hide')
-
-  if (isSphere.value) {
-    selectedTab.value = 'time-tab'
-  }
-}
-</script>
+<template>
+  <atoms-modal
+    :title="localization.common.preferences"
+    :modal-loading="isLoading || props.securityLoader"
+    test-id="user-preferences-modal"
+    width="580px"
+    height="420px"
+    show
+    @hide="onHide"
+  >
+    <template #modalBody>
+      <atoms-nav-bar
+        v-model="selectedTab"
+        :items="tabsItems"
+        test-id="user-preferences-nav-bar"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-time-format
+        v-if="selectedTab === 'time-tab'"
+        :new-view="props.newView"
+        :time-format="props.timeFormat"
+        @update-time-format="emits('update-time-format', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-change-language
+        v-if="selectedTab === 'language-tab'"
+        :new-view="props.newView"
+        :selected-type="props.selectedLanguageType"
+        :selected-language="props.selectedLanguage"
+        @update-language="emits('update-language', $event)"
+        @update-is-browser="emits('update-is-browser', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-inventory
+        v-if="selectedTab === 'inventory-tab' && isSphere"
+        :new-view="props.newView"
+        :vm-cluster="props.vmCluster"
+        @update-vm-clusters="emits('update-vm-clusters', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-default-console
+        v-if="selectedTab === 'console-tab' && isSphere"
+        :new-view="props.newView"
+        :remote-console="props.remoteConsole"
+        @update-remote-console="emits('update-remote-console', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-security
+        v-if="selectedTab === 'security-tab'"
+        v-model:security="security"
+        :recovery="props.recovery"
+        @confirm="emits('security-confirm', $event)"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-view
+        v-if="selectedTab === 'view-tab'"
+        :new-view="props.newView"
+        :new-view-local="props.newViewLocal"
+        @update-is-new-view="emits('update-is-new-view', $event)"
+      />
+    </template>
+
+    <template #modalFooter>
+      <button
+        id="user-preferences-cancel-button"
+        data-id="user-preferences-cancel-button"
+        class="btn btn-outline"
+        @click="onHide"
+      >
+        {{ localization.common.cancel }}
+      </button>
+      <button
+        id="user-preferences-apply-button"
+        data-id="user-preferences-apply-button"
+        class="btn btn-primary"
+        @click="onSubmit"
+      >
+        {{ localization.common.save }}
+      </button>
+    </template>
+  </atoms-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_CollapseNavItem } from '~/components/atoms/collapse/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LangValue, UI_T_Project } from '~/lib/models/types'
+import type { UI_T_UserPreferenceTab } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types'
+import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
+import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces'
+import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
+
+const security = defineModel<boolean>('security')
+
+const props = defineProps<{
+  project: UI_T_Project
+  timeFormat: UI_T_TimeValue
+  selectedLanguage: UI_T_LangValue
+  selectedLanguageType: UI_T_LangValue
+  newView: boolean
+  newViewLocal: boolean
+  remoteConsole: string
+  vmCluster: boolean
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'update-time-format', value: UI_T_TimeValue): void
+  (event: 'update-language', value: string): void
+  (event: 'update-is-browser', value: string): void
+  (event: 'update-is-new-view', value: boolean): void
+  (event: 'update-remote-console', value: string): void
+  (event: 'update-vm-clusters', value: boolean): void
+  (event: 'security-confirm', value: boolean): void
+  (event: 'submit'): void
+}>()
+
+// const { $store }: any = useNuxtApp()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isLoading = ref<boolean>(false)
+
+const isSphere = ref<boolean>(props.project === 'sphere')
+const selectedTab = ref<UI_T_UserPreferenceTab>('time-tab')
+
+const tabsItems = computed<UI_I_CollapseNavItem[]>(() =>
+  preferencesTabs(localization.value, props.project)
+)
+
+const onSubmit = (): void => {
+  isLoading.value = true
+  emits('submit')
+}
+
+const onHide = (): void => {
+  emits('hide')
+
+  if (isSphere.value) {
+    selectedTab.value = 'time-tab'
+  }
+}
+</script>

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

@@ -1,6 +1,16 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-layout-the-header-user-menu-modals-preferences-change-language-new
+    v-if="props.newView"
+    :selected-language="selectedLanguageLocal"
+    :description="description"
+    :radio-options="radioOptions"
+    :language-mode="languageMode"
+    :locales="locales"
+    @update-language="onSelectLang"
+    @update-is-browser="onUpdateIsBrowser"
+  />
+  <common-layout-the-header-user-menu-modals-preferences-change-language-old
+    v-else
     :selected-language="selectedLanguageLocal"
     :description="description"
     :radio-options="radioOptions"
@@ -37,12 +47,6 @@ const emits = defineEmits<{
 const config = useRuntimeConfig()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
 const description = computed<string>(() => {
   return localization.value.common.languageDesc.replaceAll(
     '{trademark}',
@@ -105,4 +109,7 @@ watch(
   },
   { immediate: true }
 )
+
+// TODO remove
+// const localsLocal = ref<any>(locales.filter((_, i) => i > 0))
 </script>

package/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/{New.vue → ChangeLanguageNew.vue}

@@ -19,7 +19,7 @@
             :test-id="item.testId"
             :label="item.label"
             :value="item.value"
-            size="md"
+            size="sm"
           />
 
           <span v-if="item.selectLang" class="select-language">
@@ -56,6 +56,7 @@ const emits = defineEmits<{
   (event: 'update-is-browser', value: string): void
 }>()
 
+// const config = useRuntimeConfig()
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const selectedLanguageLocal = computed<UI_I_Dropdown>({

package/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/{Old.vue → ChangeLanguageOld.vue}

@@ -53,6 +53,8 @@ const emits = defineEmits<{
   (event: 'update-is-browser', value: string): void
 }>()
 
+// const config = useRuntimeConfig()
+
 const selectedLanguageLocal = computed<UI_T_LangValue>({
   get() {
     return props.selectedLanguage

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

@@ -1,6 +1,11 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-layout-the-header-user-menu-modals-preferences-default-console-new
+    v-if="props.newView"
+    v-model="consoleValue"
+    :console-options="consoleOptions"
+  />
+  <common-layout-the-header-user-menu-modals-preferences-default-console-old
+    v-else
     v-model="consoleValue"
     :console-options="consoleOptions"
   />
@@ -20,12 +25,6 @@ const emits = defineEmits<{
   (event: 'update-remote-console', value: string): void
 }>()
 
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const consoleOptions = readonly<UI_I_RadioItemConsole[]>(

package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/{New.vue → DefaultConsoleNew.vue}

@@ -25,7 +25,7 @@
             :label="item.label"
             :value="item.value"
             :disabled="item.disabled"
-            size="md"
+            size="sm"
           />
         </div>
       </div>
@@ -37,13 +37,13 @@
 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'
 
-const consoleValue = defineModel<string>()
-
 const props = defineProps<{
   consoleOptions: UI_I_RadioItemConsole[]
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const consoleValue = defineModel<string>()
 </script>
 
 <style lang="scss" scoped>

package/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/{Old.vue → DefaultConsoleOld.vue}

@@ -30,13 +30,13 @@
 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'
 
-const consoleValue = defineModel<string>()
-
 const props = defineProps<{
   consoleOptions: UI_I_RadioItemConsole[]
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const consoleValue = defineModel<string>()
 </script>
 
 <style lang="scss" scoped>

package/components/common/layout/theHeader/userMenu/modals/preferences/inventory/Inventory.vue

@@ -1,5 +1,12 @@
 <template>
-  <component :is="currentComponent" v-model="vmInHostsClusters" />
+  <common-layout-the-header-user-menu-modals-preferences-inventory-new
+    v-if="props.newView"
+    v-model="vmInHostsClusters"
+  />
+  <common-layout-the-header-user-menu-modals-preferences-inventory-old
+    v-else
+    v-model="vmInHostsClusters"
+  />
 </template>
 
 <script setup lang="ts">
@@ -12,12 +19,6 @@ const emits = defineEmits<{
   (event: 'update-vm-clusters', value: boolean): void
 }>()
 
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
 const vmInHostsClusters = computed<boolean>({
   get() {
     return props.vmCluster

package/components/common/layout/theHeader/userMenu/modals/preferences/inventory/{New.vue → InventoryNew.vue}

@@ -20,7 +20,6 @@
           v-model="vmInHostsClusters"
           :label-text="localization.common.virtualMachinesLabel"
           test-id="user-preferences-inventory-show-vms-checkbox"
-          size="md"
         />
       </div>
     </div>
@@ -30,7 +29,7 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const vmInHostsClusters = defineModel<boolean>()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const vmInHostsClusters = defineModel<boolean>()
 </script>

package/components/common/layout/theHeader/userMenu/modals/preferences/inventory/{Old.vue → InventoryOld.vue}

@@ -23,9 +23,9 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
-const vmInHostsClusters = defineModel<boolean>()
-
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const vmInHostsClusters = defineModel<boolean>()
 </script>
 
 <style lang="scss" scoped></style>

package/components/common/layout/theHeader/userMenu/modals/preferences/lib/models/types.ts

@@ -1,7 +1,7 @@
-export type UI_T_UserPreferenceTab =
-  | 'time-tab'
-  | 'language-tab'
-  | 'console-tab'
-  | 'inventory-tab'
-  | 'security-tab'
-  | 'view-tab'
+export type UI_T_UserPreferenceTab =
+  | 'time-tab'
+  | 'language-tab'
+  | 'console-tab'
+  | 'inventory-tab'
+  | 'security-tab'
+  | 'view-tab'