Squashed commit of the following:
commit 8b61e3edeb644d7a27d322a569e85a7f76667243
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 14:26:13 2021 +0200
Removed comments
commit 40dd5f0c186ab4b7b239c054d468f33bd550e0a4
Merge: 3a51568 a11d166
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 13:00:59 2021 +0200
Merge branch 'develop' into feature/TV-268-deltagare-data
commit 3a515683513e8152507a744489d79dc62efbc64c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 12:53:03 2021 +0200
Removed wrong data-structure from deltagare-card component
commit 2b2da9fb6b25c980bacfe3f37201f569c05fce8c
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 12:19:37 2021 +0200
Added more mock-data to deltagare api
commit 8c52ba5a3a259eb0a4c084eb516180a333bafb45
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 11:01:47 2021 +0200
Added highestEducation to mock-api and fixed dynamic mock-api paths
commit a6b372bf05900698dc592ca15853def26cebe841
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Fri Jul 2 08:33:06 2021 +0200
Added fallbackvalues for deltagare
commit 6bbad6826620fc4d95877884fefbb0951216fab0
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu Jul 1 16:05:05 2021 +0200
WIP adding mock-data
commit b20e3b057ac50c7f929e8eeaff3a06c5372280a9
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu Jul 1 10:30:32 2021 +0200
Added some data to deltagarekort
commit ac15170c089be760bd72a470e9f83603dedba945
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Thu Jul 1 09:40:56 2021 +0200
Added deltagare page and components. Also mapped drivers-licenses
commit 80785b31453553ce78e75b8a76a9ca2758870a0e
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Wed Jun 30 15:52:28 2021 +0200
Added mapping
commit 1b15d0d621b2bb0b3d44d695df12f68637205223
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Wed Jun 30 15:20:53 2021 +0200
Added deltagareCompact in service
commit 20f7de869d0343a5af59acb83964eea224bcf926
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date: Wed Jun 30 14:57:59 2021 +0200
Added deltagare models and started with service
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.