Squashed commit of the following: commit 39d7130c131ac7a7dda050e5894f4762e841627f Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Mon Jun 14 08:40:44 2021 +0200 Update mock-login.component.html commit 6012a7f526e3b9410a364c39a74e6c9a9ae2426a Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 9 10:59:35 2021 +0200 Fixat enligt kommentarer commit 3c76368b772f37498e419299554bcb4b5f519164 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 9 10:03:49 2021 +0200 Bytt ut jwt-referenser commit 853387f8cc18e38387bed50ed2d65342ec68dcc2 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 9 09:50:16 2021 +0200 merge with develop commit 553431a880f97eda948b13a2b967c8dee4cf9dd3 Merge: 8b1cca348801a9Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Wed Jun 9 09:46:17 2021 +0200 Merge branch 'develop' into feature/TV-252-and-TV-255-login-sidor # Conflicts: # apps/dafa-web/src/app/data/models/employee.model.ts # apps/dafa-web/src/app/data/models/participant.model.ts # apps/dafa-web/src/app/data/models/sort.model.ts # apps/dafa-web/src/app/pages/administration/pages/employee-card/employee-card.component.ts # apps/dafa-web/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.ts # apps/dafa-web/src/app/pages/administration/pages/employees/employees.component.html # apps/dafa-web/src/app/services/api/employee.service.ts # apps/dafa-web/src/app/services/api/participants.service.ts # apps/dafa-web/src/app/services/api/user.service.ts # apps/dafa-web/src/app/utils/sort.util.ts # mock-api/dafa-web/server.js commit 8b1cca3553be37cb9bf68f67ae4612095e2b67d8 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 16:44:07 2021 +0200 fix basic styling at login and logout pages commit cdad17716bac1510d34c9d4bc8653455b6c16d24 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 16:34:12 2021 +0200 Bryter ut logged-in-shell commit bf294eefe448d3c708c6299154f376e264b53c81 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 16:14:18 2021 +0200 extract logged in shell to own component commit b44e6f0dc6e45f4f27fb4375ecfc59bc35ba745c Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 16:14:03 2021 +0200 auth interceptor commit 1540759b97afe18b47d86ea5f33d5cc29663ba3a Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 15:05:41 2021 +0200 lägg till skelett för ciam landing sida och en mock-login-sida commit d211f7cdb46bea0d9ac1d6400c7171b924ddff77 Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 15:03:59 2021 +0200 return singular token commit e0e725cee778d488fd3ec467d28592c1c8e9e3eb Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se> Date: Tue Jun 8 14:20:36 2021 +0200 add auth check and an API to get the token http://localhost:4200/api/get-token?code=auth_code_from_CIAM_with_all_permissions commit 4055d3a14eda9737ef76ed5e85ea35480e19e71c Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Jun 7 15:20:26 2021 +0200 updates after PR comments commit f515ed6d06087f62de7522745691429d7ca91153 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Jun 7 12:07:50 2021 +0200 Now using Sort interface again commit 5c793a5a7579a520c3792bb3d13c00bb68dbfcd4 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Jun 7 11:54:27 2021 +0200 Fixed bug showing wrong amount in pagination component commit 7c55751147e05c1279b75356dc143b069e63e6b2 Merge: 11eab63a701888Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Jun 7 11:42:59 2021 +0200 Updated after merge with develop commit 11eab6330191a140c2cfd7094838495793e02719 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Jun 7 11:23:52 2021 +0200 Added functionality to sort on different columns commit f13422a2aa53a69a243f32f9cd0b7ed6bd3441fc Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Jun 4 11:40:22 2021 +0200 Fixed other mappings after changes in the mock-api commit ba2d3200167281422354f5e3cfdf7720444a9c4c Merge: 6232b32d91b3e6Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Jun 4 10:00:00 2021 +0200 Added paging functionality commit 6232b3274ff73f2da929342a244fbc87430b796f Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Jun 4 09:25:01 2021 +0200 Added meta model and changed services to adapt new API data structure ... and 1 more commit
DAFA-web
The project was generated using Nx.
Quick Start & Documentation
For all commands we will refer to the npm scripts located inside package.json. When using these commands, you do not need to have @angular/cli installed globally on your computer.
To get started, clone the repository and run npm install in the root of the project, this will install all dependencies.
Development server DAFA-web
Run npm start for a dev server. Navigate to http://localhost:4200/. The app will automatically reload if you change any of the source files.
Dotnet API
Run npm run start:api to run against the Dotnet API.
Generate an application
Run npm run new-app my-app to generate an application. When using Nx, you can create multiple applications and libraries in the same workspace.
Generate a library
Run npm run new-lib my-lib to generate a library. Libraries are shareable across libraries and applications. They can be imported from @dafa-web-monorepo/mylib.
Code scaffolding
Run npm run new-component my-component --project=my-app to generate a new component.
Build DAFA-web
Run npm run build to build the project. The build artifacts will be stored in the dist/ directory. Use the --prod flag for a production build.
Dotnet API
Run npm run build:api to build the project using the Dotnet API.
Running unit tests on DAFA-web
Run npm run test to execute the unit tests via Jest.
Run npm run nx affected:test to execute the unit tests affected by a change.
Running end-to-end tests on DAFA-web
Run npm run e2e to execute the end-to-end tests via Cypress.
Run npm run nx affected:e2e to execute the end-to-end tests affected by a change.
Understand your workspace
Run npm run nx dep-graph to see a diagram of the dependencies of your projects.
Git workflow
-
Use branching model Gitflow.
- Example:
feature/TV-XXXXorbugfix/TV-XXXX - A useful CLI helper tool can be used: gitflow-avh.
- Example:
-
Clone origin, create feature/bugfix branches and push back to origin.
-
Don't forget to commit and push your changes regulary!
-
Create a pull request for each feature branch.
-
When merging the pull request, follow conventional commits structure inside the merge message.
-
The merge-message, which follows conventional commits, will be added to the CHANGELOG after a release is made.
-
A commit message could look like this:
feat(startpage): Added headings and description to the startpage (TV-1234). -
The changelog would look something like this:
### Features - **startpage:** Added headings and description to the startpage ([TV-1234](https://jira.arbetsformedlingen.se/browse/TV-1234)) ([commit-hash](https://bitbucket.arbetsformedlingen.se/projects/tea/repos/dafa-web-monorepo/commits/commit-hash))
-
-
Upon merge, Open Shift will deploy the application to AUTO and TEST.
Release and deploy
We use a semi-automated release and deploy to different test-enviroments. A release script is used in combination with semantic-release to add the correct version of the application and changes to the changelog. The deployments are made depending on which branches are updated:
developis automatically deployed to AUTO and TEST.nextis automatically deployed to SYS.mainis automatically deployed to ACC. After this is completed, a question needs to be answered whether the image should be deployed to PROD.
Deploy to SYS
To deploy the application to SYS you need to create a release. Make sure you are in the develop branch and are up-to-date with origin. Then run npm run release. This will:
- Update the CHANGELOG.md and copies the CHANGELOG to assets.
- Bump the applications version according to semantic versioning.
- Commits the CHANGELOG to
developand pushes it to origin. - Merge
developintonextand pushesnextto origin.
Open Shift will deploy the application to SYS.
Release to ACC and PROD
To release the latest version of next to ACC and eventually to PROD; a pull request should be created to merge next into main. The next branch is protected and will not be deleted upon merge.
Open Shift will deploy the application to ACC and a question inside the pipeline is asked if the application also should be deployed to PROD. This question will persist for 24 hours.