bfg-common 1.3.594 → 1.3.596

package/components/common/wizards/datastore/add/readyComplete/ReadyComplete.vue

@@ -1,95 +1,95 @@
-<template>
-  <div class="ready-complete">
-    <div class="ready-complete__desc">{{ localization.readyCompleteDesc }}</div>
-
-    <common-details-list :items="properties" class="ready-complete__list list">
-      <template #default="{ item }">
-        <common-details-item
-          :has-children="true"
-          :test-id="item.testId"
-          open-by-default
-        >
-          <template #stackBlockKey>
-            <span class="list__labels">
-              {{ localization.chosenDatastoreName }}
-            </span>
-          </template>
-
-          <template #stackChildren>
-            <template
-              v-for="(item2, key2) in item.items"
-              :key="`${item2}_${key2}`"
-            >
-              <common-details-item
-                :has-children="false"
-                :test-id="item2.testId"
-                class="list__default-style"
-              >
-                <template #stackBlockKey>
-                  <div>
-                    {{ item2.label }}
-                  </div>
-                </template>
-                <template #stackBlockContent>
-                  <div v-if="item2.data">
-                    <div
-                      v-for="item3 in item2.data"
-                      :key="item3"
-                      class="flex-align-center"
-                    >
-                      <div class="vsphere-icon-host"></div>
-                      <span>{{ item3 }}</span>
-                    </div>
-                  </div>
-                  <span v-else>
-                    {{ item2.value }}
-                  </span>
-                </template>
-              </common-details-item>
-            </template>
-          </template>
-        </common-details-item>
-      </template>
-    </common-details-list>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-
-const props = defineProps<{
-  dataReadyView: UI_I_DetailsItem[]
-}>()
-// console.log(props)
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const properties = computed<UI_I_DetailsItem[]>(() => props.dataReadyView)
-</script>
-
-<style lang="scss" scoped>
-@import '~/assets/scss/common/mixins.scss';
-.ready-complete {
-  &__list {
-    @include flex($dir: column);
-    padding: 12px 0;
-    row-gap: 15px;
-  }
-}
-.list {
-  &__labels {
-    @include text($fs: 13px, $fw: 700);
-  }
-  :deep(.list__default-style) {
-    .stack-block {
-      &__label {
-        align-items: flex-start;
-      }
-      &-content {
-        white-space: pre-line;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="ready-complete">
+    <div class="ready-complete__desc">{{ localization.readyCompleteDesc }}</div>
+
+    <common-details-list :items="properties" class="ready-complete__list list">
+      <template #default="{ item }">
+        <common-details-item
+          :has-children="true"
+          :test-id="item.testId"
+          open-by-default
+        >
+          <template #stackBlockKey>
+            <span class="list__labels">
+              {{ localization.chosenDatastoreName }}
+            </span>
+          </template>
+
+          <template #stackChildren>
+            <template
+              v-for="(item2, key2) in item.items"
+              :key="`${item2}_${key2}`"
+            >
+              <common-details-item
+                :has-children="false"
+                :test-id="item2.testId"
+                class="list__default-style"
+              >
+                <template #stackBlockKey>
+                  <div>
+                    {{ item2.label }}
+                  </div>
+                </template>
+                <template #stackBlockContent>
+                  <div v-if="item2.data">
+                    <div
+                      v-for="item3 in item2.data"
+                      :key="item3"
+                      class="flex-align-center"
+                    >
+                      <div class="vsphere-icon-host"></div>
+                      <span>{{ item3 }}</span>
+                    </div>
+                  </div>
+                  <span v-else>
+                    {{ item2.value }}
+                  </span>
+                </template>
+              </common-details-item>
+            </template>
+          </template>
+        </common-details-item>
+      </template>
+    </common-details-list>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_DetailsItem } from '~/components/common/details/lib/models/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+
+const props = defineProps<{
+  dataReadyView: UI_I_DetailsItem[]
+}>()
+// console.log(props)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const properties = computed<UI_I_DetailsItem[]>(() => props.dataReadyView)
+</script>
+
+<style lang="scss" scoped>
+@import '~/assets/scss/common/mixins.scss';
+.ready-complete {
+  &__list {
+    @include flex($dir: column);
+    padding: 12px 0;
+    row-gap: 15px;
+  }
+}
+.list {
+  &__labels {
+    @include text($fs: 13px, $fw: 700);
+  }
+  :deep(.list__default-style) {
+    .stack-block {
+      &__label {
+        align-items: flex-start;
+      }
+      &-content {
+        white-space: pre-line;
+      }
+    }
+  }
+}
+</style>

package/components/common/wizards/vm/migrate/select/storage/table/datastore/lib/config/config.ts

@@ -43,7 +43,7 @@ const getItems = (
     [localization.used, true, '110px', storageTableKeys[5]],
     [localization.type, true, '110px', storageTableKeys[6]],
     [localization.thinProvisioning, true, '132px', storageTableKeys[7]],
-    [localization.access, true, '110px', storageTableKeys[8]],
+    [localization.common.access, true, '110px', storageTableKeys[8]],
     [localization.hardwareAcceleration, true, '134px', storageTableKeys[9]],
     [localization.driverType, true, '110px', storageTableKeys[10]],
     [localization.device, true, '110px', storageTableKeys[11]],

package/components/common/wizards/vm/migrate/select/targetServer/new/lib/config/defaultForm.ts

@@ -7,7 +7,7 @@ export const defaultFormFunc = (localization: UI_I_Localization): any => {
       validations: [
         {
           value: 'required',
-          errorText: localization.fieldRequired,
+          errorText: localization.common.fieldRequired,
         },
       ],
     },
@@ -16,7 +16,7 @@ export const defaultFormFunc = (localization: UI_I_Localization): any => {
       validations: [
         {
           value: 'required',
-          errorText: localization.fieldRequired,
+          errorText: localization.common.fieldRequired,
         },
       ],
     },
@@ -25,7 +25,7 @@ export const defaultFormFunc = (localization: UI_I_Localization): any => {
       validations: [
         {
           value: 'required',
-          errorText: localization.fieldRequired,
+          errorText: localization.common.fieldRequired,
         },
       ],
     },

package/composables/productNameLocal.ts

@@ -1,21 +1,46 @@
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_LanguageKey } from '~/lib/models/types'
 
 export function productNameLocal(
   localization: UI_I_Localization
 ): UI_I_Localization {
   const config = useRuntimeConfig()
 
-  const keys = Object.keys(localization)
   const productName =
     config.public.LOCALIZATION_CODE === 'ru'
       ? config.public.PRODUCT_NAME_RU
       : config.public.PRODUCT_NAME_EN
 
-  for (let key in localization) {
-    localization[key] = localization[key].replaceAll(
-      '{productName}',
-      String(productName)
-    )
+  return replaceProductNameRecursion(localization, productName)
+}
+
+const replaceProductNameRecursion = (
+  localization: UI_I_Localization,
+  productName: any
+): UI_I_Localization => {
+  for (const key of Object.keys(localization)) {
+    const item = localization[key as UI_T_LanguageKey]
+    // TODO move to config
+    const localizationKeys = [
+      'common',
+      'auth',
+      'home',
+      'tasks',
+      'layout',
+      'mainNavigation',
+      'administration',
+      'inventoryConfigure',
+      'datastoreWizard',
+      'inventorySummary',
+      'contextMenu',
+      'networks',
+      'inventory',
+    ]
+    if (localizationKeys.includes(key)) {
+      for (const key2 of Object.keys(item)) {
+        item[key2] = item[key2].replaceAll('{productName}', productName)
+      }
+    }
   }
 
   return localization

package/composables/useEnvLanguage.ts

@@ -3,9 +3,9 @@ export function useEnvLanguage(): string {
 
   let localizationCode = 'en_US'
   const langFromLocalStorage =
+    $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
     useLocalStorage('lang') ||
-    useLocalStorage('languageType') ||
-    $store.getters['main/getInterfaceLang'] // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('languageType')
 
   if (langFromLocalStorage) {
     if (

package/lib/models/interfaces.ts

@@ -1,4 +1,4 @@
-import { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
+import type { UI_T_NotificationStatus } from '~/components/atoms/alert/lib/models/types'
 import { UI_E_State } from '~/lib/models/enums'
 
 export interface UI_I_ItemView {
@@ -13,8 +13,21 @@ export interface UI_I_ArbitraryObject<T> {
   [key: string]: T
 }
 
-export interface UI_I_Localization extends UI_I_ArbitraryObject<string> {}
-
+export interface UI_I_Localization {
+  common: UI_I_ArbitraryObject<string>
+  auth: UI_I_ArbitraryObject<string>
+  home: UI_I_ArbitraryObject<string>
+  tasks: UI_I_ArbitraryObject<string>
+  layout: UI_I_ArbitraryObject<string>
+  mainNavigation: UI_I_ArbitraryObject<string>
+  administration: UI_I_ArbitraryObject<string>
+  inventoryConfigure: UI_I_ArbitraryObject<string>
+  datastoreWizard: UI_I_ArbitraryObject<string>
+  inventorySummary: UI_I_ArbitraryObject<string>
+  contextMenu: UI_I_ArbitraryObject<string>
+  networks: UI_I_ArbitraryObject<string>
+  inventory: UI_I_ArbitraryObject<string>
+}
 export interface UI_I_SendTaskParams {
   method: string
   target: string

package/lib/models/types.ts

@@ -1,7 +1,15 @@
 export type UI_T_Project = 'sphere' | 'procurator'
 
 export type UI_T_Binary = 'KB' | 'MB' | 'GB' | 'TB' | 'PB' | 'EB' | 'ZB' | 'YB'
-export type UI_T_BinaryLower = 'kb' | 'mb' | 'gb' | 'tb' | 'pb' | 'eb' | 'zb' | 'yb'
+export type UI_T_BinaryLower =
+  | 'kb'
+  | 'mb'
+  | 'gb'
+  | 'tb'
+  | 'pb'
+  | 'eb'
+  | 'zb'
+  | 'yb'
 
 export type UI_T_LangValue =
   | 'en_US'
@@ -11,3 +19,18 @@ export type UI_T_LangValue =
   | 'kk_KZ'
   | 'be_BY'
   | 'BROWSER'
+
+export type UI_T_LanguageKey =
+  | 'common'
+  | 'auth'
+  | 'home'
+  | 'tasks'
+  | 'layout'
+  | 'mainNavigation'
+  | 'administration'
+  | 'inventoryConfigure'
+  | 'datastoreWizard'
+  | 'inventorySummary'
+  | 'contextMenu'
+  | 'networks'
+  | 'inventory'

package/lib/utils/sendTask.ts

@@ -30,7 +30,7 @@ const showNotification = (message: UI_I_NotifyBodyMessage): void => {
 }
 const msgError: UI_I_NotifyBodyMessage = {
   status: 'error',
-  title: localization.value.error,
+  title: localization.value.common.error,
   desc: '',
 }
 const handleErrors = (error: Ref<API_UI_I_Error>): void => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.3.594",
+  "version": "1.3.596",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "^1.0.15",
-    "bfg-uikit": "1.0.88",
+    "bfg-uikit": "1.0.91",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }