From 18889ad725f7f7e5a7e3f7abcf156487556dbeaf Mon Sep 17 00:00:00 2001 From: Ramires Viana <59319979+ramiresviana@users.noreply.github.com> Date: Wed, 14 Apr 2021 11:51:33 +0000 Subject: [PATCH 01/18] fix: no items displayed on file listing --- frontend/src/views/files/Listing.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue index 16640861..798498e5 100644 --- a/frontend/src/views/files/Listing.vue +++ b/frontend/src/views/files/Listing.vue @@ -254,6 +254,7 @@ diff --git a/frontend/src/views/Share.vue b/frontend/src/views/Share.vue index a60af1c8..cc370cfe 100644 --- a/frontend/src/views/Share.vue +++ b/frontend/src/views/Share.vue @@ -19,7 +19,50 @@ -
+
+

+
+
+
+
+
+ {{ $t("files.loading") }} +

+
+
+
+
+ +
+

{{ $t("login.password") }}

+
+ +
+ +
+
+ +
+
+
+ +
+
-
-
-
- -
-

{{ $t("login.password") }}

-
- -
- -
-
- -
-
-
- -
@@ -256,9 +266,10 @@ export default { this.token = file.token || ""; this.updateRequest(file); - this.setLoading(false); } catch (e) { this.error = e; + } finally { + this.setLoading(false); } }, keyEvent(event) { diff --git a/frontend/src/views/files/Listing.vue b/frontend/src/views/files/Listing.vue index 26023b85..e3c8c253 100644 --- a/frontend/src/views/files/Listing.vue +++ b/frontend/src/views/files/Listing.vue @@ -114,8 +114,13 @@ />
-
-

+
+

+
+
+
+
+
{{ $t("files.loading") }}

@@ -284,7 +289,15 @@ export default { }; }, computed: { - ...mapState(["req", "selected", "user", "show", "multiple", "selected"]), + ...mapState([ + "req", + "selected", + "user", + "show", + "multiple", + "selected", + "loading", + ]), ...mapGetters(["selectedCount"]), nameSorted() { return this.req.sorting.by === "name"; @@ -799,17 +812,13 @@ export default { viewMode: this.user.viewMode === "mosaic" ? "list" : "mosaic", }; - try { - await users.update(data, ["viewMode"]); + users.update(data, ["viewMode"]).catch(this.$showError); - // Await ensures correct value for setItemWeight() - await this.$store.commit("updateUser", data); + // Await ensures correct value for setItemWeight() + await this.$store.commit("updateUser", data); - this.setItemWeight(); - this.fillWindow(); - } catch (e) { - this.$showError(e); - } + this.setItemWeight(); + this.fillWindow(); }, upload: function () { if ( diff --git a/frontend/src/views/files/Preview.vue b/frontend/src/views/files/Preview.vue index 26521153..73600567 100644 --- a/frontend/src/views/files/Preview.vue +++ b/frontend/src/views/files/Preview.vue @@ -46,15 +46,14 @@ -
+
- - @@ -13,6 +13,10 @@ import HeaderBar from "@/components/header/HeaderBar"; const errors = { + 0: { + icon: "cloud_off", + message: "errors.connection", + }, 403: { icon: "error", message: "errors.forbidden", @@ -33,11 +37,17 @@ export default { HeaderBar, }, props: ["errorCode", "showHeader"], - data: function () { - return { - icon: errors[this.errorCode].icon, - message: this.$t(errors[this.errorCode].message), - }; + computed: { + code() { + return this.errorCode === "0" || + this.errorCode === "404" || + this.errorCode === "403" + ? parseInt(this.errorCode) + : 500; + }, + info() { + return errors[this.code]; + }, }, }; diff --git a/frontend/src/views/Files.vue b/frontend/src/views/Files.vue index 02d73c61..3ae407c2 100644 --- a/frontend/src/views/Files.vue +++ b/frontend/src/views/Files.vue @@ -4,7 +4,7 @@ - +

@@ -67,11 +67,6 @@ export default { return "preview"; } }, - errorCode() { - return this.error.message === "404" || this.error.message === "403" - ? parseInt(this.error.message) - : 500; - }, }, created() { this.fetchData(); diff --git a/frontend/src/views/Share.vue b/frontend/src/views/Share.vue index cc370cfe..790bf64d 100644 --- a/frontend/src/views/Share.vue +++ b/frontend/src/views/Share.vue @@ -60,7 +60,7 @@

- +