gemma: client/src/store/usermanagement.js annotate

annotate client/src/store/usermanagement.js @ 3678:8f58851927c0

client: make layer factory only return new layer config for individual maps instead of each time it is invoked. The purpose of the factory was to support multiple maps with individual layers. But returning a new config each time it is invoked leads to bugs that rely on the layer's state. Now this factory reuses the same objects it created before, per map.

author	Markus Kottlaender <markus@intevation.de>
date	Mon, 17 Jun 2019 17:31:35 +0200
parents	2c0170be6cf0
children	2261462ddcdc

rev	line source
1362 ca33ad696594 remove the first empyty lines Fadi Abbud <fadi.abbud@intevation.de> parents: 1361 diff changeset	1 /* This is Free Software under GNU Affero General Public License v >= 3.0
1019 ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	2 * without warranty, see README.md and license for details.
1361 ea3a89a1813a remove trailing whitespace, add headers for Makefile, add the missed authors Fadi Abbud <fadi.abbud@intevation.de> parents: 1296 diff changeset	3 *
1019 ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	4 * SPDX-License-Identifier: AGPL-3.0-or-later
ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	5 * License-Filename: LICENSES/AGPL-3.0.txt
1361 ea3a89a1813a remove trailing whitespace, add headers for Makefile, add the missed authors Fadi Abbud <fadi.abbud@intevation.de> parents: 1296 diff changeset	6 *
ea3a89a1813a remove trailing whitespace, add headers for Makefile, add the missed authors Fadi Abbud <fadi.abbud@intevation.de> parents: 1296 diff changeset	7 * Copyright (C) 2018 by via donau
1019 ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	8 * – Österreichische Wasserstraßen-Gesellschaft mbH
ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	9 * Software engineering by Intevation GmbH
1361 ea3a89a1813a remove trailing whitespace, add headers for Makefile, add the missed authors Fadi Abbud <fadi.abbud@intevation.de> parents: 1296 diff changeset	10 *
1019 ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	11 * Author(s):
ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	12 * Thomas Junk <thomas.junk@intevation.de>
1363 d0c4d17ee7ab add missing authors Fadi Abbud <fadi.abbud@intevation.de> parents: 1362 diff changeset	13 * Markus Kottländer <markus@intevation.de>
1019 ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	14 */
ca628dce90dd Licensing information added Thomas Junk <thomas.junk@intevation.de> parents: 585 diff changeset	15
2947 a6eea3002e6e client: cleanup import paths Fadi Abbud <fadi.abbud@intevation.de> parents: 1363 diff changeset	16 import { HTTP } from "@/lib/http";
585 ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	17
1296 99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	18 // initial state
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	19 const init = () => {
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	20 return {
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	21 users: null,
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	22 currentUser: null,
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	23 userDetailsVisible: false
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	24 };
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	25 };
99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	26
585 ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	27 const newUser = () => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	28 return {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	29 user: "",
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	30 email: "",
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	31 country: null,
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	32 role: null,
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	33 isNew: true,
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	34 password: "",
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	35 roleLabel: ""
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	36 };
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	37 };
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	38
1114 8d12056d602a shortened store file imports Markus Kottlaender <markus@intevation.de> parents: 1096 diff changeset	39 export default {
1296 99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	40 init,
585 ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	41 namespaced: true,
1296 99c039e86624 replaced manual store cleanup on logout with central store reset Markus Kottlaender <markus@intevation.de> parents: 1272 diff changeset	42 state: init(),
585 ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	43 getters: {
3506 e2ed741545e1 import_overview: added country column Thomas Junk <thomas.junk@intevation.de> parents: 2947 diff changeset	44 userCountries: state => {
3670 2c0170be6cf0 usermanagement: return an empty list of user countries in case the user is logged out and the object is not present Thomas Junk <thomas.junk@intevation.de> parents: 3508 diff changeset	45 if (!state.users) return [];
3506 e2ed741545e1 import_overview: added country column Thomas Junk <thomas.junk@intevation.de> parents: 2947 diff changeset	46 return state.users.reduce((o, n) => {
3508 081182dfcc35 import_overview: country for sys_admin = global Thomas Junk <thomas.junk@intevation.de> parents: 3506 diff changeset	47 o[n.user] = n.role !== "sys_admin" ? n.country : "global";
3506 e2ed741545e1 import_overview: added country column Thomas Junk <thomas.junk@intevation.de> parents: 2947 diff changeset	48 return o;
e2ed741545e1 import_overview: added country column Thomas Junk <thomas.junk@intevation.de> parents: 2947 diff changeset	49 }, {});
e2ed741545e1 import_overview: added country column Thomas Junk <thomas.junk@intevation.de> parents: 2947 diff changeset	50 },
585 ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	51 isUserDetailsVisible: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	52 return state.userDetailsVisible;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	53 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	54 currentUser: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	55 return state.currentUser;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	56 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	57 users: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	58 return state.users;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	59 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	60 getUserByName: state => name => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	61 return state.users.find(user => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	62 return user.user === name;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	63 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	64 }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	65 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	66 mutations: {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	67 setUserDetailsInvisible: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	68 state.userDetailsVisible = false;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	69 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	70 setUserDetailsVisible: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	71 state.userDetailsVisible = true;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	72 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	73 usersLoaded: (state, data) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	74 const resolveLabel = x => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	75 const labels = {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	76 waterway_user: "Waterway User",
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	77 waterway_admin: "Waterway Administrator",
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	78 sys_admin: "System Admininistrator"
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	79 };
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	80 return labels[x];
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	81 };
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	82 let users = data.users.map(u => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	83 u["roleLabel"] = resolveLabel(u["role"]);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	84 return u;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	85 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	86 state.users = users;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	87 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	88 setCurrentUser: (state, data) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	89 state.currentUser = data;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	90 state.userDetailsVisible = true;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	91 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	92 clearCurrentUser: state => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	93 state.currentUser = newUser();
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	94 }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	95 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	96 actions: {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	97 deleteUser({ commit }, data) {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	98 const { name } = data;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	99 return new Promise((resolve, reject) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	100 HTTP.delete("/users/" + name, {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	101 headers: { "X-Gemma-Auth": localStorage.getItem("token") }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	102 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	103 .then(response => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	104 commit("clearCurrentUser");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	105 commit("setUserDetailsInvisible");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	106 resolve(response);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	107 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	108 .catch(error => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	109 reject(error);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	110 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	111 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	112 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	113 saveCurrentUser({ commit }, data) {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	114 const { path, user } = data;
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	115 if (user.isNew) {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	116 return new Promise((resolve, reject) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	117 HTTP.post("/users", user, {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	118 headers: { "X-Gemma-Auth": localStorage.getItem("token") }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	119 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	120 .then(response => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	121 commit("setUserDetailsInvisible");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	122 commit("clearCurrentUser");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	123 resolve(response);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	124 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	125 .catch(error => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	126 reject(error);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	127 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	128 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	129 } else {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	130 return new Promise((resolve, reject) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	131 HTTP.put("/users/" + path, user, {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	132 headers: { "X-Gemma-Auth": localStorage.getItem("token") }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	133 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	134 .then(response => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	135 commit("setUserDetailsInvisible");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	136 commit("clearCurrentUser");
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	137 resolve(response);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	138 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	139 .catch(error => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	140 reject(error);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	141 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	142 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	143 }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	144 },
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	145 loadUsers({ commit }) {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	146 return new Promise((resolve, reject) => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	147 HTTP.get("/users", {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	148 headers: { "X-Gemma-Auth": localStorage.getItem("token") }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	149 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	150 .then(response => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	151 commit("usersLoaded", response.data);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	152 resolve(response);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	153 })
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	154 .catch(error => {
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	155 reject(error);
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	156 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	157 });
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	158 }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	159 }
ef307bd6b5d8 refac: restructured client application Thomas Junk <thomas.junk@intevation.de> parents: diff changeset	160 };