bfg-common 1.5.244 → 1.5.246

package/components/common/vm/actions/editSettings/EditSettingsOld.vue

@@ -50,6 +50,7 @@
             :state="props.state"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
+            :is-datastore-loading="props.isDatastoreLoading"
             :customize-hardware-submit="props.customizeHardwareSubmit"
             is-edit
             @get-storage="emits('get-storage', $event)"
@@ -103,6 +104,7 @@ const props = defineProps<{
   project: UI_T_Project
   loading: boolean
   datastore: UI_I_DatastoreTableItem[]
+  isDatastoreLoading: boolean
   networksTable: UI_I_NetworkTableItem[]
   selectedNavItem: UI_T_SelectedNavItem
   vmCpuHelpTextSecond: string

package/components/common/vm/actions/editSettings/new/New.vue

@@ -53,6 +53,7 @@
             :state="props.state"
             :get-datastore-table-func="props.getDatastoreTableFunc"
             :datastore="props.datastore"
+            :is-datastore-loading="props.isDatastoreLoading"
             :customize-hardware-submit="props.customizeHardwareSubmit"
             is-edit
             @get-storage="emits('get-storage', $event)"
@@ -110,6 +111,7 @@ const props = defineProps<{
   project: UI_T_Project
   loading: boolean
   datastore: UI_I_DatastoreTableItem[]
+  isDatastoreLoading: boolean
   networksTable: UI_I_NetworkTableItem[]
   selectedNavItem: UI_T_SelectedNavItem
   vmCpuHelpTextSecond: string

package/components/common/wizards/vm/migrate/select/computeResource/tableView/TableView.vue

@@ -105,9 +105,7 @@ watch(
 const headItems = computed<UI_I_HeadItem[]>(() =>
   table[props.type].headItems(localization.value)
 )
-const columnKeys = computed<UI_I_ColumnKey[]>(() =>
-  table[props.type].columnKeys(localization.value)
-)
+const columnKeys = computed<UI_I_ColumnKey[]>(table[props.type].columnKeys(localization.value))
 watch(localization, () => {
   columnKeys.value = table[props.type].columnKeys(localization.value)
 })

package/lib/utils/utils.ts

@@ -10,9 +10,15 @@ export const enumKeyFromValue = (
   return dataFromEnum ? dataFromEnum[0] : undefined
 }
 
+export const extractContentInBrackets = (inputString: string): string => {
+  const regex = /\[([^\]]+)\]/
+  const match = inputString.match(regex)
+
+  return match ? match[1] : ''
+}
 export const extractContentLastSlash = (
-  inputString: string,
-  after = false
+    inputString: string,
+    after = false
 ): string => {
   const regex = after ? /\/([^/]+)\/?$/ : /(.*)\//
 
@@ -21,6 +27,12 @@ export const extractContentLastSlash = (
   return match ? match[1] : ''
 }
 
+export const removeLastSlash = (
+    inputString: string
+): string => {
+  return inputString.endsWith('/') ? inputString.slice(0, -1) : inputString
+}
+
 export const intToIp = (value: number): string => {
   return [
     (value >> 24) & 0xff,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.244",
+  "version": "1.5.246",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",
@@ -35,7 +35,7 @@
     "@vueuse/components": "^10.1.2",
     "date-fns": "^2.29.3",
     "bfg-nuxt-3-graph": "1.0.26",
-    "bfg-uikit": "1.0.438",
+    "bfg-uikit": "1.0.442",
     "html2canvas": "^1.4.1",
     "prettier-eslint": "^15.0.1"
   }

package/plugins/cron.ts

@@ -0,0 +1,75 @@
+import { defineNuxtPlugin } from '#app'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
+export default defineNuxtPlugin(() => {
+  const cron = function (): any {
+    const self: any = {}
+
+    self.cronToHumanReadable = (
+      cronString: string,
+      localization: UI_I_Localization
+    ): string => {
+      const [minutes, hours, , , daysString] = cronString.split(' ')
+
+      const daysMap = {
+        0: localization.sundays,
+        1: localization.mondays,
+        2: localization.tuesdays,
+        3: localization.wednesdays,
+        4: localization.thursdays,
+        5: localization.fridays,
+        6: localization.saturdays,
+      }
+
+      let days = localization.everyDay
+      if (daysString !== '*') {
+        const daysArray = daysString
+          .split(',')
+          // @ts-ignore
+          .map((day: number) => daysMap[day])
+        days = `${localization.on2} ${daysArray.join(', ')}`
+      }
+
+      // Формирование строки времени
+      const time = `${String(hours).padStart(2, '0')}:${String(
+        minutes
+      ).padStart(2, '0')}`
+
+      return `${days} ${localization.in} ${time}`
+    }
+
+    self.decodeCron = (cronString: string): any => {
+      const [minutes, hours, , , daysString] = cronString.split(' ')
+
+      const days =
+        daysString === '*'
+          ? [0, 1, 2, 3, 4, 5, 6]
+          : daysString.split(',').map(Number)
+
+      const h = hours === '*' ? '00' : String(hours).padStart(2, '0')
+      const m = minutes === '*' ? '00' : String(minutes).padStart(2, '0')
+      const time = `${h}:${m}`
+
+      return [
+        days,
+        time,
+      ]
+    }
+
+    self.encodeCron = (days: number[], time: string): string => {
+      const { 0: hours, 1: minutes } = time.split(':').map(Number)
+
+      const daysString = days.length === 7 ? '*' : days.join(',')
+
+      return `${minutes} ${hours} * * ${daysString}`
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      cron,
+    },
+  }
+})

package/plugins/helpers.ts

@@ -0,0 +1,18 @@
+import { defineNuxtPlugin } from '#app'
+export default defineNuxtPlugin(() => {
+  const isObjectEmpty = (obj: any): boolean => {
+    for (const i in obj) {
+      // eslint-disable-next-line no-prototype-builtins
+      if (obj.hasOwnProperty(i)) {
+        return false
+      }
+    }
+    return true
+  }
+
+  return {
+    provide: {
+      isObjectEmpty,
+    },
+  }
+})

package/plugins/number.ts

@@ -0,0 +1,18 @@
+import { defineNuxtPlugin } from '#app'
+export default defineNuxtPlugin(() => {
+  const number = function (): any {
+    const self: any = {}
+    self.format = function (n: number, format: string): string {
+      const formatter = new Intl.NumberFormat(format)
+      return formatter.format(n)
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      number,
+    },
+  }
+})

package/plugins/panelStates.ts

@@ -0,0 +1,70 @@
+import { defineNuxtPlugin } from '#app'
+import type { UI_I_PanelOptions } from '~/lib/models/plugins/panelStates/interfaces'
+
+export default defineNuxtPlugin(() => {
+  const panelStates = function (): any {
+    const self: any = {}
+    let options: UI_I_PanelOptions = {
+      leftPanelWidth: 20,
+      topPanelHeight: 80,
+      isBottomPanelCollapsed: false,
+    }
+
+    self.setLeftPanelWidth = function (width: number): void {
+      options.leftPanelWidth = width
+
+      self.setPanelStatesInStorage()
+    }
+    self.setTopPanelHeight = function (height: number): void {
+      options.topPanelHeight = height
+
+      self.setPanelStatesInStorage()
+    }
+    self.bottomPanelCollapse = function (collapse: boolean): void {
+      options.isBottomPanelCollapsed = collapse
+
+      self.setPanelStatesInStorage()
+    }
+
+    self.setPanelStatesInStorage = function (): void {
+      useLocalStorage('panelStates', options)
+      self.emitChanges()
+    }
+    self.getPanelStatesOfStorage = function (): UI_I_PanelOptions {
+      let panelStates = useLocalStorage('panelStates')
+
+      if (!panelStates) {
+        // const parent = document.getElementById('default-layout-outer')
+        const parent = document.body
+        const parentHeight = parent?.clientHeight || 0
+        const onePercent = parentHeight / 100
+        const defaultRecentTasksHeight = 250
+
+        options.topPanelHeight =
+          (parentHeight - defaultRecentTasksHeight - 1.5) / onePercent
+
+        panelStates = options
+      }
+
+      options = panelStates
+
+      return panelStates
+    }
+
+    self.cb = (): void => {}
+    self.on = function (cb: () => any | void): void {
+      self.cb = cb
+    }
+    self.emitChanges = function (): void {
+      self.cb(options)
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      panelStates,
+    },
+  }
+})

package/plugins/text.ts

@@ -1,3 +1,5 @@
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+
 export default defineNuxtPlugin(() => {
   const text = function () {
     const self: any = {}
@@ -36,6 +38,15 @@ export default defineNuxtPlugin(() => {
         )
         .join(' ')
     }
+    self.replaceStringByLocalization = function (
+      str: string,
+      localization: UI_I_Localization
+    ): string {
+      return str.replace(/\[\w+\]/g, (val) => {
+        const variable = val.replace(/\[|\]/g, '')
+        return localization.common[variable]
+      })
+    }
 
     return self
   }.call({})

package/plugins/time.ts

@@ -0,0 +1,17 @@
+import { defineNuxtPlugin } from '#app'
+export default defineNuxtPlugin(() => {
+  const time = function (): any {
+    const self: any = {}
+    self.millisecondsToHour = function (ms: number): number {
+      return ~~(ms / 1000 / 60 / 60 / 24)
+    }
+
+    return self
+  }.call({})
+
+  return {
+    provide: {
+      time,
+    },
+  }
+})