From 7bb3c30154dffaff56d228a1efa7921df10de6f3 Mon Sep 17 00:00:00 2001
From: arditdomi <32884230+arditdomi@users.noreply.github.com>
Date: Wed, 4 Nov 2020 10:08:23 +0000
Subject: [PATCH] [ACA-4099] Fix search query in content node selector (#6299)

---
 .../content-node-selector-panel.component.spec.ts          | 7 ++++---
 .../content-node-selector-panel.component.ts               | 4 ++--
 lib/content-services/src/lib/mock/search-query.mock.ts     | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts
index 7ec0975b08..1cd6997d2f 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts
@@ -96,6 +96,7 @@ describe('ContentNodeSelectorPanelComponent', () => {
             sitesService = TestBed.inject(SitesService);
             contentNodeSelectorPanelService = TestBed.inject(ContentNodeSelectorPanelService);
             searchQueryBuilderService = component.queryBuilderService;
+            component.queryBuilderService.resetToDefaults();
 
             spyOn(nodeService,  'getNode').and.returnValue(of({ id: 'fake-node', path: { elements: [{ nodeType: 'st:site', name: 'fake-site'}] } }));
             searchSpy = spyOn(searchQueryBuilderService, 'execute');
@@ -400,12 +401,12 @@ describe('ContentNodeSelectorPanelComponent', () => {
                 fixture.detectChanges();
 
                 expect(updateSpy).toHaveBeenCalled();
-                expect(searchQueryBuilderService.userQuery).toEqual('(search-term)');
+                expect(searchQueryBuilderService.userQuery).toEqual('(search-term*)');
                 expect(component.searchTerm).toEqual('search-term');
             }));
 
             it('should perform a search when the queryBody gets updated and it is defined', async () => {
-                searchQueryBuilderService.userQuery = 'search-term';
+                searchQueryBuilderService.userQuery = 'search-term*';
                 searchQueryBuilderService.update();
 
                 fixture.detectChanges();
@@ -695,7 +696,7 @@ describe('ContentNodeSelectorPanelComponent', () => {
             });
 
             it('should the query restrict the search to the site and not to the currentFolderId in case is changed', () => {
-                component.queryBuilderService.userQuery = 'search-term';
+                component.queryBuilderService.userQuery = 'search-term*';
                 component.currentFolderId = 'my-root-id';
                 component.restrictRootToCurrentFolderId = true;
                 component.siteChanged(<SiteEntry> { entry: { guid: 'my-site-id' } });
diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts
index fbab2bcc86..4a66ac328a 100644
--- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts
+++ b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.ts
@@ -273,9 +273,9 @@ export class ContentNodeSelectorPanelComponent implements OnInit, OnDestroy {
                 debounceTime(this.debounceSearch),
                 takeUntil(this.onDestroy$)
             )
-            .subscribe(searchValue => {
+            .subscribe((searchValue: string) => {
                 this.searchTerm = searchValue;
-                this.queryBuilderService.userQuery = searchValue;
+                this.queryBuilderService.userQuery = searchValue.length > 0 ? `${searchValue}*` : searchValue ;
                 this.queryBuilderService.update();
             });
 
diff --git a/lib/content-services/src/lib/mock/search-query.mock.ts b/lib/content-services/src/lib/mock/search-query.mock.ts
index 20418dfbd3..9355c980c0 100644
--- a/lib/content-services/src/lib/mock/search-query.mock.ts
+++ b/lib/content-services/src/lib/mock/search-query.mock.ts
@@ -19,7 +19,7 @@ import { QueryBody } from '@alfresco/js-api';
 
 export const mockQueryBody: QueryBody = <QueryBody> {
     query: {
-        query: '(search-term)',
+        query: '(search-term*)',
         language: 'afts'
     },
     include: ['path', 'allowableOperations'],