From 0de65e7d98ee70982bbd2d5609735f13382dfd37 Mon Sep 17 00:00:00 2001 From: Schlotter Benjamin Date: Wed, 29 Jul 2020 13:37:24 +0200 Subject: [PATCH] Sort files and folders in the share path (#1960) --- CHANGELOG.md | 1 + cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- cvat-ui/src/components/file-manager/file-manager.tsx | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50e059a..b297e626 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Smaller object details () +- Files and folders under share path are now alphabetically sorted ### Deprecated - diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index f6ff3fd8..0ca9624a 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.6.5", + "version": "1.6.6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index 922033db..49a2bd37 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.6.5", + "version": "1.6.6", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { diff --git a/cvat-ui/src/components/file-manager/file-manager.tsx b/cvat-ui/src/components/file-manager/file-manager.tsx index 3e2f2551..3c970cd5 100644 --- a/cvat-ui/src/components/file-manager/file-manager.tsx +++ b/cvat-ui/src/components/file-manager/file-manager.tsx @@ -129,6 +129,8 @@ export default class FileManager extends React.PureComponent { private renderShareSelector(): JSX.Element { function renderTreeNodes(data: TreeNodeNormal[]): JSX.Element[] { + // sort alphabetically + data.sort((a: TreeNodeNormal, b: TreeNodeNormal): number => a.key.localeCompare(b.key)); return data.map((item: TreeNodeNormal) => { if (item.children) { return (