arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(employee): Added functionality to delete employees. (TV-352)

Browse Source 
Squashed commit of the following:

commit 2602b9205ef86307fa7c85ecb6ce87cb51b71150
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Sep 2 15:40:49 2021 +0200

    Added error-handling

commit 4a3f79948b992e5ad7278328957380215ad21ed7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Sep 2 14:48:54 2021 +0200

    Removed some unused variables

commit f8e69dce84fee2b1fe2a06d6f0960511c286e2b5
Merge: b155865 b80bf22
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Sep 2 14:39:44 2021 +0200

    Merged develop and fixed conflicts

commit b15586559dab669d652d3a44625bacae4620ed40
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Thu Sep 2 14:34:58 2021 +0200

    Added separate component for employee deletion

commit 1720b4954ebbc2868db6f0304fc57b0f3ff07216
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Tue Aug 31 07:50:56 2021 +0200

    added the showing of errror- and succsess messages when employee is deleted (TV-352)

commit 2556d53802249fff545a2d256a178479103108e7
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 30 13:33:22 2021 +0200

    minor change (TV-352)

commit 035dbbe67486392a7a9c656ac73103e938953b24
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 30 12:38:07 2021 +0200

    added close and open methods for better handling of modal (TV-352)

commit abc9ce0f8580ae1b9d784bc7591f095faeddcc33
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 30 12:27:07 2021 +0200

    feat(edit-employee): added functionality to delete employee, and catch error if such exists

commit 23603dd2d84b0e694a19c2131c9c842cf730d97b
Merge: 56a4a6a 02cf0f6
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Mon Aug 30 11:19:18 2021 +0200

    Merge branch 'develop' into feature/TV-352-add-delete-employee-button

commit 56a4a6a9c9195542f51578bd4ee937086ace8df8
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Aug 27 12:58:23 2021 +0200

    added the basic http-delete request method

commit 2f61ff7d6ac2c42a7972fc88548d3d59172cbcc1
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Aug 27 09:18:13 2021 +0200

    added the basic html/css and functionality for deleting an employee from edit-page
This commit is contained in:
Erik Tiekstra
2021-09-02 15:42:03 +02:00
parent b80bf226a9
commit b7ff429db3
19 changed files with 218 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mock-api/mina-sidor-fa/scripts/employees.js
View File

@@ -18,9 +18,11 @@ function generateEmployees(amount = 10) {
const currentTjanster = chooseRandom(TJANSTER, faker.datatype.number({ min: 1, max: TJANSTER.length }));
const currentUtforandeVerksamheter = chooseRandom(UTFORANDEVERKSAMHETER, faker.datatype.number({ min: 1, max: 5 }));
const hasBehorigheter = Math.random() > 0.1;
const id = faker.datatype.uuid();
const employee = {
ciamUserId: faker.datatype.uuid(),
id,
ciamUserId: id,
firstName,
lastName,
name: `${firstName} ${lastName}`,

5
mock-api/mina-sidor-fa/server.js
View File

@@ -12,7 +12,6 @@ server.use(
'*sort=utforandeVerksamhet*': '$1sort=utforandeVerksamhet[0]$2',
'*sort=tjanst*': '$1sort=tjanst[0]$2',
'/users/invite*': '/invites$1',
'/users/:id': '/employees?ciamUserId=:id',
'/users*': '/employees$1',
'/employees*search=*': '/employees$1fullName_like=$2',
'/employees*onlyEmployeesWithoutAuthorization=*': '/employees$1roles.length_lte=1',
@@ -88,10 +87,6 @@ router.render = (req, res) => {
const authRegex = /(?:\/auth\/)(userinfo|organizations)/g;
const isAuthPath = authRegex.exec(pathname);
if (isEmployeePath) {
data = data[0];
}
if (isAuthPath) {
const authSubPath = isAuthPath[1];