Squashed commit of the following: commit ed8404251283d896f8612cf43f3a2e3dc59015e1 Merge: 032e45014739fbAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 23 15:09:38 2021 +0200 Merge branch 'develop' into feature/TV-654-pr-form-base commit 032e450166458e9b64070ab4fbe9b2c948c5f8ea Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 23 14:53:49 2021 +0200 removed an unused method commit 836bbe566c778149df2967dae1d5cc414f7bbdc9 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 23 11:47:36 2021 +0200 fixed minor mismatches in report-layout component commit 81b9813b3ae7856da3d22276efeb1f45f468142f Merge: 9a3cd920302b1aAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Thu Sep 23 11:30:09 2021 +0200 merged with develop and fixed conflicts commit 9a3cd92009bf63c12a0b0aca0aa7ddf2e5d0b74d Merge: d000840caf235aAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Wed Sep 22 17:47:02 2021 +0200 merged in develop and fixed some conflicts commit d0008408c6a680a82efc8e7e539048d9728a9a20 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Wed Sep 22 16:46:47 2021 +0200 moved functionality from report-layout-komponent to make esier for the developer commit 19fb49a81d1033e6b9224a253a8aa8dc2332e781 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Wed Sep 22 15:43:28 2021 +0200 creatde basic for for periodisk redovising commit 5fab5c82204099d6b203df7744dd3a20b0d37c67 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Wed Sep 22 15:42:34 2021 +0200 added basic git add . commit 4b73819a0250e6791bd7ad198d0904c72565c5bf Merge: d3778d65846c2cAuthor: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Tue Sep 21 17:11:57 2021 +0200 Merge branch 'develop' into feature/TV-654-pr-form-base commit d3778d6887a3d3d01523d764cb7f4664754cfa5b Merge: 0317b36ee17697Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Tue Sep 21 16:57:26 2021 +0200 Merge branch 'develop' into feature/TV-654-pr-form-base commit 0317b36ffc2ed6b57dcdee66aebc3eca37faf3b8 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Tue Sep 21 16:55:02 2021 +0200 created component for periodisk redovisning, and updated report-layout component with some functionalities
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.