Squashed commit of the following: commit f75e29597c13b5d9c4232631e5c396974c6470fa Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 16:25:12 2021 +0200 Added name to employees-list component for listing names of utförandeverksamheter as the response have changed so utforandeVerksamheter contains more then just the name. commit a2665dc110243c3327bb4ee88099f7e19451456e Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:45:52 2021 +0200 Updated avrop.js to match new mock-api commit 71ac0c85c73615d6a638670250d390d90a673051 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:28:26 2021 +0200 Reverted some changes after comparison with develop. commit d96d3d6ae3390582d7a06a765b6667bf4733614a Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 12:17:43 2021 +0200 Added flag allaUtforandeVerksamheter to employee mock-api commit 833c32a63fc18a67cde498fd0e976483cff8f047 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Mon Aug 23 11:47:38 2021 +0200 - Splitted out utförandeverksamheter from organizations.js to utforande-verksamhet.js which is included in employees.js - Changed layout - Prepared markup for all utforande verksamheter permission. Needs to be changed to mock-api data-value when we get it from backend. commit 31d33010af049f8b3cf5ba7b7ea8e1f03cf38fb1 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 15:26:00 2021 +0200 Added name/organizationNumber commit 1037098f67ad9bfd4400a2b0de1daf7e969b378d Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 13:56:24 2021 +0200 Utforande verksamheter amends to work with changed api settings commit 436440fe3a8f2170029a4d7b418f10741e9e233a Merge: 5cbb694e6f8090Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 11:31:59 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.html # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-card/employee-card.component.scss # apps/mina-sidor-fa/src/app/pages/administration/pages/employee-form/employee-form.component.ts # apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts # apps/mina-sidor-fa/src/app/shared/models/api/employee.response.model.ts # apps/mina-sidor-fa/src/app/shared/models/employee.model.ts # apps/mina-sidor-fa/src/app/shared/services/api/authentication.service.ts # apps/mina-sidor-fa/src/app/shared/services/api/employee.service.ts # apps/mina-sidor-fa/src/app/shared/services/api/user.service.ts # mock-api/mina-sidor-fa/scripts/employees.js # mock-api/mina-sidor-fa/scripts/generate-api.js # mock-api/mina-sidor-fa/scripts/tjanster.js # mock-api/mina-sidor-fa/server.js commit 5cbb694bb5b836f3826f7dadae300a0f7feba80f Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 11:19:02 2021 +0200 Reference name changes commit 387451b3168a101f94f2b49470521d74a4f30e65 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Fri Aug 20 10:42:56 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.html # mock-api/mina-sidor-fa/scripts/employees.js commit c7d31f6f926e52be9b5c4aec59eafd4d22d36e00 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 16:09:20 2021 +0200 Renamed organization to utforandeVerksamhet and changed referenses. commit 12d9f49f56d658da6a2082af46091eeb48b6031f Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 15:57:08 2021 +0200 Utforande verksamheter cards created commit e88962cd20394b54bad9904258d6876230d60f51 Merge: 5211885b7c7b6bAuthor: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 11:04:14 2021 +0200 Merge branch 'develop' into feature/TV-361-ta-fram-komponent-for-utf-verk-adresser-i-visningslaget commit 52118858f20f7f63812cec44641753f1760e2300 Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Wed Aug 18 10:58:40 2021 +0200 Updated mock-api commit 63da7e7f4cfc1b7cbd721899300357694103900b Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se> Date: Tue Aug 17 10:28:57 2021 +0200 SKapat upp komponent
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.
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-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.