Skip to content
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

[ADF-5210] Order by folder on default #5945

Merged
merged 1 commit into from
Aug 3, 2020
Merged

[ADF-5210] Order by folder on default #5945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1451,7 +1451,7 @@ describe('DocumentList', () => {
where: undefined,
maxItems: 25,
skipCount: 0,
orderBy: ['nodeType DESC', 'name asc' ],
orderBy: ['isFolder DESC', 'name asc' ],
rootFolderId: 'fake-id'
}, ['test-include']);
});
Expand All @@ -1467,7 +1467,7 @@ describe('DocumentList', () => {
where: '(isFolder=true)',
maxItems: 25,
skipCount: 0,
orderBy: ['nodeType DESC', 'name asc' ],
orderBy: ['isFolder DESC', 'name asc' ],
rootFolderId: 'fake-id'
}, ['test-include']);
});
Expand All @@ -1484,7 +1484,7 @@ describe('DocumentList', () => {
maxItems: 25,
skipCount: 0,
where: undefined,
orderBy: ['nodeType DESC', 'size DESC'],
orderBy: ['isFolder DESC', 'size DESC'],
rootFolderId: 'fake-id'
}, ['test-include']);
});
Expand All @@ -1502,7 +1502,7 @@ describe('DocumentList', () => {
expect(documentListService.getFolder).toHaveBeenCalledWith(null, {
maxItems: 25,
skipCount: 0,
orderBy: ['nodeType DESC', 'name asc' ],
orderBy: ['isFolder DESC', 'name asc' ],
rootFolderId: 'folder-id',
where: undefined
}, undefined);
Expand Down
2 changes: 1 addition & 1 deletion lib/content-services/src/lib/document-list/components/document-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
* rule to be added to the sorting apart from the one driven by the header.
*/
@Input()
additionalSorting = ['nodeType DESC'];
additionalSorting = ['isFolder DESC'];

/** Defines sorting mode. Can be either `client` (items in the list
* are sorted client-side) or `server` (the ordering supplied by the
Expand Down