Mercurial > gemma
changeset 1122:a4c74a95c177 store-refactoring
minor store refactoring
removed unused getters from user store and renamed functions to adhere to nameing scheme
removed unnecessary getter from map store
| author | Markus Kottlaender <markus@intevation.de> |
|---|---|
| date | Tue, 06 Nov 2018 11:21:29 +0100 |
| parents | 035dc35e1dfc |
| children | d9e6a1f6f394 |
| files | client/src/App.vue client/src/application/Userbar.vue client/src/map/Maplayer.vue client/src/router.js client/src/store/map.js client/src/store/user.js |
| diffstat | 6 files changed, 24 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/App.vue Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/App.vue Tue Nov 06 11:21:29 2018 +0100 @@ -99,12 +99,12 @@ * Thomas Junk <thomas.junk@intevation.de> * Markus Kottländer <markus.kottlaender@intevation.de> */ -import { mapGetters } from "vuex"; +import { mapState } from "vuex"; export default { name: "app", computed: { - ...mapGetters("user", ["isAuthenticated"]), + ...mapState("user", ["isAuthenticated"]), routeName() { const routeName = this.$route.name; return routeName;
--- a/client/src/application/Userbar.vue Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/application/Userbar.vue Tue Nov 06 11:21:29 2018 +0100 @@ -2,7 +2,7 @@ <div> <img @click="extendUserMenu" class="ui-element userpic shadow" src="../application/assets/user.png"> <div :class="userManagementStyle"> - <span v-if="!isUsermenuCollapsed" class="username align-self-center">{{ userinfo }}</span> + <span v-if="!isUsermenuCollapsed" class="username align-self-center">{{ user }}</span> <span v-if="!isUsermenuCollapsed" class="logout align-self-center" @click="logoff"> <i class="fa fa-power-off"></i> </span> @@ -59,7 +59,7 @@ * Author(s): * Thomas Junk <thomas.junk@intevation.de> */ -import { mapGetters } from "vuex"; +import { mapGetters, mapState } from "vuex"; export default { name: "user", data() { @@ -70,7 +70,7 @@ this.$store.commit("application/toggleUserMenu"); }, logoff() { - this.$store.commit("user/clear_auth"); + this.$store.commit("user/clearAuth"); this.$store.commit("application/resetSidebar"); this.$store.commit("application/resetUserMenu"); this.$store.commit("application/resetSplitScreen"); @@ -78,7 +78,7 @@ } }, computed: { - ...mapGetters("user", ["userinfo"]), + ...mapState("user", ["user"]), ...mapGetters("application", ["isUsermenuCollapsed"]), userManagementStyle() { return {
--- a/client/src/map/Maplayer.vue Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/map/Maplayer.vue Tue Nov 06 11:21:29 2018 +0100 @@ -68,8 +68,8 @@ }; }, computed: { - ...mapGetters("map", ["layers", "getLayerByName"]), - ...mapState("map", ["openLayersMap", "drawMode"]), + ...mapGetters("map", ["getLayerByName"]), + ...mapState("map", ["layers", "openLayersMap", "drawMode"]), ...mapState("bottlenecks", ["selectedSurvey"]), mapStyle() { return {
--- a/client/src/router.js Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/router.js Tue Nov 06 11:21:29 2018 +0100 @@ -97,12 +97,12 @@ localStorage.getItem("expires") ); if (sessionStillActive(expiresFromPastSession)) { - store.commit("user/set_user", localStorage.getItem("user")); - store.commit("user/set_expires", expiresFromPastSession); - store.commit("user/set_roles", localStorage.getItem("roles")); - store.commit("user/set_authenticate", true); + store.commit("user/setUser", localStorage.getItem("user")); + store.commit("user/setExpires", expiresFromPastSession); + store.commit("user/setRoles", localStorage.getItem("roles")); + store.commit("user/setIsAuthenticate", true); } else { - store.commit("user/clear_auth"); + store.commit("user/clearAuth"); } next(); } @@ -116,7 +116,7 @@ router.beforeEach((to, from, next) => { const requiresAuth = to.matched.some(record => record.meta.requiresAuth); - const loggedIn = store.getters["user/isAuthenticated"]; + const loggedIn = store.state.user.isAuthenticated; const expiresFromPastSession = toMillisFromString( localStorage.getItem("expires") );
--- a/client/src/store/map.js Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/store/map.js Tue Nov 06 11:21:29 2018 +0100 @@ -284,9 +284,6 @@ ] }, getters: { - layers: state => { - return state.layers; - }, layersForLegend: state => { return state.layers.filter(layer => layer.showInLegend); },
--- a/client/src/store/user.js Tue Nov 06 10:00:13 2018 +0100 +++ b/client/src/store/user.js Tue Nov 06 11:21:29 2018 +0100 @@ -18,24 +18,12 @@ export default { namespaced: true, state: { - authenticated: false, + isAuthenticated: false, expires: null, roles: [], user: "" }, getters: { - isAuthenticated: state => { - return state.authenticated; - }, - userinfo: state => { - return state.user; - }, - roles: state => { - return state.roles; - }, - expires: state => { - return state.expires; - }, isWaterwayAdmin: state => { return state.roles.includes("waterway_admin"); }, @@ -44,7 +32,7 @@ } }, mutations: { - auth_success: (state, data) => { + authSuccess: (state, data) => { const { token, user, expires, roles } = data; localStorage.setItem("expires", expires); localStorage.setItem("roles", roles); @@ -55,24 +43,24 @@ state.user = user; state.authenticated = true; }, - clear_auth: state => { + clearAuth: state => { state.authenticated = false; state.expires = null; state.roles = []; state.user = ""; localStorage.clear(); }, - set_user: (state, name) => { + setUser: (state, name) => { state.user = name; }, - set_roles: (state, roles) => { + setRoles: (state, roles) => { state.roles = roles; }, - set_expires: (state, expires) => { + setExpires: (state, expires) => { state.expires = expires; }, - set_authenticate: state => { - state.authenticated = true; + setIsAuthenticate: state => { + state.isAuthenticated = true; } }, actions: { @@ -81,11 +69,11 @@ return new Promise((resolve, reject) => { HTTP.post("/login", user) .then(response => { - commit("auth_success", response.data); + commit("authSuccess", response.data); resolve(response); }) .catch(error => { - commit("clear_auth"); + commit("clearAuth"); reject(error); }); });