bfg-common 1.5.710 → 1.5.711

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

@@ -1,86 +1,78 @@
-<template>
-  <common-layout-the-header-user-menu-modals-preferences-new
-    v-if="props.newView"
-    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')"
-    @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')"
-  />
-</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, 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
-  newView: boolean
-  newViewLocal: boolean
-  selectedLanguageType: UI_T_LangValue
-  selectedLanguage: UI_I_Dropdown | string
-  remoteConsole: string
-  vmCluster: boolean
-  securityLoader: boolean // для Сферы
-  recovery: UI_I_Recovery | null // для Сферы
-}>()
-
-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
-}>()
-</script>
+<template>
+  <common-layout-the-header-user-menu-modals-preferences-new
+    v-if="props.newView"
+    v-model:security="security"
+    v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
+    :project="props.project"
+    :new-view="props.newView"
+    :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-language="emits('update-language', $event)"
+    @update-is-browser="emits('update-is-browser', $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"
+    v-model:new-view-local="newViewLocal"
+    v-model:time-format="timeFormat"
+    :project="props.project"
+    :new-view="props.newView"
+    :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-language="emits('update-language', $event)"
+    @update-is-browser="emits('update-is-browser', $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')"
+  />
+</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, 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 timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
+
+const props = defineProps<{
+  project: UI_T_Project
+  newView: boolean
+  selectedLanguageType: UI_T_LangValue
+  selectedLanguage: UI_I_Dropdown | string
+  remoteConsole: string
+  vmCluster: boolean
+  securityLoader: boolean // для Сферы
+  recovery: UI_I_Recovery | null // для Сферы
+}>()
+
+const emits = defineEmits<{
+  (event: 'hide'): void
+  (event: 'reset'): 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
+}>()
+</script>

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

@@ -1,115 +1,111 @@
-<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>
+<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
+            v-model:time-format="timeFormat"
+            :new-view="props.newView"
+          />
+        </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 timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
+
+const props = defineProps<{
+  project: UI_T_Project
+  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-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>

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

@@ -17,9 +17,8 @@
 
       <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
@@ -54,9 +53,8 @@
 
       <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>
 
@@ -91,14 +89,14 @@ 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 timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 
 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 // для Сферы
@@ -106,10 +104,8 @@ const props = defineProps<{
 }>()
 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