bfg-common 1.5.773 → 1.5.775

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

@@ -1,22 +1,48 @@
 <template>
-  <component
-    :is="currentComponent"
+  <common-layout-the-header-user-menu-modals-preferences-new
+    v-if="props.newView"
     v-model:security="security"
-    v-model:is-show-notification="isShowNotification"
-    v-model:new-view-local="newViewLocal"
-    v-model:time-format="timeFormat"
-    v-model:console-value="consoleValue"
-    v-model:vm-in-hosts-clusters="vmInHostsClusters"
     :project="props.project"
+    :time-format="props.timeFormat"
     :new-view="props.newView"
+    :new-view-local="props.newViewLocal"
     :selected-language-type="props.selectedLanguageType"
     :selected-language="props.selectedLanguage"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
     :security-loader="props.securityLoader"
     :recovery="props.recovery"
     @hide="emits('hide')"
     @reset="emits('reset')"
+    @update-time-format="emits('update-time-format', $event)"
     @update-language="emits('update-language', $event)"
     @update-is-browser="emits('update-is-browser', $event)"
+    @update-is-new-view="emits('update-is-new-view', $event)"
+    @update-remote-console="emits('update-remote-console', $event)"
+    @update-vm-clusters="emits('update-vm-clusters', $event)"
+    @security-confirm="emits('security-confirm', $event)"
+    @submit="emits('submit')"
+  />
+  <common-layout-the-header-user-menu-modals-preferences-old
+    v-else
+    v-model:security="security"
+    :project="props.project"
+    :time-format="props.timeFormat"
+    :new-view="props.newView"
+    :new-view-local="props.newViewLocal"
+    :selected-language-type="props.selectedLanguageType"
+    :selected-language="props.selectedLanguage"
+    :remote-console="props.remoteConsole"
+    :vm-cluster="props.vmCluster"
+    :security-loader="props.securityLoader"
+    :recovery="props.recovery"
+    @hide="emits('hide')"
+    @update-time-format="emits('update-time-format', $event)"
+    @update-language="emits('update-language', $event)"
+    @update-is-browser="emits('update-is-browser', $event)"
+    @update-is-new-view="emits('update-is-new-view', $event)"
+    @update-remote-console="emits('update-remote-console', $event)"
+    @update-vm-clusters="emits('update-vm-clusters', $event)"
     @security-confirm="emits('security-confirm', $event)"
     @submit="emits('submit')"
   />
@@ -26,20 +52,21 @@
 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_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 type {
+  UI_I_Recovery
+} from "~/components/common/layout/theHeader/userMenu/modals/preferences/security/lib/models/interfaces";
 
 const security = defineModel<boolean>('security')
-const isShowNotification = defineModel<boolean>('isShowNotification')
-const newViewLocal = defineModel<boolean>('newViewLocal')
-const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
-const consoleValue = defineModel<string>('consoleValue')
-const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
 
 const props = defineProps<{
   project: UI_T_Project
+  timeFormat: UI_T_TimeValue
   newView: boolean
+  newViewLocal: boolean
   selectedLanguageType: UI_T_LangValue
   selectedLanguage: UI_I_Dropdown | string
+  remoteConsole: string
+  vmCluster: boolean
   securityLoader: boolean // для Сферы
   recovery: UI_I_Recovery | null // для Сферы
 }>()
