feat(core): remove mode and pages field from Collection (#4817)

This commit is contained in:
3720
2023-11-02 18:47:43 +08:00
committed by GitHub
parent bf17b4789b
commit 7068d5f38a
20 changed files with 1085 additions and 983 deletions
@@ -1,4 +1,4 @@
import { AnimatedCollectionsIcon } from '@affine/component';
import { AnimatedCollectionsIcon, toast } from '@affine/component';
import {
MenuItem as SidebarMenuItem,
MenuLinkItem as SidebarMenuLinkItem,
@@ -54,10 +54,17 @@ const CollectionRenderer = ({
}) => {
const [collapsed, setCollapsed] = useState(true);
const setting = useCollectionManager(collectionsCRUDAtom);
const t = useAFFiNEI18N();
const { setNodeRef, isOver } = useDroppable({
id: `${Collections_DROP_AREA_PREFIX}${collection.id}`,
data: {
addToCollection: (id: string) => {
if (collection.allowList.includes(id)) {
toast(t['com.affine.collection.addPage.alreadyExists']());
return;
} else {
toast(t['com.affine.collection.addPage.success']());
}
setting.addPage(collection.id, id).catch(err => {
console.error(err);
});
@@ -36,10 +36,8 @@ const FilterContainer = ({ workspaceId }: { workspaceId: string }) => {
const setting = useCollectionManager(collectionsCRUDAtom);
const saveToCollection = useCallback(
async (collection: Collection) => {
console.log(setting.currentCollection.filterList);
await setting.createCollection({
...collection,
mode: 'rule',
filterList: setting.currentCollection.filterList,
});
navigateHelper.jumpToCollection(workspaceId, collection.id);