bfg-common 1.5.543 → 1.5.545

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

@@ -2,6 +2,7 @@
   <common-pages-backups-modals-restore-new
     v-if="isNewView"
     v-model="model"
+    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :alert-messages="alertMessages"
@@ -15,12 +16,14 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
+    @submit-confirm="onFinish"
     @hide="onHideModal"
-    @submit="onRestore"
+    @submit-wizard="onSubmitWizard"
   />
   <common-pages-backups-modals-restore-old
     v-else
     v-model="model"
+    v-model:is-show-confirm="isShowConfirm"
     :wizard="wizard"
     :selected-scheme="selectedScheme"
     :ready-complete-data="readyToCompleteInfo"
@@ -35,8 +38,9 @@
     @get-datastore="getDatastoreTableFunc"
     @get-networks="onGetNetworks"
     @change-steps="onChangeSteps"
-    @finish="onRestore"
+    @submit-confirm="onFinish"
     @hide="onHideModal"
+    @submit-wizard="onSubmitWizard"
   />
 </template>
 
@@ -271,17 +275,16 @@ const onHideModal = (): void => {
   emits('hide')
 }
 
-const onRestore = (): void => {
-  // Этот проверка уже есть в RestoreOld
-  // if (model.value.restore_code === restoreCodes.existing) {
-  //   isShowConfirm.value = true
-  // } else {
+const isShowConfirm = ref<boolean>(false)
+
+const onSubmitWizard = (): 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/RestoreNew.vue

@@ -10,7 +10,7 @@
     class="restore-wizard"
     @change-steps="onChangeSteps"
     @hide="onHideModal"
-    @submit="onCreateDatastore"
+    @submit="emits('submit-wizard')"
   >
     <template #content="{ selectedStep }">
       <ui-wizard-block
@@ -161,6 +161,14 @@
       </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">
@@ -178,6 +186,7 @@ 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
@@ -195,8 +204,9 @@ 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'): void
+  (event: 'submit-wizard'): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -250,7 +260,6 @@ 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="onRestore"
+      @submit="emits('submit-wizard')"
     >
       <template #modalBody="{ selectedStep }">
         <div
@@ -79,7 +79,7 @@
     :headline="localization.common.attention"
     :description="localization.common.restoreBackupConfirmDescription"
     @hide-modal="isShowConfirm = false"
-    @confirm="onFinish"
+    @confirm="emits('submit-confirm')"
   />
 </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,7 +116,8 @@ 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: 'finish'): void
+  (event: 'submit-confirm'): void
+  (event: 'submit-wizard'): void
   (event: 'hide'): void
 }>()
 
@@ -138,23 +139,10 @@ 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/package.json

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