From dad5b5d890f17e2b04d2e21d8512c374819b63a6 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 24 Sep 2024 19:20:27 +0200
Subject: [PATCH] Update RestarVMDialog in edit VM page; fix slots-template
 issue

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester/dialog/RestartVMDialog.vue      | 65 +++++++++----------
 .../edit/kubevirt.io.virtualmachine/index.vue |  6 +-
 2 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/pkg/harvester/dialog/RestartVMDialog.vue b/pkg/harvester/dialog/RestartVMDialog.vue
index 8e9b02e5..c158e65b 100644
--- a/pkg/harvester/dialog/RestartVMDialog.vue
+++ b/pkg/harvester/dialog/RestartVMDialog.vue
@@ -4,10 +4,13 @@ import AsyncButton from '@shell/components/AsyncButton';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import { exceptionToErrorsArray } from '@shell/utils/error';
+import AppModal from '@shell/components/AppModal';
+
 export default {
   emits: ['close'],
   
   components: {
+    AppModal,
     Card,
     AsyncButton,
     Banner,
@@ -31,7 +34,6 @@ export default {
       try {
         this.vm.doActionGrowl('restart', {});
         buttonDone(true);
-        this.resolve();
         this.close();
       } catch (err) {
         console.error(err); // eslint-disable-line
@@ -56,44 +58,41 @@ export default {
       class="prompt-restart"
       :show-highlight-border="false"
     >
-      <h4
-        slot="title"
-        v-clean-html="t('harvester.modal.restart.title')"
-        class="text-default-text"
-      />
-
-      <template slot="body">
-        <slot name="body">
-          <div
-            v-clean-html="t('harvester.modal.restart.tip')"
-            class="pl-10 pr-10"
-          >
-          </div>
-        </slot>
+      <template #title>
+        <h4
+          v-clean-html="t('harvester.modal.restart.title')"
+          class="text-default-text"
+        />
       </template>
 
-      <div
-        slot="actions"
-        class="bottom"
-      >
-        <Banner
-          v-for="(err, i) in errors" :key="i" color="error"
-          :label="err"
+      <template #body>
+        <div
+          v-clean-html="t('harvester.modal.restart.tip')"
+          class="pl-10 pr-10"
         />
-        <div class="buttons">
-          <button
-            class="btn role-secondary mr-10"
-            @click="close"
-          >
-            {{ t('harvester.modal.restart.cancel') }}
-          </button>
+      </template>
 
-          <AsyncButton
-            mode="restart"
-            @click="apply"
+      <template #actions>
+        <div class="bottom">
+          <Banner
+            v-for="(err, i) in errors" :key="i" color="error"
+            :label="err"
           />
+          <div class="buttons">
+            <button
+              class="btn role-secondary mr-10"
+              @click="close"
+            >
+              {{ t('harvester.modal.restart.cancel') }}
+            </button>
+
+            <AsyncButton
+              mode="restart"
+              @click="apply"
+            />
+          </div>
         </div>
-      </div>
+      </template>
     </Card>
   </app-modal>
 </template>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index 64e7be1e..6e32c10f 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -413,7 +413,10 @@ export default {
 
       return new Promise((resolve) => {
         this.isOpen = true;
-        this.$refs.restartDialog.resolve = resolve;
+
+        this.$nextTick(() => {
+          this.$refs.restartDialog.resolve = resolve;
+        });
       });
     },
 
@@ -854,6 +857,7 @@ export default {
 
     <RestartVMDialog
       v-if="isOpen"
+      ref="restartDialog"
       :vm="value"
     />
   </CruResource>