bfg-common 1.0.96 → 1.0.98

package/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/PartitionConfiguration.vue

@@ -1,230 +1,230 @@
-<template>
-  <div class="partition">
-    <div class="clr-form-control clr-row">
-      <label class="clr-col-md-4 clr-control-label">
-        {{ localization.partitionConfiguration }}
-      </label>
-
-      <div class="clr-col-md-8 p-0">
-        <div class="clr-select-wrapper">
-          <select
-            id="host-select"
-            v-model="selectedHost"
-            class="dropdown-toggle"
-            @change="onSelectHost"
-          >
-            <option
-              v-for="(item, index) in partitionConfiguration"
-              :key="index"
-              :value="item.value"
-              :disabled="item.disabled"
-            >
-              {{ item.text }}
-            </option>
-          </select>
-        </div>
-      </div>
-    </div>
-
-    <div class="datastore-size-container clr-flex-row clr-flex">
-      <label class="clr-col-md-4 clr-control-label" for="datastore-size">
-        {{ localization.datastoreSize }}
-      </label>
-
-      <div class="datastore-size-slider-container clr-col-md-8 p-0">
-        <div class="clr-col-xl-6 clr-col-md-8 p-0">
-          <div
-            class="partition__range-input clr-control-container clr-col-md-10 clr-col-12"
-          >
-            <div class="clr-range-wrapper">
-              <input
-                id="datastore-size-input-0"
-                v-model="datastoreSize"
-                type="range"
-                min="0"
-                :max="countDatastoreSizeToGb"
-                step="0.01"
-                class="ng-valid clr-range ng-dirty ng-touched"
-              />
-            </div>
-          </div>
-        </div>
-
-        <input
-          id="datastore-size-input-1"
-          v-model="datastoreSize"
-          type="number"
-          min="0"
-          :max="countDatastoreSizeToGb"
-          step="0.01"
-          class="show-arrow"
-        />
-        <span>{{ localization.gb }}</span>
-      </div>
-    </div>
-
-    <template v-if="props.vmfsVersion === 'vmfs-6'">
-      <div class="clr-form-control clr-row">
-        <label class="clr-col-md-4 clr-control-label">
-          {{ localization.blockSize }}
-        </label>
-
-        <div>
-          <div class="clr-select-wrapper">
-            <select
-              id="datastore-size-select"
-              v-model="selectedSize"
-              class="dropdown-toggle"
-              @change="onSelectHost"
-            >
-              <option
-                v-for="(item, index) in blockSize"
-                :key="index"
-                :value="item.value"
-                :disabled="item.disabled"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-
-      <div class="clr-form-control clr-row">
-        <label class="clr-col-md-4 clr-control-label">{{
-          localization.spaceReclamationGranularity
-        }}</label>
-
-        <div>
-          <div class="clr-select-wrapper">
-            <select
-              id="granularity-select"
-              v-model="selectedGranularity"
-              class="dropdown-toggle"
-              @change="onSelectHost"
-            >
-              <option
-                v-for="(item, index) in spaceGranularity"
-                :key="index"
-                :value="item.value"
-                :disabled="item.disabled"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-
-      <div class="clr-form-control clr-row">
-        <label class="clr-col-md-4 clr-control-label">{{
-          localization.spaceReclamationPriority
-        }}</label>
-
-        <div>
-          <div class="clr-select-wrapper">
-            <select
-              id="priority-select"
-              v-model="selectedPriority"
-              class="dropdown-toggle"
-              @change="onSelectHost"
-            >
-              <option
-                v-for="(item, index) in spacePriority"
-                :key="index"
-                :value="item.value"
-                :disabled="item.disabled"
-              >
-                {{ item.text }}
-              </option>
-            </select>
-          </div>
-        </div>
-      </div>
-    </template>
-
-    <common-wizards-datastore-add-shared-storm-partition-configuration-size-graphic
-      :selected-size="+datastoreSize"
-      :capacity="countDatastoreSizeToGb"
-    />
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_Localization } from '~/models/interfaces'
-import { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/models/types'
-import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/models/interfaces'
-import {
-  partitionConfigurationFunc,
-  spacePriorityFunc,
-  spaceGranularityFunc,
-  blockSizeFunc,
-} from '~/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/config/selectOptions'
-
-const props = withDefaults(
-  defineProps<{
-    vmfsVersion: UI_T_VmfsType
-    selectedLunDiskSize: number
-  }>(),
-  {
-    selectedLunDiskSize: 0,
-  }
-)
-const localization = computed<UI_I_Localization>(() => useLocal())
-const { $binary } = useNuxtApp()
-
-const selectedHost = ref('all-partitions')
-const partitionConfiguration = computed<UI_I_SelectHostOptions[]>(() =>
-  partitionConfigurationFunc(localization.value)
-)
-
-const selectedSize = ref('1')
-const blockSize = computed<UI_I_SelectHostOptions[]>(() =>
-  blockSizeFunc(localization.value)
-)
-
-const selectedGranularity = ref('1')
-const spaceGranularity = computed<UI_I_SelectHostOptions[]>(() =>
-  spaceGranularityFunc(localization.value)
-)
-
-const selectedPriority = ref('low')
-const spacePriority = computed<UI_I_SelectHostOptions[]>(() =>
-  spacePriorityFunc(localization.value)
-)
-
-const countDatastoreSizeToGb = computed(() => {
-  return $binary.mbToGb(props.selectedLunDiskSize)
-})
-
-const datastoreSize = ref<number | null>(null)
-watch(
-  () => props.selectedLunDiskSize,
-  (_val) => {
-    datastoreSize.value = countDatastoreSizeToGb.value
-  }
-)
-
-const onSelectHost = (): void => {}
-</script>
-
-<style lang="scss" scoped>
-.partition {
-  .datastore-size-container {
-    display: flex;
-    margin-left: -1em;
-    margin-top: 1.2rem;
-    margin-bottom: 1.2rem;
-  }
-  .clr-form-control {
-    display: flex;
-    flex-direction: row;
-  }
-  &__range-input {
-    margin-left: -10px;
-  }
-}
-.datastore-size-slider-container {
-  display: flex;
-}
-</style>
+<template>
+  <div class="partition">
+    <div class="clr-form-control clr-row">
+      <label class="clr-col-md-4 clr-control-label">
+        {{ localization.partitionConfiguration }}
+      </label>
+
+      <div class="clr-col-md-8 p-0">
+        <div class="clr-select-wrapper">
+          <select
+            id="host-select"
+            v-model="selectedHost"
+            class="dropdown-toggle"
+            @change="onSelectHost"
+          >
+            <option
+              v-for="(item, index) in partitionConfiguration"
+              :key="index"
+              :value="item.value"
+              :disabled="item.disabled"
+            >
+              {{ item.text }}
+            </option>
+          </select>
+        </div>
+      </div>
+    </div>
+
+    <div class="datastore-size-container clr-flex-row clr-flex">
+      <label class="clr-col-md-4 clr-control-label" for="datastore-size">
+        {{ localization.datastoreSize }}
+      </label>
+
+      <div class="datastore-size-slider-container clr-col-md-8 p-0">
+        <div class="clr-col-xl-6 clr-col-md-8 p-0">
+          <div
+            class="partition__range-input clr-control-container clr-col-md-10 clr-col-12"
+          >
+            <div class="clr-range-wrapper">
+              <input
+                id="datastore-size-input-0"
+                v-model="datastoreSize"
+                type="range"
+                min="0"
+                :max="countDatastoreSizeToGb"
+                step="0.01"
+                class="ng-valid clr-range ng-dirty ng-touched"
+              />
+            </div>
+          </div>
+        </div>
+
+        <input
+          id="datastore-size-input-1"
+          v-model="datastoreSize"
+          type="number"
+          min="0"
+          :max="countDatastoreSizeToGb"
+          step="0.01"
+          class="show-arrow"
+        />
+        <span>{{ localization.gb }}</span>
+      </div>
+    </div>
+
+    <template v-if="props.vmfsVersion === 'vmfs-6'">
+      <div class="clr-form-control clr-row">
+        <label class="clr-col-md-4 clr-control-label">
+          {{ localization.blockSize }}
+        </label>
+
+        <div>
+          <div class="clr-select-wrapper">
+            <select
+              id="datastore-size-select"
+              v-model="selectedSize"
+              class="dropdown-toggle"
+              @change="onSelectHost"
+            >
+              <option
+                v-for="(item, index) in blockSize"
+                :key="index"
+                :value="item.value"
+                :disabled="item.disabled"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </div>
+        </div>
+      </div>
+
+      <div class="clr-form-control clr-row">
+        <label class="clr-col-md-4 clr-control-label">{{
+          localization.spaceReclamationGranularity
+        }}</label>
+
+        <div>
+          <div class="clr-select-wrapper">
+            <select
+              id="granularity-select"
+              v-model="selectedGranularity"
+              class="dropdown-toggle"
+              @change="onSelectHost"
+            >
+              <option
+                v-for="(item, index) in spaceGranularity"
+                :key="index"
+                :value="item.value"
+                :disabled="item.disabled"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </div>
+        </div>
+      </div>
+
+      <div class="clr-form-control clr-row">
+        <label class="clr-col-md-4 clr-control-label">{{
+          localization.spaceReclamationPriority
+        }}</label>
+
+        <div>
+          <div class="clr-select-wrapper">
+            <select
+              id="priority-select"
+              v-model="selectedPriority"
+              class="dropdown-toggle"
+              @change="onSelectHost"
+            >
+              <option
+                v-for="(item, index) in spacePriority"
+                :key="index"
+                :value="item.value"
+                :disabled="item.disabled"
+              >
+                {{ item.text }}
+              </option>
+            </select>
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <common-wizards-datastore-add-shared-storm-partition-configuration-size-graphic
+      :selected-size="+datastoreSize"
+      :capacity="countDatastoreSizeToGb"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_Localization } from '~/models/interfaces'
+import { UI_T_VmfsType } from '~/components/common/wizards/datastore/add/models/types'
+import { UI_I_SelectHostOptions } from '~/components/common/wizards/datastore/add/sharedStorm/deviceSelection/models/interfaces'
+import {
+  partitionConfigurationFunc,
+  spacePriorityFunc,
+  spaceGranularityFunc,
+  blockSizeFunc,
+} from '~/components/common/wizards/datastore/add/sharedStorm/partitionConfiguration/config/selectOptions'
+
+const props = withDefaults(
+  defineProps<{
+    vmfsVersion: UI_T_VmfsType
+    selectedLunDiskSize: number
+  }>(),
+  {
+    selectedLunDiskSize: 0,
+  }
+)
+const localization = computed<UI_I_Localization>(() => useLocal())
+const { $binary } = useNuxtApp()
+
+const selectedHost = ref('all-partitions')
+const partitionConfiguration = computed<UI_I_SelectHostOptions[]>(() =>
+  partitionConfigurationFunc(localization.value)
+)
+
+const selectedSize = ref('1')
+const blockSize = computed<UI_I_SelectHostOptions[]>(() =>
+  blockSizeFunc(localization.value)
+)
+
+const selectedGranularity = ref('1')
+const spaceGranularity = computed<UI_I_SelectHostOptions[]>(() =>
+  spaceGranularityFunc(localization.value)
+)
+
+const selectedPriority = ref('low')
+const spacePriority = computed<UI_I_SelectHostOptions[]>(() =>
+  spacePriorityFunc(localization.value)
+)
+
+const countDatastoreSizeToGb = computed(() => {
+  return $binary.mbToGb(props.selectedLunDiskSize)
+})
+
+const datastoreSize = ref<number | null>(null)
+watch(
+  () => props.selectedLunDiskSize,
+  (_val) => {
+    datastoreSize.value = countDatastoreSizeToGb.value
+  }
+)
+
+const onSelectHost = (): void => {}
+</script>
+
+<style lang="scss" scoped>
+.partition {
+  .datastore-size-container {
+    display: flex;
+    margin-left: -1em;
+    margin-top: 1.2rem;
+    margin-bottom: 1.2rem;
+  }
+  .clr-form-control {
+    display: flex;
+    flex-direction: row;
+  }
+  &__range-input {
+    margin-left: -10px;
+  }
+}
+.datastore-size-slider-container {
+  display: flex;
+}
+</style>

