Merge in TEA/mina-sidor-fa-web from feature/TV-945-felhantering-2 to develop
Squashed commit of the following:
commit 9e581d36dfecb901fbd4c04eb5b8a80e77a51216
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 15:29:20 2021 +0100
Fixed last few error-handling issues
commit eb35f23d05d8584673ea3f8f28a67206bb21a3cf
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 15:17:45 2021 +0100
Renamed api-services
commit e2764cb623701afadfb6455e77b8f6e718c1523a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 15:13:54 2021 +0100
Improved error-handling for user and refactored user(api)service
commit 78cbdc6695653646eee73f1583ef6e272158d50a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:53:52 2021 +0100
Improved error-handling for tjanst
commit 9b4ae985f9a92ed1eb7a9d823b37ce7cc069c417
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:35:41 2021 +0100
Improved error-handling for slutredovisning
commit 37bb43bde8151075450cd988715d6b9cb2ab8b1b
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:32:18 2021 +0100
Improved error-handling for signal
commit a8e3bfb4a222d05abfdcb5b415dc93682731c14d
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:23:22 2021 +0100
Improved error-handling for periodisk redovisning
commit f1eb5cb768fb662412ef73026586a88982ea56c7
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:19:24 2021 +0100
Improved error-handling for news
commit cd81cade46bc28d70a67f3a54dc571c3e348606a
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:19:15 2021 +0100
Improved error-handling for informativ rapport
commit bff13ae4e54b40546266d46f0595aa3594cf32ca
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:16:29 2021 +0100
Improved error-handling for handlingar
commit 9264f0aa63fdb6e260cf3221cee838795bd095dc
Merge: 174264e4 8f0b7016
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Tue Dec 7 13:05:30 2021 +0100
Merge branch 'develop' into feature/TV-945-felhantering-2
commit 174264e495296c87f6d60b5e017a95b8f0efe76e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Mon Dec 6 12:59:41 2021 +0100
Improved error-handling for handledare
commit c1430f375f3baf604ec153405f40eb51c84b5eb9
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Mon Dec 6 12:48:18 2021 +0100
Improved error-handling for export, frånvaroreport, gemensam planering
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.