bfg-common 1.5.708 → 1.5.709

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

@@ -1,115 +1,114 @@
-<template>
-  <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>
-
-<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 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 }
-)
-
-// TODO remove
-// const localsLocal = ref<any>(locales.filter((_, i) => i > 0))
-</script>
+<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>

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

@@ -1,89 +1,65 @@
-<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="sm"
-          />
-
-          <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 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>
-.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="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>

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

@@ -1,91 +1,66 @@
-<template>
-  <form id="change-language-form" class="compact change-default-console">
-    <div class="description">
-      {{ props.description }}
-    </div>
-
-    <div v-for="(item, key) in props.radioOptions" :key="key" class="radio">
-      <input
-        :id="item.label"
-        v-model="languageModeLocal"
-        :data-id="item.testId"
-        :value="item.value"
-        type="radio"
-      />
-      <label :for="item.label"> {{ item.label }} </label>
-
-      <span v-if="item.selectLang" class="select select-lang">
-        <select
-          id="language-select"
-          v-model="selectedLanguageLocal"
-          :disabled="languageModeLocal !== item.value"
-          data-id="language-select"
-        >
-          <option
-            v-for="(item2, key2) in props.locales"
-            :key="key2"
-            :value="item2.value"
-          >
-            {{ item2.text }}
-          </option>
-        </select>
-      </span>
-    </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_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 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>
-.radio {
-  margin-bottom: 5px;
-  &:nth-child(2) {
-    margin-top: 10px;
-  }
-}
-.select-lang {
-  margin-left: 3px;
-  height: 24px;
-  & > select {
-    height: 100%;
-  }
-}
-</style>
+<template>
+  <form id="change-language-form" class="compact change-default-console">
+    <div class="description">
+      {{ props.description }}
+    </div>
+
+    <div v-for="(item, key) in props.radioOptions" :key="key" class="radio">
+      <input
+        :id="item.label"
+        v-model="languageMode"
+        :data-id="item.testId"
+        :value="item.value"
+        type="radio"
+      />
+      <label :for="item.label"> {{ item.label }} </label>
+
+      <span v-if="item.selectLang" class="select select-lang">
+        <select
+          id="language-select"
+          v-model="selectedLanguage"
+          :disabled="languageMode !== item.value"
+          data-id="language-select"
+        >
+          <option
+            v-for="(item2, key2) in props.locales"
+            :key="key2"
+            :value="item2.value"
+          >
+            {{ item2.text }}
+          </option>
+        </select>
+      </span>
+    </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_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<{
+  description: string
+  radioOptions: UI_I_RadioItemLang[]
+  locales: UI_I_Dropdown[]
+}>()
+</script>
+
+<style lang="scss" scoped>
+.radio {
+  margin-bottom: 5px;
+  &:nth-child(2) {
+    margin-top: 10px;
+  }
+}
+.select-lang {
+  margin-left: 3px;
+  height: 24px;
+  & > select {
+    height: 100%;
+  }
+}
+</style>

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

@@ -1,11 +1,6 @@
 <template>
-  <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
+  <component
+    :is="currentComponent"
     v-model="consoleValue"
     :console-options="consoleOptions"
   />
@@ -25,6 +20,12 @@ 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/{DefaultConsoleNew.vue → New.vue}

@@ -25,7 +25,7 @@
             :label="item.label"
             :value="item.value"
             :disabled="item.disabled"
-            size="sm"
+            size="md"
           />
         </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/{DefaultConsoleOld.vue → Old.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,12 +1,5 @@
 <template>
-  <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"
-  />
+  <component :is="currentComponent" v-model="vmInHostsClusters" />
 </template>
 
 <script setup lang="ts">
@@ -19,6 +12,12 @@ 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/{InventoryNew.vue → New.vue}

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