bfg-common 1.5.761 → 1.5.762

package/components/common/wizards/network/add/steps/portProperties/PortProperties.vue

@@ -86,45 +86,30 @@ const fields = ref<UI_I_PortProperties>({
   },
 })
 
-const setEnabledServiceDefault = (
-  tcp: UI_T_TCP,
-  currentFields: UI_I_PortProperties
-): void => {
-  tcp === 'default' &&
-    (fields.value = {
-      ...currentFields,
-      services: servicesInitial,
-    })
-}
-
-const setEnabledServiceProvisioning = (
+const setEnabledService = (
   tcp: UI_T_TCP,
   currentFields: UI_I_PortProperties,
   newFields?: UI_I_PortProperties
 ): void => {
-  tcp === 'provisioning' &&
-    (fields.value = {
+  if (tcp === 'default') {
+    fields.value = {
+      ...currentFields,
+      services: useDeepCopy(servicesInitial),
+    }
+  } else if (servicesInitial.hasOwnProperty(tcp)) {
+    fields.value = {
       ...(newFields || currentFields),
       services: {
-        ...servicesInitial,
-        provisioning: true,
+        ...useDeepCopy(servicesInitial),
+        [tcp]: true,
       },
-    })
-}
-
-const setEnabledServiceVMotion = (
-  tcp: UI_T_TCP,
-  currentFields: UI_I_PortProperties,
-  newFields?: UI_I_PortProperties
-): void => {
-  tcp === '' &&
-    (fields.value = {
+    }
+  } else {
+    fields.value = {
       ...(newFields || currentFields),
-      services: {
-        ...servicesInitial,
-        vMotion: true,
-      },
-    })
+      services: useDeepCopy(servicesInitial),
+    }
+  }
 }
 
 let oldFields = useDeepCopy(fields.value)
@@ -134,9 +119,7 @@ watch(
   (newFields: UI_I_PortProperties) => {
     if (newFields.tcp && newFields.tcp !== oldFields.tcp) {
       emits('change-gateway-flag', false)
-      setEnabledServiceDefault(newFields.tcp, fields.value)
-      setEnabledServiceProvisioning(newFields.tcp, fields.value, newFields)
-      setEnabledServiceVMotion(newFields.tcp, fields.value, newFields)
+      setEnabledService(newFields.tcp, fields.value, newFields)
     }
 
     oldFields.networkLabel !== newFields.networkLabel &&
@@ -184,9 +167,7 @@ watch(
   () => fields.value.tcp,
   (newTcp: UI_T_TCP, oldTcp: UI_T_TCP) => {
     if (newTcp !== oldTcp) {
-      setEnabledServiceDefault(newTcp, fields.value)
-      setEnabledServiceProvisioning(newTcp, fields.value)
-      setEnabledServiceVMotion(newTcp, fields.value)
+      setEnabledService(newTcp, fields.value)
     }
     emits('change-port-properties', fields.value)
   }
@@ -196,7 +177,10 @@ watch(
   () => props.tcpStacks,
   (newValue: UI_I_TCPStack[]) => {
     if (fields.value.tcp === '') {
-      fields.value.tcp = newValue?.[0]?.id || ''
+      fields.value.tcp =
+        newValue?.find?.((item) => item.id === 'default')?.id ||
+        newValue?.[0]?.id ||
+        ''
     }
   },
   { deep: true, immediate: true }

package/components/common/wizards/network/add/steps/portProperties/PortPropertiesOld.vue

@@ -146,7 +146,7 @@
                 <select id="tsp" v-model="fields.tcp" data-id="tsp-select">
                   <template v-for="tcp in props.tcpStacks" :key="tcp.id">
                     <option :value="tcp.id">
-                      {{ localization.common[tcp.id] }}
+                      {{ localization.common[tcp.id] || tcp.id }}
                     </option>
                   </template>
                   <!--                  <option value="1">{{ localization.common.provisioning }}</option>-->

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.761",
+  "version": "1.5.762",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/plugins/time.ts

@@ -1,58 +1,58 @@
-import { defineNuxtPlugin } from '#app'
-import type { UI_T_LangValue } from '~/lib/models/types'
-export default defineNuxtPlugin(() => {
-  const time = function (): any {
-    const self: any = {}
-    self.millisecondsToHour = function (ms: number): number {
-      return ~~(ms / 1000 / 60 / 60 / 24)
-    }
-    self.formatTime = (
-      seconds: number,
-      lang: UI_T_LangValue = 'ru_RU'
-    ): string => {
-      const units = {
-        en_US: { s: 's', m: 'm', h: 'h' },
-        ru_RU: { s: 'с', m: 'м', h: 'ч' },
-        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
-        be_BY: { s: 'с', m: 'хв', h: 'г' },
-        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
-        zh_CHS: { s: '秒', m: '分', h: '时' },
-        BROWSER: { s: 's', m: 'm', h: 'h' },
-      }
-
-      const unit = units[lang] || units.en_US
-
-      if (seconds < 60) {
-        return `${seconds}${unit.s}`
-      }
-
-      const hours = Math.floor(seconds / 3600)
-      const minutes = Math.floor((seconds % 3600) / 60)
-      const secs = seconds % 60
-
-      let result = ''
-
-      if (hours > 0) {
-        result += `${hours}${unit.h} `
-      }
-
-      if (minutes > 0) {
-        result += `${minutes}${unit.m} `
-      }
-
-      if (secs > 0) {
-        result += `${secs}${unit.s}`
-      }
-
-      return result.trim()
-    }
-
-    return self
-  }.call({})
-
-  return {
-    provide: {
-      time,
-    },
-  }
-})
+import { defineNuxtPlugin } from '#app'
+import type { UI_T_LangValue } from '~/lib/models/types'
+export default defineNuxtPlugin(() => {
+  const time = function (): any {
+    const self: any = {}
+    self.millisecondsToHour = function (ms: number): number {
+      return ~~(ms / 1000 / 60 / 60 / 24)
+    }
+    self.formatTime = (
+      seconds: number,
+      lang: UI_T_LangValue = 'ru_RU'
+    ): string => {
+      const units = {
+        en_US: { s: 's', m: 'm', h: 'h' },
+        ru_RU: { s: 'с', m: 'м', h: 'ч' },
+        hy_AM: { s: 'վ', m: 'ր', h: 'ժ' },
+        be_BY: { s: 'с', m: 'хв', h: 'г' },
+        kk_KZ: { s: 'сек', m: 'мин', h: 'сағ' },
+        zh_CHS: { s: '秒', m: '分', h: '时' },
+        BROWSER: { s: 's', m: 'm', h: 'h' },
+      }
+
+      const unit = units[lang] || units.en_US
+
+      if (seconds < 60) {
+        return `${seconds}${unit.s}`
+      }
+
+      const hours = Math.floor(seconds / 3600)
+      const minutes = Math.floor((seconds % 3600) / 60)
+      const secs = seconds % 60
+
+      let result = ''
+
+      if (hours > 0) {
+        result += `${hours}${unit.h} `
+      }
+
+      if (minutes > 0) {
+        result += `${minutes}${unit.m} `
+      }
+
+      if (secs > 0) {
+        result += `${secs}${unit.s}`
+      }
+
+      return result.trim()
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      time,
+    },
+  }
+})