Skip to content

[ACS-10384] after recent changes search query builder can t process non latin characters #11241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[ACS-10384] after recent changes search query builder can t process non latin characters #11241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52201bc
[ACS-10384] Fixed error when using non-latina characters in search
AleksanderSklorz Oct 1, 2025
3d78e9a
[ACS-10384] Unit tests
AleksanderSklorz Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/content-services/src/lib/search/services/base-query-builder.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ export abstract class BaseQueryBuilderService {
*/
encodeQuery() {
try {
this.encodedQuery = btoa(JSON.stringify(this.filterRawParams));
this.encodedQuery = btoa(String.fromCharCode(...new TextEncoder().encode(JSON.stringify(this.filterRawParams))));
} catch (error) {
console.error('Failed to encode query parameters:', error);
this.encodedQuery = '';
Expand Down
45 changes: 45 additions & 0 deletions lib/content-services/src/lib/search/services/search-header-query-builder.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,18 @@ import { SearchHeaderQueryBuilderService } from './search-header-query-builder.s
import { TestBed } from '@angular/core/testing';
import { ContentTestingModule } from '../../testing/content.testing.module';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { ActivatedRoute, Router } from '@angular/router';

describe('SearchHeaderQueryBuilderService', () => {
let activatedRoute: ActivatedRoute;
let router: Router;

beforeEach(() => {
TestBed.configureTestingModule({
imports: [ContentTestingModule]
});
router = TestBed.inject(Router);
activatedRoute = TestBed.inject(ActivatedRoute);
});

const buildConfig = (searchSettings): AppConfigService => {
Expand Down Expand Up @@ -142,4 +148,43 @@ describe('SearchHeaderQueryBuilderService', () => {
expect(searchHeaderService.activeFilters.length).toBe(1);
});
});

describe('updateSearchQueryParams', () => {
it('should use properly encoded query containing non-latin character when calls router.navigate', () => {
spyOn(router, 'navigate');
spyOn(console, 'error');
const service = TestBed.inject(SearchHeaderQueryBuilderService);
service.filterRawParams = { userQuery: '((cm:name:"wąż*" OR cm:title:"wąż*" OR cm:description:"wąż*" OR TEXT:"wąż*" OR TAG:"wąż*"))' };

service.updateSearchQueryParams();
expect(console.error).not.toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith([], {
relativeTo: activatedRoute,
queryParams: {
q: 'eyJ1c2VyUXVlcnkiOiIoKGNtOm5hbWU6XCJ3xIXFvCpcIiBPUiBjbTp0aXRsZTpcInfEhcW8KlwiIE9SIGNtOmRlc2NyaXB0aW9uOlwid8SFxbwqXCIgT1IgVEVYVDpcInfEhcW8KlwiIE9SIFRBRzpcInfEhcW8KlwiKSkifQ=='
},
queryParamsHandling: 'merge'
});
});
});

describe('navigateToSearch', () => {
it('should use properly encoded query containing non-latin character when calls router.navigate', async () => {
spyOn(router, 'navigate');
spyOn(console, 'error');
const searchUrl = 'search';
const service = TestBed.inject(SearchHeaderQueryBuilderService);
service.filterRawParams = { userQuery: '((cm:name:"wąż*" OR cm:title:"wąż*" OR cm:description:"wąż*" OR TEXT:"wąż*" OR TAG:"wąż*"))' };
service.encodeQuery();

await service.navigateToSearch('', searchUrl);
expect(console.error).not.toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith([searchUrl], {
queryParams: {
q: 'eyJ1c2VyUXVlcnkiOiIoKGNtOm5hbWU6XCJ3xIXFvCpcIiBPUiBjbTp0aXRsZTpcInfEhcW8KlwiIE9SIGNtOmRlc2NyaXB0aW9uOlwid8SFxbwqXCIgT1IgVEVYVDpcInfEhcW8KlwiIE9SIFRBRzpcInfEhcW8KlwiKSkifQ=='
},
queryParamsHandling: 'merge'
});
});
});
});
39 changes: 39 additions & 0 deletions lib/content-services/src/lib/search/services/search-query-builder.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,4 +801,43 @@ describe('SearchQueryBuilder', () => {
});
});
});

describe('updateSearchQueryParams', () => {
it('should use properly encoded query containing non-latin character when calls router.navigate', () => {
spyOn(router, 'navigate');
spyOn(console, 'error');
const service = TestBed.inject(SearchQueryBuilderService);
service.filterRawParams = { userQuery: '((cm:name:"wąż*" OR cm:title:"wąż*" OR cm:description:"wąż*" OR TEXT:"wąż*" OR TAG:"wąż*"))' };

service.updateSearchQueryParams();
expect(console.error).not.toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith([], {
relativeTo: activatedRoute,
queryParams: {
q: 'eyJ1c2VyUXVlcnkiOiIoKGNtOm5hbWU6XCJ3xIXFvCpcIiBPUiBjbTp0aXRsZTpcInfEhcW8KlwiIE9SIGNtOmRlc2NyaXB0aW9uOlwid8SFxbwqXCIgT1IgVEVYVDpcInfEhcW8KlwiIE9SIFRBRzpcInfEhcW8KlwiKSkifQ=='
},
queryParamsHandling: 'merge'
});
});
});

describe('navigateToSearch', () => {
it('should use properly encoded query containing non-latin character when calls router.navigate', async () => {
spyOn(router, 'navigate');
spyOn(console, 'error');
const searchUrl = 'search';
const service = TestBed.inject(SearchQueryBuilderService);
service.filterRawParams = { userQuery: '((cm:name:"wąż*" OR cm:title:"wąż*" OR cm:description:"wąż*" OR TEXT:"wąż*" OR TAG:"wąż*"))' };
service.encodeQuery();

await service.navigateToSearch('', searchUrl);
expect(console.error).not.toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith([searchUrl], {
queryParams: {
q: 'eyJ1c2VyUXVlcnkiOiIoKGNtOm5hbWU6XCJ3xIXFvCpcIiBPUiBjbTp0aXRsZTpcInfEhcW8KlwiIE9SIGNtOmRlc2NyaXB0aW9uOlwid8SFxbwqXCIgT1IgVEVYVDpcInfEhcW8KlwiIE9SIFRBRzpcInfEhcW8KlwiKSkifQ=='
},
queryParamsHandling: 'merge'
});
});
});
});