Squashed commit of the following: commit 6331ed75b007f97f46d92584b55ca8c358fb9dd0 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 13:13:48 2021 +0200 TV-565 hide link, update routing commit d5b08ef9f7e3e896b19c765ccb6cbd65b4ed2754 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 12:42:43 2021 +0200 TV-565 deleted unused method commit 6e6095130c01ce2b6a978e06cb1b1a6ccb362ce0 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 12:34:21 2021 +0200 TV-565 refactoring signal report commit 5a4452ed88554ce5e462d53222889c5535802208 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 11:28:19 2021 +0200 TV-565 corrected format date commit 2983df1c7af82d6495b7fb5cca92ed7398e52d63 Merge: fa36a8213321e04aAuthor: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 09:12:35 2021 +0200 Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier commit fa36a8210951cd495895f6ae8df30f397ea35cad Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Fri Oct 8 09:12:02 2021 +0200 TV-565 refactoring validation, cleaning scss commit 33076ba5e3dd136324d89d03feee0ad6ed094625 Merge: 1f3d5cf8890573b1Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 17:32:50 2021 +0200 Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier commit 1f3d5cf8bd16376e8d798d00261c72c4db462280 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 13:44:33 2021 +0200 TV-565 refactoring, send in avrop to report layout commit 2a79f44202a5e1db7ba6d0564be708f535ebe8f0 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 11:27:03 2021 +0200 TV-565 updated spec files commit 3ae4a3d50f5b9d6d24c491cda47992960c7b744c Merge: d606ef903d941fddAuthor: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 11:13:35 2021 +0200 Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier commit d606ef90f44d4d27b8588f51d1717732545deb0d Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 11:08:31 2021 +0200 TV-565 fixed validation commit 9d733ab4868d85a5756e45023e8efe4a10623e29 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Oct 6 09:12:39 2021 +0200 TV-565 max, min dates, text updates, part time utbildning commit b3e479b84bd5622be2d4e2b44648560c8731c92a Merge: b95dd0d95cee9695Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Oct 5 23:23:01 2021 +0200 Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier commit b95dd0d96e5d10415a145925904565ed7bfb12a3 Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Fri Oct 1 16:34:15 2021 +0200 TV-565 fix according to PR comments commit 99c3e6f7cea6edf44684dd2ee3011c8911c6645e Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 13:06:22 2021 +0200 TV-565 remove file commit 273a93d2d074b2fafaa14c6d3ef5f51fdbb62a22 Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 12:56:33 2021 +0200 TV-565 cleanup commit 2a2237505d14ed15add4c623afb7705f29e0069c Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 12:43:00 2021 +0200 TV-565 solved merge conflicts commit e3357510ab62b27327716b160daf626c9d399251 Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 10:09:32 2021 +0200 TV-565 mergekonflikter commit 46421470a560123d3ad9ee5c64fea564cfb4cc8b Merge: 62e231806147a2e7Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 10:04:50 2021 +0200 Merge branch 'develop' into feature/TV-565-report-signal-arbete-studier # Conflicts: # apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-card/deltagare-card.component.ts # apps/mina-sidor-fa/src/app/pages/deltagare/pages/deltagare-report/pages/deltagare-avvikelse/deltagare-avvikelse.component.html # apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.html # apps/mina-sidor-fa/src/app/pages/deltagare/shared/confirm-dialog/confirm-dialog.component.ts # apps/mina-sidor-fa/src/app/pages/deltagare/shared/report-layout/report-layout.component.scss commit 62e2318092a978e59147fa18e80a0c5d1a25d0f8 Author: Cecilia Varnava <cecilia.varnava@arbetsformedlingen.se> Date: Thu Sep 30 09:50:58 2021 +0200 TV-565 fix shared report layout progress ... and 15 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.