2cc45187e6
* tweaking effect details * wrap work on this feature * adds correct color to drop cursor * simplify logic for early return * much better comment so Tom doesn't fire me * feat: Allow changing sort order of collections * refactor: Move validation to model feat: Make custom order the default (in prep for dnd) * feat: Add sort choice to edit collection modal fix: Improved styling of generic InputSelect * fix: Vertical space left after removing previous collection description * chore: Tweak language, menu contents, add auto-disclosure on sub menus * only show drop-to-reorder cursor when sort is set to manual Co-authored-by: Tom Moor <tom.moor@gmail.com>
52 lines
1.4 KiB
JavaScript
52 lines
1.4 KiB
JavaScript
// @flow
|
|
import naturalSort from "../../shared/utils/naturalSort";
|
|
import { Collection } from "../models";
|
|
|
|
type Document = {
|
|
children: Document[],
|
|
id: string,
|
|
title: string,
|
|
url: string,
|
|
};
|
|
|
|
const sortDocuments = (documents: Document[], sort): Document[] => {
|
|
const orderedDocs = naturalSort(documents, sort.field, {
|
|
direction: sort.direction,
|
|
});
|
|
|
|
return orderedDocs.map((document) => ({
|
|
...document,
|
|
children: sortDocuments(document.children, sort),
|
|
}));
|
|
};
|
|
|
|
export default function present(collection: Collection) {
|
|
const data = {
|
|
id: collection.id,
|
|
url: collection.url,
|
|
name: collection.name,
|
|
description: collection.description,
|
|
sort: collection.sort,
|
|
icon: collection.icon,
|
|
color: collection.color || "#4E5C6E",
|
|
private: collection.private,
|
|
createdAt: collection.createdAt,
|
|
updatedAt: collection.updatedAt,
|
|
deletedAt: collection.deletedAt,
|
|
documents: collection.documentStructure || [],
|
|
};
|
|
|
|
// Handle the "sort" field being empty here for backwards compatability
|
|
if (!data.sort) {
|
|
data.sort = { field: "title", direction: "asc" };
|
|
}
|
|
|
|
// "index" field is manually sorted and is represented by the documentStructure
|
|
// already saved in the database, no further sort is needed
|
|
if (data.sort.field !== "index") {
|
|
data.documents = sortDocuments(collection.documentStructure, data.sort);
|
|
}
|
|
|
|
return data;
|
|
}
|