From 9f4781ce038795005ac9174c9c77142869fddef9 Mon Sep 17 00:00:00 2001 From: Felipe Morato Date: Wed, 5 Jan 2022 11:49:29 +0200 Subject: [PATCH 1/3] Fix console errors during initial state. --- swift_browser_ui_frontend/src/common/store.js | 4 ++-- swift_browser_ui_frontend/src/entries/login.js | 14 ++++++++++++++ swift_browser_ui_frontend/src/entries/main.js | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/swift_browser_ui_frontend/src/common/store.js b/swift_browser_ui_frontend/src/common/store.js index c6704be1a..7a13f93bb 100644 --- a/swift_browser_ui_frontend/src/common/store.js +++ b/swift_browser_ui_frontend/src/common/store.js @@ -18,8 +18,8 @@ Vue.use(Vuex); const store = new Vuex.Store({ state: { projects: [], - active: undefined, - uname: undefined, + active: {}, + uname: "", multipleProjects: false, isLoading: false, isFullPage: true, diff --git a/swift_browser_ui_frontend/src/entries/login.js b/swift_browser_ui_frontend/src/entries/login.js index 169850152..7cbb9d5a4 100644 --- a/swift_browser_ui_frontend/src/entries/login.js +++ b/swift_browser_ui_frontend/src/entries/login.js @@ -1,10 +1,24 @@ import Vue from "vue"; import App from "@/pages/LoginPage.vue"; +import getLangCookie from "@/common/conv"; +import translations from "@/common/lang"; + // Import project css import "@/css/prod.scss"; +import VueI18n from "vue-i18n"; + +Vue.use(VueI18n); + + +const i18n = new VueI18n({ + locale: getLangCookie(), + messages: translations, +}); + new Vue ({ + i18n, data: { formname: "Token id:", loginformname: "Openstack account:", diff --git a/swift_browser_ui_frontend/src/entries/main.js b/swift_browser_ui_frontend/src/entries/main.js index 3425282d8..f05413176 100644 --- a/swift_browser_ui_frontend/src/entries/main.js +++ b/swift_browser_ui_frontend/src/entries/main.js @@ -291,7 +291,7 @@ new Vue({ else { retl.push({ alias: this.$t("message.containers") - + this.$store.state.active.name, + + this.$store.state.active.name || "", address: {name: "ContainersView"}, }); } From 6da5082aac16f63cacdd4f1a665173cd10d29ca7 Mon Sep 17 00:00:00 2001 From: Felipe Morato Date: Wed, 5 Jan 2022 11:50:15 +0200 Subject: [PATCH 2/3] Refactor truncate to prevent undefined error. --- swift_browser_ui_frontend/src/common/conv.js | 7 +++++++ swift_browser_ui_frontend/src/components/ObjectTable.vue | 8 +++----- .../src/components/ShareRequestsTable.vue | 6 +++--- swift_browser_ui_frontend/src/components/SharedTable.vue | 5 ++--- swift_browser_ui_frontend/src/pages/BrowserPage.vue | 6 +++--- swift_browser_ui_frontend/src/views/Containers.vue | 6 ++---- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/swift_browser_ui_frontend/src/common/conv.js b/swift_browser_ui_frontend/src/common/conv.js index 7df943114..3e174c85b 100644 --- a/swift_browser_ui_frontend/src/common/conv.js +++ b/swift_browser_ui_frontend/src/common/conv.js @@ -189,3 +189,10 @@ export function makeGetObjectsMetaURL(container, objects) { } export const taginputConfirmKeys = [",", ";", ":", ".", " ", "Tab", "Enter"]; + +export function truncate(value, length) { + if (!value) { + return ""; + } + return value.length > length ? value.substr(0, length) + "..." : value; +} diff --git a/swift_browser_ui_frontend/src/components/ObjectTable.vue b/swift_browser_ui_frontend/src/components/ObjectTable.vue index 1027224ff..2d2c6a806 100644 --- a/swift_browser_ui_frontend/src/components/ObjectTable.vue +++ b/swift_browser_ui_frontend/src/components/ObjectTable.vue @@ -328,7 +328,7 @@ diff --git a/swift_browser_ui_frontend/src/views/Containers.vue b/swift_browser_ui_frontend/src/views/Containers.vue index 192a64263..dc7afc0c4 100644 --- a/swift_browser_ui_frontend/src/views/Containers.vue +++ b/swift_browser_ui_frontend/src/views/Containers.vue @@ -282,7 +282,7 @@