Merge in TEA/mina-sidor-fa-web from feature/TV-945-felhantering to develop Squashed commit of the following: commit b621bd7d9dd0a03a22476f196521f2535731fa12 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 16:01:06 2021 +0100 Added better error-handling to employee commit 876ed3caf6ff1ffb98bb16491526e4417086cba9 Merge: 02607a5fec63435fAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 15:24:31 2021 +0100 Merge branch 'develop' into feature/TV-945-felhantering commit 02607a5f007dc7e46d61460fc71a1b27bdda9392 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 08:25:49 2021 +0100 Added better error-handling to deltagare händelser commit 30c2726ccebc73a2ca9a0c72cdc564cad2ac82aa Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 08:17:22 2021 +0100 Updated deltagare error handling with data commit 893de8478e5a2919c684667eb31afd35986cb396 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 08:05:50 2021 +0100 Added better error-handling to avvikelse commit 5c64b8c10a7f3fb2cec5cab2c8d86073169a6033 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 07:47:59 2021 +0100 Added better error-handling to authentication commit 8fa187d4da0b75d2bb62bc16cdcf540064bd4433 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Dec 3 07:47:43 2021 +0100 Added better error-handling to avrop commit 3bd23e6ad642e95caa5bd88215442281495f970c Merge: f941d144938014abAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Dec 2 13:02:08 2021 +0100 Merge branch 'develop' into feature/TV-945-felhantering commit f941d14435e1ed3e371cee84ef85d508ed70b2ce Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Dec 1 16:08:00 2021 +0100 Added improved error-handling to deltagare-api.service commit 3889b398d9ce0e5e1b6498e10794a946b65c2a47 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Wed Dec 1 15:45:36 2021 +0100 Added better error-handling connected to APM
mina-sidor-fa
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 mina-sidor-fa
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 @mina-sidor-fa/mylib.
Code scaffolding
Run npm run new-component my-component --project=my-app to generate a new component.
Build mina-sidor-fa
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.
Mock-api
If you want to use the mock-api, read the README here.
Dotnet API
Run npm run build:api to build the project using the Dotnet API.
Running unit tests on mina-sidor-fa
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 mina-sidor-fa
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/mina-sidor-fa-web/commits/commit-hash))
-
-
Upon merge, Open Shift will deploy the application to AUTO and SYS.
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 SYS.nextis automatically deployed to TEST.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 TEST
To deploy the application to TEST 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 TEST.
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.