From ce67fb5964e6aa9466e6f6ca5912a87564412c48 Mon Sep 17 00:00:00 2001
From: Kloon ImKloon <kloon15@gmail.com>
Date: Mon, 4 Sep 2023 12:15:39 +0200
Subject: [PATCH] Fix errors in settings and shares

---
 frontend/src/components/prompts/Share.vue |  2 +-
 frontend/src/main.js                      |  4 ++--
 frontend/src/stores/auth.js               |  3 ++-
 frontend/src/views/Share.vue              |  4 ++--
 frontend/src/views/settings/Global.vue    | 14 ++++++++++++--
 frontend/src/views/settings/Profile.vue   |  1 +
 frontend/src/views/settings/User.vue      | 14 ++++++++++++--
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/prompts/Share.vue b/frontend/src/components/prompts/Share.vue
index ee01ecad..fee1f2af 100644
--- a/frontend/src/components/prompts/Share.vue
+++ b/frontend/src/components/prompts/Share.vue
@@ -145,7 +145,7 @@ export default {
       listing: true,
     };
   },
-  inject: ["$showError"],
+  inject: ["$showError", "$showSuccess"],
   computed: {
     ...mapState(useFileStore, [
       "req",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 322c017b..cc019092 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -1,5 +1,5 @@
 import { disableExternal } from "@/utils/constants";
-import { createApp } from "vue";
+import { createApp, configureCompat } from "vue";
 import Noty from "noty";
 import VueLazyload from "vue-lazyload";
 import createPinia from "@/stores";
@@ -7,7 +7,7 @@ import router from "@/router";
 import i18n from "@/i18n";
 import App from "@/App.vue";
 
-// import "core-js/actual/structured-clone";
+configureCompat({ RENDER_FUNCTION: false });
 
 import dayjs from "dayjs";
 import localizedFormat from "dayjs/plugin/localizedFormat";
diff --git a/frontend/src/stores/auth.js b/frontend/src/stores/auth.js
index 533af927..7b57ef27 100644
--- a/frontend/src/stores/auth.js
+++ b/frontend/src/stores/auth.js
@@ -1,6 +1,7 @@
 import { defineStore } from "pinia";
 import dayjs from "dayjs";
 import i18n, { detectLocale } from "@/i18n";
+import { cloneDeep } from "lodash-es";
 
 export const useAuthStore = defineStore("auth", {
   // convert to a function
@@ -35,7 +36,7 @@ export const useAuthStore = defineStore("auth", {
           i18n.global.locale.value = locale;
         }
 
-        this.user[field] = structuredClone(value[field]);
+        this.user[field] = cloneDeep(value[field]);
       }
     },
     // easily reset state using `$reset`
diff --git a/frontend/src/views/Share.vue b/frontend/src/views/Share.vue
index bc0d1eca..6434f00a 100644
--- a/frontend/src/views/Share.vue
+++ b/frontend/src/views/Share.vue
@@ -113,7 +113,7 @@
             </a>
           </div>
           <div class="share__box__element share__box__center">
-            <qrcode-vue :value="link" size="200" level="M"></qrcode-vue>
+            <qrcode-vue :value="link" :size="200" level="M"></qrcode-vue>
           </div>
         </div>
         <div
@@ -221,7 +221,7 @@ export default {
     },
   },
   created: async function () {
-    const hash = this.$route.params.pathMatch.split("/")[0];
+    const hash = this.$route.params.path[0];
     this.hash = hash;
     await this.fetchData();
   },
diff --git a/frontend/src/views/settings/Global.vue b/frontend/src/views/settings/Global.vue
index 7fb24c89..2dfca0d7 100644
--- a/frontend/src/views/settings/Global.vue
+++ b/frontend/src/views/settings/Global.vue
@@ -44,7 +44,12 @@
 
           <h3>{{ $t("settings.branding") }}</h3>
 
-          <i18n-t keypath="settings.brandingHelp" tag="p" class="small">
+          <i18n-t
+            keypath="settings.brandingHelp"
+            tag="p"
+            class="small"
+            scope="global"
+          >
             <a
               class="link"
               target="_blank"
@@ -177,7 +182,12 @@
         </div>
 
         <div class="card-content">
-          <i18n-t keypath="settings.commandRunnerHelp" tag="p" class="small">
+          <i18n-t
+            keypath="settings.commandRunnerHelp"
+            tag="p"
+            class="small"
+            scope="global"
+          >
             <code>FILE</code>
             <code>SCOPE</code>
             <a
diff --git a/frontend/src/views/settings/Profile.vue b/frontend/src/views/settings/Profile.vue
index f28f24af..5ccf81df 100644
--- a/frontend/src/views/settings/Profile.vue
+++ b/frontend/src/views/settings/Profile.vue
@@ -118,6 +118,7 @@ export default {
     this.hideDotfiles = this.user.hideDotfiles;
     this.singleClick = this.user.singleClick;
     this.dateFormat = this.user.dateFormat;
+    this.loading = false;
   },
   methods: {
     ...mapActions(useAuthStore, ["updateUser"]),
diff --git a/frontend/src/views/settings/User.vue b/frontend/src/views/settings/User.vue
index d2cc9a04..00090e2e 100644
--- a/frontend/src/views/settings/User.vue
+++ b/frontend/src/views/settings/User.vue
@@ -28,6 +28,15 @@
           >
             {{ $t("buttons.delete") }}
           </button>
+          <router-link to="/settings/users">
+            <button
+              class="button button--flat button--grey"
+              :aria-label="$t('buttons.cancel')"
+              :title="$t('buttons.cancel')"
+            >
+              {{ $t("buttons.cancel") }}
+            </button>
+          </router-link>
           <input
             class="button button--flat"
             type="submit"
@@ -67,6 +76,7 @@ import { useLayoutStore } from "@/stores/layout";
 import { users as api, settings } from "@/api";
 import UserForm from "@/components/settings/UserForm.vue";
 import Errors from "@/views/Errors.vue";
+import { cloneDeep } from "lodash-es";
 
 export default {
   name: "user",
@@ -120,7 +130,7 @@ export default {
             id: 0,
           };
         } else {
-          const id = this.$route.params.pathMatch;
+          const id = this.$route.params.id;
           this.user = { ...(await api.get(id)) };
         }
       } catch (e) {
@@ -161,7 +171,7 @@ export default {
           await api.update(user);
 
           if (user.id === this.user.id) {
-            this.setUser({ ...structuredClone(user) });
+            this.setUser({ ...cloneDeep(user) });
           }
 
           this.$showSuccess(this.$t("settings.userUpdated"));