bfg-common 1.3.328 → 1.3.330

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

@@ -105,7 +105,7 @@ const emits = defineEmits<{
 const localization = computed<UI_I_Localization>(() => useLocal())
 
 const loading = ref<boolean>(false)
-const datastoreType = ref<UI_T_DatastoreType>('local')
+const datastoreType = ref<UI_T_DatastoreType>(props.mode === 'procurator' ? 'local' : 'shared-storm')
 const nfsVersion = ref<UI_T_NfsType>('nfs-3')
 
 const stepPosition = ref<number>(0)

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

@@ -1,67 +1,70 @@
-import { API_UI_I_Error } from '~/lib/models/store/interfaces'
-import {
-  UI_I_DatastoreValidityName,
-  UI_T_WizardDatastoreMode,
-} from '~/components/common/wizards/datastore/add/lib/models/types'
-// import {
-//   UI_I_CreateDatastoreBodyRequest,
-//   I_CreateStorageUuid,
-// } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-
-// type T_StoragePoolNameResult = {
-//   data: I_CreateStorageUuid
-//   msg: API_UI_I_Error
-// }
-
-// type T_NullableStoragePoolNameResult = {
-//   [K in keyof T_StoragePoolNameResult]: T_StoragePoolNameResult[K] | null
-// }
-
-export const checkValidityName = async (
-  name: string,
-  _mode: UI_T_WizardDatastoreMode = 'procurator'
-): Promise<UI_I_DatastoreValidityName> => {
-
-  // @ts-ignore
-  const { error } = await useMyFetch<null, API_UI_I_Error>(
-    `/ui/ds/validate?name=${name}`,
-    {
-      method: 'GET',
-    }
-  )
-
-  if (error.value && error.value.data.error_code !== 0) {
-    const existError = error.value.data?.error_message || error.value.data
-
-    return { valid: false, msg: existError }
-  }
-
-  return { valid: true, msg: null }
-}
-
-// export const getStoragePoolName = async <T>(
-//   url: string,
-//   params: T
-// ): Promise<T_NullableStoragePoolNameResult> => {
-//   const { data, error } = await useMyFetch<I_CreateStorageUuid, API_UI_I_Error>(
-//     url,
-//     {
-//       method: 'POST',
-//       body: params,
-//     }
-//   )
-//
-//   if (error.value) return { data: null, msg: error.value }
-//
-//   return { data: data.value, msg: null }
-// }
-
-// export const createDatastore = async <T = UI_I_CreateDatastoreBodyRequest>(
-//   params: T
-// ): Promise<API_UI_I_Error> => {
-//   const { error } = await useMyFetch<any, API_UI_I_Error>('/api/v1/pn/ds', {
-//     method: 'POST',
-//     body: params,
-//   })
-//   return error.value
-// }
+import { API_UI_I_Error } from '~/lib/models/store/interfaces'
+import {
+  UI_I_DatastoreValidityName,
+  UI_T_WizardDatastoreMode,
+} from '~/components/common/wizards/datastore/add/lib/models/types'
+// import {
+//   UI_I_CreateDatastoreBodyRequest,
+//   I_CreateStorageUuid,
+// } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+// type T_StoragePoolNameResult = {
+//   data: I_CreateStorageUuid
+//   msg: API_UI_I_Error
+// }
+
+// type T_NullableStoragePoolNameResult = {
+//   [K in keyof T_StoragePoolNameResult]: T_StoragePoolNameResult[K] | null
+// }
+
+export const checkValidityName = async (
+  name: string,
+  mode: UI_T_WizardDatastoreMode = 'procurator'
+): Promise<UI_I_DatastoreValidityName> => {
+  // TODO move to projects!!!
+
+  const kind = 10 // TODO move in global space
+  const url =
+    mode === 'procurator'
+      ? `/ui/ds/validate?name=${name}`
+      : `/ui/object/validate_name?name=${name}&kind=${kind}`
+  // @ts-ignore
+  const { error } = await useMyFetch<null, API_UI_I_Error>(url, {
+    method: 'GET',
+  })
+
+  if (error.value && error.value.data.error_code !== 0) {
+    const existError = error.value.data?.error_message || error.value.data
+
+    return { valid: false, msg: existError }
+  }
+
+  return { valid: true, msg: null }
+}
+
+// export const getStoragePoolName = async <T>(
+//   url: string,
+//   params: T
+// ): Promise<T_NullableStoragePoolNameResult> => {
+//   const { data, error } = await useMyFetch<I_CreateStorageUuid, API_UI_I_Error>(
+//     url,
+//     {
+//       method: 'POST',
+//       body: params,
+//     }
+//   )
+//
+//   if (error.value) return { data: null, msg: error.value }
+//
+//   return { data: data.value, msg: null }
+// }
+
+// export const createDatastore = async <T = UI_I_CreateDatastoreBodyRequest>(
+//   params: T
+// ): Promise<API_UI_I_Error> => {
+//   const { error } = await useMyFetch<any, API_UI_I_Error>('/api/v1/pn/ds', {
+//     method: 'POST',
+//     body: params,
+//   })
+//   return error.value
+// }

package/components/common/wizards/datastore/add/local/createName/CreateName.vue

@@ -1,160 +1,160 @@
-<template>
-  <div class="create-datastore-name">
-    <atoms-alert
-      v-show="errors.length"
-      test-id="datastore-creat-name"
-      status="alert-danger"
-      :items="errors"
-      @remove="onRemoveValidationErrors"
-    />
-
-    <div class="clr-form-control clr-row">
-      <label for="datastore-name" class="clr-control-label clr-col-md-2">{{
-        localization.datastoreName
-      }}</label>
-
-      <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
-        <div class="flex-align-center">
-          <input
-            id="datastore-name"
-            v-model.trim="form.name.value"
-            data-id="datastore-name-input"
-            type="text"
-            class="clr-input"
-            @blur="onBlurInputName"
-            @input="onInputName"
-          />
-          <atoms-the-icon class="error-icon" name="info-circle" />
-        </div>
-
-        <div class="clr-subtext ng-star-inserted">
-          {{ nameErrorText }}
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
-import { UI_I_Localization } from '~/lib/models/interfaces'
-import { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
-import { defaultFormFunc } from '~/components/common/wizards/datastore/add/local/createName/lib/config/defaultForm'
-import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
-
-const props = defineProps<{
-  localCreateNameSubmit: number
-}>()
-const emits = defineEmits<{
-  (event: 'loading', value: boolean): void
-  (event: 'submit', value: string): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $validation } = useNuxtApp()
-
-const validation = $validation.call({})
-const defaultForm: UI_I_FormValidationDataStore = defaultFormFunc(
-  localization.value
-)
-const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
-
-const setForm = () => {
-  form.value = useDeepCopy(defaultForm)
-  validation.setForm(form)
-}
-setForm()
-
-const validForm = ref<UI_I_ValidationTouchResult | null>(null)
-
-/* Validation for Name input */
-const isInitNameValidation = ref<boolean>(false)
-const onBlurInputName = (): void => {
-  validForm.value = validation.touch()
-  isInitNameValidation.value = true
-}
-const onInputName = () => {
-  validForm.value = validation.touch()
-}
-const nameErrorText = computed<string>(() => {
-  if (!isInitNameValidation.value) return ''
-  return validForm.value?.errors?.name?.[0] || ''
-})
-/* Validation Name input end */
-
-const errors = ref<string[]>([])
-const showValidationErrors = (data: string[]): void => {
-  errors.value = data
-}
-const onRemoveValidationErrors = (): void => {
-  errors.value = []
-}
-const submit = async (): Promise<void> => {
-  const name = form.value.name.value
-
-  if (!name) {
-    validForm.value = validation.touch()
-    isInitNameValidation.value = true
-    if (nameErrorText.value) return
-  }
-
-  if (name) {
-    emits('loading', true)
-
-    const { valid, msg } = await checkValidityName(name)
-
-    emits('loading', false)
-
-    if (!valid) {
-      showValidationErrors([msg])
-      return
-    }
-  }
-
-  onRemoveValidationErrors()
-  emits('submit', name)
-}
-watch(
-  () => props.localCreateNameSubmit,
-  () => {
-    submit()
-  }
-)
-</script>
-
-<style lang="scss" scoped>
-.create-datastore-name {
-  &__alert-info {
-    :deep(.alert-text) {
-      font-size: 11px;
-      letter-spacing: normal;
-    }
-  }
-  .clr-form-control {
-    display: flex;
-    flex-direction: row;
-
-    .clr-control-container {
-      min-height: 48px;
-      input {
-        width: 375px;
-      }
-      &.clr-error {
-        .clr-subtext,
-        .error-icon {
-          display: block;
-        }
-      }
-      .clr-subtext,
-      .error-icon {
-        display: none;
-      }
-      .error-icon {
-        fill: #db2100;
-        width: 24px;
-        height: 24px;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="create-datastore-name">
+    <atoms-alert
+      v-show="errors.length"
+      test-id="datastore-creat-name"
+      status="alert-danger"
+      :items="errors"
+      @remove="onRemoveValidationErrors"
+    />
+
+    <div class="clr-form-control clr-row">
+      <label for="datastore-name" class="clr-control-label clr-col-md-2">{{
+        localization.datastoreName
+      }}</label>
+
+      <div class="clr-control-container" :class="nameErrorText && 'clr-error'">
+        <div class="flex-align-center">
+          <input
+            id="datastore-name"
+            v-model.trim="form.name.value"
+            data-id="datastore-name-input"
+            type="text"
+            class="clr-input"
+            @blur="onBlurInputName"
+            @input="onInputName"
+          />
+          <atoms-the-icon class="error-icon" name="info-circle" />
+        </div>
+
+        <div class="clr-subtext ng-star-inserted">
+          {{ nameErrorText }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_ValidationTouchResult } from '~/lib/models/plugins/validation/interfaces'
+import { UI_I_Localization } from '~/lib/models/interfaces'
+import { UI_I_FormValidationDataStore } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/lib/models/interfaces'
+import { defaultFormFunc } from '~/components/common/wizards/datastore/add/local/createName/lib/config/defaultForm'
+import { checkValidityName } from '~/components/common/wizards/datastore/add/lib/utils'
+
+const props = defineProps<{
+  localCreateNameSubmit: number
+}>()
+const emits = defineEmits<{
+  (event: 'loading', value: boolean): void
+  (event: 'submit', value: string): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $validation } = useNuxtApp()
+
+const validation = $validation.call({})
+const defaultForm: UI_I_FormValidationDataStore = defaultFormFunc(
+  localization.value
+)
+const form = ref<UI_I_FormValidationDataStore>(useDeepCopy(defaultForm))
+
+const setForm = () => {
+  form.value = useDeepCopy(defaultForm)
+  validation.setForm(form)
+}
+setForm()
+
+const validForm = ref<UI_I_ValidationTouchResult | null>(null)
+
+/* Validation for Name input */
+const isInitNameValidation = ref<boolean>(false)
+const onBlurInputName = (): void => {
+  validForm.value = validation.touch()
+  isInitNameValidation.value = true
+}
+const onInputName = () => {
+  validForm.value = validation.touch()
+}
+const nameErrorText = computed<string>(() => {
+  if (!isInitNameValidation.value) return ''
+  return validForm.value?.errors?.name?.[0] || ''
+})
+/* Validation Name input end */
+
+const errors = ref<string[]>([])
+const showValidationErrors = (data: string[]): void => {
+  errors.value = data
+}
+const onRemoveValidationErrors = (): void => {
+  errors.value = []
+}
+const submit = async (): Promise<void> => {
+  const name = form.value.name.value
+
+  if (!name) {
+    validForm.value = validation.touch()
+    isInitNameValidation.value = true
+    if (nameErrorText.value) return
+  }
+
+  if (name) {
+    emits('loading', true)
+
+    const { valid, msg } = await checkValidityName(name)
+
+    emits('loading', false)
+
+    if (!valid) {
+      showValidationErrors([msg])
+      return
+    }
+  }
+
+  onRemoveValidationErrors()
+  emits('submit', name)
+}
+watch(
+  () => props.localCreateNameSubmit,
+  () => {
+    submit()
+  }
+)
+</script>
+
+<style lang="scss" scoped>
+.create-datastore-name {
+  &__alert-info {
+    :deep(.alert-text) {
+      font-size: 11px;
+      letter-spacing: normal;
+    }
+  }
+  .clr-form-control {
+    display: flex;
+    flex-direction: row;
+
+    .clr-control-container {
+      min-height: 48px;
+      input {
+        width: 375px;
+      }
+      &.clr-error {
+        .clr-subtext,
+        .error-icon {
+          display: block;
+        }
+      }
+      .clr-subtext,
+      .error-icon {
+        display: none;
+      }
+      .error-icon {
+        fill: #db2100;
+        width: 24px;
+        height: 24px;
+      }
+    }
+  }
+}
+</style>

package/components/common/wizards/datastore/add/nfs/configuration/Configuration.vue

@@ -295,7 +295,7 @@ const submit = async (): Promise<void> => {
 
   emits('loading', true)
 
-  const { valid, msg } = await checkValidityName(name.value)
+  const { valid, msg } = await checkValidityName(name.value, props.mode)
 
   emits('loading', false)
 

package/package.json

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