From c5668e8096434d4fecf0fd4dd389c47d936ff831 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:17:20 +0300 Subject: [PATCH 01/58] Create label.yml --- .github/workflows/label.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/label.yml diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml new file mode 100644 index 0000000000..2d8b3fa8a2 --- /dev/null +++ b/.github/workflows/label.yml @@ -0,0 +1,23 @@ +# This workflow will triage pull requests and apply a label based on the +# paths that are modified in the pull request. +# +# To use this workflow, you will need to set up a .github/labeler.yml +# file with configuration. For more information, see: +# https://github.com/actions/labeler/blob/master/README.md + +name: Labeler +on: + pull_request: + branches: + - master + - dev + +jobs: + label: + + runs-on: ubuntu-latest + + steps: + - uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" From ad72b2bce44160674ac0778f2c8c17dcbcfae387 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:21:23 +0300 Subject: [PATCH 02/58] Update label.yml --- .github/workflows/label.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 2d8b3fa8a2..7992fa5ee2 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -21,3 +21,4 @@ jobs: - uses: actions/labeler@v2 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" + problem: -./* From cdee4fb0a85b885d15a6bbb4df1fc7545f380c8a Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:22:02 +0300 Subject: [PATCH 03/58] Delete .travis.yml --- .travis.yml | 60 ----------------------------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b6579a99d2..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,60 +0,0 @@ -language: csharp -mono: none -dotnet: 2.1.300 -script: - - dotnet build framework - - dotnet build modules/users - - dotnet build modules/permission-management - - dotnet build modules/setting-management - - dotnet build modules/identity - - dotnet build modules/tenant-management - - dotnet build modules/account - - dotnet build modules/docs - - dotnet build modules/blogging - - dotnet test framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests - - dotnet test framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests - - dotnet test framework/test/Volo.Abp.AspNetCore.Mvc.Tests - - dotnet test framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests - - dotnet test framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests - - dotnet test framework/test/Volo.Abp.AspNetCore.Tests - - dotnet test framework/test/Volo.Abp.Auditing.Tests - - dotnet test framework/test/Volo.Abp.Authorization.Tests - - dotnet test framework/test/Volo.Abp.Autofac.Tests - - dotnet test framework/test/Volo.Abp.AutoMapper.Tests - - dotnet test framework/test/Volo.Abp.Caching.Tests - - dotnet test framework/test/Volo.Abp.Castle.Core.Tests - - dotnet test framework/test/Volo.Abp.Core.Tests - - dotnet test framework/test/Volo.Abp.Data.Tests - - dotnet test framework/test/Volo.Abp.Ddd.Tests - - dotnet test framework/test/Volo.Abp.EntityFrameworkCore.Tests - - dotnet test framework/test/Volo.Abp.EventBus.Distributed.Tests - - dotnet test framework/test/Volo.Abp.EventBus.Tests - - dotnet test framework/test/Volo.Abp.Http.Client.Tests - - dotnet test framework/test/Volo.Abp.Localization.Tests - - dotnet test framework/test/Volo.Abp.MemoryDb.Tests - - dotnet test framework/test/Volo.Abp.MongoDB.Tests - - dotnet test framework/test/Volo.Abp.MultiTenancy.Tests - - dotnet test framework/test/Volo.Abp.Serialization.Tests - - dotnet test framework/test/Volo.Abp.TestApp.Tests - - dotnet test framework/test/Volo.Abp.UI.Navigation.Tests - - dotnet test framework/test/Volo.Abp.Uow.Tests - - dotnet test framework/test/Volo.Abp.Validation.Tests - - dotnet test framework/test/Volo.Abp.VirtualFileSystem.Tests - - dotnet test modules/blogging/test/Volo.Blogging.Application.Tests - - dotnet test modules/blogging/test/Volo.Blogging.EntityFrameworkCore.Tests - - dotnet test modules/identity/test/Volo.Abp.Identity.Domain.Tests - - dotnet test modules/identity/test/Volo.Abp.Identity.EntityFrameworkCore.Tests - - dotnet test modules/identity/test/Volo.Abp.Identity.MongoDB.Tests - - dotnet test modules/identity/test/Volo.Abp.Identity.Application.Tests - - dotnet test modules/permission-management/test/Volo.Abp.PermissionManagement.Tests - - dotnet test modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests - - dotnet test modules/permission-management/test/Volo.Abp.PermissionManagement.EntityFrameworkCore.Tests - - dotnet test modules/setting-management/test/Volo.Abp.SettingManagement.EntityFrameworkCore.Tests - - dotnet test modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests - - dotnet test modules/setting-management/test/Volo.Abp.SettingManagement.Tests - - dotnet test modules/tenant-management/test/Volo.Abp.TenantManagement.EntityFrameworkCore.Tests - - dotnet test modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests - - dotnet test modules/tenant-management/test/Volo.Abp.TenantManagement.Application.Tests - - dotnet test modules/users/test/Volo.Abp.Users.MongoDB.Tests - - dotnet test modules/users/test/Volo.Abp.Users.EntityFrameworkCore.Tests - \ No newline at end of file From 328c10d2181ad206ad7588190dd78acfcf5afb34 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:26:04 +0300 Subject: [PATCH 04/58] Update label.yml --- .github/workflows/label.yml | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 7992fa5ee2..dcafb97dc9 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -1,24 +1,11 @@ -# This workflow will triage pull requests and apply a label based on the -# paths that are modified in the pull request. -# -# To use this workflow, you will need to set up a .github/labeler.yml -# file with configuration. For more information, see: -# https://github.com/actions/labeler/blob/master/README.md - -name: Labeler +name: "Pull Request Labeler" on: - pull_request: - branches: - - master - - dev +- pull_request jobs: - label: - + triage: runs-on: ubuntu-latest - steps: - uses: actions/labeler@v2 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" - problem: -./* From c211a22cab258463ebfe7dcdcf7503f11578305c Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:26:47 +0300 Subject: [PATCH 05/58] Create labeler.yml --- .github/labeler.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 0000000000..bc4ffb1cb8 --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,3 @@ +# Add 'repo' label to any root file changes +repo: + - ./* From 13726471dbe4cd1a7bae2800291a7f78d7fa9982 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 11:37:53 +0300 Subject: [PATCH 06/58] Update labeler.yml --- .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index bc4ffb1cb8..cfb8b444da 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,3 @@ # Add 'repo' label to any root file changes repo: - - ./* + - ./**/* From 718ddfa00434c25ee39a9fd3ae5ead9fff02554d Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 12 Nov 2019 15:23:05 +0300 Subject: [PATCH 07/58] docs: update angular readme files --- npm/ng-packs/README.md | 2 ++ .../packages/account-config/README.md | 4 ++- npm/ng-packs/packages/account/README.md | 2 ++ npm/ng-packs/packages/core/README.md | 2 ++ .../packages/feature-management/README.md | 2 ++ .../packages/identity-config/README.md | 4 ++- npm/ng-packs/packages/identity/README.md | 2 ++ .../packages/permission-management/README.md | 2 ++ .../setting-management-config/README.md | 25 ++----------------- .../packages/setting-management/README.md | 4 ++- .../tenant-management-config/README.md | 4 ++- .../packages/tenant-management/README.md | 2 ++ npm/ng-packs/packages/theme-basic/README.md | 2 ++ npm/ng-packs/packages/theme-shared/README.md | 2 ++ 14 files changed, 32 insertions(+), 27 deletions(-) diff --git a/npm/ng-packs/README.md b/npm/ng-packs/README.md index 454e4ec858..f42afee40b 100644 --- a/npm/ng-packs/README.md +++ b/npm/ng-packs/README.md @@ -1 +1,3 @@