package/models/store/storage/interfaces.ts

@@ -1,32 +1,32 @@
-import { API_UI_I_Node } from '~/models/store/interfaces'
-
-export interface API_UI_I_DatastoreTableItemCapacity {
-  capacity_mb: number
-  provisioned_mb: number
-  free_mb: number
-  used_mb: number
-}
-
-export interface API_UI_I_DatastoreTableItem extends API_UI_I_Node {
-  pool_name: string
-  type_code: number
-  type_text: string
-  drive_type: string
-  capacity: API_UI_I_DatastoreTableItemCapacity
-  thin_provisioning: boolean
-  access_mode: string
-  hardware_acceleration: string
-  device: string
-  storage_io_control: boolean
-  storage_compatibility: string
-}
-
-export interface UI_I_DatastoreTableItem extends API_UI_I_DatastoreTableItem {}
-
-export interface UI_I_FolderOrFileTreePayload {
-  type: string
-  id: string
-  path: string
-  merge: boolean
-  show: boolean
-}
+import { API_UI_I_Node } from '~/models/store/interfaces'
+
+export interface API_UI_I_DatastoreTableItemCapacity {
+  capacity_mb: number
+  provisioned_mb: number
+  free_mb: number
+  used_mb: number
+}
+
+export interface API_UI_I_DatastoreTableItem extends API_UI_I_Node {
+  pool_name: string
+  type_code: number
+  type_text: string
+  drive_type: string
+  capacity: API_UI_I_DatastoreTableItemCapacity
+  thin_provisioning: boolean
+  access_mode: string
+  hardware_acceleration: string
+  device: string
+  storage_io_control: boolean
+  storage_compatibility: string
+}
+
+export interface UI_I_DatastoreTableItem extends API_UI_I_DatastoreTableItem {}
+
+export interface UI_I_FolderOrFileTreePayload {
+  type: string
+  id: string
+  path: string
+  merge: boolean
+  show: boolean
+}

