Squashed commit of the following: commit 5206466fd53275ed16d5a529abafc41db3fc09a5 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 15:11:45 2021 +0200 Merge pull request #218 in TEA/mina-sidor-fa-web from feature/TV-813 to feature/TV-782-informativ-rapport Squashed commit of the following: commit ba53ee6e2a4e7835a84b67f9ea80336a6ddc6b4f Merge: 36f8676ccfde226fAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:23:58 2021 +0200 Merge branch 'develop' into feature/TV-813 commit 36f8676cd80899937a27fd4c7873ec2adf908d67 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:19:01 2021 +0200 Removed unused module inside reportviews commit 31f6a26747bbd75d16c887674464f40d015da7a2 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:14:46 2021 +0200 Added component for report-description-list commit 2d7406fd64abcb1936f3a2145bbfb98da7f0ac7c Merge: 2e35a67dcfde226fAuthor: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 14:23:43 2021 +0200 Merge branch 'develop' into feature/TV-782-informativ-rapport commit 2e35a67db54609a00e167198648e46c25a94eea8 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 12:16:22 2021 +0200 Changed type to category commit 000c2b966a697b724a1bc58ea5ba9503b8782f42 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 12:05:57 2021 +0200 Updated with information texts commit 275f18a094ed03319ac4a6668b08a697f0202fee Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 10:24:42 2021 +0200 Implemented informativ rapport commit 4544e7c180994a009f0a93b2645965ae725ec901 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Fri Oct 22 08:10:03 2021 +0200 Added base for informativ rapport commit 36329210f4dffa2a3d8bed2a571fa880fe3b75fc Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Oct 21 14:55:09 2021 +0200 WIP
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.