bfg-common 1.5.709 → 1.5.710

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

@@ -1,113 +1,115 @@
-<template>
-  <ui-modal
-    :title="localization.common.preferences"
-    :texts="modalTexts"
-    test-id="user-preferences-modal"
-    width="580px"
-    show
-    @reset="emits('reset')"
-    @submit="emits('submit')"
-    @hide="onHide"
-  >
-    <template #content>
-      <ui-modal-block-standard>
-        <ui-modal-block-form-standard>
-          <common-layout-the-header-user-menu-modals-preferences-time-format
-            :new-view="props.newView"
-            :time-format="props.timeFormat"
-            @update-time-format="emits('update-time-format', $event)"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard>
-          <common-layout-the-header-user-menu-modals-preferences-change-language
-            :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)"
-          />
-        </ui-modal-block-form-standard>
-
-        <ui-modal-block-form-standard v-if="isSphere">
-          <common-layout-the-header-user-menu-modals-preferences-default-console
-            :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
-            :new-view="props.newView"
-            :vm-cluster="props.vmCluster"
-            @update-vm-clusters="emits('update-vm-clusters', $event)"
-          />
-        </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)"
-          />
-        </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"
-            :new-view="props.newView"
-          />
-        </ui-modal-block-form-standard>
-      </ui-modal-block-standard>
-    </template>
-  </ui-modal>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/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_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 newViewLocal = defineModel<boolean>('newViewLocal')
-
-const props = defineProps<{
-  project: UI_T_Project
-  timeFormat: UI_T_TimeValue
-  selectedLanguage: UI_I_Dropdown
-  selectedLanguageType: UI_T_LangValue
-  newView: boolean
-  remoteConsole: string
-  vmCluster: 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: UI_I_Dropdown): void
-  (event: 'update-is-browser', value: string): void
-  (event: 'update-remote-console', value: string): void
-  (event: 'update-vm-clusters', value: boolean): void
-  (event: 'security-confirm', value: boolean): void
-  (event: 'submit'): void
-  (event: 'reset'): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const modalTexts = ref<UI_I_ModalTexts>({
-  resetToDefault: localization.value.common.resetToDefault,
-  button1: localization.value.common.cancel,
-  button2: localization.value.common.save,
-})
-
-const isSphere = ref<boolean>(props.project === 'sphere')
-
-const onHide = (): void => {
-  emits('hide')
-}
-</script>
+<template>
+  <ui-modal
+    :title="localization.common.preferences"
+    :texts="modalTexts"
+    test-id="user-preferences-modal"
+    width="580px"
+    show
+    @reset="emits('reset')"
+    @submit="emits('submit')"
+    @hide="onHide"
+  >
+    <template #content>
+      <ui-modal-block-standard>
+        <ui-modal-block-form-standard>
+          <common-layout-the-header-user-menu-modals-preferences-time-format
+            :new-view="props.newView"
+            :time-format="props.timeFormat"
+            @update-time-format="emits('update-time-format', $event)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard>
+          <common-layout-the-header-user-menu-modals-preferences-change-language
+            :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)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard v-if="isSphere">
+          <common-layout-the-header-user-menu-modals-preferences-default-console
+            :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
+            :new-view="props.newView"
+            :vm-cluster="props.vmCluster"
+            @update-vm-clusters="emits('update-vm-clusters', $event)"
+          />
+        </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)"
+          />
+        </ui-modal-block-form-standard>
+
+        <ui-modal-block-form-standard without-border-bottom>
+          <common-layout-the-header-user-menu-modals-preferences-view
+            :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>
+    </template>
+  </ui-modal>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+import type { UI_I_ModalTexts } from '~/node_modules/bfg-uikit/components/ui/modal/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_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 props = defineProps<{
+  project: UI_T_Project
+  timeFormat: UI_T_TimeValue
+  selectedLanguage: UI_I_Dropdown
+  selectedLanguageType: UI_T_LangValue
+  newView: boolean
+  newViewLocal: boolean
+  remoteConsole: string
+  vmCluster: 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: 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
+  (event: 'reset'): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const modalTexts = ref<UI_I_ModalTexts>({
+  resetToDefault: localization.value.common.resetToDefault,
+  button1: localization.value.common.cancel,
+  button2: localization.value.common.save,
+})
+
+const isSphere = ref<boolean>(props.project === 'sphere')
+
+const onHide = (): void => {
+  emits('hide')
+}
+</script>

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

@@ -54,8 +54,9 @@
 
       <common-layout-the-header-user-menu-modals-preferences-view
         v-if="selectedTab === 'view-tab'"
