bfg-common 1.5.491 → 1.5.493

package/components/common/vm/actions/register/lib/config/steps.ts

@@ -1,86 +1,86 @@
-import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
-import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-
-export const dynamicSteps = {
-  selectName: 0,
-  selectNameFolder: 1,
-  selectComputeResource: 2,
-  readyComplete: 3,
-}
-
-export const stepsFunc = (
-  localization: UI_I_Localization
-): UI_I_WizardStep[] => {
-  return [
-    // Procurator
-    {
-      id: dynamicSteps.selectName,
-      stepName: '',
-      title: localization.common.selectName,
-      subTitle: localization.common.specifyUniqueName,
-      status: UI_E_WIZARD_STATUS.SELECTED,
-      isValid: true,
-      testId: 'vm-select-name',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectNameFolder,
-      stepName: '',
-      title: localization.vmWizard.selectNameFolder,
-      subTitle: localization.common.specifyUniqueNameTargetLocation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-name-folder',
-      fields: {
-        name: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    // Sphere
-    {
-      id: dynamicSteps.selectComputeResource,
-      stepName: '',
-      title: localization.vmWizard.selectComputeResource,
-      subTitle: localization.common.selectDestinationComputeResourceOperation,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-select-compute-resource',
-      fields: {
-        computeResource: {
-          field: '',
-          alert: '',
-        },
-      },
-    },
-    {
-      id: dynamicSteps.readyComplete,
-      stepName: '',
-      title: localization.vmWizard.readyComplete,
-      subTitle: localization.vmWizard.lastCreateSubtitle,
-      status: UI_E_WIZARD_STATUS.INACTIVE,
-      isValid: true,
-      testId: 'vm-ready-complete',
-      fields: {},
-    },
-  ]
-}
-
-export const stepsSchemeInitial = [
-  // 0 Procurator
-  [dynamicSteps.selectName, dynamicSteps.readyComplete],
-  // 1 Sphere
-  [
-    dynamicSteps.selectNameFolder,
-    dynamicSteps.selectComputeResource,
-    dynamicSteps.readyComplete,
-  ],
-]
+import type { UI_I_WizardStep } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/interfaces'
+import { UI_E_WIZARD_STATUS } from '~/node_modules/bfg-uikit/components/ui/wizard/lib/models/enums'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+export const dynamicSteps = {
+  selectName: 0,
+  selectNameFolder: 1,
+  selectComputeResource: 2,
+  readyComplete: 3,
+}
+
+export const stepsFunc = (
+  localization: UI_I_Localization
+): UI_I_WizardStep[] => {
+  return [
+    // Procurator
+    {
+      id: dynamicSteps.selectName,
+      stepName: '',
+      title: localization.common.selectName,
+      subTitle: localization.common.specifyUniqueName,
+      status: UI_E_WIZARD_STATUS.SELECTED,
+      isValid: true,
+      testId: 'vm-select-name',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectNameFolder,
+      stepName: '',
+      title: localization.vmWizard.selectNameFolder,
+      subTitle: localization.common.specifyUniqueNameTargetLocation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-name-folder',
+      fields: {
+        name: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    // Sphere
+    {
+      id: dynamicSteps.selectComputeResource,
+      stepName: '',
+      title: localization.vmWizard.selectComputeResource,
+      subTitle: localization.common.selectDestinationComputeResourceOperation,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-select-compute-resource',
+      fields: {
+        computeResource: {
+          field: '',
+          alert: '',
+        },
+      },
+    },
+    {
+      id: dynamicSteps.readyComplete,
+      stepName: '',
+      title: localization.vmWizard.readyComplete,
+      subTitle: localization.vmWizard.lastCreateSubtitle,
+      status: UI_E_WIZARD_STATUS.INACTIVE,
+      isValid: true,
+      testId: 'vm-ready-complete',
+      fields: {},
+    },
+  ]
+}
+
+export const stepsSchemeInitial = [
+  // 0 Procurator
+  [dynamicSteps.selectName, dynamicSteps.readyComplete],
+  // 1 Sphere
+  [
+    dynamicSteps.selectNameFolder,
+    dynamicSteps.selectComputeResource,
+    dynamicSteps.readyComplete,
+  ],
+]

package/components/common/wizards/datastore/add/Add.vue

@@ -59,11 +59,13 @@ const props = withDefaults(
     nfsHosts?: UI_I_CompatibleHosts
     hostId?: string
     isMainFilter?: boolean
+    datacenterId?: string // For Sphere
   }>(),
   {
     nfsHosts: undefined,
     hostId: undefined,
     isMainFilter: undefined,
+    datacenterId: '',
   }
 )
 const emits = defineEmits<{
@@ -111,7 +113,8 @@ const validationFunc = async (
       dynamicSteps.nameAndDevice,
       'datastoreName',
       wizard,
-      props.project
+      props.project,
+      props.datacenterId
     )
 
     value = nameValidation.newValue
@@ -144,7 +147,8 @@ const validationFunc = async (
       dynamicSteps.nameAndConfigure,
       'name',
       wizard,
-      props.project
+      props.project,
+      props.datacenterId
     )
     value = nameValidation.newValue
 

package/components/common/wizards/datastore/add/lib/utils.ts

@@ -3,30 +3,60 @@ import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
 import type { UI_T_Project } from '~/lib/models/types'
 import { UI_E_Kind } from '~/lib/models/enums'
 
-export const checkValidityName = async (
-  name: string,
-  wizard: Wizard,
-  project: UI_T_Project,
+export const checkValidityName = async ({
+  name,
+  wizard,
+  project,
+  sendMessage,
+  datacenterId,
+}: {
+  name: string
+  wizard: Wizard
+  project: UI_T_Project
   sendMessage: (message: string) => void
-): Promise<void> => {
-
+  datacenterId?: string
+}): Promise<void> => {
   wizard.setLoader(true)
-  const url =
-    project === 'procurator'
-      ? `/ui/ds/validate?name=${encodeURIComponent(name)}`
-      : `/ui/object/validate_name?name=${encodeURIComponent(name)}&kind=${UI_E_Kind.STORAGE_VALIDATION_NAME}`
-  // @ts-ignore
-  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
-    method: 'GET',
-  })
-  wizard.setLoader(false)
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-    sendMessage(existError)
-    return
+
+  try {
+    const url = buildValidationUrl(name, project, datacenterId)
+
+    const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+      method: 'GET',
+    })
+
+    if (error?.value?.data?.error_code !== 0) {
+      const existError =
+        error.value.data?.error_message ?? String(error.value.data)
+      sendMessage(existError)
+      return
+    }
+
+    sendMessage('')
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : 'Unknown error'
+    sendMessage(msg)
+  } finally {
+    wizard.setLoader(false)
   }
-  sendMessage('')
+}
+
+const buildValidationUrl = (
+  name: string,
+  project: UI_T_Project,
+  datacenterId?: string
+): string => {
+  if (project === 'procurator') {
+    const params = new URLSearchParams({ name })
+    return `/ui/ds/validate?${params.toString()}`
+  }
+
+  const params = new URLSearchParams()
+  params.set('name', name)
+  params.set('kind', String(UI_E_Kind.STORAGE_VALIDATION_NAME))
+  if (datacenterId) params.set('datacenter', datacenterId)
+
+  return `/ui/object/validate_name?${params.toString()}`
 }
 
 export const validateNameAndGenerateDataId = (

package/components/common/wizards/datastore/add/lib/validations.ts

@@ -13,7 +13,8 @@ const checkName = async (
   form: UI_I_CreateDatastoreForm,
   localization: UI_I_Localization,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_AsyncCheckReturn> => {
   const typeCode = form.type_code
 
@@ -26,11 +27,17 @@ const checkName = async (
   }
   if (form.name && help) {
     return new Promise((resolve, _reject) =>
-      checkValidityName(form.name, wizard, project, (message: string) => {
-        resolve({
-          isValid: message === '',
-          message: message === '' ? '' : message,
-        })
+      checkValidityName({
+        name: form.name,
+        wizard,
+        project,
+        datacenterId,
+        sendMessage: (message: string) => {
+          resolve({
+            isValid: message === '',
+            message: message === '' ? '' : message,
+          })
+        },
       })
     )
   } else {
@@ -47,14 +54,15 @@ export const checkDatastoreNameAsync = async (
   stepId: number,
   fieldName: string,
   wizard: Wizard,
-  project: UI_T_Project
+  project: UI_T_Project,
+  datacenterId?: string
 ): Promise<UI_I_ValidationReturn> => {
   let stepHasError = false
 
   const labelValidation: {
     isValid: boolean
     message: string
-  } = await checkName(form, localization, wizard, project)
+  } = await checkName(form, localization, wizard, project, datacenterId)
 
   if (!labelValidation.isValid) {
     stepHasError = wizard.setValidation(stepId, fieldName, {

package/components/common/wizards/datastore/add/steps/typeMode/lib/config/typeOptions.ts

@@ -1,43 +1,43 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
-
-export const datastoreTypesFunc = (
-  localization: UI_I_Localization,
-  _project?: UI_T_Project
-): UI_I_RadioOption[] => {
-  return [
-    {
-      id: 'datastore-type-shared-storm',
-      label: localization.common.stormSharedStorage,
-      value: 2,
-      disabled: false,
-      description: localization.common.sharedStormDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.stormSharedStorageHelpDesc,
-      testId: 'datastore-type-shared-storm',
-    },
-    {
-      id: 'datastore-type-nfs',
-      label: localization.common.nfs,
-      value: 4,
-      disabled: false,
-      description: localization.common.nfsDesc,
-      isTooltip: false,
-      tooltipContent: localization.common.nfsHelpDesc,
-      testId: 'datastore-type-nfs',
-    },
-  ]
-
-  // if (project === 'procurator') {
-  //   types.unshift({
-  //     label: localization.common.localStorage,
-  //     value: 1,
-  //     disabled: false,
-  //     description: localization.common.localDesc,
-  //     isTooltip: false,
-  //     tooltipContent: localization.common.localStorageHelpDesc,
-  //     testId: 'datastore-type-local',
-  //   })
-  // }
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+import type { UI_I_RadioOption } from '~/components/common/select/radio/lib/models/interfaces'
+
+export const datastoreTypesFunc = (
+  localization: UI_I_Localization,
+  _project?: UI_T_Project
+): UI_I_RadioOption[] => {
+  return [
+    {
+      id: 'datastore-type-shared-storm',
+      label: localization.common.stormSharedStorage,
+      value: 2,
+      disabled: false,
+      description: localization.common.sharedStormDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.stormSharedStorageHelpDesc,
+      testId: 'datastore-type-shared-storm',
+    },
+    {
+      id: 'datastore-type-nfs',
+      label: localization.common.nfs,
+      value: 4,
+      disabled: false,
+      description: localization.common.nfsDesc,
+      isTooltip: false,
+      tooltipContent: localization.common.nfsHelpDesc,
+      testId: 'datastore-type-nfs',
+    },
+  ]
+
+  // if (project === 'procurator') {
+  //   types.unshift({
+  //     label: localization.common.localStorage,
+  //     value: 1,
+  //     disabled: false,
+  //     description: localization.common.localDesc,
+  //     isTooltip: false,
+  //     tooltipContent: localization.common.localStorageHelpDesc,
+  //     testId: 'datastore-type-local',
+  //   })
+  // }
+}

package/components/common/wizards/vm/migrate/select/network/Network.vue

@@ -1,103 +1,103 @@
-<template>
-  <div class="select-network">
-    <div class="select-network__text">
-      {{ selectNetworkHeadline }}
-    </div>
-
-    <common-wizards-vm-migrate-select-network-table-network
-      v-model="model"
-      :networks="dataNetwork"
-      :source-networks="sourceNetworks"
-    />
-
-    <common-wizards-vm-common-validation-compatibility
-      :loading="false"
-      status="Success"
-      text="compatibilityChecksSucceeded"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
-
-const model = defineModel<any>({ required: true })
-
-const props = defineProps<{
-  vmInfo: any | null
-  networks: any
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const selectNetworkHeadline = computed<string>(() => {
-  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
-    localization.value.common
-
-  return model.value.isBasicNetworkMode
-    ? migrateNetworkingForAllAdapters
-    : migrateNetworkingForEachAdapters
-})
-
-const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
-  return props.networks?.items?.map((network) => {
-    return {
-      id: network.id,
-      name: network.name,
-      net_bridge: '',
-    }
-  })
-})
-
-const dataNetwork = computed(() => {
-  return (
-    props.vmInfo?.network_devices?.map((network) => {
-      const destinationNetwork =
-        sourceNetworks.value?.map((src) => {
-          return { text: src.name, value: src.name }
-        }) || []
-      return {
-        mac: network.mac,
-        network_adapter: network.model,
-        source_network: network.network,
-        value: destinationNetwork[0]?.value || '',
-        destination_network: [
-          ...destinationNetwork,
-          { text: `${localization.value.common.browse}...`, value: 'browser' },
-        ],
-      }
-    }) || []
-  )
-})
-watch(
-  dataNetwork,
-  (newValue) => {
-    model.value = {}
-    const newModel = {}
-    newValue.forEach((item: any) => {
-      newModel[item.mac] = item.value
-    })
-    model.value = newModel
-  },
-  { deep: true }
-)
-</script>
-
-<style lang="scss" scoped>
-@import 'assets/scss/common/mixins';
-.select-network {
-  @include flex($dir: column);
-  height: inherit;
-  margin-top: 10px;
-  &__text {
-    font-size: 12px;
-  }
-  &__matcher-details {
-    margin-top: 10px;
-  }
-  .vm-migrate-advanced-view-button {
-    text-align: end;
-  }
-}
-</style>
+<template>
+  <div class="select-network">
+    <div class="select-network__text">
+      {{ selectNetworkHeadline }}
+    </div>
+
+    <common-wizards-vm-migrate-select-network-table-network
+      v-model="model"
+      :networks="dataNetwork"
+      :source-networks="sourceNetworks"
+    />
+
+    <common-wizards-vm-common-validation-compatibility
+      :loading="false"
+      status="Success"
+      text="compatibilityChecksSucceeded"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interfaces'
+
+const model = defineModel<any>({ required: true })
+
+const props = defineProps<{
+  vmInfo: any | null
+  networks: any
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const selectNetworkHeadline = computed<string>(() => {
+  const { migrateNetworkingForAllAdapters, migrateNetworkingForEachAdapters } =
+    localization.value.common
+
+  return model.value.isBasicNetworkMode
+    ? migrateNetworkingForAllAdapters
+    : migrateNetworkingForEachAdapters
+})
+
+const sourceNetworks = computed<UI_I_NetworkTableItem[]>(() => {
+  return props.networks?.items?.map((network) => {
+    return {
+      id: network.id,
+      name: network.name,
+      net_bridge: '',
+    }
+  })
+})
+
+const dataNetwork = computed(() => {
+  return (
+    props.vmInfo?.network_devices?.map((network) => {
+      const destinationNetwork =
+        sourceNetworks.value?.map((src) => {
+          return { text: src.name, value: src.name }
+        }) || []
+      return {
+        mac: network.mac,
+        network_adapter: network.model,
+        source_network: network.network,
+        value: destinationNetwork[0]?.value || '',
+        destination_network: [
+          ...destinationNetwork,
+          { text: `${localization.value.common.browse}...`, value: 'browser' },
+        ],
+      }
+    }) || []
+  )
+})
+watch(
+  dataNetwork,
+  (newValue) => {
+    model.value = {}
+    const newModel = {}
+    newValue.forEach((item: any) => {
+      newModel[item.mac] = item.value
+    })
+    model.value = newModel
+  },
+  { deep: true }
+)
+</script>
+
+<style lang="scss" scoped>
+@import 'assets/scss/common/mixins';
+.select-network {
+  @include flex($dir: column);
+  height: inherit;
+  margin-top: 10px;
+  &__text {
+    font-size: 12px;
+  }
+  &__matcher-details {
+    margin-top: 10px;
+  }
+  .vm-migrate-advanced-view-button {
+    text-align: end;
+  }
+}
+</style>

package/composables/useAppVersion.ts

@@ -1,21 +1,21 @@
-import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
-
-export function useAppVersion(): UI_I_UseAppVersionReturnType {
-  const config = useRuntimeConfig()
-  const version = config.public.APP_VERSION as string
-
-  // const regexHasDot = /\./
-  // const regexHasDotAndB = /\.\d*b$/
-  // const regexHasDotAndD = /\..*d/
-
-  // const isBeta = regexHasDotAndB.test(version)
-  // const isDev =
-  //   regexHasDotAndD.test(version) ||
-  //   (!regexHasDot.test(version) && version.length < 8)
-
-  return {
-    version,
-    // isBeta,
-    // isDev,
-  }
-}
+import type { UI_I_UseAppVersionReturnType } from '~/lib/models/composables/useAppVersion/interfaces'
+
+export function useAppVersion(): UI_I_UseAppVersionReturnType {
+  const config = useRuntimeConfig()
+  const version = config.public.APP_VERSION as string
+
+  // const regexHasDot = /\./
+  // const regexHasDotAndB = /\.\d*b$/
+  // const regexHasDotAndD = /\..*d/
+
+  // const isBeta = regexHasDotAndB.test(version)
+  // const isDev =
+  //   regexHasDotAndD.test(version) ||
+  //   (!regexHasDot.test(version) && version.length < 8)
+
+  return {
+    version,
+    // isBeta,
+    // isDev,
+  }
+}