Merge branch 'master' of https://github.com/john-s-morgan/module-zero-core-template

Author: John Morgan

angular/package.json

@@ -28,7 +28,7 @@
     "admin-lte-css-only": "^3.0.4",
     "core-js": "^3.2.1",
     "famfamfam-flags": "^1.0.0",
-    "lodash": "^4.17.4",
+    "lodash-es": "^4.17.15",
     "moment": "2.24.0",
     "moment-timezone": "^0.5.28",
     "ngx-bootstrap": "^5.6.1",
@@ -47,7 +47,7 @@
     "@angular/compiler-cli": "^9.1.4",
     "@angularclass/hmr": "^2.1.3",
     "@types/jasmine": "^3.4.0",
-    "@types/lodash": "^4.14.150",
+    "@types/lodash-es": "^4.17.3",
     "@types/moment-timezone": "^0.5.12",
     "@types/node": "^13.13.4",
     "codelyzer": "^5.1.2",
@@ -67,4 +67,4 @@
     "webpack-bundle-analyzer": "^3.7.0"
   },
   "angular-cli": {}
-}
+}

angular/src/account/layout/account-languages.component.ts

@@ -5,7 +5,7 @@ import {
   ChangeDetectionStrategy
 } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
-import * as _ from 'lodash';
+import { filter as _filter } from 'lodash-es';
 
 @Component({
   selector: 'account-languages',
@@ -22,7 +22,7 @@ export class AccountLanguagesComponent extends AppComponentBase
   }
 
   ngOnInit() {
-    this.languages = _.filter(
+    this.languages = _filter(
       this.localization.languages,
       (l) => !l.isDisabled
     );

angular/src/app-initializer.ts

@@ -2,7 +2,7 @@ import { Injectable, Injector } from '@angular/core';
 import { PlatformLocation, registerLocaleData } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import * as moment from 'moment';
-import * as _ from 'lodash';
+import { filter as _filter, merge as _merge } from 'lodash-es';
 import { AppConsts } from '@shared/AppConsts';
 import { AppSessionService } from '@shared/session/app-session.service';
 import { environment } from './environments/environment';
@@ -89,7 +89,7 @@ export class AppInitializer {
       return locale;
     }
 
-    const localeMapings = _.filter(AppConsts.localeMappings, { from: locale });
+    const localeMapings = _filter(AppConsts.localeMappings, { from: locale });
     if (localeMapings && localeMapings.length) {
       return localeMapings[0]['to'];
     }
@@ -136,7 +136,7 @@ export class AppInitializer {
       .subscribe((response) => {
         const result = response.result;
 
-        _.merge(abp, result);
+        _merge(abp, result);
 
         abp.clock.provider = this.getCurrentClockProvider(
           result.clock.provider

angular/src/app/layout/header-language-menu.component.ts

@@ -9,7 +9,7 @@ import {
   UserServiceProxy,
   ChangeUserLanguageDto
 } from '@shared/service-proxies/service-proxies';
-import * as _ from 'lodash';
+import { filter as _filter } from 'lodash-es';
 
 @Component({
   selector: 'header-language-menu',
@@ -26,7 +26,7 @@ export class HeaderLanguageMenuComponent extends AppComponentBase
   }
 
   ngOnInit() {
-    this.languages = _.filter(
+    this.languages = _filter(
       this.localization.languages,
       (l) => !l.isDisabled
     );

angular/src/app/roles/create-role/create-role-dialog.component.ts

@@ -7,7 +7,6 @@ import {
 } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
-import * as _ from 'lodash';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
   RoleServiceProxy,
@@ -16,6 +15,7 @@ import {
   CreateRoleDto,
   PermissionDtoListResultDto
 } from '@shared/service-proxies/service-proxies';
+import { forEach as _forEach, map as _map } from 'lodash-es';
 
 @Component({
   templateUrl: 'create-role-dialog.component.html'
@@ -48,7 +48,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
   }
 
   setInitialPermissionsStatus(): void {
-    _.map(this.permissions, (item) => {
+    _map(this.permissions, (item) => {
       this.checkedPermissionsMap[item.name] = this.isPermissionChecked(
         item.name
       );
@@ -67,7 +67,7 @@ export class CreateRoleDialogComponent extends AppComponentBase
 
   getCheckedPermissions(): string[] {
     const permissions: string[] = [];
-    _.forEach(this.checkedPermissionsMap, function (value, key) {
+    _forEach(this.checkedPermissionsMap, function (value, key) {
       if (value) {
         permissions.push(key);
       }

angular/src/app/roles/edit-role/edit-role-dialog.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
-import * as _ from 'lodash';
+import { forEach as _forEach, includes as _includes, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
   RoleServiceProxy,
@@ -52,15 +52,15 @@ export class EditRoleDialogComponent extends AppComponentBase
   }
 
   setInitialPermissionsStatus(): void {
-    _.map(this.permissions, (item) => {
+    _map(this.permissions, (item) => {
       this.checkedPermissionsMap[item.name] = this.isPermissionChecked(
         item.name
       );
     });
   }
 
   isPermissionChecked(permissionName: string): boolean {
-    return _.includes(this.grantedPermissionNames, permissionName);
+    return _includes(this.grantedPermissionNames, permissionName);
   }
 
   onPermissionChange(permission: PermissionDto, $event) {
@@ -69,7 +69,7 @@ export class EditRoleDialogComponent extends AppComponentBase
 
   getCheckedPermissions(): string[] {
     const permissions: string[] = [];
-    _.forEach(this.checkedPermissionsMap, function (value, key) {
+    _forEach(this.checkedPermissionsMap, function (value, key) {
       if (value) {
         permissions.push(key);
       }

angular/src/app/users/create-user/create-user-dialog.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
-import * as _ from 'lodash';
+import { forEach as _forEach, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
   UserServiceProxy,
@@ -60,7 +60,7 @@ export class CreateUserDialogComponent extends AppComponentBase
   }
 
   setInitialRolesStatus(): void {
-    _.map(this.roles, (item) => {
+    _map(this.roles, (item) => {
       this.checkedRolesMap[item.normalizedName] = this.isRoleChecked(
         item.normalizedName
       );
@@ -79,7 +79,7 @@ export class CreateUserDialogComponent extends AppComponentBase
 
   getCheckedRoles(): string[] {
     const roles: string[] = [];
-    _.forEach(this.checkedRolesMap, function (value, key) {
+    _forEach(this.checkedRolesMap, function (value, key) {
       if (value) {
         roles.push(key);
       }

angular/src/app/users/edit-user/edit-user-dialog.component.ts

@@ -7,7 +7,7 @@ import {
 } from '@angular/core';
 import { finalize } from 'rxjs/operators';
 import { BsModalRef } from 'ngx-bootstrap/modal';
-import * as _ from 'lodash';
+import { forEach as _forEach, includes as _includes, map as _map } from 'lodash-es';
 import { AppComponentBase } from '@shared/app-component-base';
 import {
   UserServiceProxy,
@@ -48,15 +48,15 @@ export class EditUserDialogComponent extends AppComponentBase
   }
 
   setInitialRolesStatus(): void {
-    _.map(this.roles, (item) => {
+    _map(this.roles, (item) => {
       this.checkedRolesMap[item.normalizedName] = this.isRoleChecked(
         item.normalizedName
       );
     });
   }
 
   isRoleChecked(normalizedName: string): boolean {
-    return _.includes(this.user.roleNames, normalizedName);
+    return _includes(this.user.roleNames, normalizedName);
   }
 
   onRoleChange(role: RoleDto, $event) {
@@ -65,7 +65,7 @@ export class EditUserDialogComponent extends AppComponentBase
 
   getCheckedRoles(): string[] {
     const roles: string[] = [];
-    _.forEach(this.checkedRolesMap, function (value, key) {
+    _forEach(this.checkedRolesMap, function (value, key) {
       if (value) {
         roles.push(key);
       }

angular/src/root.module.ts

@@ -7,7 +7,6 @@ import { ModalModule } from 'ngx-bootstrap/modal';
 import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
 import { CollapseModule } from 'ngx-bootstrap/collapse';
 import { TabsModule } from 'ngx-bootstrap/tabs';
-import * as _ from 'lodash';
 
 import { AbpHttpInterceptor } from 'abp-ng2-module';
 

angular/yarn.lock

@@ -1062,10 +1062,17 @@
   resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.10.tgz#a1a41012012b5da9d4b205ba9eba58f6cce2ab7b"
   integrity sha512-3F8qpwBAiVc5+HPJeXJpbrl+XjawGmciN5LgiO7Gv1pl1RHtjoMNqZpqEksaPJW05ViKe8snYInRs6xB25Xdew==
 
-"@types/lodash@^4.14.150":
-  version "4.14.150"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.150.tgz#649fe44684c3f1fcb6164d943c5a61977e8cf0bd"
-  integrity sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==
+"@types/lodash-es@^4.17.3":
+  version "4.17.3"
+  resolved "https://registry.npm.taobao.org/@types/lodash-es/download/@types/lodash-es-4.17.3.tgz#87eb0b3673b076b8ee655f1890260a136af09a2d"
+  integrity sha1-h+sLNnOwdrjuZV8YkCYKE2rwmi0=
+  dependencies:
+    "@types/lodash" "*"
+
+"@types/lodash@*":
+  version "4.14.161"
+  resolved "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.161.tgz#a21ca0777dabc6e4f44f3d07f37b765f54188b18"
+  integrity sha1-ohygd32rxuT0Tz0H83t2X1QYixg=
 
 "@types/minimatch@*":
   version "3.0.3"
@@ -5065,6 +5072,11 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
+lodash-es@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
+  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
+
 lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -5080,7 +5092,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.4:
+lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==