Abp Ng Packages

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/account-config/README.md b/npm/ng-packs/packages/account-config/README.md index 9ace70206e..8212588145 100644 --- a/npm/ng-packs/packages/account-config/README.md +++ b/npm/ng-packs/packages/account-config/README.md @@ -1 +1,3 @@ -# @abp/ng.account.config \ No newline at end of file +# @abp/ng.account.config + +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/account/README.md b/npm/ng-packs/packages/account/README.md index dc2cd4534a..f3eaaed299 100644 --- a/npm/ng-packs/packages/account/README.md +++ b/npm/ng-packs/packages/account/README.md @@ -1 +1,3 @@

@abp/ng.account

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/core/README.md b/npm/ng-packs/packages/core/README.md index aeef2da412..9c1a869583 100644 --- a/npm/ng-packs/packages/core/README.md +++ b/npm/ng-packs/packages/core/README.md @@ -1 +1,3 @@

@abp/ng.core

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/feature-management/README.md b/npm/ng-packs/packages/feature-management/README.md index d040ec455a..e37720641c 100644 --- a/npm/ng-packs/packages/feature-management/README.md +++ b/npm/ng-packs/packages/feature-management/README.md @@ -1 +1,3 @@

 @abp/ng.feature-management

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/identity-config/README.md b/npm/ng-packs/packages/identity-config/README.md index 8754748f6a..800ae0093c 100644 --- a/npm/ng-packs/packages/identity-config/README.md +++ b/npm/ng-packs/packages/identity-config/README.md @@ -1 +1,3 @@ -# @abp/ng.identity.config \ No newline at end of file +# @abp/ng.identity.config + +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/identity/README.md b/npm/ng-packs/packages/identity/README.md index 7d4c7a2814..9f56af796a 100644 --- a/npm/ng-packs/packages/identity/README.md +++ b/npm/ng-packs/packages/identity/README.md @@ -1 +1,3 @@

@abp/ng.identity

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/permission-management/README.md b/npm/ng-packs/packages/permission-management/README.md index 29fbdc1a7f..db523171a3 100644 --- a/npm/ng-packs/packages/permission-management/README.md +++ b/npm/ng-packs/packages/permission-management/README.md @@ -1 +1,3 @@

@abp/ng.permission-management

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/setting-management-config/README.md b/npm/ng-packs/packages/setting-management-config/README.md index 9e69e2dce1..7bd9716004 100644 --- a/npm/ng-packs/packages/setting-management-config/README.md +++ b/npm/ng-packs/packages/setting-management-config/README.md @@ -1,24 +1,3 @@ -# SettingManagementConfig +# @abp/ng.setting-management.config -This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.2.7. - -## Code scaffolding - -Run `ng generate component component-name --project setting-management-config` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module --project setting-management-config`. -> Note: Don't forget to add `--project setting-management-config` or else it will be added to the default project in your `angular.json` file. - -## Build - -Run `ng build setting-management-config` to build the project. The build artifacts will be stored in the `dist/` directory. - -## Publishing - -After building your library with `ng build setting-management-config`, go to the dist folder `cd dist/setting-management-config` and run `npm publish`. - -## Running unit tests - -Run `ng test setting-management-config` to execute the unit tests via [Karma](https://karma-runner.github.io). - -## Further help - -To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md). +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/setting-management/README.md b/npm/ng-packs/packages/setting-management/README.md index 54044cc8c0..4d6e7525c0 100644 --- a/npm/ng-packs/packages/setting-management/README.md +++ b/npm/ng-packs/packages/setting-management/README.md @@ -1 +1,3 @@ -

 @abp/ng.setting-management

