bfg-common 1.5.697 → 1.5.698

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/New.vue

@@ -1,101 +1,114 @@
-<template>
-  <div class="advanced-options-wrap clr-form-control">
-    <b class="advanced-options-label">
-      {{ localization.common.advancedOptions }}
-    </b>
-    <div class="advanced-options compact">
-      <div class="radio">
-        <input
-          v-model="model"
-          id="advanced-option-liner"
-          data-id="advanced-option-liner"
-          type="radio"
-          value="linear"
-        />
-        <label for="advanced-option-liner"> Linear </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid0"
-          :disabled="props.devNamesCount < 2"
-          data-id="advanced-option-raid0"
-          type="radio"
-          value="raid0"
-        />
-        <label for="advanced-option-raid0"> Raid0 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid1"
-          :disabled="props.devNamesCount < 2"
-          data-id="advanced-option-raid1"
-          type="radio"
-          value="raid1"
-        />
-        <label for="advanced-option-raid1"> Raid1 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid5"
-          :disabled="props.devNamesCount < 3"
-          data-id="advanced-option-raid5"
-          type="radio"
-          value="raid5"
-        />
-        <label for="advanced-option-raid5"> Raid5 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid6"
-          :disabled="props.devNamesCount < 4"
-          data-id="advanced-option-raid6"
-          type="radio"
-          value="raid6"
-        />
-        <label for="advanced-option-raid6"> Raid6 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid10"
-          :disabled="props.devNamesCount < 4"
-          data-id="advanced-option-raid10"
-          type="radio"
-          value="raid10"
-        />
-        <label for="advanced-option-raid10"> Raid10 </label>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
-
-const props = defineProps<{
-  devNamesCount: number
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.advanced-options-wrap {
-  display: flex;
-  gap: 10px;
-  .radio {
-    margin-bottom: 5px;
-  }
-  input[type='radio']:focus:checked + label::before,
-  input[type='radio']:focus + label::before {
-    box-shadow: inset 0 0 0 0.25rem #0094d2;
-  }
-}
-</style>
+<template>
+  <div class="advanced-options-wrap clr-form-control">
+    <b
+      class="advanced-options-label btn btn-link"
+      @click="isShowAdvancedOptions = !isShowAdvancedOptions"
+    >
+      {{ localization.common.advancedOptions }}
+    </b>
+    <div v-show="isShowAdvancedOptions" class="advanced-options compact">
+      <div class="radio">
+        <input
+          v-model="model"
+          id="advanced-option-liner"
+          data-id="advanced-option-liner"
+          type="radio"
+          value="linear"
+        />
+        <label for="advanced-option-liner"> Linear </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid0"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid0"
+          type="radio"
+          value="raid0"
+        />
+        <label for="advanced-option-raid0"> Raid0 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid1"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid1"
+          type="radio"
+          value="raid1"
+        />
+        <label for="advanced-option-raid1"> Raid1 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid5"
+          :disabled="props.devNamesCount < 3"
+          data-id="advanced-option-raid5"
+          type="radio"
+          value="raid5"
+        />
+        <label for="advanced-option-raid5"> Raid5 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid6"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid6"
+          type="radio"
+          value="raid6"
+        />
+        <label for="advanced-option-raid6"> Raid6 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid10"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid10"
+          type="radio"
+          value="raid10"
+        />
+        <label for="advanced-option-raid10"> Raid10 </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
+
+const props = defineProps<{
+  devNamesCount: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowAdvancedOptions = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss">
+.advanced-options-wrap {
+  display: flex;
+  gap: 10px;
+
+  .advanced-options-label {
+    margin: 0;
+    padding: 0;
+    line-height: normal;
+    height: auto;
+  }
+
+  .radio {
+    margin-bottom: 5px;
+  }
+  input[type='radio']:focus:checked + label::before,
+  input[type='radio']:focus + label::before {
+    box-shadow: inset 0 0 0 0.25rem #0094d2;
+  }
+}
+</style>

package/components/common/wizards/datastore/add/steps/nameAndDevice/advancedOptions/Old.vue

@@ -1,101 +1,114 @@
-<template>
-  <div class="advanced-options-wrap clr-form-control">
-    <b class="advanced-options-label">
-      {{ localization.common.advancedOptions }}
-    </b>
-    <div class="advanced-options compact">
-      <div class="radio">
-        <input
-          v-model="model"
-          id="advanced-option-liner"
-          data-id="advanced-option-liner"
-          type="radio"
-          value="linear"
-        />
-        <label for="advanced-option-liner"> Linear </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid0"
-          :disabled="props.devNamesCount < 2"
-          data-id="advanced-option-raid0"
-          type="radio"
-          value="raid0"
-        />
-        <label for="advanced-option-raid0"> Raid0 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid1"
-          :disabled="props.devNamesCount < 2"
-          data-id="advanced-option-raid1"
-          type="radio"
-          value="raid1"
-        />
-        <label for="advanced-option-raid1"> Raid1 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid5"
-          :disabled="props.devNamesCount < 3"
-          data-id="advanced-option-raid5"
-          type="radio"
-          value="raid5"
-        />
-        <label for="advanced-option-raid5"> Raid5 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid6"
-          :disabled="props.devNamesCount < 4"
-          data-id="advanced-option-raid6"
-          type="radio"
-          value="raid6"
-        />
-        <label for="advanced-option-raid6"> Raid6 </label>
-      </div>
-      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
-        <input
-          v-model="model"
-          id="advanced-option-raid10"
-          :disabled="props.devNamesCount < 4"
-          data-id="advanced-option-raid10"
-          type="radio"
-          value="raid10"
-        />
-        <label for="advanced-option-raid10"> Raid10 </label>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
-
-const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
-
-const props = defineProps<{
-  devNamesCount: number
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-</script>
-
-<style scoped lang="scss">
-.advanced-options-wrap {
-  display: flex;
-  gap: 10px;
-  .radio {
-    margin-bottom: 5px;
-  }
-  input[type='radio']:focus:checked + label::before,
-  input[type='radio']:focus + label::before {
-    box-shadow: inset 0 0 0 0.25rem #0094d2;
-  }
-}
-</style>
+<template>
+  <div class="advanced-options-wrap clr-form-control">
+    <b
+      class="advanced-options-label btn btn-link"
+      @click="isShowAdvancedOptions = !isShowAdvancedOptions"
+    >
+      {{ localization.common.advancedOptions }}
+    </b>
+    <div v-show="isShowAdvancedOptions" class="advanced-options compact">
+      <div class="radio">
+        <input
+          v-model="model"
+          id="advanced-option-liner"
+          data-id="advanced-option-liner"
+          type="radio"
+          value="linear"
+        />
+        <label for="advanced-option-liner"> Linear </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid0"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid0"
+          type="radio"
+          value="raid0"
+        />
+        <label for="advanced-option-raid0"> Raid0 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 2 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid1"
+          :disabled="props.devNamesCount < 2"
+          data-id="advanced-option-raid1"
+          type="radio"
+          value="raid1"
+        />
+        <label for="advanced-option-raid1"> Raid1 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 3 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid5"
+          :disabled="props.devNamesCount < 3"
+          data-id="advanced-option-raid5"
+          type="radio"
+          value="raid5"
+        />
+        <label for="advanced-option-raid5"> Raid5 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid6"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid6"
+          type="radio"
+          value="raid6"
+        />
+        <label for="advanced-option-raid6"> Raid6 </label>
+      </div>
+      <div :class="['radio', { disabled: props.devNamesCount < 4 }]">
+        <input
+          v-model="model"
+          id="advanced-option-raid10"
+          :disabled="props.devNamesCount < 4"
+          data-id="advanced-option-raid10"
+          type="radio"
+          value="raid10"
+        />
+        <label for="advanced-option-raid10"> Raid10 </label>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_CreateDatastoreForm } from '~/components/common/wizards/datastore/add/lib/models/interfaces'
+
+const model = defineModel<UI_I_CreateDatastoreForm['level']>({ required: true })
+
+const props = defineProps<{
+  devNamesCount: number
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isShowAdvancedOptions = ref<boolean>(false)
+</script>
+
+<style scoped lang="scss">
+.advanced-options-wrap {
+  display: flex;
+  gap: 10px;
+
+  .advanced-options-label {
+    margin: 0;
+    padding: 0;
+    line-height: normal;
+    height: auto;
+  }
+
+  .radio {
+    margin-bottom: 5px;
+  }
+  input[type='radio']:focus:checked + label::before,
+  input[type='radio']:focus + label::before {
+    box-shadow: inset 0 0 0 0.25rem #0094d2;
+  }
+}
+</style>

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/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,
+  }
+}

package/composables/useEnvLanguage.ts

@@ -1,22 +1,22 @@
-export function useEnvLanguage(): string {
-  // const { $store }: any = useNuxtApp()
-
-  const localizationCode = ref<string>('en_US')
-  const langFromLocalStorage =
-    // $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
-    useLocalStorage('lang')
-
-  if (langFromLocalStorage) {
-    if (
-      langFromLocalStorage === 'en_US' ||
-      langFromLocalStorage === 'ru_RU' ||
-      langFromLocalStorage === 'hy_AM'
-    ) {
-      localizationCode.value = langFromLocalStorage
-    }
-  }
-
-  localizationCode.value = localizationCode.value.slice(0, 2).toUpperCase()
-
-  return localizationCode.value
-}
+export function useEnvLanguage(): string {
+  // const { $store }: any = useNuxtApp()
+
+  const localizationCode = ref<string>('en_US')
+  const langFromLocalStorage =
+    // $store.getters['main/getInterfaceLang'] || // Из $store для Сферы, но думаю нужно сделать одинаково из localStorage
+    useLocalStorage('lang')
+
+  if (langFromLocalStorage) {
+    if (
+      langFromLocalStorage === 'en_US' ||
+      langFromLocalStorage === 'ru_RU' ||
+      langFromLocalStorage === 'hy_AM'
+    ) {
+      localizationCode.value = langFromLocalStorage
+    }
+  }
+
+  localizationCode.value = localizationCode.value.slice(0, 2).toUpperCase()
+
+  return localizationCode.value
+}

package/composables/useLocal.ts

@@ -1,6 +1,6 @@
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import { useLocalCommon } from '~/composables/useLocalCommon'
-
-export const useLocal = (): UI_I_Localization => {
-  return useLocalCommon()
-}
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { useLocalCommon } from '~/composables/useLocalCommon'
+
+export const useLocal = (): UI_I_Localization => {
+  return useLocalCommon()
+}