Christian Gårdebrink ee17697af8 Merge pull request #108 in TEA/mina-sidor-fa-web from feature/TV-623 to develop
Squashed commit of the following:

commit ca49a82df7d52c918ed3540bdca68d63c5c9a6bf
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 12:24:13 2021 +0200

    TV-623 Åtgärdat lintvarningar

commit f493987d3213089b7e7f2e455635b5cf13361039
Merge: cf1fa71 2dd9d3d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 11:05:43 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit cf1fa71006576dd448b0b42c688cb43ddfff8080
Merge: acab6a9 91eeb1d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Tue Sep 21 09:40:24 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit acab6a95ffa43d59e86e387658f97cbc2d1b01cb
Merge: b131d2f e120e50
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 17:39:07 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit b131d2fea3e1c7f3c5210d71c5258e8c14fec98d
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 17:38:06 2021 +0200

    TV-623 ensuring that changes are propagated to the form if the treeNodesSelector is closed by clicking outside of the control. Otherwise I imagine it would be quite annoying if you closed it by mistake..

commit 29537edfdbdda3382b5af8ffef8f971cbc2550c8
Merge: dc6a4ad 8da6899
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 14:08:46 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit dc6a4ad0f6629db2e001a8ffa7895026d2e1a1c0
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 13:36:24 2021 +0200

    TV-623 adjusted switch

commit bdd108b6621ca7bdef61d41d25db9ee6d35e1355
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:56:38 2021 +0200

    TV-623 increased min-width of control

commit a2b3d1c42fb287b45f3323a3475d02e667783c9e
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:18:17 2021 +0200

    TV-623 fixed linting issue in deltagare-card..

commit 9895eb7c8792977cf7f5c743041c95878003890e
Merge: 4ebafb5 ffc5a46
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 12:16:37 2021 +0200

    Merge branch 'develop' into feature/TV-623

commit 4ebafb57ef2e4bbbdcb924a1f92f0412257e11f1
Merge: af58d40 bfffed4
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 11:25:13 2021 +0200

    Merge branch 'develop' into TV-623

commit af58d4009be592115dfcd3df20a1c3a1499d5eb4
Author: arbetsformedlingen_garcn <christian.gardebrink@arbetsformedlingen.se>
Date:   Mon Sep 20 11:24:23 2021 +0200

    TV-623
2021-09-21 16:54:16 +02:00
2021-09-08 07:09:12 +02:00
2021-03-16 13:00:57 +01:00
2021-09-13 15:28:33 +02:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:11:11 +01:00
2021-05-04 15:55:21 +02:00
2021-03-16 13:00:57 +01:00
2021-09-03 15:52:29 +02:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-09-01 15:06:59 +02:00
2021-09-06 10:59:35 +02:00

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-XXXX or bugfix/TV-XXXX
    • A useful CLI helper tool can be used: gitflow-avh.
  • 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:

  • develop is automatically deployed to AUTO and SYS.
  • next is automatically deployed to TEST.
  • main is 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 develop and pushes it to origin.
  • Merge develop into next and pushes next to 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.

General Nx documentation

Nx Documentation

10-minute video showing all Nx features

Interactive Tutorial

Description
No description provided
Readme 3.8 MiB
Languages
TypeScript 64.6%
HTML 18.9%
JavaScript 8.9%
SCSS 6.3%
Groovy 0.8%
Other 0.5%