From 15884052a943d58525ee05f44e9bb2dc0feacc23 Mon Sep 17 00:00:00 2001
From: Darya Balvanovich <darya.balvanovich@hyland.com>
Date: Mon, 17 Jun 2024 14:17:01 +0200
Subject: [PATCH] ACS-8055 add interface and fix test

---
 docs/core/services/nodes-api.service.md               |  4 ++--
 .../src/lib/common/services/nodes-api.service.ts      | 11 +++++++++--
 .../legal-hold/services/legal-holds.service.spec.ts   |  6 +++---
 lib/js-api/src/api/gs-core-rest-api/README.md         |  1 -
 .../src/api/gs-core-rest-api/model/holdEntry.ts       |  2 +-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/core/services/nodes-api.service.md b/docs/core/services/nodes-api.service.md
index def2f9761b..35d6c37d5a 100644
--- a/docs/core/services/nodes-api.service.md
+++ b/docs/core/services/nodes-api.service.md
@@ -84,10 +84,10 @@ Accesses and manipulates ACS document nodes using their node IDs.
     -   _nodeBody:_ `any`  - New data for the node
     -   _options:_ `any`  - Optional parameters supported by JS-API
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`MinimalNode`](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/NodeMinimalEntry.md)`>` - Updated node information<br/>
-    -   **getNodeAssignHolds**(nodeId: `string`, options: `any`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Hold[]`](../../../lib/js-api/src/api/gs-core-rest-api/docs/Hold.md)`>`<br/>
+-   **getNodeAssignHolds**(nodeId: `string`, options: `{ includeSource?: boolean; } & NodesIncludeQuery & ContentPagingQuery`): [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Hold[]`](../../../lib/js-api/src/api/gs-core-rest-api/docs/Hold.md)`>`<br/>
         Getting legal holds assigned to a node.
     -   _nodeId:_ `string` - ID of the target node
-    -   _options:_ `any` - Optional parameters supported by JS-API
+    -   _options:_ `{ includeSource?: boolean; } & NodesIncludeQuery & ContentPagingQuery` - Optional parameters supported by JS-API
     -   **Returns** [`Observable`](http://reactivex.io/documentation/observable.html)`<`[`Hold[]`](../../../lib/js-api/src/api/gs-core-rest-api/docs/Hold.md)`>` - Updated node information
 
 ## Details
diff --git a/lib/content-services/src/lib/common/services/nodes-api.service.ts b/lib/content-services/src/lib/common/services/nodes-api.service.ts
index 08ae22b37e..d1c13aba1e 100644
--- a/lib/content-services/src/lib/common/services/nodes-api.service.ts
+++ b/lib/content-services/src/lib/common/services/nodes-api.service.ts
@@ -16,7 +16,7 @@
  */
 
 import { Injectable } from '@angular/core';
-import { NodeEntry, NodePaging, NodesApi, TrashcanApi, Node, Hold } from '@alfresco/js-api';
+import { NodeEntry, NodePaging, NodesApi, TrashcanApi, Node, Hold, ContentPagingQuery, NodesIncludeQuery } from '@alfresco/js-api';
 import { Subject, from, Observable, throwError } from 'rxjs';
 import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
 import { catchError, map } from 'rxjs/operators';
@@ -245,9 +245,16 @@ export class NodesApiService {
      *
      * @param nodeId ID of the target node
      * @param options Optional parameters supported by JS-API
+     * @param options.includeSource Also include **source** (in addition to **entries**) with folder information on **nodeId**
      * @returns List of assigned holds Observable<Hold[]>
      */
-    getNodeAssignHolds(nodeId: string, options?: any): Observable<Hold[]> {
+    getNodeAssignHolds(
+        nodeId: string,
+        options?: {
+            includeSource?: boolean;
+        } & NodesIncludeQuery &
+            ContentPagingQuery
+    ): Observable<Hold[]> {
         const queryOptions = Object.assign({ where: `(assocType='rma:frozenContent')` }, options);
 
         return from(this.nodesApi.listParents(nodeId, queryOptions)).pipe(
diff --git a/lib/content-services/src/lib/legal-hold/services/legal-holds.service.spec.ts b/lib/content-services/src/lib/legal-hold/services/legal-holds.service.spec.ts
index 45884a36d8..8b2f6a4e15 100644
--- a/lib/content-services/src/lib/legal-hold/services/legal-holds.service.spec.ts
+++ b/lib/content-services/src/lib/legal-hold/services/legal-holds.service.spec.ts
@@ -18,11 +18,11 @@
 import { TestBed } from '@angular/core/testing';
 import { LegalHoldService } from './legal-hold.service';
 import { ContentTestingModule } from '../../testing/content.testing.module';
-import { Hold, NodeChildAssociationPaging } from '@alfresco/js-api';
+import { Hold, HoldPaging } from '@alfresco/js-api';
 
 describe('LegalHoldsService', () => {
     let service: LegalHoldService;
-    let legalHolds: NodeChildAssociationPaging;
+    let legalHolds: HoldPaging;
     let returnedHolds: Hold[];
     const mockId = 'mockId';
 
@@ -44,7 +44,7 @@ describe('LegalHoldsService', () => {
                     }
                 ]
             }
-        } as NodeChildAssociationPaging;
+        } as HoldPaging;
 
         returnedHolds = [
             {
diff --git a/lib/js-api/src/api/gs-core-rest-api/README.md b/lib/js-api/src/api/gs-core-rest-api/README.md
index 93c1cbc44a..f47e649957 100644
--- a/lib/js-api/src/api/gs-core-rest-api/README.md
+++ b/lib/js-api/src/api/gs-core-rest-api/README.md
@@ -64,7 +64,6 @@ Class | Method | HTTP request | Description
  - [FilePlanComponentBodyUpdate](docs/FilePlanComponentBodyUpdate.md)
  - [FilePlanEntry](docs/FilePlanEntry.md)
  - [ModelError](docs/ModelError.md)
- - [NodeChildAssociationPaging](../content-rest-api/docs/NodesApi.md#NodeChildAssociationPaging)
  - [Pagination](docs/Pagination.md)
  - [PathElement](docs/PathElement.md)
  - [PathInfo](docs/PathInfo.md)
diff --git a/lib/js-api/src/api/gs-core-rest-api/model/holdEntry.ts b/lib/js-api/src/api/gs-core-rest-api/model/holdEntry.ts
index fc36aee759..d547e79893 100644
--- a/lib/js-api/src/api/gs-core-rest-api/model/holdEntry.ts
+++ b/lib/js-api/src/api/gs-core-rest-api/model/holdEntry.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Hold } from '..';
+import { Hold } from './hold';
 
 export class HoldEntry {
     entry: Hold;