bfg-common 1.5.727 → 1.5.728

package/components/common/pages/backups/modals/restore/types/{TypesOld.vue → Old.vue}

@@ -1,61 +1,62 @@
-<template>
-  <div class="select-restore-type flex">
-    <atoms-list-select-list
-      v-model="model.restore_code"
-      :items="backupTypes"
-      class="select"
-    />
-    <p class="description">
-      {{ description }}
-    </p>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_Localization } from '~/lib/models/interfaces'
-import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
-import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
-
-const description = computed<string>(
-  () => descriptionsFunc(localization.value)[model.value.restore_code - 1]
-)
-</script>
-
-<style>
-:root {
-  --type-list-border-color: #ccc;
-}
-
-:root.dark-theme {
-  --type-list-border-color: #000;
-}
-</style>
-<style scoped lang="scss">
-.select-restore-type {
-  padding-top: 12px;
-
-  .description {
-    color: #333333;
-    font-size: 13px;
-  }
-
-  .description,
-  .select {
-    flex: 1 1 100%;
-    margin-right: 5px;
-  }
-
-  :deep(select) {
-    background-color: transparent;
-    border-color: var(--type-list-border-color);
-  }
-}
-</style>
+<template>
+  <div class="select-restore-type flex">
+    <atoms-list-select-list
+      v-model="model.restore_code"
+      :items="props.backupTypes"
+      class="select"
+    />
+    <p class="description">
+      {{ description }}
+    </p>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { descriptionsFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/descriptions'
+
+const model = defineModel<UI_I_RestoreForm>({ required: true })
+
+const props = defineProps<{
+  backupTypes: UI_I_OptionItem[]
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const description = computed<string>(
+  () => descriptionsFunc(localization.value)[model.value.restore_code - 1]
+)
+</script>
+
+<style>
+:root {
+  --type-list-border-color: #ccc;
+}
+
+:root.dark-theme {
+  --type-list-border-color: #000;
+}
+</style>
+<style scoped lang="scss">
+.select-restore-type {
+  padding-top: 12px;
+
+  .description {
+    color: #333333;
+    font-size: 13px;
+  }
+
+  .description,
+  .select {
+    flex: 1 1 100%;
+    margin-right: 5px;
+  }
+
+  :deep(select) {
+    background-color: transparent;
+    border-color: var(--type-list-border-color);
+  }
+}
+</style>

package/components/common/pages/backups/modals/restore/types/Types.vue

@@ -1,19 +1,31 @@
-<template>
-  <common-pages-backups-modals-restore-types-new
-    v-if="isNewView"
-    v-model="model"
-  />
-  <common-pages-backups-modals-restore-types-old v-else v-model="model" />
-</template>
-
-<script lang="ts" setup>
-import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
-
-const model = defineModel<UI_I_RestoreForm>({ required: true })
-
-const { $store }: any = useNuxtApp()
-
-const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <component
+    :is="currentComponent"
+    v-model="model"
+    :backup-types="backupTypes"
+  />
+</template>
+
+<script lang="ts" setup>
+import type { UI_I_RestoreForm } from '~/components/common/pages/backups/modals/lib/models/interfaces'
+import type { UI_I_OptionItem } from '~/components/atoms/lib/models/interfaces'
+import type { UI_I_Localization } from '~/lib/models/interfaces'
+import { backupsTypesFunc } from '~/components/common/pages/backups/modals/restore/types/lib/config/typeOptions'
+
+const model = defineModel<UI_I_RestoreForm>({ required: true })
+
+const { $store }: any = useNuxtApp()
+
+const isNewView = computed<boolean>(() => $store.getters['main/getIsNewView'])
+const currentComponent = computed(() =>
+  isNewView.value
+    ? defineAsyncComponent(() => import('./New.vue'))
+    : defineAsyncComponent(() => import('./Old.vue'))
+)
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const backupTypes = ref<UI_I_OptionItem[]>(backupsTypesFunc(localization.value))
+</script>
+
+<style scoped lang="scss"></style>

package/components/common/pages/backups/modals/restore/types/lib/config/descriptions.ts

@@ -4,5 +4,6 @@ export const descriptionsFunc = (localization: UI_I_Localization): string[] => [
   localization.common.restoreDiskOnlyDescription,
   localization.common.restoreExistingDescription,
   localization.common.restoreAsNewDescription,
+  localization.common.restoreAsNewAndCopyDescription,
 ]
 

package/components/common/pages/backups/modals/restore/types/lib/config/typeOptions.ts

@@ -16,6 +16,11 @@ export const backupsTypesFunc = (
       value: restoreCodes.asNew,
       testId: 'backup-type-restore-as-new',
     },
+    {
+      text: localization.common.restoreAsNewAndCopy,
+      value: restoreCodes.asNew,
+      testId: 'backup-type-restore-as-new',
+    },
     {
       text: localization.common.restoreDiskOnly2,
       value: restoreCodes.diskOnly,

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',
+  },
 ]