Merge pull request #23729 from opf/code-maintenance/OP-19546-migrate-lodash-es

[OP-19546] Migrate lodash helpers to lodash-es

Author: myabc

frontend/package-lock.json

@@ -23,6 +23,7 @@
     "@types/jquery": "^4.0.1",
     "@types/jquery-migrate": "^3.3.3",
     "@types/lodash": "^4.17.24",
+    "@types/lodash-es": "^4.17.12",
     "@types/mousetrap": "^1.6.3",
     "@types/node": "^25.9.3",
     "@types/pako": "^2.0.4",
@@ -141,6 +142,7 @@
     "json5": "^2.2.2",
     "lit-html": "^3.3.3",
     "lodash": "^4.18.1",
+    "lodash-es": "^4.17.21",
     "luxon": "^3.7.2",
     "mdx-embed": "^1.1.2",
     "mime": "^4.1.0",

frontend/package.json

@@ -26,6 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { chunk } from 'lodash-es';
 import { ApiV3GettableResource, ApiV3ResourceCollection } from 'core-app/core/apiv3/paths/apiv3-resource';
 import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 import { forkJoin, from, Observable } from 'rxjs';
@@ -53,7 +54,7 @@ export class ApiV3RelationsPaths extends ApiV3ResourceCollection<RelationResourc
 
   public loadInvolved(workPackageIds:string[]):Observable<RelationResource[]> {
     if (workPackageIds.length > MAGIC_RELATION_SIZE) {
-      const chunks = _.chunk(workPackageIds, MAGIC_RELATION_SIZE);
+      const chunks = chunk(workPackageIds, MAGIC_RELATION_SIZE);
       return forkJoin(chunks.map((chunk) => this.loadInvolved(chunk)))
         .pipe(
           map((results) => _.flatten(results)),

frontend/src/app/core/apiv3/endpoints/relations/apiv3-relations-paths.ts

@@ -111,9 +111,16 @@ export class ApiV3BoardsPaths extends ApiV3Collection<Board, ApiV3BoardPath> {
   }
 
   private createGrid(type:BoardType, name:string, scope:string, actionAttribute?:string):Observable<GridResource> {
-    const payload:any = _.set({ name }, '_links.scope.href', scope);
-    payload.options = {
-      type,
+    const payload:{
+      name:string;
+      _links:{ scope:{ href:string } };
+      options:{ type:BoardType; attribute?:string };
+    } = {
+      name,
+      _links: {
+        scope: { href: scope },
+      },
+      options: { type },
     };
 
     if (actionAttribute) {

frontend/src/app/core/apiv3/virtual/apiv3-boards-paths.ts

@@ -48,7 +48,7 @@ import {
   ResourceState,
   setResourceLoading,
 } from 'core-app/core/state/resource-store';
-import { omit } from 'lodash';
+import { omit } from 'lodash-es';
 import {
   ApiV3ListParameters,
   listParamsString,

frontend/src/app/core/state/resource-store.service.ts

@@ -1,3 +1,4 @@
+import { camelCase } from 'lodash-es';
 import {
   InputState,
   multiInput,
@@ -74,7 +75,7 @@ export class States extends StatesGroup {
   }
 
   forResource<T extends HalResource = HalResource>(resource:T):InputState<T>|undefined {
-    const stateName = `${_.camelCase(resource._type)}s`;
+    const stateName = `${camelCase(resource._type)}s`;
     const state = this.forType<T>(stateName);
 
     return state && state.get(resource.id!);

frontend/src/app/core/states/states.service.ts

@@ -1,3 +1,4 @@
+import { pickBy } from 'lodash-es';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -199,7 +200,7 @@ export class BoardListComponent extends AbstractWidgetComponent implements OnIni
         this.untilDestroyed(),
       )
       .subscribe((selectionState) => {
-        const selected = Object.keys(_.pickBy(selectionState.selected, (option, _) => option === true));
+        const selected = Object.keys(pickBy(selectionState.selected, (option, _) => option === true));
 
         const focused = this.wpViewFocusService.focusedWorkPackage;
 

frontend/src/app/features/boards/board/board-list/board-list.component.ts

@@ -26,6 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { merge } from 'lodash-es';
 import { InputState } from '@openproject/reactivestates';
 import { Injector } from '@angular/core';
 import { States } from 'core-app/core/states/states.service';
@@ -171,7 +172,7 @@ export class HalResource {
   public $copy<T extends HalResource = HalResource>(source:object = {}):T {
     const clone:HalResourceClass<T> = this.constructor as any;
 
-    return new clone(this.injector, _.merge(this.$plain(), source), this.$loaded, this.halInitializer, this.$halType);
+    return new clone(this.injector, merge(this.$plain(), source), this.$loaded, this.halInitializer, this.$halType);
   }
 
   public $plain():any {

frontend/src/app/features/hal/resources/hal-resource.ts

@@ -26,6 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { merge } from 'lodash-es';
 import { CollectionResource } from 'core-app/features/hal/resources/collection-resource';
 import { HalResource } from 'core-app/features/hal/resources/hal-resource';
 import { HalLink } from 'core-app/features/hal/hal-link/hal-link';
@@ -112,7 +113,7 @@ export class QueryFilterInstanceSchemaResource extends SchemaResource {
     const dependentSchema = this.dependency.forValue(operator.href!.toString());
     const resultingSchema = {};
 
-    _.merge(resultingSchema, staticSchema, dependentSchema);
+    merge(resultingSchema, staticSchema, dependentSchema);
 
     return new QueryFilterInstanceSchemaResource(this.injector, resultingSchema, true, this.halInitializer, 'QueryFilterInstanceSchema');
   }

frontend/src/app/features/hal/resources/query-filter-instance-schema-resource.ts

@@ -26,6 +26,7 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
+import { truncate } from 'lodash-es';
 import { InputState } from '@openproject/reactivestates';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
 import { States } from 'core-app/core/states/states.service';
@@ -225,7 +226,7 @@ export class WorkPackageBaseResource extends HalResource {
   }
 
   public truncatedSubject(length = 40):string {
-    return length <= 0 ? this.subject : _.truncate(this.subject, { length: length });
+    return length <= 0 ? this.subject : truncate(this.subject, { length: length });
   }
 
   public get isLeaf():boolean {