bfg-common 1.5.716 → 1.5.718

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

@@ -1,144 +1,136 @@
-<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'"
+        v-model:time-format="timeFormat"
+        :new-view="props.newView"
+      />
+
+      <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"
+        v-model="vmInHostsClusters"
+        :new-view="props.newView"
+      />
+
+      <common-layout-the-header-user-menu-modals-preferences-default-console
+        v-if="selectedTab === 'console-tab' && isSphere"
+        v-model="consoleValue"
+        :new-view="props.newView"
+      />
+
+      <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'"
+        v-model:new-view-local="newViewLocal"
+        :new-view="props.newView"
+      />
+    </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 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
+  selectedLanguage: UI_T_LangValue
+  selectedLanguageType: UI_T_LangValue
+  newView: boolean
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'update-language', value: string): void
+  (event: 'update-is-browser', value: string): 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,13 +1,11 @@
 <template>
   <component
     :is="currentComponent"
-    :selected-language="selectedLanguageLocal"
+    v-model:language-mode="languageMode"
+    v-model:selected-language="selectedLanguageLocal"
     :description="description"
     :radio-options="radioOptions"
-    :language-mode="languageMode"
     :locales="locales"
-    @update-language="onSelectLang"
-    @update-is-browser="onUpdateIsBrowser"
   />
 </template>
 
@@ -105,4 +103,12 @@ watch(
   },
   { immediate: true }
 )
+
+watch(languageMode, (newValue) => {
+  onUpdateIsBrowser(newValue)
+})
+
+watch(selectedLanguageLocal, (newValue) => {
+  onSelectLang(newValue)
+})
 </script>

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

@@ -15,7 +15,7 @@
 
         <div v-for="(item, key) in radioOptions" :key="key" class="radio flex">
           <ui-radio
-            v-model="languageModeLocal"
+            v-model="languageMode"
             :test-id="item.testId"
             :label="item.label"
             :value="item.value"
@@ -24,9 +24,9 @@
 
           <span v-if="item.selectLang" class="select-language">
             <common-select-language
-              v-model="selectedLanguageLocal"
+              v-model="selectedLanguage"
               :normalize-lang="props.locales"
-              :disabled="languageModeLocal === 'BROWSER'"
+              :disabled="languageMode === 'BROWSER'"
               width="max-content"
               size="xs"
             />
@@ -43,38 +43,15 @@ 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 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

@@ -7,7 +7,7 @@
     <div v-for="(item, key) in props.radioOptions" :key="key" class="radio">
       <input
         :id="item.label"
-        v-model="languageModeLocal"
+        v-model="languageMode"
         :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="selectedLanguageLocal"
-          :disabled="languageModeLocal !== item.value"
+          v-model="selectedLanguage"
+          :disabled="languageMode !== item.value"
           data-id="language-select"
         >
           <option
@@ -40,36 +40,13 @@ 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 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

@@ -11,15 +11,11 @@ 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 emits = defineEmits<{
-  (event: 'update-remote-console', value: string): void
-}>()
-
 const currentComponent = computed(() =>
   props.newView
     ? defineAsyncComponent(() => import('./New.vue'))
@@ -31,13 +27,4 @@ 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/inventory/Inventory.vue

@@ -3,29 +3,16 @@
 </template>
 
 <script setup lang="ts">
+const vmInHostsClusters = defineModel<boolean>()
 const props = defineProps<{
-  vmCluster: boolean
   newView: boolean
 }>()
 
-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
-  },
-  set(newValue: boolean) {
-    emits('update-vm-clusters', newValue)
-  },
-})
 </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'

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

@@ -135,7 +135,7 @@ const props = defineProps<{
   otpDisabledSuccess: boolean
   otpErrorApiText: string
   otpDisabledErrorApiText: string
-  recovery: UI_I_Recovery
+  recovery: UI_I_Recovery | null
 }>()
 
 const emits = defineEmits<{

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

@@ -88,7 +88,7 @@ const props = defineProps<{
   isOtpLoading: boolean
   otpEnabledSuccess: boolean
   otpDisabledSuccess: boolean
-  recovery: UI_I_Recovery
+  recovery: UI_I_Recovery | null
 }>()
 const emits = defineEmits<{
   (event: 'confirm'): void

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

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="currentComponent"
-    v-model="timeItem"
+    v-model="timeFormat"
     :description="description"
     :format-options="formatOptions"
   />
@@ -13,15 +13,11 @@ import type { UI_I_RadioItem } from '~/components/common/layout/theHeader/userMe
 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'
 
+const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 const props = defineProps<{
-  timeFormat: UI_T_TimeValue
   newView: boolean
 }>()
 
-const emits = defineEmits<{
-  (event: 'update-time-format', value: UI_T_TimeValue): void
-}>()
-
 const currentComponent = computed(() =>
   props.newView
     ? defineAsyncComponent(() => import('./New.vue'))
@@ -42,13 +38,4 @@ const description = computed<string>(() =>
 const formatOptions = readonly<UI_I_RadioItem[]>(
   formatOptionsFunc(localization.value)
 )
-
-const timeItem = computed<UI_T_TimeValue>({
-  get() {
-    return props.timeFormat
-  },
-  set(newValue: UI_T_TimeValue) {
-    emits('update-time-format', newValue)
-  },
-})
 </script>

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

@@ -1,7 +1,7 @@
 <template>
   <component
     :is="currentComponent"
-    v-model="model"
+    v-model="newViewLocal"
     :description="description"
   />
 </template>
@@ -9,13 +9,9 @@
 <script setup lang="ts">
 import type { UI_I_Localization } from '~/lib/models/interfaces'
 
+const newViewLocal = defineModel<boolean>('newViewLocal')
 const props = defineProps<{
   newView: boolean
-  newViewLocal: boolean
-}>()
-
-const emits = defineEmits<{
-  (event: 'update-is-new-view', value: boolean): void
 }>()
 
 const config = useRuntimeConfig()
@@ -34,13 +30,4 @@ const description = computed<string>(() => {
     String(config.public[`TRADEMARK_${useEnvLanguage()}`])
   )
 })
-
-const model = computed<boolean>({
-  get() {
-    return props.newViewLocal
-  },
-  set(newValue: boolean) {
-    emits('update-is-new-view', newValue)
-  },
-})
 </script>