Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Revert some collaborator changes

Hakan Shehu5c303a2fe3be
diff --git a/desktop/src/main/handlers/mutations/board-view-create.ts b/desktop/src/main/handlers/mutations/board-view-create.ts
index ece5d037..29c3b40b 100644
--- a/desktop/src/main/handlers/mutations/board-view-create.ts
+++ b/desktop/src/main/handlers/mutations/board-view-create.ts
@@ -52,10 +52,6 @@ export class BoardViewCreateMutationHandler
attributesMap.set('index', generateNodeIndex(maxIndex, null));
attributesMap.set('name', input.name);
attributesMap.set('groupBy', input.groupBy);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/calendar-view-create.ts b/desktop/src/main/handlers/mutations/calendar-view-create.ts
index d3a63651..b732f421 100644
--- a/desktop/src/main/handlers/mutations/calendar-view-create.ts
+++ b/desktop/src/main/handlers/mutations/calendar-view-create.ts
@@ -52,10 +52,6 @@ export class CalendarViewCreateMutationHandler
attributesMap.set('index', generateNodeIndex(maxIndex, null));
attributesMap.set('name', input.name);
attributesMap.set('groupBy', input.groupBy);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/channel-create.ts b/desktop/src/main/handlers/mutations/channel-create.ts
index abfa054c..f8e7e290 100644
--- a/desktop/src/main/handlers/mutations/channel-create.ts
+++ b/desktop/src/main/handlers/mutations/channel-create.ts
@@ -46,10 +46,6 @@ export class ChannelCreateMutationHandler
attributesMap.set('parentId', input.spaceId);
attributesMap.set('index', generateNodeIndex(maxIndex, null));
attributesMap.set('name', input.name);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/database-create.ts b/desktop/src/main/handlers/mutations/database-create.ts
index 56d83004..c599ac54 100644
--- a/desktop/src/main/handlers/mutations/database-create.ts
+++ b/desktop/src/main/handlers/mutations/database-create.ts
@@ -47,10 +47,6 @@ export class DatabaseCreateMutationHandler
attributesMap.set('parentId', input.spaceId);
attributesMap.set('index', generateNodeIndex(maxIndex, null));
attributesMap.set('name', input.name);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const databaseAttributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/file-create.ts b/desktop/src/main/handlers/mutations/file-create.ts
index f2b87a91..f36bdb04 100644
--- a/desktop/src/main/handlers/mutations/file-create.ts
+++ b/desktop/src/main/handlers/mutations/file-create.ts
@@ -46,10 +46,6 @@ export class FileCreateMutationHandler
attributesMap.set('extension', metadata.extension);
attributesMap.set('size', metadata.size);
attributesMap.set('mimeType', metadata.mimeType);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/folder-create.ts b/desktop/src/main/handlers/mutations/folder-create.ts
index 1dc33435..77c0860b 100644
--- a/desktop/src/main/handlers/mutations/folder-create.ts
+++ b/desktop/src/main/handlers/mutations/folder-create.ts
@@ -51,10 +51,6 @@ export class FolderCreateMutationHandler
attributesMap.set('parentId', input.parentId);
attributesMap.set('index', index);
attributesMap.set('name', input.name);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/message-create.ts b/desktop/src/main/handlers/mutations/message-create.ts
index ae583073..23647fa5 100644
--- a/desktop/src/main/handlers/mutations/message-create.ts
+++ b/desktop/src/main/handlers/mutations/message-create.ts
@@ -79,10 +79,6 @@ export class MessageCreateMutationHandler
fileAttributesMap.set('extension', metadata.extension);
fileAttributesMap.set('size', metadata.size);
fileAttributesMap.set('mimeType', metadata.mimeType);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- fileAttributesMap.set('collaborators', collaboratorsMap);
});
const fileAttributes = JSON.stringify(fileAttributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/page-create.ts b/desktop/src/main/handlers/mutations/page-create.ts
index 570c454d..4f24fa21 100644
--- a/desktop/src/main/handlers/mutations/page-create.ts
+++ b/desktop/src/main/handlers/mutations/page-create.ts
@@ -51,10 +51,6 @@ export class PageCreateMutationHandler
attributesMap.set('parentId', input.parentId);
attributesMap.set('index', index);
attributesMap.set('name', input.name);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/record-create.ts b/desktop/src/main/handlers/mutations/record-create.ts
index 47afdfc4..4f53db06 100644
--- a/desktop/src/main/handlers/mutations/record-create.ts
+++ b/desktop/src/main/handlers/mutations/record-create.ts
@@ -46,10 +46,6 @@ export class RecordCreateMutationHandler
attributesMap.set('type', NodeTypes.Record);
attributesMap.set('parentId', input.databaseId);
attributesMap.set('index', generateNodeIndex(maxIndex, null));
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/mutations/table-view-create.ts b/desktop/src/main/handlers/mutations/table-view-create.ts
index 71fc0e93..e1f54b72 100644
--- a/desktop/src/main/handlers/mutations/table-view-create.ts
+++ b/desktop/src/main/handlers/mutations/table-view-create.ts
@@ -51,10 +51,6 @@ export class TableViewCreateMutationHandler
attributesMap.set('parentId', input.databaseId);
attributesMap.set('index', generateNodeIndex(maxIndex, null));
attributesMap.set('name', input.name);
-
- const collaboratorsMap = new Y.Map<string>();
- collaboratorsMap.set(input.userId, NodeRole.Owner);
- attributesMap.set('collaborators', collaboratorsMap);
});
const attributes = JSON.stringify(attributesMap.toJSON());
diff --git a/desktop/src/main/handlers/queries/node-collaborator-search.ts b/desktop/src/main/handlers/queries/node-collaborator-search.ts
index a52bdaea..97f78445 100644
--- a/desktop/src/main/handlers/queries/node-collaborator-search.ts
+++ b/desktop/src/main/handlers/queries/node-collaborator-search.ts
@@ -8,7 +8,7 @@ import {
import { sql } from 'kysely';
import { SelectNode } from '@/main/data/workspace/schema';
import { NodeTypes } from '@/lib/constants';
-import { NodeCollaboratorNode } from '@/types/nodes';
+import { NodeCollaborator } from '@/types/nodes';
import { MutationChange } from '@/operations/mutations';
import { isEqual } from 'lodash';
@@ -103,9 +103,7 @@ export class NodeCollaboratorSearchQueryHandler
return result.rows;
}
- private buildCollaboratorNodes = (
- rows: SelectNode[],
- ): NodeCollaboratorNode[] => {
+ private buildCollaboratorNodes = (rows: SelectNode[]): NodeCollaborator[] => {
return rows.map((row) => {
const attributes = JSON.parse(row.attributes);
return {
diff --git a/desktop/src/operations/queries/node-collaborator-search.ts b/desktop/src/operations/queries/node-collaborator-search.ts
index fb9365a5..c814d785 100644
--- a/desktop/src/operations/queries/node-collaborator-search.ts
+++ b/desktop/src/operations/queries/node-collaborator-search.ts
@@ -1,4 +1,4 @@
-import { NodeCollaboratorNode } from '@/types/nodes';
+import { NodeCollaborator } from '@/types/nodes';
export type NodeCollaboratorSearchQueryInput = {
type: 'node_collaborator_search';
@@ -11,7 +11,7 @@ declare module '@/operations/queries' {
interface QueryMap {
node_collaborator_search: {
input: NodeCollaboratorSearchQueryInput;
- output: NodeCollaboratorNode[];
+ output: NodeCollaborator[];
};
}
}
diff --git a/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
index 97de5958..c4cf01fc 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { NodeCollaboratorSearch } from '@/renderer/components/collaborators/node-collaborator-search';
-import { NodeCollaboratorNode } from '@/types/nodes';
+import { NodeCollaborator } from '@/types/nodes';
import { Button } from '@/renderer/components/ui/button';
import { Spinner } from '@/renderer/components/ui/spinner';
import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';
@@ -20,9 +20,9 @@ export const NodeCollaboratorCreate = ({
const workspace = useWorkspace();
const { mutate, isPending } = useMutation();
- const [collaborators, setCollaborators] = React.useState<
- NodeCollaboratorNode[]
- >([]);
+ const [collaborators, setCollaborators] = React.useState<NodeCollaborator[]>(
+ [],
+ );
const [role, setRole] = React.useState('collaborator');
return (
diff --git a/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
index 28ec097a..d695b988 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { NodeCollaboratorNode } from '@/types/nodes';
+import { NodeCollaborator } from '@/types/nodes';
import {
Popover,
PopoverContent,
@@ -22,8 +22,8 @@ import { X } from 'lucide-react';
interface NodeCollaboratorSearchProps {
excluded: string[];
- value: NodeCollaboratorNode[];
- onChange: (value: NodeCollaboratorNode[]) => void;
+ value: NodeCollaborator[];
+ onChange: (value: NodeCollaborator[]) => void;
}
export const NodeCollaboratorSearch = ({
diff --git a/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/desktop/src/renderer/components/collaborators/node-collaborator.tsx
index 54edc5d4..709146c8 100644
--- a/desktop/src/renderer/components/collaborators/node-collaborator.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { NodeCollaboratorNode } from '@/types/nodes';
+import { NodeCollaborator as NodeCollaboratorType } from '@/types/nodes';
import { Avatar } from '@/renderer/components/avatars/avatar';
import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';
import { useMutation } from '@/renderer/hooks/use-mutation';
@@ -8,7 +8,7 @@ import { Trash2 } from 'lucide-react';
interface NodeCollaboratorProps {
nodeId: string;
- collaborator: NodeCollaboratorNode;
+ collaborator: NodeCollaboratorType;
removable?: boolean;
}