From 59f980379aaa031a46f681b8980e52ba613401b5 Mon Sep 17 00:00:00 2001 From: Monika Radaviciute Date: Tue, 7 Mar 2023 13:36:35 +0200 Subject: [PATCH 1/5] Replaced snackbar with custom toast --- .../src/components/ObjectTable.vue | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/ObjectTable.vue b/swift_browser_ui_frontend/src/components/ObjectTable.vue index 16a9fb593..cea9e4dbb 100644 --- a/swift_browser_ui_frontend/src/components/ObjectTable.vue +++ b/swift_browser_ui_frontend/src/components/ObjectTable.vue @@ -113,6 +113,18 @@ id="objects-toasts" data-testid="objects-toasts" /> + +

{{ this.$t("message.largeDownMessage") }}

+ + {{ this.$t("message.largeDownAction") }} + + @@ -430,17 +442,19 @@ export default { }); } }, + removeToast: function() { + this.enableDownload(); + document.querySelector("#largeDownload-toasts") + .removeToast("largeDownload"); + }, confirmDownload: function () { - // Snackbar for enabling large downloads for the duration of the - // session - this.$buefy.snackbar.open({ - duration: 5000, - message: this.$t("message.largeDownMessage"), - type: "is-success", - position: "is-top", - actionText: this.$t("message.largeDownAction"), - onAction: this.enableDownload, - }); + document.querySelector("#largeDownload-toasts").addToast( + { type: "info", + message: "", + id: "largeDownload", + progress: false, + custom: true }, + ); }, enableDownload: function () { // Enables large downloads upon execution From 7b02f126015fb3eae668e39b0eab686ae67e6dc7 Mon Sep 17 00:00:00 2001 From: Monika Radaviciute Date: Tue, 7 Mar 2023 16:25:37 +0200 Subject: [PATCH 2/5] Replaced refresh snackbar with toast --- .../src/components/BrowserSecondaryNavbar.vue | 17 ++++++++++++++++ swift_browser_ui_frontend/src/entries/main.js | 20 ++++++++----------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue index 28be95d10..b303da7f3 100644 --- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue +++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue @@ -63,6 +63,19 @@ vertical="center" data-testid="copy-toasts" /> + +

Encryption engine is ready. Refresh the + window to enable encryption.

+ + Refresh + +
diff --git a/swift_browser_ui_frontend/src/entries/main.js b/swift_browser_ui_frontend/src/entries/main.js index cd059e406..fc5032d6f 100644 --- a/swift_browser_ui_frontend/src/entries/main.js +++ b/swift_browser_ui_frontend/src/entries/main.js @@ -247,18 +247,14 @@ new Vue({ navigator.serviceWorker.addEventListener("message", e => { if (e.data.eventType == "wasmReady") { - this.$buefy.snackbar.open({ - message: - "Encryption engine is ready. Hit refresh to refresh the " + - "window to enable encryption.", - type: "is-success", - position: "is-top", - actionText: "Refresh", - indefinite: true, - onAction: () => { - location.reload(); - }, - }); + document.querySelector("#refresh-toasts").addToast( + { type: "success", + message: "", + id: "refresh-toast", + progress: false, + persistent: true, + custom: true }, + ); } }); From 010a6549179b4de9ff2f56fe5009b089121ab87d Mon Sep 17 00:00:00 2001 From: Monika Radaviciute Date: Wed, 8 Mar 2023 09:54:17 +0200 Subject: [PATCH 3/5] Move strings to lang file --- swift_browser_ui_frontend/src/common/lang.js | 8 ++++++++ .../src/components/BrowserSecondaryNavbar.vue | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/swift_browser_ui_frontend/src/common/lang.js b/swift_browser_ui_frontend/src/common/lang.js index 50de29100..afb4c7ba3 100644 --- a/swift_browser_ui_frontend/src/common/lang.js +++ b/swift_browser_ui_frontend/src/common/lang.js @@ -425,6 +425,10 @@ let default_translations = { uploadedFiles: "Uploaded files will be shared with all project members in ", advancedOptions: "Advanced encryption options", + enReady: + "Encryption engine is ready. Refresh the " + + "window to enable encryption.", + refresh: "Refresh", }, search: { container: "Bucket", @@ -903,6 +907,10 @@ let default_translations = { uploadedFiles: "Lähetetyt tiedostot jaetaan kaikille jäsenille projektissa ", advancedOptions: "Edistyneitä salausvaihtoehtoja", + enReady: + "Encryption engine is ready. Refresh the " + + "window to enable encryption.", + refresh: "Refresh", }, search: { container: "Säiliö", diff --git a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue index b303da7f3..2155c28dd 100644 --- a/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue +++ b/swift_browser_ui_frontend/src/components/BrowserSecondaryNavbar.vue @@ -67,13 +67,12 @@ id="refresh-toasts" data-testid="refresh-toasts" > -

Encryption engine is ready. Refresh the - window to enable encryption.

+

{{ $t("message.encrypt.enReady") }}

- Refresh + {{ $t("message.encrypt.refresh") }} From dc74a1884a939c69a07cb7be9994cf89437aee9b Mon Sep 17 00:00:00 2001 From: Monika Radaviciute Date: Wed, 8 Mar 2023 10:56:02 +0200 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7a90ce9d..2226e5b63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - (GH #920) Optimize docker builds, making them faster by leveraging more caching mechanisms and removing unnecessary package installation - (GH #1007) Create new Taginput component to replace Buefy's taginput component - (GH #1009) Replace buefy toasts with c-toasts from `csc-ui` +- (GH #1014) Replace buefy snackbars with custom c-toasts from `csc-ui` ### Fixed From 7ff03f152ed7a82490c6376ed1433737ea17690b Mon Sep 17 00:00:00 2001 From: Monika Radaviciute Date: Wed, 8 Mar 2023 11:20:37 +0200 Subject: [PATCH 5/5] Remove 'this' --- swift_browser_ui_frontend/src/components/ObjectTable.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swift_browser_ui_frontend/src/components/ObjectTable.vue b/swift_browser_ui_frontend/src/components/ObjectTable.vue index cea9e4dbb..1d5917a61 100644 --- a/swift_browser_ui_frontend/src/components/ObjectTable.vue +++ b/swift_browser_ui_frontend/src/components/ObjectTable.vue @@ -117,12 +117,12 @@ id="largeDownload-toasts" data-testid="largeDownload-toasts" > -

{{ this.$t("message.largeDownMessage") }}

+

{{ $t("message.largeDownMessage") }}

- {{ this.$t("message.largeDownAction") }} + {{ $t("message.largeDownAction") }}