Squashed commit of the following: commit d81856c59c267c8a8fe783b74ce1a6fdda36426d Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 11 09:21:27 2021 +0200 TV-280 package-lock fix. commit 62ea965118c8a423c506663b73e3f6961cef8cc2 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 10 11:50:22 2021 +0200 TV-280 bytte ut DeltagareAvrop mot Avrop och fixade lite kompileringsfel när man byggde till prod. commit b12d1f25118de2315475a6a944915b8a2eaf6cdf Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 10 10:52:59 2021 +0200 TV-280 fixat lite mergningsproblem från develop-branchen.. commit ab26ceaf60c4508ad9fa66aba4e48e85de81d1d8 Merge: 6dec798 8c5bbe2 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 10 09:30:30 2021 +0200 Merge branch 'develop' into feature/TV-280 commit 8c5bbe2b0c728941566da5e4e290b6b0f66d3149 Merge: ce2dcb09a49f9aAuthor: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 10 09:27:11 2021 +0200 Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop commit 6dec7980eb2c3eb845643e7358905d2b85fd3cad Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Mon Aug 9 12:54:45 2021 +0200 TV-280 anpassade egenskaper till namn i API:et commit ce2dcb0aaf0604891cf41f4cb56c812b4f985f95 Merge: 06cf023f7207aeAuthor: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Mon Aug 9 10:56:10 2021 +0200 Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop commit 0c83b68114b43c6263c4fac186f987f17697f8c8 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Mon Aug 9 09:25:06 2021 +0200 TV-280 ändrade efter feedback i PR.. commit 10724872b3bb19b21c023173c0dd884e47de09ef Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Fri Aug 6 21:45:43 2021 +0200 TV-280 lade till information om handledare om det finns sådan. commit e8072207c5d634a244bd9549efdc58de1ea4d69e Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Fri Aug 6 21:41:53 2021 +0200 TV-280 glömde att kryssrutan för att ta bort deltagaren bara ska visas när handledareConfirmed är true, lade till det nu. commit 248bc391c0943eb9427e803a0694dc0502f55cdf Merge: b43af52 06cf023 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Fri Aug 6 17:33:25 2021 +0200 Merge branch 'develop' into feature/TV-280 commit 06cf023e0685574b2dd43d1cd3b5227bb72f58c2 Merge: 0b53b3e229fb83Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Fri Aug 6 17:32:54 2021 +0200 Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop commit b43af528b23371a1da7359e0153a4517a890b165 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Fri Aug 6 17:32:42 2021 +0200 TV-280 första utkast på rad. Model är rena tramset tills vidare.. commit 0b53b3eee95caa759364e627eea7c1118a8702a2 Merge: c2466f15d1e357Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 4 10:28:22 2021 +0200 Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop commit 7fbff2fa570d64da87192b914dfbb2c7e49b1147 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 4 09:57:21 2021 +0200 TV-280 wip commit c2466f11190e10666e463b4c85acf1fd94bd0c3a Merge: 0c0c04576fbab9Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 3 16:31:44 2021 +0200 Merge branch 'develop' of ssh://bitbucket.arbetsformedlingen.se:7999/tea/dafa-web-monorepo into develop commit 0c0c045f341d70dd21f246eebf85d5ed71393796 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Mon Aug 2 09:20:41 2021 +0200 Added open-shift configuration for api-route
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.