inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2026-09-09 18:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNT-25276] sorting using sorting key configuration is not correctly saved in localstorage (#4905)

Browse Source 
* [MNT-25276] Fixed sorting when column key is different than sortingKey

* [MNT-25276] Unit tests
This commit is contained in:
AleksanderSklorz
2025-11-28 10:06:18 +01:00
committed by GitHub
parent e983af8d58
commit b54e42cce2
2 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/aca-content/src/lib/directives/document-list.directive.spec.ts
+60 -4
View File
@@ -30,6 +30,8 @@ import { TestBed } from '@angular/core/testing';
describe('DocumentListDirective', () => {
let documentListDirective: DocumentListDirective;
const preferenceKey = 'files';
const sortingKey = 'sortingKey';
const documentListMock: any = {
currentFolderId: '',
stickyHeader: false,
@@ -159,7 +161,7 @@ describe('DocumentListDirective', () => {
it('should set user preferences for columns visibility`', () => {
const event = new CustomEvent('columnsVisibilityChanged', { detail: { 'app.tags': true, 'app.name': false } });
mockRoute.snapshot.data.sortingPreferenceKey = 'files';
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
documentListDirective.ngOnInit();
documentListDirective.onColumnsVisibilityChange(event);
@@ -168,7 +170,7 @@ describe('DocumentListDirective', () => {
it('should set user preferences for columns order`', () => {
const event = new CustomEvent('columnsOrderChanged', { detail: ['app.tags', 'app.name'] });
mockRoute.snapshot.data.sortingPreferenceKey = 'files';
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
documentListDirective.ngOnInit();
documentListDirective.onColumnOrderChanged(event);
@@ -177,7 +179,7 @@ describe('DocumentListDirective', () => {
it('should set user preferences for columns width`', () => {
const event = new CustomEvent('columnsWidthChanged', { detail: { 'app.tags': 65, 'app.name': 75 } });
mockRoute.snapshot.data.sortingPreferenceKey = 'files';
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
documentListDirective.ngOnInit();
documentListDirective.onColumnsWidthChanged(event);
@@ -185,7 +187,7 @@ describe('DocumentListDirective', () => {
});
it('should set document list properties from user preferences`', () => {
mockRoute.snapshot.data.sortingPreferenceKey = 'files';
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
userPreferencesServiceMock.hasItem.and.returnValue(true);
userPreferencesServiceMock.get.and.returnValue(false);
userPreferencesServiceMock.get.withArgs('files.columns.width').and.returnValue(JSON.stringify({ 'app.tag': 87 }));
@@ -197,4 +199,58 @@ describe('DocumentListDirective', () => {
expect(documentListMock.setColumnsOrder).toEqual(['app.tag', 'app.name']);
expect(documentListMock.setColumnsVisibility).toEqual({ 'app.tag': true });
});
it('should set sorting using sortingKey from preferences if sortingKey exists in preferences', () => {
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
documentListMock.sortingMode = 'server';
userPreferencesServiceMock.get.and.callThrough().withArgs(`${preferenceKey}.sorting.sortingKey`, null).and.returnValue(sortingKey);
documentListDirective.ngOnInit();
expect(documentListMock.sorting).toEqual([sortingKey, undefined]);
expect(documentListMock.data.setSorting).toHaveBeenCalledWith({
key: sortingKey,
direction: undefined
});
});
it('should set sorting using key from preferences when sortingKey is missing in preferences', () => {
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
documentListMock.sortingMode = 'server';
userPreferencesServiceMock.get.and.callThrough().withArgs(`${preferenceKey}.sorting.key`, null).and.returnValue(sortingKey);
documentListDirective.ngOnInit();
expect(documentListMock.sorting).toEqual([sortingKey, undefined]);
expect(documentListMock.data.setSorting).toHaveBeenCalledWith({
key: sortingKey,
direction: undefined
});
});
describe('onReady', () => {
beforeEach(() => {
mockRoute.snapshot.data.sortingPreferenceKey = preferenceKey;
});
it('should set sorting using sortingKey from preferences if sortingKey exists in preferences', () => {
userPreferencesServiceMock.get.and.callThrough().withArgs(`${preferenceKey}.sorting.sortingKey`, null).and.returnValue(sortingKey);
documentListDirective.onReady();
expect(documentListMock.sorting).toEqual([sortingKey, undefined]);
expect(documentListMock.data.setSorting).toHaveBeenCalledWith({
key: sortingKey,
direction: undefined
});
});
it('should set sorting using key from preferences when sortingKey is missing in preferences', () => {
userPreferencesServiceMock.get.and.callThrough().withArgs(`${preferenceKey}.sorting.key`, null).and.returnValue(sortingKey);
documentListDirective.onReady();
expect(documentListMock.sorting).toEqual([sortingKey, undefined]);
expect(documentListMock.data.setSorting).toHaveBeenCalledWith({
key: sortingKey,
direction: undefined
});
});
});
});
projects/aca-content/src/lib/directives/document-list.directive.ts
+2 -1
View File
@@ -193,7 +193,8 @@ export class DocumentListDirective implements OnInit {
];
const [currentKey, currentDir] = [
this.preferences.get(`${this.sortingPreferenceKey}.sorting.key`, null),
this.preferences.get(`${this.sortingPreferenceKey}.sorting.sortingKey`, null) ||
this.preferences.get(`${this.sortingPreferenceKey}.sorting.key`, null),
this.preferences.get(`${this.sortingPreferenceKey}.sorting.direction`, null)
];