@@ -47,15 +74,13 @@ const props = defineProps<{
 const emits = defineEmits<{
   (event: 'hide'): void
   (event: 'reset'): void
+  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): 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 currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
 </script>

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

@@ -13,8 +13,9 @@
       <ui-modal-block-standard>
         <ui-modal-block-form-standard>
           <common-layout-the-header-user-menu-modals-preferences-time-format
-            v-model:time-format="timeFormat"
             :new-view="props.newView"
+            :time-format="props.timeFormat"
+            @update-time-format="emits('update-time-format', $event)"
           />
         </ui-modal-block-form-standard>
 
@@ -30,31 +31,25 @@
 
         <ui-modal-block-form-standard v-if="isSphere">
           <common-layout-the-header-user-menu-modals-preferences-default-console
-            v-model="consoleValue"
             :new-view="props.newView"
+            :remote-console="props.remoteConsole"
+            @update-remote-console="emits('update-remote-console', $event)"
           />
         </ui-modal-block-form-standard>
 
         <ui-modal-block-form-standard v-if="isSphere">
           <common-layout-the-header-user-menu-modals-preferences-inventory
-            v-model="vmInHostsClusters"
             :new-view="props.newView"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard v-if="isSphere">
-          <common-layout-the-header-user-menu-modals-preferences-security
-            v-model:security="security"
-            :recovery="props.recovery"
-            @confirm="emits('security-confirm', $event)"
+            :vm-cluster="props.vmCluster"
+            @update-vm-clusters="emits('update-vm-clusters', $event)"
           />
         </ui-modal-block-form-standard>
 
         <ui-modal-block-form-standard without-border-bottom>
           <common-layout-the-header-user-menu-modals-preferences-view
-            v-model:new-view-local="newViewLocal"
-            v-model:is-show-notification="isShowNotification"
             :new-view="props.newView"
+            :new-view-local="props.newViewLocal"
+            @update-is-new-view="emits('update-is-new-view', $event)"
           />
         </ui-modal-block-form-standard>
       </ui-modal-block-standard>
@@ -68,28 +63,25 @@ import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/mod
 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_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'
-
-const security = defineModel<boolean>('security')
-const isShowNotification = defineModel<boolean>('isShowNotification')
-const newViewLocal = defineModel<boolean>('newViewLocal')
-const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
-const consoleValue = defineModel<string>('consoleValue')
-const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
 
 const props = defineProps<{
   project: UI_T_Project
+  timeFormat: UI_T_TimeValue
   selectedLanguage: UI_I_Dropdown
   selectedLanguageType: UI_T_LangValue
   newView: boolean
-  recovery: UI_I_Recovery | null // для Сферы
-  securityLoader: boolean // для warning console
+  newViewLocal: boolean
+  remoteConsole: string
+  vmCluster: boolean
 }>()
 const emits = defineEmits<{
   (event: 'hide'): void
+  (event: 'update-time-format', value: UI_T_TimeValue): void
   (event: 'update-language', value: UI_I_Dropdown): void
   (event: 'update-is-browser', value: string): void
-  (event: 'security-confirm', value: boolean): void
+  (event: 'update-is-new-view', value: boolean): void
+  (event: 'update-remote-console', value: string): void
+  (event: 'update-vm-clusters', value: boolean): void
   (event: 'submit'): void
   (event: 'reset'): void
 }>()

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

@@ -17,8 +17,9 @@
 
       <common-layout-the-header-user-menu-modals-preferences-time-format
         v-if="selectedTab === 'time-tab'"
-        v-model:time-format="timeFormat"
         :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
@@ -32,14 +33,16 @@
 
       <common-layout-the-header-user-menu-modals-preferences-inventory
         v-if="selectedTab === 'inventory-tab' && isSphere"
-        v-model="vmInHostsClusters"
         :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"
-        v-model="consoleValue"
         :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
@@ -51,9 +54,9 @@
 
       <common-layout-the-header-user-menu-modals-preferences-view
         v-if="selectedTab === 'view-tab'"
-        v-model:new-view-local="newViewLocal"
-        v-model:is-show-notification="isShowNotification"
         :new-view="props.newView"
+        :new-view-local="props.newViewLocal"
+        @update-is-new-view="emits('update-is-new-view', $event)"
       />
     </template>
 
@@ -88,28 +91,33 @@ import type { UI_I_Recovery } from '~/components/common/layout/theHeader/userMen
 import { preferencesTabs } from '~/components/common/layout/theHeader/userMenu/modals/preferences/lib/config/preferencesTabs'
 
 const security = defineModel<boolean>('security')
-const isShowNotification = defineModel<boolean>('isShowNotification')
-const newViewLocal = defineModel<boolean>('newViewLocal')
-const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
-const consoleValue = defineModel<string>('consoleValue')
-const vmInHostsClusters = defineModel<boolean>('vmInHostsClusters')
 
 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)

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

@@ -1,11 +1,23 @@
 <template>
-  <component
-    :is="currentComponent"
-    v-model:language-mode="languageMode"
-    v-model:selected-language="selectedLanguageLocal"
+  <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"
+    :language-mode="languageMode"
+    :locales="locales"
+    @update-language="onSelectLang"
+    @update-is-browser="onUpdateIsBrowser"
   />
 </template>
 
@@ -35,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}',
@@ -104,11 +110,6 @@ watch(
   { immediate: true }
 )
 
-watch(languageMode, (newValue) => {
-  onUpdateIsBrowser(newValue)
-})
-
-watch(selectedLanguageLocal, (newValue) => {
-  onSelectLang(newValue)
-})
+// 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}

@@ -15,18 +15,18 @@
 
         <div v-for="(item, key) in radioOptions" :key="key" class="radio flex">
           <ui-radio
-            v-model="languageMode"
+            v-model="languageModeLocal"
             :test-id="item.testId"
             :label="item.label"
             :value="item.value"
-            size="md"
+            size="sm"
           />
 
           <span v-if="item.selectLang" class="select-language">
             <common-select-language
-              v-model="selectedLanguage"
+              v-model="selectedLanguageLocal"
               :normalize-lang="props.locales"
