Squashed commit of the following: commit 41f27ba3701d7b690e941f2038676218facaab84 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:40:44 2021 +0200 TV-366 removed redundant import commit f31d3d6545375e2c84254a60b9e072333fddaa80 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:38:41 2021 +0200 TV-366 made a bunch of changes in accordance with the feedback from the current pull request. commit 04c0775649390ce36cc3d2c03ae3cd756e8190b5 Merge: 721b58ee712f2fAuthor: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Thu Aug 19 06:10:28 2021 +0200 Co-authored-by: af-aden <af-aden@users.noreply.github.com> commit 721b58e1767c465673cb817414e1410b403f5e60 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 18 10:16:40 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 # Conflicts: # apps/mina-sidor-fa/src/app/pages/administration/pages/employees/components/employees-list/employees-list.component.spec.ts # apps/mina-sidor-fa/src/app/pages/logout/logout.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.html # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.scss # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.spec.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-form/organization-picker-form.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker-routing.module.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.html # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.scss # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.spec.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.component.ts # apps/mina-sidor-fa/src/app/pages/organization-picker/organization-picker.module.ts # apps/mina-sidor-fa/src/app/shared/guards/auth.guard.ts commit f3e6e590fe24f0b3aefb45d3b8bfae9a3ce7af82 Merge: fbda233218e3d6Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Wed Aug 18 09:41:54 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 commit fbda233782a0850edb5e23b50f0030486a15effe Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:50:08 2021 +0200 TV-366 removing stored selected organization when logging out. commit ed51909892cd92f180f6785635f85c735ec3f129 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:05:14 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 # Conflicts: # apps/dafa-web/src/app/shared/services/api/user.service.ts commit 6a77f2497aec71d174c719d27c6d5c644ba53fed Merge: 17f643d6d29baaAuthor: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 19:04:22 2021 +0200 Merge branch 'develop-remote' into feature/TV-366 commit 17f643d18abcbdbfe12a91a63179278d559fdba5 Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se> Date: Tue Aug 17 17:35:59 2021 +0200 TV-366 First version od organization-picker
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.