Chingiz Esenbaev 4afe9b589b Merge pull request #28 in TEA/dafa-web-monorepo from feature/TV-285-hantera-avrop-skelett to develop
Squashed commit of the following:

commit 4d31c7c490c37ba2b9715b6d4b5ee2cb58f1fb06
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 23 14:18:52 2021 +0200

    add step 4

commit cfeb21b69200a70987cd93caa17527402d0447a1
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 23 13:49:20 2021 +0200

    Update avrop-table.component.ts

commit 253f77f8882028d1590bd7e5ff2a17516ab9ed01
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Wed Jun 23 13:18:01 2021 +0200

    Update avrop-table.component.ts

commit 86f8ea2a6840834c9661b715c08bdfaeb20f7e98
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 13:50:39 2021 +0200

    remove unused tests

commit 5ec16261ba95911a808c1535233950509df1235f
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 13:02:05 2021 +0200

    cleanup

commit f80630704573fac90b618f06ba50db6409a576ae
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 11:53:28 2021 +0200

    filters only in step 1

commit 0c1c2ac6c5c8c8016b676ef4ba7959c10d0e5b74
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 11:52:09 2021 +0200

    default checked

commit 1516ac5074846dabfaa354a8dca7e1cd81e8174c
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 11:42:04 2021 +0200

    add filters and checkboxes

commit b5b5d96a713c37a03ab4a4dcbe34d2f236ccc1c3
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Tue Jun 22 10:46:38 2021 +0200

    add apis methods for filters

commit 3a71113b9dc7bde5306be7e47fc3a3e3568dcd27
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 15:56:35 2021 +0200

    selectableDeltagareList$ from API service

commit 7efcfcbb9e19fff41b3424b079910000954fec03
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 15:46:16 2021 +0200

    add avrop api service

commit 7146c45ea88e4871856efe0bc263db901f0ee393
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 14:02:32 2021 +0200

    Fixed flow

commit d8690eb36b13c5f01f8bfe655d9885b50e6631a7
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 12:21:41 2021 +0200

    structure start

commit 06344cb34c1e0702310cfabaccb094094eb44649
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 11:10:31 2021 +0200

    add table and row components

commit 28dba7accfc819b3a91150275ec5f1ec10494d3b
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 11:03:46 2021 +0200

    added avrop-filters

commit f477dc3d19e30ae461b09de1b0817b41e120c9f2
Author: Daniel Appelgren <daniel.appelgren@arbetsformedlingen.se>
Date:   Mon Jun 21 11:02:17 2021 +0200

    rename call-off to avrop

commit 9109bd15b518dcb5e3b1c272dcc8c90fa9e6843b
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Fri Jun 18 14:24:31 2021 +0200

    fix: removed comment and console print

commit e75537d2434ae57d4933b435150641ddabd262fa
Merge: 9c8a224 f7081d8
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 18 13:03:49 2021 +0200

    Merge branch 'develop' into feature/TV-285-hantera-avrop-skelett

commit 9c8a22424e4a7e692a38148e1d06da464f136748
Author: Aden Hassan <aden.hassan@arbetsformedlingen.se>
Date:   Fri Jun 18 10:04:10 2021 +0200

    feature/tv-285: added basic logic to toggle between the progress steps and render correct ui

commit e39b5b9b1dc513e1a24dd945590343b5c063f65f
Merge: 8004cd5 88c68e1
Author: Chingiz <chingiz.esenbaev@arbetsformedlingen.se>
Date:   Thu Jun 17 17:21:19 2021 +0200

    Merge branch 'develop' into feature/TV-285-hantera-avrop-skelett

... and 2 more commits
2021-06-23 15:24:39 +02:00
2021-03-16 13:00:57 +01:00
2021-05-11 14:54:03 +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-05-18 09:48:21 +02:00
2021-05-18 11:27:06 +02:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-03-16 13:00:57 +01:00
2021-04-06 07:34:04 +02:00

DAFA-web

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 DAFA-web

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 @dafa-web-monorepo/mylib.

Code scaffolding

Run npm run new-component my-component --project=my-app to generate a new component.

Build DAFA-web

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 DAFA-web

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 DAFA-web

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/dafa-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:

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

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%