Squashed commit of the following: commit 2602b9205ef86307fa7c85ecb6ce87cb51b71150 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Sep 2 15:40:49 2021 +0200 Added error-handling commit 4a3f79948b992e5ad7278328957380215ad21ed7 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Sep 2 14:48:54 2021 +0200 Removed some unused variables commit f8e69dce84fee2b1fe2a06d6f0960511c286e2b5 Merge: b155865b80bf22Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Sep 2 14:39:44 2021 +0200 Merged develop and fixed conflicts commit b15586559dab669d652d3a44625bacae4620ed40 Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se> Date: Thu Sep 2 14:34:58 2021 +0200 Added separate component for employee deletion commit 1720b4954ebbc2868db6f0304fc57b0f3ff07216 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Tue Aug 31 07:50:56 2021 +0200 added the showing of errror- and succsess messages when employee is deleted (TV-352) commit 2556d53802249fff545a2d256a178479103108e7 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Mon Aug 30 13:33:22 2021 +0200 minor change (TV-352) commit 035dbbe67486392a7a9c656ac73103e938953b24 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Mon Aug 30 12:38:07 2021 +0200 added close and open methods for better handling of modal (TV-352) commit abc9ce0f8580ae1b9d784bc7591f095faeddcc33 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Mon Aug 30 12:27:07 2021 +0200 feat(edit-employee): added functionality to delete employee, and catch error if such exists commit 23603dd2d84b0e694a19c2131c9c842cf730d97b Merge: 56a4a6a02cf0f6Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Mon Aug 30 11:19:18 2021 +0200 Merge branch 'develop' into feature/TV-352-add-delete-employee-button commit 56a4a6a9c9195542f51578bd4ee937086ace8df8 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Aug 27 12:58:23 2021 +0200 added the basic http-delete request method commit 2f61ff7d6ac2c42a7972fc88548d3d59172cbcc1 Author: Aden Hassan <aden.hassan@arbetsformedlingen.se> Date: Fri Aug 27 09:18:13 2021 +0200 added the basic html/css and functionality for deleting an employee from edit-page
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/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.