From 3e4b435af082b6bb7c206c8c06a8008c293ffa14 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Sep 2020 07:48:44 +0300 Subject: [PATCH 01/10] fix: resolve features modal bugs resolves #5458 --- .../feature-management.component.html | 47 ++++--- npm/ng-packs/yarn.lock | 123 +++++++++--------- 2 files changed, 92 insertions(+), 78 deletions(-) diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index f857487e1e..76c56fd3f0 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -1,4 +1,4 @@ - +

{{ 'AbpFeatureManagement::Features' | abpLocalization }}

@@ -15,7 +15,7 @@ >
  • {{ group.displayName }} @@ -64,16 +64,20 @@
    - - - - {{ 'AbpFeatureManagement::Save' | abpLocalization }} - - + + + {{ 'AbpFeatureManagement::Save' | abpLocalization }} + diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index 3c7c96dae9..9f43b90083 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -2,24 +2,24 @@ # yarn lockfile v1 -"@abp/ng.account@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.1.2.tgz#42f95ad70f06586848737ad5e18461a193a51348" - integrity sha512-sFJPvak4pGbX0dDtVjBhY0slRRI0oTz8reJqcFfpUywPMJj2VsCz97W70xB33Yr/mQZDg6BjhXkrl15GdyWt2w== +"@abp/ng.account@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.account/-/ng.account-3.2.0-rc.1.tgz#0b5e7abb30becb0c841cf00692856f0c123c2918" + integrity sha512-Xm3lHUfIyg86HxSmOosmbUqnfw1Klggybqy5fxtLm+sZ/JnrMWPdzQYO/Dw4gq5mwlVVKqD/pjk+hYPxe9+Eag== dependencies: - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.core@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.1.2.tgz#edc2de8fa7332f4bd17ddeaee94c52aa8bb51fcc" - integrity sha512-ura5fD4ZIJhLD97WrSNILoFfwFqJJJOygeZuGpfslCbeNM1JEf4Jk4XQzfnk7u+xW7IgtBZXtisheIuY2taawA== +"@abp/ng.core@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.core/-/ng.core-3.2.0-rc.1.tgz#85bd27ae0da2732fbad9fd4af395e718ff2233d1" + integrity sha512-c3x0/Y4r7v1ZlvbYba2Vs/JrqemuSmCB1V9pQESlQfJJXJWhDZPi40jrA62X16AF42fUpK7GxWb1p13HpRk57A== dependencies: - "@abp/utils" "^3.1.1" + "@abp/utils" "^3.1.2" "@angular/localize" "~10.0.10" - "@ngxs/router-plugin" "^3.6.2" - "@ngxs/storage-plugin" "^3.6.2" - "@ngxs/store" "^3.6.2" + "@ngxs/router-plugin" "^3.7.0" + "@ngxs/storage-plugin" "^3.7.0" + "@ngxs/store" "^3.7.0" angular-oauth2-oidc "^10.0.0" just-clone "^3.1.0" just-compare "^1.3.0" @@ -27,35 +27,35 @@ ts-toolbelt "6.15.4" tslib "^2.0.0" -"@abp/ng.feature-management@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.1.2.tgz#91269097f925bc0772c443d688f46070fce5def9" - integrity sha512-s59KNoOY2TWuume2iAzdKz9GBFVyj3q0BmhL7hW6IgyV96Zg9FP+UKYCXvPM8HtsLmXis3Zrv7TnJDAF+5VrHw== +"@abp/ng.feature-management@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.feature-management/-/ng.feature-management-3.2.0-rc.1.tgz#ce2e53ae323f9fad83a8afc8d194457956f1409c" + integrity sha512-HljQCTVgqmw9RPjHkvDgDuNuYR/+zAcAIQ18sNOgM7sigm+1E7jzi7EkOVchckLob1qrDqx0JJq8cDISr5jVMQ== dependencies: - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.identity@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.1.2.tgz#6d039a6cbb431c61a8bf9d291c1e6bf2120e478e" - integrity sha512-p+NGSuSd6OPxDZQr7iOhUIWTkpzyGUcphy6iloDgXX9YoTdIoh03ZMMJMpR6UBmPYLjPpP4U/eUFVxi2DjdCzA== +"@abp/ng.identity@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.identity/-/ng.identity-3.2.0-rc.1.tgz#912f481dd0649eceab573deb5dfbc9887b436792" + integrity sha512-WuPzl5zlOFOyXv4REnW9uUgac437nZTH8Z6oaJHWLCoDdh5vXUMbvCN5w4N2HIM0Rlp1+o/h2RP7MVv+5Smniw== dependencies: - "@abp/ng.permission-management" "~3.1.2" - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.permission-management" "~3.2.0-rc.1" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.permission-management@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.1.2.tgz#bacc09d3e92262d111734e4ffc4344300b16f978" - integrity sha512-nqLo3VFNFeouU33qQHK0abbKCjSlT9VXJk0WYzsiS2Z7lENYqtImRCxqpHlB32ACIdMMUWbmo8OMvYzpt++kRg== +"@abp/ng.permission-management@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.permission-management/-/ng.permission-management-3.2.0-rc.1.tgz#f9a13aa50331da316dd9d61ba260ca1e9bc19b72" + integrity sha512-Eakg2cS6xGeByhBNHj4L95kFjMMPh+T21LGOccs02UdbVaNy5k8YjPYpGdDrzKlfnYa6NJOnosvvncwwIHgQtA== dependencies: - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.schematics@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.1.2.tgz#37a634ada068967468e68def9110ead6960bf8a4" - integrity sha512-ULvkA/smLhErHLe6TdW0CzrortAf4Rjq/eshrMqS0A7EANzlw2TBpjZmn7kJSFawLTatDy9+GyQ8Cewc9H0VXA== +"@abp/ng.schematics@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.schematics/-/ng.schematics-3.2.0-rc.1.tgz#47331238103cfce0f45e7c2969a6cc17a6a0c49b" + integrity sha512-sHgAq6moIfEXXht2ouYHUV5NfFfof1L13MfnvneNqgtksn5Au3KPQvEtXgl5hQ7+6mjgMumtyp7z3MzR+r9bBQ== dependencies: "@angular-devkit/core" "~10.0.3" "@angular-devkit/schematics" "~10.0.3" @@ -63,37 +63,37 @@ jsonc-parser "^2.3.0" typescript "~3.9.2" -"@abp/ng.setting-management@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.1.2.tgz#dda39e646e79e853b090c3f4af79181a65446af2" - integrity sha512-o01Z7abV0kL4wwsOcRJZp8btev+X0qHCHfLf4u0zAwTjtXc4LzTtlU2hHLT19U42UYZlFUJvENnmTAhLnCLAVw== +"@abp/ng.setting-management@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.setting-management/-/ng.setting-management-3.2.0-rc.1.tgz#df8d56df342eb57c478e43cd152666f657131aad" + integrity sha512-aND/Qj8xyKdxYg/LBtxQOvCHl1Pokp7P5L5/2Bpgme8zeRK7/xymUSemTQ0dSpCnFmE8vEreX0EacUqBFBFx0A== dependencies: - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.tenant-management@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.1.2.tgz#94fd626515575f8c0e361b36eb173a772ea3fc54" - integrity sha512-vdPSBYYxWUSZxhDg2FMadndj+kZ3ddPkzgBaQldncIvhHsxLQCPwj4ZhqXJ7HHqvZ30JqGiJzk4Ejx0Rv5vu+Q== +"@abp/ng.tenant-management@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.tenant-management/-/ng.tenant-management-3.2.0-rc.1.tgz#ec833e8a8a268b72a81be34c00b22b4b2ae5b635" + integrity sha512-hROU4eDEVaZvoeXXpEtxSF4OE1tzwRSqsTSTs5LQe7W/fB5LIp3Szmf5zpWuuwXxOZwGWzk7fUNgV7LXt9VmPg== dependencies: - "@abp/ng.feature-management" "~3.1.2" - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.feature-management" "~3.2.0-rc.1" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.theme.basic@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.1.2.tgz#e60d15db641a13eebc76d7e793efdc5cf4a6a8f7" - integrity sha512-gYS82euwyVU0D9GLXIqt8h1qtwqXtmu7KqIRyjb0IFi2iIvBGal6jMNKHk6wEI0A0/iNy6pra98bYPUZo+FKxQ== +"@abp/ng.theme.basic@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.basic/-/ng.theme.basic-3.2.0-rc.1.tgz#b5df1c27774c7f278769c0f83fb1bbe9166da20c" + integrity sha512-iLNxxzfGZM3oKJ3zwXpv/TytI9SA7T64LKdFhnvlyrRca2GJOBMMSYlgmcs9e+USNmXVuHPhIAWA8/SBdUvyyA== dependencies: - "@abp/ng.theme.shared" "~3.1.2" + "@abp/ng.theme.shared" "~3.2.0-rc.1" tslib "^2.0.0" -"@abp/ng.theme.shared@~3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.1.2.tgz#b86940d569a992e72e279c34f50f4e4353b6ecc8" - integrity sha512-/e0oB0azdms4QJTtw+7l95t/UmxU5CxQAB4RLIlbnuJFK4NXZObRjb2ujc6PqdaUCGh5djsWxNqVjkcsWcHX2Q== +"@abp/ng.theme.shared@~3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/ng.theme.shared/-/ng.theme.shared-3.2.0-rc.1.tgz#0e8e5f6cb8c2de05b4706142af6716f704d9ef16" + integrity sha512-CytunBUQeU2Sjfv6wqeud3lT052rC+9bJRehT23PpXUFlx3Tz5e7R44H/+66mLGmOzQWYWEcu+AbKTcqgM/4Ow== dependencies: - "@abp/ng.core" "~3.1.2" + "@abp/ng.core" "~3.2.0-rc.1" "@fortawesome/fontawesome-free" "^5.14.0" "@ng-bootstrap/ng-bootstrap" "^7.0.0" "@ngx-validate/core" "^0.0.11" @@ -102,13 +102,20 @@ chart.js "^2.9.3" tslib "^2.0.0" -"@abp/utils@^3.1.1", "@abp/utils@^3.1.2": +"@abp/utils@^3.1.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.1.2.tgz#e9bca8f6133dc2af587c45825e734d2accabcd96" integrity sha512-wnbHGQDGkQYazez1YSXAZ0ZDbsIZZr2ZN8V4LtOSAfzmYhPhFZ5qftoM0xoxlbmsuLLX6QtiPvxU35kEmlZPyg== dependencies: just-compare "^1.3.0" +"@abp/utils@^3.2.0-rc.1": + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.2.0-rc.1.tgz#2231c62512bfff3b130283d35ac4a6458cf7d070" + integrity sha512-Qk+ZFmskrCIY2L/C3Dw6WxC0XHHvKmoue508HBvszEZsIwhdw9QJefmOn+Um0tMHo0p9Bd7By80CNlMjG3CLeg== + dependencies: + just-compare "^1.3.0" + "@angular-builders/jest@^10.0.0": version "10.0.1" resolved "https://registry.yarnpkg.com/@angular-builders/jest/-/jest-10.0.1.tgz#a1a6fb5d11b5d54c051bdaa2012b5f046371560c" @@ -2374,21 +2381,21 @@ dependencies: tslib "^1.9.0" -"@ngxs/router-plugin@^3.6.2", "@ngxs/router-plugin@^3.7.0": +"@ngxs/router-plugin@^3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@ngxs/router-plugin/-/router-plugin-3.7.0.tgz#9d0595d8ec12e6143eb9f2f726fcc7cdec8cd635" integrity sha512-nmArryNIBLWqIKLWelOQhgxEC3evLPDNDkE+PEYvwoASC4NP5rHIqJv0borJAWBCwo10t5wPeT1417vBQex5aQ== dependencies: tslib "^1.9.0" -"@ngxs/storage-plugin@^3.6.2", "@ngxs/storage-plugin@^3.7.0": +"@ngxs/storage-plugin@^3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@ngxs/storage-plugin/-/storage-plugin-3.7.0.tgz#3a0bc75f5dbba17a18e37b69cfde5d470cfceb45" integrity sha512-j5rGYfhi1S+sAky956DIs+6AYP9FMBWL2Uz+omKBS/i42mjhyD26UfApORjwCOyW5PCb4Tq3B14ZPxyAaSi/OA== dependencies: tslib "^1.9.0" -"@ngxs/store@^3.6.2", "@ngxs/store@^3.7.0": +"@ngxs/store@^3.7.0": version "3.7.0" resolved "https://registry.yarnpkg.com/@ngxs/store/-/store-3.7.0.tgz#e46387219dae610c685accc119ae42e351afcaa4" integrity sha512-w9fG/DhKBgH1VJMKSoeNW9x9ycD9/Dzy+VkpFD8Jv0JBNX0MRgP+5KQQe3ZKwnJ+7S0UV/99JvJaWgxc/WOvPw== From 056b1e8c05a51ffc2a957756df196ba2c38dfa9b Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 18 Sep 2020 07:50:26 +0300 Subject: [PATCH 02/10] refactor: change given property to track.by --- .../feature-management/feature-management.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html index 76c56fd3f0..76eabdb8de 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html +++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html @@ -68,7 +68,7 @@