package/modules/fixContentBuild/index.ts

@@ -1,65 +1,65 @@
-import { defineNuxtModule } from '@nuxt/kit'
-const fs = require('fs')
-const path = require('path')
-import {
-  replaceFileContent,
-  removeNonImageFiles,
-  removeImagesFromContent,
-  updateImagesPath,
-} from './utils/methods'
-
-export default defineNuxtModule({
-  meta: {
-    name: 'fix-content-build',
-    configKey: 'fixContentBuild',
-  },
-  setup() {
-    if (
-      process.env.NODE_ENV === 'development' ||
-      process.env.npm_command !== 'exec'
-    )
-      return
-
-    // Правим путь к файлу
-    const filePath = path.join(
-      __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
-      '@nuxt',
-      'content',
-      'dist',
-      'runtime',
-      'legacy',
-      'composables',
-      'query.mjs'
-    )
-    const searchString = '/query/${hash(params)}'
-    const replacementString = 'cache'
-    replaceFileContent(filePath, searchString, replacementString)
-    // End block
-
-    // Переносим весь контент и удаляем все файлы кроме картинок
-    const contentPath = path.join(
-      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-      'content',
-      'help'
-    )
-    if (!fs.existsSync(contentPath)) return
-
-    const publicPath = path.join(
-      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
-      'public',
-      'help',
-      'images'
-    )
-    fs.cp(contentPath, publicPath, { recursive: true }, () => {
-      // Удаляем все файлы кроме картинок
-      removeNonImageFiles(publicPath)
-
-      // Удаляем картинки из папки content
-      removeImagesFromContent(contentPath)
-    })
-    // End block
-
-    // Правим путь к картинкам
-    updateImagesPath(contentPath)
-  },
-})
+import { defineNuxtModule } from '@nuxt/kit'
+const fs = require('fs')
+const path = require('path')
+import {
+  replaceFileContent,
+  removeNonImageFiles,
+  removeImagesFromContent,
+  updateImagesPath,
+} from './utils/methods'
+
+export default defineNuxtModule({
+  meta: {
+    name: 'fix-content-build',
+    configKey: 'fixContentBuild',
+  },
+  setup() {
+    if (
+      process.env.NODE_ENV === 'development' ||
+      process.env.npm_command !== 'exec'
+    )
+      return
+
+    // Правим путь к файлу
+    const filePath = path.join(
+      __dirname.replace('/bfg-common/modules/fixContentBuild', ''),
+      '@nuxt',
+      'content',
+      'dist',
+      'runtime',
+      'legacy',
+      'composables',
+      'query.mjs'
+    )
+    const searchString = '/query/${hash(params)}'
+    const replacementString = 'cache'
+    replaceFileContent(filePath, searchString, replacementString)
+    // End block
+
+    // Переносим весь контент и удаляем все файлы кроме картинок
+    const contentPath = path.join(
+      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+      'content',
+      'help'
+    )
+    if (!fs.existsSync(contentPath)) return
+
+    const publicPath = path.join(
+      __dirname.replace('/node_modules/bfg-common/modules/fixContentBuild', ''),
+      'public',
+      'help',
+      'images'
+    )
+    fs.cp(contentPath, publicPath, { recursive: true }, () => {
+      // Удаляем все файлы кроме картинок
+      removeNonImageFiles(publicPath)
+
+      // Удаляем картинки из папки content
+      removeImagesFromContent(contentPath)
+    })
+    // End block
+
+    // Правим путь к картинкам
+    updateImagesPath(contentPath)
+  },
+})

package/package.json

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