bfg-common 1.5.548 → 1.5.550

package/components/common/pages/backups/modals/restore/RestoreNew.vue

@@ -10,7 +10,7 @@
     class="restore-wizard"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
-    @submit="emits('submit-wizard')"
+    @submit="onCreateDatastore"
   >
     <template #content="{ selectedStep }">
       <ui-wizard-block
@@ -161,14 +161,6 @@
       </ui-wizard-block>
     </template>
   </ui-wizard>
-
-  <common-modals-confirmation
-    v-if="isShowConfirm"
-    :headline="localization.common.attention"
-    :description="localization.common.restoreBackupConfirmDescription"
-    @hide-modal="isShowConfirm = false"
-    @confirm="emits('submit-confirm')"
-  />
 </template>
 
 <script setup lang="ts">
@@ -186,7 +178,6 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
-const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
@@ -204,9 +195,8 @@ const emits = defineEmits<{
   (event: 'change-storage', value: UI_I_DatastoreTableItem | null): void
   (event: 'get-datastore', value: string): void
   (event: 'get-networks', value: string): void
-  (event: 'submit-confirm'): void
   (event: 'hide'): void
-  (event: 'submit-wizard'): void
+  (event: 'submit'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -260,6 +250,7 @@ const onGetNetworks = (hostId: string): void => {
 }
 
 const onHideModal = (): void => emits('hide')
+const onCreateDatastore = (): void => emits('submit')
 </script>
 
 <style scoped lang="scss">

package/components/common/pages/backups/modals/restore/RestoreOld.vue

@@ -9,7 +9,7 @@
       test-id="restore"
       @change-steps="onChangeSteps"
       @hide="onHideModal"
-      @submit="emits('submit-wizard')"
+      @submit="onRestore"
     >
       <template #modalBody="{ selectedStep }">
         <div
@@ -79,7 +79,7 @@
     :headline="localization.common.attention"
     :description="localization.common.restoreBackupConfirmDescription"
     @hide-modal="isShowConfirm = false"
-    @confirm="emits('submit-confirm')"
+    @confirm="onFinish"
   />
 </template>
 
@@ -93,15 +93,15 @@ import type { UI_I_NetworkTableItem } from '~/lib/models/store/network/interface
 import type { UI_I_NameCheck } from '~/components/common/pages/backups/modals/restore/name/lib/models/interfaces'
 import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
 import { dynamicSteps } from '~/components/common/pages/backups/modals/restore/lib/config/steps'
+import { restoreCodes } from '~/components/common/pages/backups/modals/restore/lib/config/restoreCodes'
 
 const model = defineModel<UI_I_RestoreForm>({ required: true })
-const isShowConfirm = defineModel<boolean>('is-show-confirm')
 
 const props = defineProps<{
   wizard: Wizard
   selectedScheme: number[]
   readyCompleteData: UI_I_TableInfoItem[]
-  // nameFormSubmit: null | Function
+  nameFormSubmit: null | Function
   storageSubmit: null | Function
   isLoading: boolean
   errors: string[]
@@ -116,8 +116,7 @@ const emits = defineEmits<{
   (event: 'get-networks', value: string): void
   (event: 'check-name', value: UI_I_NameCheck): void
   (event: 'change-steps', value: UI_I_WizardStep[]): void
-  (event: 'submit-confirm'): void
-  (event: 'submit-wizard'): void
+  (event: 'finish'): void
   (event: 'hide'): void
 }>()
 
@@ -139,10 +138,23 @@ const onCheckName = async (data: UI_I_NameCheck): Promise<void> => {
   emits('check-name', data)
 }
 
+const onFinish = (): void => {
+  emits('finish')
+}
 const onHideModal = (): void => {
   emits('hide')
 }
 
+const onRestore = (): void => {
+  if (model.value.restore_code === restoreCodes.existing) {
+    isShowConfirm.value = true
+  } else {
+    onFinish()
+  }
+}
+
+const isShowConfirm = ref<boolean>(false)
+
 const onGetNetworks = (hostId: string): void => {
   emits('get-networks', hostId)
 }

package/components/common/pages/backups/modals/restore/name/lib/models/interfaces.ts

@@ -1,6 +1,6 @@
-import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
-
-export interface UI_I_NameCheck {
-  name: string
-  cb: (error: API_UI_I_Error) => void
-}
+import type { API_UI_I_Error } from '~/lib/models/store/interfaces'
+
+export interface UI_I_NameCheck {
+  name: string
+  cb: (error: API_UI_I_Error) => void
+}

package/components/common/pages/home/lib/models/interfaces.ts

@@ -1,48 +1,48 @@
-import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
-import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
-import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
-
-export interface UI_I_ZoneList extends UI_I_Option {}
-export interface UI_I_Hosts {
-  connected: number
-  disconnected: number
-  maintenance: number
-  total: number
-}
-
-export interface UI_I_Vms {
-  powered_on: number
-  powered_off: number
-  suspended: number
-  total: number
-}
-
-export interface UI_I_Alert {
-  item: string
-  type: UI_T_NodeType
-  id: number
-  alerts: number
-  warnings: number
-}
-
-export interface UI_I_Service {
-  id: number
-  item: string
-  statusIcon: string
-  statusText: string
-  version: string
-}
-
-export interface UI_I_HomeInfo {
-  resource_meter: UI_I_Resources[]
-  vms: UI_I_Vms
-  alerts: UI_I_Alert[]
-  services: UI_I_Service[]
-  hosts?: UI_I_Hosts
-}
-
-export interface UI_I_Card {
-  text: string
-  value: number
-  icon?: string
-}
+import type { UI_T_NodeType } from '~/components/common/pages/home/lib/models/types'
+import type { UI_I_Resources } from '~/components/common/resource/lib/models/interfaces'
+import type { UI_I_Option } from '~/components/atoms/select/lib/models/interfaces'
+
+export interface UI_I_ZoneList extends UI_I_Option {}
+export interface UI_I_Hosts {
+  connected: number
+  disconnected: number
+  maintenance: number
+  total: number
+}
+
+export interface UI_I_Vms {
+  powered_on: number
+  powered_off: number
+  suspended: number
+  total: number
+}
+
+export interface UI_I_Alert {
+  item: string
+  type: UI_T_NodeType
+  id: number
+  alerts: number
+  warnings: number
+}
+
+export interface UI_I_Service {
+  id: number
+  item: string
+  statusIcon: string
+  statusText: string
+  version: string
+}
+
+export interface UI_I_HomeInfo {
+  resource_meter: UI_I_Resources[]
+  vms: UI_I_Vms
+  alerts: UI_I_Alert[]
+  services: UI_I_Service[]
+  hosts?: UI_I_Hosts
+}
+
+export interface UI_I_Card {
+  text: string
+  value: number
+  icon?: string
+}

package/components/common/pages/home/widgets/hosts/Hosts.vue

@@ -1,27 +1,27 @@
-<template>
-  <common-pages-home-widgets-hosts-new
-    v-if="isNewView"
-    :hosts="props.hosts"
-    :loading="props.loading"
-  />
-
-  <common-pages-home-widgets-hosts-old
-    v-else
-    :hosts="props.hosts"
-  />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
-
-const props = defineProps<{
-  hosts: UI_I_Hosts
-  loading: boolean
-}>()
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-pages-home-widgets-hosts-new
+    v-if="isNewView"
+    :hosts="props.hosts"
+    :loading="props.loading"
+  />
+
+  <common-pages-home-widgets-hosts-old
+    v-else
+    :hosts="props.hosts"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Hosts } from '~/components/common/pages/home/lib/models/interfaces'
+
+const props = defineProps<{
+  hosts: UI_I_Hosts
+  loading: boolean
+}>()
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/home/widgets/hosts/lib/config/items.ts

@@ -1,23 +1,23 @@
-import type {
-  UI_I_Card,
-  UI_I_Hosts,
-} from '~/components/common/pages/home/lib/models/interfaces'
-
-export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
-  {
-    value: hosts.connected,
-    text: 'connected',
-    icon: 'vsphere-icon-Host_Connect',
-  },
-  {
-    value: hosts.disconnected,
-    text: 'disconnected',
-    icon: 'vsphere-icon-Host_Disconnect',
-  },
-
-  {
-    value: hosts.maintenance,
-    text: 'maintenance',
-    icon: 'vsphere-icon-host-maintenance',
-  },
-]
+import type {
+  UI_I_Card,
+  UI_I_Hosts,
+} from '~/components/common/pages/home/lib/models/interfaces'
+
+export const itemsFunc = (hosts: UI_I_Hosts): UI_I_Card[] => [
+  {
+    value: hosts.connected,
+    text: 'connected',
+    icon: 'vsphere-icon-Host_Connect',
+  },
+  {
+    value: hosts.disconnected,
+    text: 'disconnected',
+    icon: 'vsphere-icon-Host_Disconnect',
+  },
+
+  {
+    value: hosts.maintenance,
+    text: 'maintenance',
+    icon: 'vsphere-icon-host-maintenance',
+  },
+]

package/components/common/pages/home/widgets/vms/VmsOld.vue

@@ -1,35 +1,35 @@
-<template>
-  <div :class="classes">
-    <div class="entity-status">
-      <common-pages-home-card
-        :title="localization.common.vms"
-        :count="props.vms.total"
-        icon-name="vsphere-icon-vm"
-      >
-        <common-pages-home-status-content :items="props.vms" />
-      </common-pages-home-card>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
-import type { UI_T_Project } from '~/lib/models/types'
-const props = defineProps<{
-  vms: UI_I_Vms
-  project?: UI_T_Project
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const classes = computed<string>(() => {
-  let classes = 'clr-col-md-6 clr-col-sm-12'
-  if (props.project === 'procurator') {
-    classes = 'clr-col-md-12 clr-col-sm-12'
-  }
-  return classes
-})
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div :class="classes">
+    <div class="entity-status">
+      <common-pages-home-card
+        :title="localization.common.vms"
+        :count="props.vms.total"
+        icon-name="vsphere-icon-vm"
+      >
+        <common-pages-home-status-content :items="props.vms" />
+      </common-pages-home-card>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_I_Vms } from '~/components/common/pages/home/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
+const props = defineProps<{
+  vms: UI_I_Vms
+  project?: UI_T_Project
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const classes = computed<string>(() => {
+  let classes = 'clr-col-md-6 clr-col-sm-12'
+  if (props.project === 'procurator') {
+    classes = 'clr-col-md-12 clr-col-sm-12'
+  }
+  return classes
+})
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/pages/home/widgets/vms/lib/config/items.ts

@@ -1,20 +1,20 @@
-import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
-
-export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
-  {
-    value: vms.powered_on,
-    text: 'powered_on',
-    icon: 'vsphere-icon-vm-on',
-  },
-  {
-    value: vms.powered_off,
-    text: 'powered_off',
-    icon: 'icon-vm-power-off',
-  },
-
-  {
-    value: vms.suspended,
-    text: 'suspended',
-    icon: 'vsphere-icon-vm-suspended',
-  },
+import type {UI_I_Card, UI_I_Vms} from "~/components/common/pages/home/lib/models/interfaces";
+
+export const itemsFunc = (vms: UI_I_Vms): UI_I_Card[] => [
+  {
+    value: vms.powered_on,
+    text: 'powered_on',
+    icon: 'vsphere-icon-vm-on',
+  },
+  {
+    value: vms.powered_off,
+    text: 'powered_off',
+    icon: 'icon-vm-power-off',
+  },
+
+  {
+    value: vms.suspended,
+    text: 'suspended',
+    icon: 'vsphere-icon-vm-suspended',
+  },
 ]

package/components/common/pages/scheduledTasks/lib/utils/utils.ts

@@ -1,84 +1,84 @@
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_SendTaskParams,
-} from '~/lib/models/interfaces'
-import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
-import { base64 } from '~/lib/utils/base64'
-import type {
-  UI_I_CreateScheduledTaskArgs,
-  UI_I_ScheduledTasksTableItem,
-} from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
-import type { UI_T_ScheduledTasksActionsType } from '~/components/common/pages/scheduledTasks/lib/models/types'
-
-export const defineScheduleTaskModalTitle = (
-  type: UI_T_ScheduledTasksActionsType,
-  isEdit: boolean
-): string => {
-  const localization: UI_I_Localization = useLocal()
-  const { scheduleNewTasks, scheduleTaskEdit } = localization.common
-
-  const typeTitleMap: Partial<Record<UI_T_ScheduledTasksActionsType, string>> =
-    {
-      'power-on': localization.common.powerOn,
-      'power-off': localization.common.powerOff,
-      'shut-down-guest-os': localization.common.shutDownGuestOs,
-      'restart-guest-os': localization.common.restartGuestOs,
-      suspend: localization.common.suspend,
-      reset: localization.common.reset,
-      'take-snapshot': localization.common.takeSnapshot,
-    }
-
-  const title = typeTitleMap[type]
-  const modalMode = isEdit ? scheduleTaskEdit : scheduleNewTasks
-
-  return `${modalMode} (${title})`
-}
-export const scheduledTasks = (
-  form: UI_I_ScheduleNewTasksForm,
-  args: UI_I_SendTaskParams,
-  target: string,
-  isEdit: boolean,
-  data: UI_I_ScheduledTasksTableItem,
-  project: UI_T_Project
-): UI_I_SendTaskParams => {
-  const methodArgs = {
-    method: args.method,
-    params: {
-      target: args.target,
-      args: args.args ? base64.encode(args.args) : '',
-    },
-  }
-
-  let method = ''
-  switch (project) {
-    case 'sphere':
-      method = isEdit
-        ? 'VirtualMachines.UpdateScheduledTask'
-        : 'VirtualMachines.CreateScheduledTask'
-      break
-    case 'procurator':
-      method = isEdit ? 'vm.update_sched_task' : 'vm.create_sched_task'
-      break
-  }
-
-  const taskArgs: UI_I_CreateScheduledTaskArgs = {
-    target,
-    name: form.task_name,
-    description: form.description,
-    toggle: form.toggle,
-    cron_2: form.cron,
-    notify_emails: form.ntfn_target,
-    args: base64.encode(methodArgs),
-    ...(isEdit && {
-      rid: data.rid,
-      last_modified: data.last_modified,
-    }),
-  }
-
-  return {
-    method,
-    target,
-    args: taskArgs,
-  }
-}
+import type { UI_T_Project } from '~/lib/models/types'
+import type {
+  UI_I_Localization,
+  UI_I_SendTaskParams,
+} from '~/lib/models/interfaces'
+import type { UI_I_ScheduleNewTasksForm } from '~/components/common/pages/scheduledTasks/modals/lib/models/interfaces'
+import { base64 } from '~/lib/utils/base64'
+import type {
+  UI_I_CreateScheduledTaskArgs,
+  UI_I_ScheduledTasksTableItem,
+} from '~/components/common/pages/scheduledTasks/lib/models/interfaces'
+import type { UI_T_ScheduledTasksActionsType } from '~/components/common/pages/scheduledTasks/lib/models/types'
+
+export const defineScheduleTaskModalTitle = (
+  type: UI_T_ScheduledTasksActionsType,
+  isEdit: boolean
+): string => {
+  const localization: UI_I_Localization = useLocal()
+  const { scheduleNewTasks, scheduleTaskEdit } = localization.common
+
+  const typeTitleMap: Partial<Record<UI_T_ScheduledTasksActionsType, string>> =
+    {
+      'power-on': localization.common.powerOn,
+      'power-off': localization.common.powerOff,
+      'shut-down-guest-os': localization.common.shutDownGuestOs,
+      'restart-guest-os': localization.common.restartGuestOs,
+      suspend: localization.common.suspend,
+      reset: localization.common.reset,
+      'take-snapshot': localization.common.takeSnapshot,
+    }
+
+  const title = typeTitleMap[type]
+  const modalMode = isEdit ? scheduleTaskEdit : scheduleNewTasks
+
+  return `${modalMode} (${title})`
+}
+export const scheduledTasks = (
+  form: UI_I_ScheduleNewTasksForm,
+  args: UI_I_SendTaskParams,
+  target: string,
+  isEdit: boolean,
+  data: UI_I_ScheduledTasksTableItem,
+  project: UI_T_Project
+): UI_I_SendTaskParams => {
+  const methodArgs = {
+    method: args.method,
+    params: {
+      target: args.target,
+      args: args.args ? base64.encode(args.args) : '',
+    },
+  }
+
+  let method = ''
+  switch (project) {
+    case 'sphere':
+      method = isEdit
+        ? 'VirtualMachines.UpdateScheduledTask'
+        : 'VirtualMachines.CreateScheduledTask'
+      break
+    case 'procurator':
+      method = isEdit ? 'vm.update_sched_task' : 'vm.create_sched_task'
+      break
+  }
+
+  const taskArgs: UI_I_CreateScheduledTaskArgs = {
+    target,
+    name: form.task_name,
+    description: form.description,
+    toggle: form.toggle,
+    cron_2: form.cron,
+    notify_emails: form.ntfn_target,
+    args: base64.encode(methodArgs),
+    ...(isEdit && {
+      rid: data.rid,
+      last_modified: data.last_modified,
+    }),
+  }
+
+  return {
+    method,
+    target,
+    args: taskArgs,
+  }
+}

package/components/common/readyToComplete/ReadyToComplete.vue

@@ -1,17 +1,17 @@
-<template>
-  <common-ready-to-complete-new v-if="isNewView" :data="props.data" />
-  <common-ready-to-complete-old v-else :data="props.data" />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
-
-const props = defineProps<{
-  data: UI_I_TableInfoItem[]
-}>()
-
-const { $store }: any = useNuxtApp()
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <common-ready-to-complete-new v-if="isNewView" :data="props.data" />
+  <common-ready-to-complete-old v-else :data="props.data" />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_TableInfoItem } from '~/components/atoms/table/info/lib/models/interfaces'
+
+const props = defineProps<{
+  data: UI_I_TableInfoItem[]
+}>()
+
+const { $store }: any = useNuxtApp()
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+</script>
+
+<style lang="scss" scoped></style>