\ No newline at end of file +

 @abp/ng.setting-management

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/tenant-management-config/README.md b/npm/ng-packs/packages/tenant-management-config/README.md index 77548feaf9..e2d3c3638b 100644 --- a/npm/ng-packs/packages/tenant-management-config/README.md +++ b/npm/ng-packs/packages/tenant-management-config/README.md @@ -1 +1,3 @@ -# @abp/ng.tenant-management.config \ No newline at end of file +# @abp/ng.tenant-management.config + +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/tenant-management/README.md b/npm/ng-packs/packages/tenant-management/README.md index 0d67aa2d24..f44dae0ecb 100644 --- a/npm/ng-packs/packages/tenant-management/README.md +++ b/npm/ng-packs/packages/tenant-management/README.md @@ -1 +1,3 @@

@abp/ng.tenant-management

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/theme-basic/README.md b/npm/ng-packs/packages/theme-basic/README.md index fc9a74c13d..0dce3c6526 100644 --- a/npm/ng-packs/packages/theme-basic/README.md +++ b/npm/ng-packs/packages/theme-basic/README.md @@ -1 +1,3 @@

@abp/ng.theme.basic

+ +[docs.abp.io](https://docs.abp.io) diff --git a/npm/ng-packs/packages/theme-shared/README.md b/npm/ng-packs/packages/theme-shared/README.md index 0e215e6579..e1b21f241d 100644 --- a/npm/ng-packs/packages/theme-shared/README.md +++ b/npm/ng-packs/packages/theme-shared/README.md @@ -1 +1,3 @@

@abp/ng.theme.shared

+ +[docs.abp.io](https://docs.abp.io) From c043bd1018b6e658f42510bf2b6b1304516a0032 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:46:54 +0300 Subject: [PATCH 08/58] Update label.yml --- .github/workflows/label.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index dcafb97dc9..ec3d0ba5e8 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -1,6 +1,8 @@ name: "Pull Request Labeler" on: -- pull_request + pull_request: + paths: + - '/npm/ng-packs/*' jobs: triage: From 1c81e585c9dae99308e933e17b459d8adf074ca3 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:49:12 +0300 Subject: [PATCH 09/58] Update label.yml --- .github/workflows/label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index ec3d0ba5e8..9719a29737 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -2,7 +2,7 @@ name: "Pull Request Labeler" on: pull_request: paths: - - '/npm/ng-packs/*' + - '/npm/ng-packs/**.md' jobs: triage: From 0d7c254e252c237a281b4aaf668c3d93fefea58c Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 17:50:25 +0300 Subject: [PATCH 10/58] Update label.yml --- .github/workflows/label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 9719a29737..5c72dcc313 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -2,7 +2,7 @@ name: "Pull Request Labeler" on: pull_request: paths: - - '/npm/ng-packs/**.md' + - 'npm/ng-packs/**' jobs: triage: From 778c747b3454a3e9b48506ceed3e831a4b934ae8 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:44:40 +0300 Subject: [PATCH 11/58] Create angular.yml --- .github/workflows/angular.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/workflows/angular.yml diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml new file mode 100644 index 0000000000..e9434aafda --- /dev/null +++ b/.github/workflows/angular.yml @@ -0,0 +1,7 @@ +steps: +- uses: actions/checkout@v1 +- uses: actions/setup-node@v1 + with: + node-version: '10.x' +- run: npm install +- run: npm test From 2a58b8e18924ed9b436426fa8cfdee98a7801382 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:48:15 +0300 Subject: [PATCH 12/58] Update angular.yml --- .github/workflows/angular.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index e9434aafda..ed5d26de08 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -1,7 +1,14 @@ -steps: -- uses: actions/checkout@v1 -- uses: actions/setup-node@v1 - with: - node-version: '10.x' -- run: npm install -- run: npm test +name: "Angular build and test action" +on: + pull_request: + paths: + - 'npm/ng-packs/**' +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: '10.x' + - run: cd npm/ng-packs && npm install From 13e3374907f30ab8347386bed6ce5eedf4c1a2a2 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:51:07 +0300 Subject: [PATCH 13/58] Delete label.yml --- .github/workflows/label.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 .github/workflows/label.yml diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml deleted file mode 100644 index 5c72dcc313..0000000000 --- a/.github/workflows/label.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: "Pull Request Labeler" -on: - pull_request: - paths: - - 'npm/ng-packs/**' - -jobs: - triage: - runs-on: ubuntu-latest - steps: - - uses: actions/labeler@v2 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" From 4a6afb8e4b2785833fe45ec0543612b622e22734 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:51:19 +0300 Subject: [PATCH 14/58] Delete labeler.yml --- .github/labeler.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .github/labeler.yml diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index cfb8b444da..0000000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,3 +0,0 @@ -# Add 'repo' label to any root file changes -repo: - - ./**/* From 58178dd05615dd7cc7c60984e396274c90e21ba6 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 18:52:01 +0300 Subject: [PATCH 15/58] Update angular.yml --- .github/workflows/angular.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index ed5d26de08..1f957dbf4b 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -4,11 +4,12 @@ on: paths: - 'npm/ng-packs/**' jobs: - triage: - runs-on: ubuntu-latest + build: + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - uses: actions/setup-node@v1 with: node-version: '10.x' - run: cd npm/ng-packs && npm install + - run: pwd From fcbe3c88f2dbd5c36345e28d06f744da04056e37 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:00:42 +0300 Subject: [PATCH 16/58] Update angular.yml --- .github/workflows/angular.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 1f957dbf4b..d77a9b8cfa 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -3,6 +3,9 @@ on: pull_request: paths: - 'npm/ng-packs/**' + push: + paths: + - 'npm/ng-packs/**' jobs: build: runs-on: ubuntu-18.04 @@ -11,5 +14,6 @@ jobs: - uses: actions/setup-node@v1 with: node-version: '10.x' - - run: cd npm/ng-packs && npm install + - run: pwd && npm install + working-directory: npm/ng-packs - run: pwd From abf8dd3430f1f7cf3eca8f4e4910ae98fde930d2 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:02:25 +0300 Subject: [PATCH 17/58] Update angular.yml --- .github/workflows/angular.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index d77a9b8cfa..8a466cec26 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: actions/setup-node@v1 + - uses: borales/actions-yarn@v2.0.0 with: node-version: '10.x' - - run: pwd && npm install + - run: pwd && yarn working-directory: npm/ng-packs - run: pwd From dedf9c0eb0518f9508de4106c6f4f21d52176fdf Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:08:46 +0300 Subject: [PATCH 18/58] Update angular.yml --- .github/workflows/angular.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 8a466cec26..5c95b90c0c 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -14,6 +14,8 @@ jobs: - uses: borales/actions-yarn@v2.0.0 with: node-version: '10.x' - - run: pwd && yarn + - run: | + pwd + yarn working-directory: npm/ng-packs - run: pwd From 85f13cad9ff11f7281c3064501597de7053e9619 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:11:13 +0300 Subject: [PATCH 19/58] Update angular.yml --- .github/workflows/angular.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 5c95b90c0c..11a1914985 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -17,5 +17,4 @@ jobs: - run: | pwd yarn - working-directory: npm/ng-packs - run: pwd From af108d7fb915337df6cf2138a8d1e9d05421d6a9 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:12:22 +0300 Subject: [PATCH 20/58] Update angular.yml --- .github/workflows/angular.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 11a1914985..1945a2d4c1 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -6,6 +6,9 @@ on: push: paths: - 'npm/ng-packs/**' + branches: + - master + - dev jobs: build: runs-on: ubuntu-18.04 From 500f0bae5465814389197c55466f158d22085158 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:16:27 +0300 Subject: [PATCH 21/58] Update angular.yml --- .github/workflows/angular.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 1945a2d4c1..20fc85d595 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -20,4 +20,5 @@ jobs: - run: | pwd yarn + working-directory: npm/ng-packs - run: pwd From 4981b7bce1c3cbd02b620c68b4745728fc1ffe16 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:17:30 +0300 Subject: [PATCH 22/58] Update README.md --- npm/ng-packs/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/npm/ng-packs/README.md b/npm/ng-packs/README.md index f42afee40b..5f73c2589e 100644 --- a/npm/ng-packs/README.md +++ b/npm/ng-packs/README.md @@ -1,3 +1,2 @@

Abp Ng Packages

- [docs.abp.io](https://docs.abp.io) From f82e7f709daa945089b4ff5d2fca26905738db1c Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:23:50 +0300 Subject: [PATCH 23/58] Update angular.yml --- .github/workflows/angular.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 20fc85d595..c856887c33 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -3,6 +3,9 @@ on: pull_request: paths: - 'npm/ng-packs/**' + branches: + - master + - dev push: paths: - 'npm/ng-packs/**' From 75fcba38fd2913ca8100a334435589c87f5bfc2d Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:25:24 +0300 Subject: [PATCH 24/58] Update angular.yml --- .github/workflows/angular.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index c856887c33..4d229c0178 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -1,11 +1,6 @@ name: "Angular build and test action" on: pull_request: - paths: - - 'npm/ng-packs/**' - branches: - - master - - dev push: paths: - 'npm/ng-packs/**' From 667c0e21185fb6254d6c24ca87d14a46d689c6d6 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:28:21 +0300 Subject: [PATCH 25/58] Update angular.yml --- .github/workflows/angular.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 4d229c0178..71ac470892 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -1,9 +1,14 @@ name: "Angular build and test action" on: pull_request: + paths: + - 'npm/ng-packs/**' + branches: + - master + - dev push: paths: - - 'npm/ng-packs/**' + - 'npm/ng-packs/**' branches: - master - dev From d254aee526d5cb5e5ee3333008507d337bfde582 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:31:48 +0300 Subject: [PATCH 26/58] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c22fe5ec4b..cbdbfe4ba8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # ABP - [![Build Status](http://vjenkins.dynu.net:5480/job/abp/badge/icon)](http://ci.volosoft.com:5480/blue/organizations/jenkins/abp/activity) [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) From 0c75ee44867442caacfc66fdae683661151b4c90 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:33:23 +0300 Subject: [PATCH 27/58] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cbdbfe4ba8..c22fe5ec4b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # ABP + [![Build Status](http://vjenkins.dynu.net:5480/job/abp/badge/icon)](http://ci.volosoft.com:5480/blue/organizations/jenkins/abp/activity) [![NuGet](https://img.shields.io/nuget/v/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) [![NuGet Download](https://img.shields.io/nuget/dt/Volo.Abp.Core.svg?style=flat-square)](https://www.nuget.org/packages/Volo.Abp.Core) From a1ef5c4ca71fb0546d5badd1ad79ee600e6aa4c4 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:34:21 +0300 Subject: [PATCH 28/58] Update .prettierrc --- npm/ng-packs/.prettierrc | 1 + 1 file changed, 1 insertion(+) diff --git a/npm/ng-packs/.prettierrc b/npm/ng-packs/.prettierrc index 4b9a2d97d0..b5b5724081 100644 --- a/npm/ng-packs/.prettierrc +++ b/npm/ng-packs/.prettierrc @@ -3,3 +3,4 @@ "singleQuote": true, "trailingComma": "all" } + From 833a1ae4669f34f8feec2b6654f1feda0357121e Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:36:28 +0300 Subject: [PATCH 29/58] Update angular.yml --- .github/workflows/angular.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 71ac470892..c3c143169e 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -20,8 +20,5 @@ jobs: - uses: borales/actions-yarn@v2.0.0 with: node-version: '10.x' - - run: | - pwd - yarn - working-directory: npm/ng-packs + - run: pwd - run: pwd From 39c39b2fbc44d54e46e8a8b4206076d023ef5c4a Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:37:43 +0300 Subject: [PATCH 30/58] Update angular.yml --- .github/workflows/angular.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index c3c143169e..dcdaf1d7da 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -17,8 +17,4 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: borales/actions-yarn@v2.0.0 - with: - node-version: '10.x' - - run: pwd - run: pwd From 5d354a328d84c5be1c487e7d8d7fd3c5e86e20bb Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:49:55 +0300 Subject: [PATCH 31/58] Update angular.yml --- .github/workflows/angular.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index dcdaf1d7da..0bf65a728f 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -13,8 +13,25 @@ on: - master - dev jobs: + install: + runs-on: ubuntu-18.04 + steps: + - uses: actions/checkout@v1 + - uses: borales/actions-yarn@v2.0.0 + with: + node-version: '10.x' + - run: | + yarn + yarn global add symlink + working-directory: npm/ng-packs build: + needs: [install] runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - run: pwd + - uses: borales/actions-yarn@v2.0.0 + with: + node-version: '10.x' + - run: | + symlink copy --angular --packages @abp/ng.core --sync-build + working-directory: npm/ng-packs From 8f331e9c44244cdac2a8794eb832d1110f18f035 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:50:57 +0300 Subject: [PATCH 32/58] Update angular.yml --- .github/workflows/angular.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index 0bf65a728f..ea4b4ec598 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -1,4 +1,4 @@ -name: "Angular build and test action" +name: "Angular build and test" on: pull_request: paths: From 725a519ed92be5fa4cca11bcbdffde43731b1f03 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 19:55:26 +0300 Subject: [PATCH 33/58] Update angular.yml --- .github/workflows/angular.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index ea4b4ec598..da461c55d6 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -21,6 +21,7 @@ jobs: with: node-version: '10.x' - run: | + node -v yarn yarn global add symlink working-directory: npm/ng-packs From c20ccc1457dcfd3a1a1498c78e54433b1b9fe4cc Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 12 Nov 2019 20:09:58 +0300 Subject: [PATCH 34/58] Update angular.yml --- .github/workflows/angular.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml index da461c55d6..e0a9ef55dd 100644 --- a/.github/workflows/angular.yml +++ b/.github/workflows/angular.yml @@ -17,20 +17,20 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: borales/actions-yarn@v2.0.0 + - uses: actions/setup-node@v1 with: node-version: '10.x' - run: | node -v - yarn - yarn global add symlink + npm install + npm install -g symlink working-directory: npm/ng-packs build: needs: [install] runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v1 - - uses: borales/actions-yarn@v2.0.0 + - uses: actions/setup-node@v1 with: node-version: '10.x' - run: | From 8d93285120053d8a3d6aef5b0a911843b2eedc00 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:12:31 +0300 Subject: [PATCH 35/58] test: add jest configs to modules without tests --- npm/ng-packs/packages/account-config/jest.config.js | 7 +++++++ npm/ng-packs/packages/account-config/tsconfig.spec.json | 8 +++++--- npm/ng-packs/packages/account/jest.config.js | 7 +++++++ npm/ng-packs/packages/account/tsconfig.spec.json | 8 +++++--- npm/ng-packs/packages/identity-config/jest.config.js | 7 +++++++ npm/ng-packs/packages/identity-config/tsconfig.spec.json | 8 +++++--- .../packages/setting-management-config/jest.config.js | 7 +++++++ .../packages/setting-management-config/tsconfig.spec.json | 8 +++++--- npm/ng-packs/packages/setting-management/jest.config.js | 7 +++++++ .../packages/setting-management/tsconfig.spec.json | 8 +++++--- .../packages/tenant-management-config/jest.config.js | 7 +++++++ .../packages/tenant-management-config/tsconfig.spec.json | 8 +++++--- 12 files changed, 72 insertions(+), 18 deletions(-) create mode 100644 npm/ng-packs/packages/account-config/jest.config.js create mode 100644 npm/ng-packs/packages/account/jest.config.js create mode 100644 npm/ng-packs/packages/identity-config/jest.config.js create mode 100644 npm/ng-packs/packages/setting-management-config/jest.config.js create mode 100644 npm/ng-packs/packages/setting-management/jest.config.js create mode 100644 npm/ng-packs/packages/tenant-management-config/jest.config.js diff --git a/npm/ng-packs/packages/account-config/jest.config.js b/npm/ng-packs/packages/account-config/jest.config.js new file mode 100644 index 0000000000..a52fa2f369 --- /dev/null +++ b/npm/ng-packs/packages/account-config/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'account-config', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/account-config/tsconfig.spec.json b/npm/ng-packs/packages/account-config/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/account-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/account-config/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/account/jest.config.js b/npm/ng-packs/packages/account/jest.config.js new file mode 100644 index 0000000000..5392bab38e --- /dev/null +++ b/npm/ng-packs/packages/account/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'account', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/account/tsconfig.spec.json b/npm/ng-packs/packages/account/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/account/tsconfig.spec.json +++ b/npm/ng-packs/packages/account/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/identity-config/jest.config.js b/npm/ng-packs/packages/identity-config/jest.config.js new file mode 100644 index 0000000000..16fc34a4e6 --- /dev/null +++ b/npm/ng-packs/packages/identity-config/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'setting-management-config', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/identity-config/tsconfig.spec.json b/npm/ng-packs/packages/identity-config/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/identity-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/identity-config/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/setting-management-config/jest.config.js b/npm/ng-packs/packages/setting-management-config/jest.config.js new file mode 100644 index 0000000000..56d7a72808 --- /dev/null +++ b/npm/ng-packs/packages/setting-management-config/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'identity-config', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/setting-management-config/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/setting-management/jest.config.js b/npm/ng-packs/packages/setting-management/jest.config.js new file mode 100644 index 0000000000..56d7a72808 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'identity-config', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/setting-management/tsconfig.spec.json b/npm/ng-packs/packages/setting-management/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/setting-management/tsconfig.spec.json +++ b/npm/ng-packs/packages/setting-management/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } diff --git a/npm/ng-packs/packages/tenant-management-config/jest.config.js b/npm/ng-packs/packages/tenant-management-config/jest.config.js new file mode 100644 index 0000000000..affd49e0d7 --- /dev/null +++ b/npm/ng-packs/packages/tenant-management-config/jest.config.js @@ -0,0 +1,7 @@ +const jestConfig = require('../../jest.config'); + +module.exports = { + ...jestConfig, + name: 'tenant-management-config', + 'ts-jest': { allowSyntheticDefaultImports: true }, +}; diff --git a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json index ebce9b9fdb..54e55c4f05 100644 --- a/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json +++ b/npm/ng-packs/packages/tenant-management-config/tsconfig.spec.json @@ -1,9 +1,11 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "outDir": "../../out-tsc/spec", - "types": ["node", "jest"] + "emitDecoratorMetadata": true, + "esModuleInterop": true, + "outDir": "../../dist/out-tsc", + "module": "commonjs", + "types": ["jest", "node"] }, - "files": [], "include": ["**/*.spec.ts", "**/*.d.ts"] } From dd61d67a432ca7f335aa31e4069e20d6f6cc851e Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:12:45 +0300 Subject: [PATCH 36/58] test(account): add account.service.spec --- .../src/lib/tests/account.service.spec.ts | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts diff --git a/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts b/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts new file mode 100644 index 0000000000..16bfb84f2a --- /dev/null +++ b/npm/ng-packs/packages/account/src/lib/tests/account.service.spec.ts @@ -0,0 +1,35 @@ +import { createHttpFactory, HttpMethod, SpectatorHttp } from '@ngneat/spectator/jest'; +import { AccountService } from '../services/account.service'; +import { Store } from '@ngxs/store'; +import { RestService } from '@abp/ng.core'; +import { RegisterRequest } from '../models/user'; + +describe('AccountService', () => { + let spectator: SpectatorHttp; + const createHttp = createHttpFactory({ + dataService: AccountService, + providers: [RestService], + mocks: [Store], + }); + + beforeEach(() => (spectator = createHttp())); + + it('should send a GET to find tenant', () => { + spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.service.findTenant('test').subscribe(); + spectator.expectOne('https://abp.io/api/abp/multi-tenancy/tenants/by-name/test', HttpMethod.GET); + }); + + it('should send a POST to register API', () => { + const mock = { + userName: 'test', + emailAddress: 'test@test.com', + password: 'test1234', + appName: 'Angular', + } as RegisterRequest; + spectator.get(Store).selectSnapshot.andReturn('https://abp.io'); + spectator.service.register(mock).subscribe(); + const req = spectator.expectOne('https://abp.io/api/account/register', HttpMethod.POST); + expect(req.request.body).toEqual(mock); + }); +}); From feacd02901109c1ad848775ddfb590f6686415f0 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:13:11 +0300 Subject: [PATCH 37/58] chore: update jest configs --- npm/ng-packs/angular.json | 82 +++++++++++++++------------------------ 1 file changed, 32 insertions(+), 50 deletions(-) diff --git a/npm/ng-packs/angular.json b/npm/ng-packs/angular.json index d06f64cd18..3be4755410 100644 --- a/npm/ng-packs/angular.json +++ b/npm/ng-packs/angular.json @@ -19,7 +19,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -48,7 +49,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -77,7 +79,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -103,11 +106,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/account/src/test.ts", - "tsConfig": "packages/account/tsconfig.spec.json", - "karmaConfig": "packages/account/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -135,7 +137,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -166,7 +169,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -194,7 +198,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -225,7 +230,8 @@ "test": { "builder": "@angular-builders/jest:run", "options": { - "coverage": true + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -254,11 +260,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/setting-management/src/test.ts", - "tsConfig": "packages/setting-management/tsconfig.spec.json", - "karmaConfig": "packages/setting-management/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -287,11 +292,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/setting-management-config/src/test.ts", - "tsConfig": "packages/setting-management-config/tsconfig.spec.json", - "karmaConfig": "packages/setting-management-config/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -320,11 +324,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/identity-config/src/test.ts", - "tsConfig": "packages/identity-config/tsconfig.spec.json", - "karmaConfig": "packages/identity-config/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -350,11 +353,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/account-config/src/test.ts", - "tsConfig": "packages/account-config/tsconfig.spec.json", - "karmaConfig": "packages/account-config/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -380,11 +382,10 @@ } }, "test": { - "builder": "@angular-devkit/build-angular:karma", + "builder": "@angular-builders/jest:run", "options": { - "main": "packages/tenant-management-config/src/test.ts", - "tsConfig": "packages/tenant-management-config/tsconfig.spec.json", - "karmaConfig": "packages/tenant-management-config/karma.conf.js" + "coverage": true, + "passWithNoTests": true } }, "lint": { @@ -501,25 +502,6 @@ "browserTarget": "dev-app:build" } }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "apps/dev-app/src/test.ts", - "polyfills": "apps/dev-app/src/polyfills.ts", - "tsConfig": "apps/dev-app/tsconfig.spec.json", - "karmaConfig": "apps/dev-app/karma.conf.js", - "assets": ["apps/dev-app/src/favicon.ico", "apps/dev-app/src/assets"], - "styles": [ - "apps/dev-app/src/styles.scss", - "node_modules/bootstrap/dist/css/bootstrap.min.css", - "node_modules/font-awesome/css/font-awesome.min.css", - "node_modules/primeng/resources/themes/nova-light/theme.css", - "node_modules/primeicons/primeicons.css", - "node_modules/primeng/resources/primeng.min.css" - ], - "scripts": [] - } - }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { From 2c891d84e904f619cc4ac6de834e0dbc666837ee Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:14:32 +0300 Subject: [PATCH 38/58] fix(theme-shared): creating custom error component problem --- .../src/lib/components/error/error.component.ts | 9 ++++++++- .../theme-shared/src/lib/handlers/error.handler.ts | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts index b06475ac7a..cc64e5445b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts @@ -8,6 +8,8 @@ import { OnDestroy, Type, ViewChild, + ApplicationRef, + Injector, } from '@angular/core'; import { fromEvent, Subject } from 'rxjs'; import { debounceTime, filter } from 'rxjs/operators'; @@ -18,8 +20,12 @@ import { debounceTime, filter } from 'rxjs/operators'; styleUrls: ['error.component.scss'], }) export class ErrorComponent implements AfterViewInit, OnDestroy { + appRef: ApplicationRef; + cfRes: ComponentFactoryResolver; + injector: Injector; + status = 0; title: Config.LocalizationParam = 'Oops!'; @@ -39,9 +45,10 @@ export class ErrorComponent implements AfterViewInit, OnDestroy { ngAfterViewInit() { if (this.customComponent) { - const customComponentRef = this.cfRes.resolveComponentFactory(this.customComponent).create(null); + const customComponentRef = this.cfRes.resolveComponentFactory(this.customComponent).create(this.injector); customComponentRef.instance.errorStatus = this.status; customComponentRef.instance.destroy$ = this.destroy$; + this.appRef.attachView(customComponentRef.hostView); this.containerRef.nativeElement.appendChild((customComponentRef.hostView as EmbeddedViewRef).rootNodes[0]); customComponentRef.changeDetectorRef.detectChanges(); } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts index ced1980067..ecf82cc9e1 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts @@ -212,6 +212,8 @@ export class ErrorHandler { if (this.canCreateCustomError(instance.status as ErrorScreenErrorCodes)) { this.componentRef.instance.cfRes = this.cfRes; + this.componentRef.instance.appRef = this.appRef; + this.componentRef.instance.injector = this.injector; this.componentRef.instance.customComponent = this.httpErrorConfig.errorScreen.component; } From 9552ee0221826c0e938e20b20f178a3a071c6c75 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:35:44 +0300 Subject: [PATCH 39/58] refactor(theme-shared): change margin class --- .../theme-shared/src/lib/components/error/error.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html index ce1137bc20..7121f06c7b 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html @@ -1,5 +1,5 @@
- From 8365934032c144927ae9ac636dbf1a89db94113c Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 10:55:04 +0300 Subject: [PATCH 40/58] feat(theme-shared): add hideCloseIcon property to http error config token --- .../src/lib/components/error/error.component.html | 2 +- .../src/lib/components/error/error.component.ts | 2 ++ .../packages/theme-shared/src/lib/handlers/error.handler.ts | 6 +++--- npm/ng-packs/packages/theme-shared/src/lib/models/common.ts | 1 + .../packages/theme-shared/src/lib/theme-shared.module.ts | 2 +- .../tokens/{error-pages.token.ts => http-error.token.ts} | 0 6 files changed, 8 insertions(+), 5 deletions(-) rename npm/ng-packs/packages/theme-shared/src/lib/tokens/{error-pages.token.ts => http-error.token.ts} (100%) diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html index 7121f06c7b..8801240bbf 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.html @@ -1,5 +1,5 @@
- diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts index cc64e5445b..70ddce726e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/components/error/error.component.ts @@ -36,6 +36,8 @@ export class ErrorComponent implements AfterViewInit, OnDestroy { destroy$: Subject; + hideCloseIcon = false; + @ViewChild('container', { static: false }) containerRef: ElementRef; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts index ecf82cc9e1..0aa9956aa5 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/handlers/error.handler.ts @@ -19,7 +19,6 @@ import { ErrorComponent } from '../components/error/error.component'; import { HttpErrorConfig, ErrorScreenErrorCodes } from '../models/common'; import { Toaster } from '../models/toaster'; import { ConfirmationService } from '../services/confirmation.service'; -import { HTTP_ERROR_CONFIG } from '../tokens/error-pages.token'; export const DEFAULT_ERROR_MESSAGES = { defaultError: { @@ -56,7 +55,7 @@ export class ErrorHandler { private cfRes: ComponentFactoryResolver, private rendererFactory: RendererFactory2, private injector: Injector, - @Inject(HTTP_ERROR_CONFIG) private httpErrorConfig: HttpErrorConfig, + @Inject('HTTP_ERROR_CONFIG') private httpErrorConfig: HttpErrorConfig, ) { this.actions.pipe(ofActionSuccessful(RestOccurError, RouterError, RouterDataResolved)).subscribe(res => { if (res instanceof RestOccurError) { @@ -209,7 +208,8 @@ export class ErrorHandler { this.componentRef.instance[key] = instance[key]; } } - + console.warn(this.httpErrorConfig.errorScreen); + this.componentRef.instance.hideCloseIcon = this.httpErrorConfig.errorScreen.hideCloseIcon; if (this.canCreateCustomError(instance.status as ErrorScreenErrorCodes)) { this.componentRef.instance.cfRes = this.cfRes; this.componentRef.instance.appRef = this.appRef; diff --git a/npm/ng-packs/packages/theme-shared/src/lib/models/common.ts b/npm/ng-packs/packages/theme-shared/src/lib/models/common.ts index f0cd03d6e7..2bca410f5e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/models/common.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/models/common.ts @@ -14,5 +14,6 @@ export interface HttpErrorConfig { | [ErrorScreenErrorCodes, ErrorScreenErrorCodes] | [ErrorScreenErrorCodes, ErrorScreenErrorCodes, ErrorScreenErrorCodes] | [ErrorScreenErrorCodes, ErrorScreenErrorCodes, ErrorScreenErrorCodes, ErrorScreenErrorCodes]; + hideCloseIcon?: boolean; }; } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 28c3926367..3c7ba9f866 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -19,7 +19,7 @@ import { TableSortDirective } from './directives/table-sort.directive'; import { ErrorHandler } from './handlers/error.handler'; import { chartJsLoaded$ } from './utils/widget-utils'; import { RootParams } from './models/common'; -import { HTTP_ERROR_CONFIG, httpErrorConfigFactory } from './tokens/error-pages.token'; +import { HTTP_ERROR_CONFIG, httpErrorConfigFactory } from './tokens/http-error.token'; export function appendScript(injector: Injector) { const fn = () => { diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tokens/error-pages.token.ts b/npm/ng-packs/packages/theme-shared/src/lib/tokens/http-error.token.ts similarity index 100% rename from npm/ng-packs/packages/theme-shared/src/lib/tokens/error-pages.token.ts rename to npm/ng-packs/packages/theme-shared/src/lib/tokens/http-error.token.ts From 4769843e305badd5da64efccfb90d1552c576b6f Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 16:39:21 +0300 Subject: [PATCH 41/58] feat(theme-shared): add date parser formatter for ng-datepicker --- .../src/lib/theme-shared.module.ts | 5 ++ .../src/lib/utils/date-parser-formatter.ts | 52 +++++++++++++++++++ .../theme-shared/src/lib/utils/index.ts | 1 + 3 files changed, 58 insertions(+) create mode 100644 npm/ng-packs/packages/theme-shared/src/lib/utils/date-parser-formatter.ts diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts index 3c7ba9f866..50072f3d6d 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts @@ -20,6 +20,9 @@ import { ErrorHandler } from './handlers/error.handler'; import { chartJsLoaded$ } from './utils/widget-utils'; import { RootParams } from './models/common'; import { HTTP_ERROR_CONFIG, httpErrorConfigFactory } from './tokens/http-error.token'; +import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap'; +import { DateParserFormatter } from './utils/date-parser-formatter'; +import { DatePipe } from '@angular/common'; export function appendScript(injector: Injector) { const fn = () => { @@ -68,6 +71,7 @@ export function appendScript(injector: Injector) { SortOrderIconComponent, TableSortDirective, ], + providers: [DatePipe], entryComponents: [ErrorComponent], }) export class ThemeSharedModule { @@ -88,6 +92,7 @@ export class ThemeSharedModule { useFactory: httpErrorConfigFactory, deps: [HTTP_ERROR_CONFIG], }, + { provide: NgbDateParserFormatter, useClass: DateParserFormatter }, ], }; } diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/date-parser-formatter.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/date-parser-formatter.ts new file mode 100644 index 0000000000..5bae578d16 --- /dev/null +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/date-parser-formatter.ts @@ -0,0 +1,52 @@ +import { Injectable, Optional } from '@angular/core'; +import { NgbDateParserFormatter, NgbDateStruct } from '@ng-bootstrap/ng-bootstrap'; +import { DatePipe } from '@angular/common'; + +function padNumber(value: number) { + if (isNumber(value)) { + return `0${value}`.slice(-2); + } else { + return ''; + } +} + +function isNumber(value: any): boolean { + return !isNaN(toInteger(value)); +} + +function toInteger(value: any): number { + return parseInt(`${value}`, 10); +} + +@Injectable() +export class DateParserFormatter extends NgbDateParserFormatter { + constructor(@Optional() private datePipe: DatePipe) { + super(); + } + + parse(value: string): NgbDateStruct { + if (value) { + const dateParts = value.trim().split('-'); + if (dateParts.length === 1 && isNumber(dateParts[0])) { + return { year: toInteger(dateParts[0]), month: null, day: null }; + } else if (dateParts.length === 2 && isNumber(dateParts[0]) && isNumber(dateParts[1])) { + return { year: toInteger(dateParts[0]), month: toInteger(dateParts[1]), day: null }; + } else if (dateParts.length === 3 && isNumber(dateParts[0]) && isNumber(dateParts[1]) && isNumber(dateParts[2])) { + return { year: toInteger(dateParts[0]), month: toInteger(dateParts[1]), day: toInteger(dateParts[2]) }; + } + } + return null; + } + + format(date: NgbDateStruct): string { + if (date && this.datePipe) { + return this.datePipe.transform(new Date(date.year, date.month, date.day), 'shortDate'); + } else { + return date + ? `${date.year}-${isNumber(date.month) ? padNumber(date.month) : ''}-${ + isNumber(date.day) ? padNumber(date.day) : '' + }` + : ''; + } + } +} diff --git a/npm/ng-packs/packages/theme-shared/src/lib/utils/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/utils/index.ts index 1976b866a0..3742880cb7 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/utils/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/utils/index.ts @@ -1 +1,2 @@ export * from './widget-utils'; +export * from './date-parser-formatter'; From 80e362a06d05da9f9ac214e95a46510c713ad5b3 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Wed, 13 Nov 2019 16:39:47 +0300 Subject: [PATCH 42/58] feat(setting-management): add a class --- .../src/lib/components/setting-management.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html index 054430b011..8d5fd0e8d1 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html +++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.html @@ -19,7 +19,7 @@