Skip to content

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

Rename some properties for consistency

Hakan Shehua26b961bb4c8
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
index d6e69cda..157136aa 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
@@ -34,7 +34,7 @@ export const NodeCollaboratorCreate = ({
<NodeCollaboratorRoleDropdown
value={role}
onChange={setRole}
- editable={true}
+ canEdit={true}
/>
<Button
variant="default"
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
index 9ad36a3f..f55c3108 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
@@ -43,17 +43,17 @@ const roles: NodeCollaboratorRole[] = [
interface NodeCollaboratorRoleDropdownProps {
value: string;
onChange: (value: string) => void;
- editable: boolean;
+ canEdit: boolean;
}
export const NodeCollaboratorRoleDropdown = ({
value,
onChange,
- editable,
+ canEdit,
}: NodeCollaboratorRoleDropdownProps) => {
const currentRole = roles.find((role) => role.value === value);
- if (!editable) {
+ if (!canEdit) {
return (
<p className="p-1 text-sm text-muted-foreground">{currentRole?.name}</p>
);
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
index 00955d52..f941c4dd 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborator.tsx
@@ -10,16 +10,16 @@ interface NodeCollaboratorProps {
nodeId: string;
collaboratorId: string;
role: NodeRole;
- editable: boolean;
- removable: boolean;
+ canEdit: boolean;
+ canRemove: boolean;
}
export const NodeCollaborator = ({
nodeId,
collaboratorId,
role,
- editable,
- removable,
+ canEdit,
+ canRemove,
}: NodeCollaboratorProps) => {
const workspace = useWorkspace();
const { mutate } = useMutation();
@@ -54,7 +54,7 @@ export const NodeCollaborator = ({
<div className="flex flex-row items-center gap-1">
<NodeCollaboratorRoleDropdown
value={role}
- editable={editable}
+ canEdit={canEdit}
onChange={(newRole) => {
mutate({
input: {
@@ -67,7 +67,7 @@ export const NodeCollaborator = ({
});
}}
/>
- {removable && (
+ {canRemove && (
<Trash2
className="size-4 cursor-pointer text-muted-foreground hover:text-foreground"
onClick={() => {
diff --git a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
index 9712991a..54965f88 100644
--- a/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
+++ b/apps/desktop/src/renderer/components/collaborators/node-collaborators.tsx
@@ -54,8 +54,8 @@ export const NodeCollaborators = ({
nodeId={nodeId}
collaboratorId={collaborator.collaboratorId}
role={collaborator.role}
- editable={canEdit}
- removable={canEdit}
+ canEdit={canEdit}
+ canRemove={canEdit}
/>
))}
</React.Fragment>
@@ -88,8 +88,8 @@ export const NodeCollaborators = ({
nodeId={nodeId}
collaboratorId={collaborator.collaboratorId}
role={collaborator.role}
- editable={canEdit}
- removable={false}
+ canEdit={canEdit}
+ canRemove={false}
/>
))}
</div>
diff --git a/apps/desktop/src/renderer/components/documents/document-editor.tsx b/apps/desktop/src/renderer/components/documents/document-editor.tsx
index aedd4805..09453625 100644
--- a/apps/desktop/src/renderer/components/documents/document-editor.tsx
+++ b/apps/desktop/src/renderer/components/documents/document-editor.tsx
@@ -60,14 +60,14 @@ interface DocumentEditorProps {
documentId: string;
content: JSONContent;
versionId: string;
- editable: boolean;
+ canEdit: boolean;
}
export const DocumentEditor = ({
documentId,
content,
versionId,
- editable,
+ canEdit,
}: DocumentEditorProps) => {
const workspace = useWorkspace();
const { mutate } = useMutation();
@@ -157,7 +157,7 @@ export const DocumentEditor = ({
},
},
content: content,
- editable,
+ editable: canEdit,
shouldRerenderOnTransaction: false,
autofocus: 'start',
onUpdate: async ({ editor, transaction }) => {
@@ -195,7 +195,7 @@ export const DocumentEditor = ({
return (
<div className="min-h-[500px]">
- {editor && editable && (
+ {editor && canEdit && (
<React.Fragment>
<EditorBubbleMenu editor={editor} />
</React.Fragment>
diff --git a/apps/desktop/src/renderer/components/documents/document.tsx b/apps/desktop/src/renderer/components/documents/document.tsx
index 15321936..153158d2 100644
--- a/apps/desktop/src/renderer/components/documents/document.tsx
+++ b/apps/desktop/src/renderer/components/documents/document.tsx
@@ -6,14 +6,14 @@ interface DocumentProps {
nodeId: string;
content?: Record<string, Block> | null;
versionId: string;
- editable: boolean;
+ canEdit: boolean;
}
export const Document = ({
nodeId,
content,
versionId,
- editable = false,
+ canEdit,
}: DocumentProps) => {
const nodeBlocks = Object.values(content ?? {});
const contents = mapBlocksToContents(nodeId, nodeBlocks);
@@ -35,7 +35,7 @@ export const Document = ({
documentId={nodeId}
content={tiptapContent}
versionId={versionId}
- editable={editable}
+ canEdit={canEdit}
/>
);
};
diff --git a/apps/desktop/src/renderer/components/pages/page-body.tsx b/apps/desktop/src/renderer/components/pages/page-body.tsx
index 773a55c3..0aa384cf 100644
--- a/apps/desktop/src/renderer/components/pages/page-body.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-body.tsx
@@ -16,7 +16,7 @@ export const PageBody = ({ page, role }: PageBodyProps) => {
nodeId={page.id}
content={page.attributes.content}
versionId={page.versionId}
- editable={canEdit}
+ canEdit={canEdit}
/>
</ScrollArea>
);
diff --git a/apps/desktop/src/renderer/components/records/record-body.tsx b/apps/desktop/src/renderer/components/records/record-body.tsx
index 8897968d..0fc43c24 100644
--- a/apps/desktop/src/renderer/components/records/record-body.tsx
+++ b/apps/desktop/src/renderer/components/records/record-body.tsx
@@ -25,7 +25,7 @@ export const RecordBody = ({ record, role }: RecordBodyProps) => {
nodeId={record.id}
content={record.attributes.content}
versionId={record.versionId}
- editable={canEdit}
+ canEdit={canEdit}
/>
</ScrollArea>
</Database>