bfg-common 1.2.35 → 1.2.37

package/components/common/addNetworking/AddNetworking.vue

@@ -71,6 +71,7 @@
         :network-label-existing-error-message="networkLabelExistingErrorMessage"
         :mtu-from-switch="mtuFromSwitch"
         :error="error"
+        :project="props.project"
         @set-error-empty="onSetErrorFieldEmpty"
         @change-error-messages="onChangeErrorMessages"
         @hide-error-message-alert="onHideErrorMessageAlert"
@@ -126,6 +127,7 @@
 
 <script setup lang="ts">
 import { UI_I_ArbitraryObject, UI_I_Localization } from '~/models/interfaces'
+import { UI_T_Project } from '~/models/types'
 import {
   createZeroSchemeReadyCompleteFunc,
   createFirstSchemeReadyCompleteFunc,
@@ -176,6 +178,7 @@ const props = withDefaults(
     isNetworkInvalid?: UI_I_NetworkLabelCheckExisting
     freeAdapters: UI_I_Adapter[]
     adapters: UI_I_SwitchAdapters
+    project?: UI_T_Project
   }>(),
   {
     isNetworkInvalid: () => isNetworkInvalidInitial,
@@ -184,6 +187,7 @@ const props = withDefaults(
     title: '',
     freeAdapters: () => [],
     standardSwitchesInitial: () => [],
+    project: 'procurator',
   }
 )
 

package/components/common/addNetworking/config/portPropertiesStep.ts

@@ -2,18 +2,30 @@ import { UI_I_Localization } from '~/models/interfaces'
 import { UI_I_PortPropertiesEnabledService } from '~/components/common/addNetworking/models/interfaces'
 
 export const portPropertiesEnabledServicesFunc = (
-    localization: UI_I_Localization
-): UI_I_PortPropertiesEnabledService[] => [
-  { label: localization.provisioning, modelValue: 'provisioning' },
-  // {
-  //   label: localization.faultToleranceLogging,
-  //   modelValue: 'faultToleranceLogging',
-  // },
-  { label: localization.management, modelValue: 'management' },
-  // { label: localization.procuratorReplication, modelValue: 'replication' },
-  // { label: localization.procuratorReplicationNFC, modelValue: 'replicationNFC' },
-  { label: localization.vSAN, modelValue: 'vSAN' },
-  // { label: localization.procuratorBackupNFC, modelValue: 'backupNFC' },
-  // { label: localization.nvmEOverTCP, modelValue: 'nVMeOverTCP' },
-  // { label: localization.nvmEOverRDMA, modelValue: 'nVMeOverRDMA' },
-]
+  localization: UI_I_Localization,
+  isSphereProject: boolean
+): UI_I_PortPropertiesEnabledService[] => {
+  let enabledServices = [
+    { label: localization.provisioning, modelValue: 'provisioning' },
+    // {
+    //   label: localization.faultToleranceLogging,
+    //   modelValue: 'faultToleranceLogging',
+    // },
+    { label: localization.management, modelValue: 'management' },
+    // { label: localization.procuratorReplication, modelValue: 'replication' },
+    // { label: localization.procuratorReplicationNFC, modelValue: 'replicationNFC' },
+    { label: localization.vSAN, modelValue: 'vSAN' },
+    // { label: localization.procuratorBackupNFC, modelValue: 'backupNFC' },
+    // { label: localization.nvmEOverTCP, modelValue: 'nVMeOverTCP' },
+    // { label: localization.nvmEOverRDMA, modelValue: 'nVMeOverRDMA' },
+  ]
+
+  if (!isSphereProject) {
+    enabledServices = enabledServices.filter(
+      (service: UI_I_PortPropertiesEnabledService) =>
+        service.modelValue !== 'provisioning'
+    )
+  }
+
+  return enabledServices
+}

package/components/common/addNetworking/models/interfaces.ts

