Daniel Appelgren 8909f7c3d1 feature(Avvikelserapporten): Använd nya dialogen (TV-845)
Merge in TEA/mina-sidor-fa-web from feature/TV-845-ersätt-dialogen-i-Avvikelserapporten-(TV-845) to develop

Squashed commit of the following:

commit 780f93baab0891a2f2ba49bf14d2c3add99e03c8
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Dec 30 11:27:28 2021 +0100

    Update avvikelse-report-form.component.ts

commit bea883f6aedfe2655efbb69d66788c1366e48a43
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Thu Dec 30 11:19:03 2021 +0100

    cleanup

commit ffdf13dfcb3d97960ddb585b09fa5e6446504a68
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:52:37 2021 +0100

    Update app.component.ts

commit 1631cb763bc7023a9e95682272fb63dcbe15d84e
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:52:03 2021 +0100

    fix deltagarelist

commit c6080ac50cb6773aac8d4e45336fc1ba2f053a8d
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:24:44 2021 +0100

    Update avrop.component.html

commit 85057d0860ddceef8309253c983a1674a57291c4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:21:33 2021 +0100

    wip

commit a73164bda8a8ae06c5700e382e197d823bef6767
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:20:04 2021 +0100

    wip

commit 83f3ada5c4c60c9e46d7b01bbbf92053eb1b29ff
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 15:18:30 2021 +0100

    wip

commit 5e184bc0e1a3f7bb6a3040d4da54a9b0e562dad3
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Dec 29 14:18:39 2021 +0100

    wip

commit 30a90ce726dde31974e26c974215f6a5a60b025e
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Dec 28 15:11:14 2021 +0100

    added scrollbars inside dialog

commit 600dd20f3281b4206c12d851cba91ae0ecf1e21a
Merge: 7af19054 b9434741
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Dec 28 14:30:49 2021 +0100

    Merge branch 'develop' into feature/TV-845-ersätt-dialogen-i-Avvikelserapporten-(TV-845)

commit 7af190549c0109f71af87157e8099aa0483c879f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Dec 28 12:05:22 2021 +0100

    wip

commit 6e47e4a641daf4cef121e96c3855e4ce4944c6c4
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Dec 28 09:38:36 2021 +0100

    wip

commit f9354d04f51425cce29f13a10b32555113edaaa2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Dec 28 09:16:54 2021 +0100

    feature(Nya deltagare): Använd nya dialogen (TV-845)
2021-12-30 14:18:58 +01:00
2021-12-06 13:46:09 +01:00
2021-03-16 13:00:57 +01:00
2021-10-01 09:20:35 +02: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-12-14 13:50:23 +01:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-12-14 13:50:23 +01: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%