-              :disabled="languageMode === 'BROWSER'"
+              :disabled="languageModeLocal === 'BROWSER'"
               width="max-content"
               size="xs"
             />
@@ -43,15 +43,39 @@ import type { UI_T_SelectedRadio } from '~/components/common/layout/theHeader/us
 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'
 
-const languageMode = defineModel<UI_T_SelectedRadio>('languageMode')
-const selectedLanguage = defineModel<UI_I_Dropdown>('selectedLanguage')
 const props = defineProps<{
+  selectedLanguage: UI_I_Dropdown
   description: string
   radioOptions: UI_I_RadioItemLang[]
+  languageMode: UI_T_SelectedRadio
   locales: UI_I_Dropdown[]
 }>()
 
+const emits = defineEmits<{
+  (event: 'update-language', value: UI_I_Dropdown): void
+  (event: 'update-is-browser', value: string): void
+}>()
+
+// const config = useRuntimeConfig()
 const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectedLanguageLocal = computed<UI_I_Dropdown>({
+  get() {
+    return props.selectedLanguage
+  },
+  set(newValue: UI_I_Dropdown) {
+    emits('update-language', newValue)
+  },
+})
+
+const languageModeLocal = computed<UI_T_SelectedRadio>({
+  get() {
+    return props.languageMode
+  },
+  set(newValue: UI_T_SelectedRadio) {
+    emits('update-is-browser', newValue)
+  },
+})
 </script>
 
 <style lang="scss" scoped>

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

@@ -7,7 +7,7 @@
     <div v-for="(item, key) in props.radioOptions" :key="key" class="radio">
       <input
         :id="item.label"
-        v-model="languageMode"
+        v-model="languageModeLocal"
         :data-id="item.testId"
         :value="item.value"
         type="radio"
@@ -17,8 +17,8 @@
       <span v-if="item.selectLang" class="select select-lang">
         <select
           id="language-select"
-          v-model="selectedLanguage"
-          :disabled="languageMode !== item.value"
+          v-model="selectedLanguageLocal"
+          :disabled="languageModeLocal !== item.value"
           data-id="language-select"
         >
           <option
@@ -40,13 +40,38 @@ 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_RadioItemLang } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/models/interfaces'
 
-const languageMode = defineModel<UI_T_SelectedRadio>('languageMode')
-const selectedLanguage = defineModel<UI_T_LangValue>('selectedLanguage')
 const props = defineProps<{
+  selectedLanguage: UI_T_LangValue
   description: string
   radioOptions: UI_I_RadioItemLang[]
+  languageMode: UI_T_SelectedRadio
   locales: UI_I_Dropdown[]
 }>()
+
+const emits = defineEmits<{
+  (event: 'update-language', value: UI_T_LangValue): void
+  (event: 'update-is-browser', value: string): void
+}>()
+
+// const config = useRuntimeConfig()
+
+const selectedLanguageLocal = computed<UI_T_LangValue>({
+  get() {
+    return props.selectedLanguage
+  },
+  set(newValue: UI_T_LangValue) {
+    emits('update-language', newValue)
+  },
+})
+
+const languageModeLocal = computed<UI_T_SelectedRadio>({
+  get() {
+    return props.languageMode
+  },
+  set(newValue: UI_T_SelectedRadio) {
+    emits('update-is-browser', newValue)
+  },
+})
 </script>
 
 <style lang="scss" scoped>

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"
   />
@@ -11,20 +16,27 @@ 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'
 import { consoleOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/defaultConsole/lib/config/consoleOptions'
 
-const consoleValue = defineModel<string>()
 const props = defineProps<{
+  remoteConsole: string
   newView: boolean
 }>()
 
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
+const emits = defineEmits<{
+  (event: 'update-remote-console', value: string): void
+}>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const consoleOptions = readonly<UI_I_RadioItemConsole[]>(
   consoleOptionsFunc(localization.value)
 )
+
+const consoleValue = computed<string>({
+  get() {
+    return props.remoteConsole
+  },
+  set(newValue: string) {
+    emits('update-remote-console', newValue)
+  },
+})
 </script>

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,18 +1,32 @@
 <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">
-const vmInHostsClusters = defineModel<boolean>()
 const props = defineProps<{
+  vmCluster: boolean
   newView: boolean
 }>()
 
-const currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
+const emits = defineEmits<{
+  (event: 'update-vm-clusters', value: boolean): void
+}>()
+
+const vmInHostsClusters = computed<boolean>({
+  get() {
+    return props.vmCluster
+  },
+  set(newValue: boolean) {
+    emits('update-vm-clusters', newValue)
+  },
+})
 </script>
 
 <style lang="scss" scoped></style>

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'