Squashed commit of the following: commit 7009ec6cae0768d134f7dff5da8d00e047ab91de Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Aug 19 13:14:22 2021 +0200 TV-351 added aria-label to delete button commit 27380c4aa24b550af0d37dc694072d7a2b1591b2 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Thu Aug 19 07:22:09 2021 +0200 TV-351 changed icon, observable for selected employee commit 45fd5248534e0738cf2242bb60f4ac7f75accf64 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 17:58:09 2021 +0200 TV-351 corr commit b8ac397712f3359495d463740b6fb97f6a8bfb0c Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 17:49:31 2021 +0200 TV-351 added takeUntil operator for unsubscription commit da328d66a9331aa7f7c901b939d826025401c721 Merge: 69cae6fffeb372Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 17:34:46 2021 +0200 Merge branch 'develop' into feature/TV-351 commit 69cae6f711c60959edff48709e2fa99ba4534c65 Merge: ed57d7db7c7b6bAuthor: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 12:58:45 2021 +0200 Merge branch 'develop' into feature/TV-351 commit ed57d7d35e132f90f374b465ffdbf507c55f4038 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 12:54:22 2021 +0200 TV-351 prev pr review fix commit eca6211388ea20c0aba9980dd4343163e54d51eb Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 12:49:19 2021 +0200 TV-351 delete employee commit 206bf42a9a952d2e74bb60ad4a12c2f0568cb100 Merge: 0d2700f218e3d6Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Wed Aug 18 08:41:23 2021 +0200 Merge branch 'develop' into feature/TV-351 commit 0d2700f1fc535d6afcddbe2bfed68ff775b3d0ea Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 17 15:15:23 2021 +0200 TV-351 add letter s if fullName ends without s commit ff0d2631f45979d6381d409e119933f48b35d852 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 17 14:18:23 2021 +0200 TV-351 delete method in service, waiting for api commit 2f1edd6e70c83b90ad6fe6399af5ef5ddf294152 Author: fueno <nicolas.fuentes-maturana@arbetsformedlingen.se> Date: Tue Aug 17 14:16:38 2021 +0200 TV-351 delete employee
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.