@@ -2,7 +2,7 @@ import { UI_E_StepStatus } from '~/components/common/addNetworking/models/enums'
 import { UI_T_TCP } from '~/components/common/addNetworking/models/types'
 
 export interface UI_I_Services {
-  vMotion: boolean
+  vMotion?: boolean
   provisioning: boolean
   faultToleranceLogging: boolean
   management: boolean
@@ -137,7 +137,7 @@ export interface UI_I_AddNetworkingZeroOrFirstSchemeDataSend {
   mtu: number
   services: {
     management: boolean
-    vmotion: boolean
+    vmotion?: boolean
     provisioning: boolean
     vsan: boolean
     fault_tolerance_logging: boolean

package/components/common/addNetworking/models/types.ts

@@ -1,5 +1,13 @@
 export type UI_T_ConnectionSettingsFieldName = 'networkLabel' | 'vlanId'
-export type UI_T_IpFourSettingsFieldName = 'ipFourAddress' | 'subnetMask' | 'defaultGateway'
+export type UI_T_IpFourSettingsFieldName =
+  | 'ipFourAddress'
+  | 'subnetMask'
+  | 'defaultGateway'
 export type UI_T_PortPropertiesFieldName = 'networkLabel' | 'vlanId' | 'mtu'
-export type UI_T_TargetDeviceFieldName = 'network' | 'switch' | 'standardSwitch' | 'mtu'
-export type UI_T_TCP = 'default' | '1' | '2'
+export type UI_T_TargetDeviceFieldName =
+  | 'network'
+  | 'switch'
+  | 'standardSwitch'
+  | 'mtu'
+export type UI_T_TCP = 'default' | '1' | '2'
+export type UI_T_Project = 'procurator' | 'sphere'

package/components/common/addNetworking/steps/PortProperties.vue

@@ -135,7 +135,7 @@
                 <select id="tsp" v-model="fields.tcp">
                   <option value="default">{{ localization.default }}</option>
                   <option value="1">{{ localization.provisioning }}</option>
-                  <option value="2">{{ localization.vMotion }}</option>
+                  <!--                  <option value="2">{{ localization.vMotion }}</option>-->
                 </select>
               </div>
             </div>
@@ -158,10 +158,17 @@
                   { disabled: fields.tcp !== 'default' },
                 ]"
               >
-                <label>
+                <label v-if="isSphereProject">
                   <input v-model="fields.services.vMotion" type="checkbox" />
                   {{ localization.vMotion }}
                 </label>
+                <label v-else>
+                  <input
+                    v-model="fields.services.provisioning"
+                    type="checkbox"
+                  />
+                  {{ localization.provisioning }}
+                </label>
               </div>
             </div>
           </div>
@@ -194,6 +201,7 @@
 
 <script setup lang="ts">
 import { UI_I_ArbitraryObject, UI_I_Localization } from '~/models/interfaces'
+import { UI_T_Project } from '~/models/types'
 import {
   servicesInitial,
   vlanIdSelectData,
@@ -221,6 +229,7 @@ const props = withDefaults(
     networkLabelExistingErrorMessage: string
     mtuFromSwitch: number
     error: UI_I_ArbitraryObject<string>
+    project: UI_T_Project
   }>(),
   {
     mtuFromSwitch: 1500,
@@ -230,9 +239,11 @@ const props = withDefaults(
 // UI_I_Localization
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const isSphereProject = computed<boolean>(() => props.project === 'sphere')
+
 // Making port properties enabled services template
 const portPropertiesEnabledServices = computed(() =>
-  portPropertiesEnabledServicesFunc(localization.value)
+  portPropertiesEnabledServicesFunc(localization.value, isSphereProject.value)
 )
 
 // Define emits for changing data and validation messages

package/components/common/monitor/models/interfaces.ts

@@ -18,4 +18,5 @@ export interface UI_I_MonitorGraphPayload {
   hostName?: string
   fields?: string
   metricType?: string
+  place?: number
 }

package/package.json

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