Squashed commit of the following: commit f5bb97c0a50a84095ac147c775eb681943c2a5c1 Merge: 83b6a0bb06436aAuthor: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 20:24:46 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit 83b6a0b2caa2267fc7dc682e8d846954d81ee4fc Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 08:11:07 2021 +0200 TV-204 added endpoint for report commit b54856d0d9bca9a97a342332679ee13ddbb0edb5 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 08:10:31 2021 +0200 TV-204 test and linting issues commit 22129a545a15137cd11bf3356185f496352ad72a Merge: 39ab301126c6e3Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Sep 8 07:39:43 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit 39ab3013798290b4fe34f997fd1525b4c30230bb Merge: 50a0064d9938ccAuthor: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Sep 2 23:13:35 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit 50a006429b9712e11798e33659ce42d17aef6526 Merge: 67de27d1f26e80Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Aug 26 17:29:41 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit 67de27dd36999635738046794609d3221f33c1b8 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Aug 26 17:19:10 2021 +0200 TV-204 review fixes commit 005aea20d647848ba3ddf18b0538fdaad5bd011d Author: bjornahlen <bjorn.ahlen@arbetsformedlingen.se> Date: Thu Aug 26 08:40:55 2021 +0200 TV-204 Small fix to report-type.enum commit 981ac20a147d6cde3e594b8475841fa4c5703ea3 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Aug 26 00:18:20 2021 +0200 TV-204 pass selected report type to deltagare.service commit e21f8e1abb78deff2b9b06da6401ed9463a5d414 Merge: 3e059ed0661d22Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 25 17:54:02 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit 3e059ed219bc95bd2cbd9a89ab4bd8f46b573c37 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 25 17:37:46 2021 +0200 TV-204 deleted mockdata commit af3aaf9018de004ea8cdc7d92505f68ce4597410 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 25 16:27:03 2021 +0200 TV-204 changed to digi-ng-form-select, validation control commit d844fb4bcc4196f7d412573ccc21c95c0de70e8f Author: bjornahlen <bjorn.ahlen@arbetsformedlingen.se> Date: Wed Aug 25 13:35:17 2021 +0200 TV-204 Changes to digi-form-select tag commit 91957c7256594e1e2953262b03bf13b6b2704c8e Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 25 10:38:40 2021 +0200 TV-204 deleted unused modules commit 130ef0afd1a8f88b5065dce5aabdafec5fb27862 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 25 10:22:48 2021 +0200 TV-204 updated spec-file commit 51bc86df92c638b6613fbd24d12054fbaf792b28 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 24 17:27:57 2021 +0200 TV-204 changed to DigiNgLinkButton commit ad2f5da7b4f1de798bcb4766e66416ca41bd4a6e Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 24 11:25:47 2021 +0200 TV-204 api GET endpoint for reports is missing commit 3effe1a4b74a55c82f697cb2c8f6221fc2558b83 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 24 11:17:04 2021 +0200 moved code commit 5cbb0d51adee361f8162f5319cc728a614002b19 Merge: fa0a2f959ce393Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 24 10:49:37 2021 +0200 Merge branch 'develop' into TV-204-reporting-participant-card commit fa0a2f9ebf5f8d8c218a50870a07194fa95d5213 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 24 10:16:11 2021 +0200 TV-204 prepair get request for reports, paginering ... and 11 more commits
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.