-        v-model:new-view-local="newViewLocal"
         :new-view="props.newView"
+        :new-view-local="props.newViewLocal"
+        @update-is-new-view="emits('update-is-new-view', $event)"
       />
     </template>
 
@@ -90,7 +91,6 @@ 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 newViewLocal = defineModel<boolean>('newViewLocal')
 
 const props = defineProps<{
   project: UI_T_Project
@@ -98,6 +98,7 @@ const props = defineProps<{
   selectedLanguage: UI_T_LangValue
   selectedLanguageType: UI_T_LangValue
   newView: boolean
+  newViewLocal: boolean
   remoteConsole: string
   vmCluster: boolean
   securityLoader: boolean // для Сферы
@@ -108,6 +109,7 @@ const emits = defineEmits<{
   (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

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

@@ -1,114 +1,108 @@
-<template>
-  <component
-    :is="currentComponent"
-    v-model:language-mode="languageMode"
-    v-model:selected-language="selectedLanguageLocal"
-    :description="description"
-    :radio-options="radioOptions"
-    :locales="locales"
-  />
-</template>
-
-<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_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'
-import { UI_E_DetectSelectedRadio } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/models/enums'
-import { locales } from '~/components/common/selectLanguage/lib/config/config'
-import { findInLocals } from '~/components/common/selectLanguage/lib/utils/utils'
-import { radioOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/config/radioOptions'
-import { defineBrowserLangFunc } from '~/components/common/layout/theHeader/lib/utils/localization'
-
-const props = defineProps<{
-  newView: boolean
-  selectedType: UI_T_LangValue
-  selectedLanguage: UI_I_Dropdown | UI_T_LangValue
-}>()
-
-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 currentComponent = computed(() =>
-  props.newView
-    ? defineAsyncComponent(() => import('./New.vue'))
-    : defineAsyncComponent(() => import('./Old.vue'))
-)
-
-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)
-)
-
-const languageMode = ref<UI_T_SelectedRadio>(
-  UI_E_DetectSelectedRadio[props.selectedType]
-)
-
-const selectedLanguageLocal = ref<UI_I_Dropdown | UI_T_LangValue>(
-  props.selectedLanguage
-)
-
-const setPreferenceLang = (language: string): void => {
-  let currentLang = language
-
-  language === 'BROWSER' &&
-    (currentLang = findInLocals(defineBrowserLangFunc()))
-
-  emits('update-language', currentLang)
-}
-
-const onSelectLang = (newValue: string): void => {
-  selectedLanguageLocal.value && setPreferenceLang(newValue)
-}
-
-const onChange = (): void => {
-  const lang =
-    languageMode.value === 'LANG'
-      ? selectedLanguageLocal.value
-      : languageMode.value // 'BROWSER'
-
-  lang && setPreferenceLang(lang)
-}
-
-const onUpdateIsBrowser = (value: string): void => {
-  emits('update-is-browser', value)
-}
-
-watch(
-  () => props.selectedLanguage,
-  (newValue: UI_I_Dropdown) => {
-    selectedLanguageLocal.value = newValue
-  },
-  { immediate: true }
-)
-
-watch(
-  () => props.selectedType,
-  (newValue: UI_T_LangValue) => {
-    languageMode.value = UI_E_DetectSelectedRadio[newValue]
-    onChange()
-    newValue && onUpdateIsBrowser(newValue)
-  },
-  { immediate: true }
-)
-
-watch(languageMode, (newValue) => {
-  onUpdateIsBrowser(newValue)
-})
-
-watch(selectedLanguageLocal, (newValue) => {
-  onSelectLang(newValue)
-})
-</script>
+<template>
+  <component
+    :is="currentComponent"
+    :selected-language="selectedLanguageLocal"
+    :description="description"
+    :radio-options="radioOptions"
+    :language-mode="languageMode"
+    :locales="locales"
+    @update-language="onSelectLang"
+    @update-is-browser="onUpdateIsBrowser"
+  />
+</template>
+
+<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_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'
+import { UI_E_DetectSelectedRadio } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/models/enums'
+import { locales } from '~/components/common/selectLanguage/lib/config/config'
+import { findInLocals } from '~/components/common/selectLanguage/lib/utils/utils'
+import { radioOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/changeLanguage/lib/config/radioOptions'
+import { defineBrowserLangFunc } from '~/components/common/layout/theHeader/lib/utils/localization'
+
+const props = defineProps<{
+  newView: boolean
+  selectedType: UI_T_LangValue
+  selectedLanguage: UI_I_Dropdown | UI_T_LangValue
+}>()
+
+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 currentComponent = computed(() =>
+  props.newView
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+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)
+)
+
+const languageMode = ref<UI_T_SelectedRadio>(
+  UI_E_DetectSelectedRadio[props.selectedType]
+)
+
+const selectedLanguageLocal = ref<UI_I_Dropdown | UI_T_LangValue>(
+  props.selectedLanguage
+)
+
+const setPreferenceLang = (language: string): void => {
+  let currentLang = language
+
+  language === 'BROWSER' &&
+    (currentLang = findInLocals(defineBrowserLangFunc()))
+
+  emits('update-language', currentLang)
+}
+
+const onSelectLang = (newValue: string): void => {
+  selectedLanguageLocal.value && setPreferenceLang(newValue)
+}
+
+const onChange = (): void => {
+  const lang =
+    languageMode.value === 'LANG'
+      ? selectedLanguageLocal.value
+      : languageMode.value // 'BROWSER'
+
+  lang && setPreferenceLang(lang)
+}
+
+const onUpdateIsBrowser = (value: string): void => {
+  emits('update-is-browser', value)
+}
+
+watch(
+  () => props.selectedLanguage,
+  (newValue: UI_I_Dropdown) => {
+    selectedLanguageLocal.value = newValue
+  },
+  { immediate: true }
+)
+
+watch(
+  () => props.selectedType,
+  (newValue: UI_T_LangValue) => {
+    languageMode.value = UI_E_DetectSelectedRadio[newValue]
+    onChange()
+    newValue && onUpdateIsBrowser(newValue)
+  },
+  { immediate: true }
+)
+</script>

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

@@ -1,65 +1,88 @@
-<template>
-  <form id="change-language-form" @submit.prevent>
-    <div class="flex">
-      <ui-modal-icon>
-        <ui-icon-icon3 name="language-new" width="20" height="20" />
-      </ui-modal-icon>
-
-      <div>
-        <div class="form-first-title">
-          {{ localization.common.language }}
-        </div>
-        <div class="form-second-title">
-          {{ props.description }}
-        </div>
-
-        <div v-for="(item, key) in radioOptions" :key="key" class="radio flex">
-          <ui-radio
-            v-model="languageMode"
-            :test-id="item.testId"
-            :label="item.label"
-            :value="item.value"
-            size="md"
-          />
-
-          <span v-if="item.selectLang" class="select-language">
-            <common-select-language
-              v-model="selectedLanguage"
-              :normalize-lang="props.locales"
-              :disabled="languageMode === 'BROWSER'"
-              width="max-content"
-              size="xs"
-            />
-          </span>
-        </div>
-      </div>
-    </div>
-  </form>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
-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'
-
-const languageMode = defineModel<UI_T_SelectedRadio>('languageMode')
-const selectedLanguage = defineModel<UI_I_Dropdown>('selectedLanguage')
-const props = defineProps<{
-  description: string
-  radioOptions: UI_I_RadioItemLang[]
-  locales: UI_I_Dropdown[]
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style lang="scss" scoped>
-.radio:not(:last-child) {
-  margin-bottom: 8px;
-}
-
-.select-language {
-  margin-left: 8px;
-}
-</style>
+<template>
+  <form id="change-language-form" @submit.prevent>
+    <div class="flex">
+      <ui-modal-icon>
+        <ui-icon-icon3 name="language-new" width="20" height="20" />
+      </ui-modal-icon>
+
+      <div>
+        <div class="form-first-title">
+          {{ localization.common.language }}
+        </div>
+        <div class="form-second-title">
+          {{ props.description }}
+        </div>
+
+        <div v-for="(item, key) in radioOptions" :key="key" class="radio flex">
+          <ui-radio
+            v-model="languageModeLocal"
+            :test-id="item.testId"
+            :label="item.label"
+            :value="item.value"
+            size="md"
+          />
+
+          <span v-if="item.selectLang" class="select-language">
+            <common-select-language
+              v-model="selectedLanguageLocal"
+              :normalize-lang="props.locales"
+              :disabled="languageModeLocal === 'BROWSER'"
+              width="max-content"
+              size="xs"
+            />
+          </span>
+        </div>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Dropdown } from '~/node_modules/bfg-uikit/components/ui/dropdown/models/interfaces'
+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'
+
+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>
+.radio:not(:last-child) {
+  margin-bottom: 8px;
+}
+
+.select-language {
+  margin-left: 8px;
+}
+</style>