From 88e24e1f72867cd27e7f1c65ecbb31109dd3aa51 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Sun, 1 Oct 2023 14:17:09 +0300
Subject: [PATCH] Replace data privacy modal in user preferences

---
 .../src/components/User/UserPreferences.vue   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
index d64e60400398..327a2c17ff46 100644
--- a/client/src/components/User/UserPreferences.vue
+++ b/client/src/components/User/UserPreferences.vue
@@ -106,9 +106,17 @@
             icon="fa-sign-out"
             title="Sign Out"
             description="Click here to sign out of all sessions."
-            @click="toggleLogout = !toggleLogout" />
+            @click="showLogoutModal = true" />
+        <b-modal v-model="showDataPrivateModal" title="Datasets are now private" title-class="font-weight-bold" ok-only>
+            <span v-localize>
+                All of your histories and datasets have been made private. If you'd like to make all *future* histories
+                private please use the
+            </span>
+            <a :href="userPermissionsUrl">User Permissions</a>
+            <span v-localize>interface</span>.
+        </b-modal>
         <b-modal
-            v-model="toggleLogout"
+            v-model="showLogoutModal"
             title="Sign out"
             title-class="font-weight-bold"
             ok-title="Sign out"
@@ -173,8 +181,9 @@ export default {
             diskQuota: "",
             messageVariant: null,
             message: null,
+            showLogoutModal: false,
+            showDataPrivateModal: false,
             toggleActivityBar: false,
-            toggleLogout: false,
             toggleTheme: false,
         };
     },
@@ -195,6 +204,9 @@ export default {
             const themes = Object.keys(this.config.themes);
             return themes?.length > 1 ?? false;
         },
+        userPermissionsUrl() {
+            return withPrefix("/user/permissions");
+        },
     },
     created() {
         const message = QueryStringParsing.get("message");
@@ -211,7 +223,6 @@ export default {
     },
     methods: {
         makeDataPrivate() {
-            const Galaxy = getGalaxyInstance();
             if (
                 confirm(
                     _l(
@@ -225,18 +236,8 @@ export default {
                     )
                 )
             ) {
-                axios.post(withPrefix(`/history/make_private?all_histories=true`)).then((response) => {
-                    Galaxy.modal.show({
-                        title: _l("Datasets are now private"),
-                        body: `All of your histories and datasets have been made private.  If you'd like to make all *future* histories private please use the <a href="${withPrefix(
-                            "/user/permissions"
-                        )}">User Permissions</a> interface.`,
-                        buttons: {
-                            Close: () => {
-                                Galaxy.modal.hide();
-                            },
-                        },
-                    });
+                axios.post(withPrefix(`/history/make_private?all_histories=true`)).then(() => {
+                    this.showDataPrivateModal = true;
                 });
             }
         },