diff --git a/Step/wwwroot/src/modules/base-components/ModalHelper.ts b/Step/wwwroot/src/modules/base-components/ModalHelper.ts
index 59b58130..97d52544 100644
--- a/Step/wwwroot/src/modules/base-components/ModalHelper.ts
+++ b/Step/wwwroot/src/modules/base-components/ModalHelper.ts
@@ -1,5 +1,6 @@
+import Vue from "vue";
 import { Factory, MessageService } from "src/_base";
-import { ConfirmModal } from "src/modules/modals";
+import { ConfirmModal } from "./";
 export class ModalHelper {
 
   public static ShowModal(view) {
@@ -12,12 +13,22 @@ export class ModalHelper {
 
   public static AskConfirm(title: string, body: string, onConfirm: Function, onCancel: Function) {
 
-    var cm = ConfirmModal;
-    cm.title = title;
-    cm.content = body;
-    cm.onCancel = onCancel;
-    cm.onConfirm = onConfirm;
+    ConfirmModal.data = function () {
+      return {
+        title: title,
+        content: body,
+        onConfirm: onConfirm,
+        onCancel: onCancel
+      }
+    };
 
-    this.ShowModal(cm);
+    var cm = Vue.component("confirmModal", ConfirmModal);
+
+      // cm.$data.title = title;
+      // Vue.set(cm, "content", body);
+      // Vue.set(cm, "onCancel", onCancel);
+      // Vue.set(cm, "onConfirm", onConfirm);
+
+      this.ShowModal(cm);
   }
 }
diff --git a/Step/wwwroot/src/modules/base-components/index.js b/Step/wwwroot/src/modules/base-components/index.js
index 774fd187..a858edec 100644
--- a/Step/wwwroot/src/modules/base-components/index.js
+++ b/Step/wwwroot/src/modules/base-components/index.js
@@ -10,5 +10,6 @@ import AccordionMaintenance from "./accordion-maintenance.vue";
 import Keypad from "./keypad.vue";
 import cardutilities from "./cards/card-utilities.vue";
 import card from "./cards/card.vue";
+import ConfirmModal from "./modal-confirm.vue";
 
-export { Loader, Modal, AppRibbon, UserInfo, ModalContainer, ModalHelper, ProcessInfo, Accordion, Keypad, cardutilities, card, AccordionMaintenance };
\ No newline at end of file
+export { Loader, Modal, AppRibbon, UserInfo, ModalContainer, ModalHelper, ProcessInfo, Accordion, Keypad, cardutilities, card, AccordionMaintenance, ConfirmModal };
\ No newline at end of file
diff --git a/Step/wwwroot/src/modules/modals/modal-confirm.vue b/Step/wwwroot/src/modules/base-components/modal-confirm.vue
similarity index 58%
rename from Step/wwwroot/src/modules/modals/modal-confirm.vue
rename to Step/wwwroot/src/modules/base-components/modal-confirm.vue
index 2602f25b..f8dce697 100644
--- a/Step/wwwroot/src/modules/modals/modal-confirm.vue
+++ b/Step/wwwroot/src/modules/base-components/modal-confirm.vue
@@ -5,23 +5,26 @@
     </section>
     <footer class="modal-confirm-delete-footer">
         <div class="pull-right">
-            <button class="btn" @click="Ok()">{{'modal_ok_button' | localize("No")}}</button>
-            <button class="btn" @click="Cancel()">{{'modal_cancel_button' | localize("Conferma")}}</button>
+            <button class="btn" @click="Cancel()">{{'modal_ok_button' | localize("No")}}</button>
+            <button class="btn" @click="Ok()">{{'modal_cancel_button' | localize("Conferma")}}</button>
         </div>
     </footer>
     </modal>
 </template>
 <script>
-import { Modal, ModalHelper } from "../base-components/modal.vue";
+import Modal from "./modal.vue";
+import {ModalHelper} from "./ModalHelper.ts";
 
 export default {
   name: "modalconfirm",
   components: { modal: Modal },
-  props: {
-    title: { default: "" },
-    content: { default: "" },
-    onConfirm: { default: null, type: Function },
-    onCancel: { default: null, type: Function }
+  data: function() {
+    return {
+    title: "",
+    content: "",
+    onConfirm: null,
+    onCancel: null,
+    }
   },
   methods: {
     Ok() {
diff --git a/Step/wwwroot/src/modules/modals/index.js b/Step/wwwroot/src/modules/modals/index.js
deleted file mode 100644
index cad1a578..00000000
--- a/Step/wwwroot/src/modules/modals/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import ConfirmModal from "./modal-confirm.vue";
-export { ConfirmModal };
\ No newline at end of file