Skip to content

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

Enable strict type checking in desktop

Hakan Shehu379310c6ecd6
diff --git a/apps/desktop/src/main/mutations/chat-create.ts b/apps/desktop/src/main/mutations/chat-create.ts
index a00c45f8..7a878e2a 100644
--- a/apps/desktop/src/main/mutations/chat-create.ts
+++ b/apps/desktop/src/main/mutations/chat-create.ts
@@ -32,8 +32,8 @@ export class ChatCreateMutationHandler
`.compile(workspaceDatabase);
const existingChats = await workspaceDatabase.executeQuery(query);
- if (existingChats.rows?.length > 0) {
- const chat = existingChats.rows[0];
+ const chat = existingChats.rows?.[0];
+ if (chat) {
return {
id: chat.id,
};
diff --git a/apps/desktop/src/main/mutations/mark-node-as-seen.ts b/apps/desktop/src/main/mutations/mark-node-as-seen.ts
index e4b98473..8d8bb895 100644
--- a/apps/desktop/src/main/mutations/mark-node-as-seen.ts
+++ b/apps/desktop/src/main/mutations/mark-node-as-seen.ts
@@ -29,9 +29,11 @@ export class MarkNodeAsSeenMutationHandler
existingUserNode &&
existingUserNode.last_seen_version_id === input.versionId
) {
- const lastSeenAt = new Date(existingUserNode.last_seen_at);
+ const lastSeenAt = existingUserNode.last_seen_at
+ ? new Date(existingUserNode.last_seen_at)
+ : null;
// if has been seen in the last 10 minutes, skip it. We don't want to spam the server with seen events.
- if (Date.now() - lastSeenAt.getTime() < 10 * 60 * 1000) {
+ if (lastSeenAt && Date.now() - lastSeenAt.getTime() < 10 * 60 * 1000) {
return {
success: true,
};
diff --git a/apps/desktop/src/main/mutations/node-reaction-create.ts b/apps/desktop/src/main/mutations/node-reaction-create.ts
index fb1dacba..fb8b2fa7 100644
--- a/apps/desktop/src/main/mutations/node-reaction-create.ts
+++ b/apps/desktop/src/main/mutations/node-reaction-create.ts
@@ -16,16 +16,13 @@ export class NodeReactionCreateMutationHandler
throw new Error('Node is not a message');
}
- const reactions = attributes.reactions;
- if (!reactions[input.reaction]) {
- reactions[input.reaction] = [];
- }
-
- if (reactions[input.reaction].includes(input.userId)) {
+ const reactionsUsers = attributes.reactions[input.reaction] ?? [];
+ if (reactionsUsers.includes(input.userId)) {
return attributes;
}
- reactions[input.reaction].push(input.userId);
+ reactionsUsers.push(input.userId);
+ attributes.reactions[input.reaction] = reactionsUsers;
return attributes;
});
diff --git a/apps/desktop/src/main/mutations/node-reaction-delete.ts b/apps/desktop/src/main/mutations/node-reaction-delete.ts
index 64f35835..fefaa0cd 100644
--- a/apps/desktop/src/main/mutations/node-reaction-delete.ts
+++ b/apps/desktop/src/main/mutations/node-reaction-delete.ts
@@ -16,19 +16,18 @@ export class NodeReactionDeleteMutationHandler
throw new Error('Node is not a message');
}
- const reactions = attributes.reactions;
- if (!reactions[input.reaction]) {
+ const reactionUsers = attributes.reactions[input.reaction] ?? [];
+ if (!reactionUsers.includes(input.userId)) {
return attributes;
}
- const reactionArray = reactions[input.reaction];
-
- const index = reactionArray.indexOf(input.userId);
+ const index = reactionUsers.indexOf(input.userId);
if (index === -1) {
return attributes;
}
- reactionArray.splice(index, 1);
+ reactionUsers.splice(index, 1);
+ attributes.reactions[input.reaction] = reactionUsers;
return attributes;
});
diff --git a/apps/desktop/src/main/mutations/select-option-create.ts b/apps/desktop/src/main/mutations/select-option-create.ts
index 049bfc57..05d04eec 100644
--- a/apps/desktop/src/main/mutations/select-option-create.ts
+++ b/apps/desktop/src/main/mutations/select-option-create.ts
@@ -23,12 +23,11 @@ export class SelectOptionCreateMutationHandler
throw new Error('Node is not a database');
}
- const fields = attributes.fields;
- if (!fields[input.fieldId]) {
+ const field = attributes.fields[input.fieldId];
+ if (!field) {
throw new Error('Field not found');
}
- const field = fields[input.fieldId];
if (field.type !== 'select' && field.type !== 'multiSelect') {
throw new Error('Field is not a select');
}
diff --git a/apps/desktop/src/main/queries/account-get.ts b/apps/desktop/src/main/queries/account-get.ts
index 09d0111a..5fc486f1 100644
--- a/apps/desktop/src/main/queries/account-get.ts
+++ b/apps/desktop/src/main/queries/account-get.ts
@@ -60,7 +60,7 @@ export class AccountGetQueryHandler
};
}
- private fetchAccount(accountId: string): Promise<SelectAccount | null> {
+ private fetchAccount(accountId: string): Promise<SelectAccount | undefined> {
return databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
diff --git a/apps/desktop/src/main/queries/workspace-get.ts b/apps/desktop/src/main/queries/workspace-get.ts
index c5faa0f9..e697ee71 100644
--- a/apps/desktop/src/main/queries/workspace-get.ts
+++ b/apps/desktop/src/main/queries/workspace-get.ts
@@ -66,7 +66,7 @@ export class WorkspaceGetQueryHandler
private fetchWorkspace(
accountId: string,
workspaceId: string
- ): Promise<SelectWorkspace | null> {
+ ): Promise<SelectWorkspace | undefined> {
return databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
diff --git a/apps/desktop/src/main/services/avatar-service.ts b/apps/desktop/src/main/services/avatar-service.ts
index 059b012b..298d72a7 100644
--- a/apps/desktop/src/main/services/avatar-service.ts
+++ b/apps/desktop/src/main/services/avatar-service.ts
@@ -9,6 +9,10 @@ class AvatarService {
public async handleAvatarRequest(request: Request): Promise<Response> {
const url = request.url.replace('avatar://', '');
const [accountId, avatarId] = url.split('/');
+ if (!accountId || !avatarId) {
+ return new Response(null, { status: 400 });
+ }
+
const avatarsDir = getAccountAvatarsDirectoryPath(accountId);
const avatarPath = path.join(avatarsDir, `${avatarId}.jpeg`);
const avatarLocalUrl = `file://${avatarPath}`;
diff --git a/apps/desktop/src/main/services/file-service.ts b/apps/desktop/src/main/services/file-service.ts
index c7c7493b..4cd1f355 100644
--- a/apps/desktop/src/main/services/file-service.ts
+++ b/apps/desktop/src/main/services/file-service.ts
@@ -40,6 +40,10 @@ class FileService {
public async handleFileRequest(request: Request): Promise<Response> {
const url = request.url.replace('local-file://', '');
const [userId, file] = url.split('/');
+ if (!userId || !file) {
+ return new Response(null, { status: 400 });
+ }
+
const filesDir = getWorkspaceFilesDirectoryPath(userId);
const filePath = path.join(filesDir, file);
@@ -349,6 +353,10 @@ class FileService {
.where('workspaces.user_id', '=', userId)
.executeTakeFirst();
+ if (!workspace) {
+ return;
+ }
+
const filesDir = getWorkspaceFilesDirectoryPath(userId);
if (!fs.existsSync(filesDir)) {
fs.mkdirSync(filesDir, { recursive: true });
diff --git a/apps/desktop/src/main/services/query-service.ts b/apps/desktop/src/main/services/query-service.ts
index fa2ec94a..aa30458e 100644
--- a/apps/desktop/src/main/services/query-service.ts
+++ b/apps/desktop/src/main/services/query-service.ts
@@ -65,7 +65,7 @@ class QueryService {
typeof query.input
>;
- let result = query.result;
+ let result: any = query.result;
let hasChanges = false;
for (const event of events) {
const changeCheckResult = await handler.checkForChanges(
diff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.ts
index b97375a3..0ba7ff37 100644
--- a/apps/desktop/src/main/services/sync-service.ts
+++ b/apps/desktop/src/main/services/sync-service.ts
@@ -167,11 +167,9 @@ class SyncService {
}
if (nodeId) {
- if (!nodeChanges[nodeId]) {
- nodeChanges[nodeId] = [];
- }
-
- nodeChanges[nodeId].push(change.id);
+ const changeIds = nodeChanges[nodeId] ?? [];
+ changeIds.push(change.id);
+ nodeChanges[nodeId] = changeIds;
}
}
@@ -189,7 +187,7 @@ class SyncService {
}
for (const nodeId of nodeIds) {
- const changeIds = nodeChanges[nodeId];
+ const changeIds = nodeChanges[nodeId] ?? [];
const states = data.nodes[nodeId];
if (!states) {
@@ -263,6 +261,9 @@ class SyncService {
const changesToDelete = new Set<number>();
for (let i = changes.length - 1; i >= 0; i--) {
const change = changes[i];
+ if (!change) {
+ continue;
+ }
if (changesToDelete.has(change.id)) {
continue;
@@ -271,6 +272,10 @@ class SyncService {
if (change.data.type === 'node_delete') {
for (let j = i - 1; j >= 0; j--) {
const otherChange = changes[j];
+ if (!otherChange) {
+ continue;
+ }
+
if (
otherChange.data.type === 'node_create' &&
otherChange.data.id === change.data.id
@@ -290,6 +295,10 @@ class SyncService {
} else if (change.data.type === 'user_node_update') {
for (let j = i - 1; j >= 0; j--) {
const otherChange = changes[j];
+ if (!otherChange) {
+ continue;
+ }
+
if (
otherChange.data.type === 'user_node_update' &&
otherChange.data.nodeId === change.data.nodeId &&
diff --git a/apps/desktop/src/renderer/components/accounts/account-redirect.tsx b/apps/desktop/src/renderer/components/accounts/account-redirect.tsx
index 6c03c6c0..e0021280 100644
--- a/apps/desktop/src/renderer/components/accounts/account-redirect.tsx
+++ b/apps/desktop/src/renderer/components/accounts/account-redirect.tsx
@@ -10,10 +10,12 @@ export const AccountRedirect = (): React.ReactNode => {
type: 'account_list',
})
.then((data) => {
- if (data.length === 0) {
- navigate('/login');
+ const firstAccount = data?.[0];
+
+ if (firstAccount) {
+ navigate(`/${firstAccount.id}`);
} else {
- navigate(`/${data[0].id}`);
+ navigate('/login');
}
});
}, [navigate]);
diff --git a/apps/desktop/src/renderer/components/accounts/account-update.tsx b/apps/desktop/src/renderer/components/accounts/account-update.tsx
index 06538e99..df02cde3 100644
--- a/apps/desktop/src/renderer/components/accounts/account-update.tsx
+++ b/apps/desktop/src/renderer/components/accounts/account-update.tsx
@@ -109,6 +109,11 @@ export const AccountUpdate = ({ account }: { account: Account }) => {
}
const filePath = result.filePaths[0];
+ if (!filePath) {
+ setIsFileDialogOpen(false);
+ return;
+ }
+
uploadAvatar({
input: {
type: 'avatar_upload',
diff --git a/apps/desktop/src/renderer/components/accounts/account.tsx b/apps/desktop/src/renderer/components/accounts/account.tsx
index 3920395e..7b6fa6f4 100644
--- a/apps/desktop/src/renderer/components/accounts/account.tsx
+++ b/apps/desktop/src/renderer/components/accounts/account.tsx
@@ -1,6 +1,5 @@
import React from 'react';
import { AccountContext } from '@/renderer/contexts/account';
-import { useApp } from '@/renderer/contexts/app';
import { Outlet, useNavigate, useParams } from 'react-router-dom';
import { AccountLogout } from '@/renderer/components/accounts/account-logout';
import { AccountSettingsDialog } from '@/renderer/components/accounts/account-settings-dialog';
@@ -9,17 +8,21 @@ import { useQuery } from '@/renderer/hooks/use-query';
export const Account = () => {
const { accountId } = useParams<{ accountId: string }>();
const navigate = useNavigate();
- const app = useApp();
const [openSettings, setOpenSettings] = React.useState(false);
const [openLogout, setOpenLogout] = React.useState(false);
- const { data } = useQuery({
- type: 'account_get',
- accountId,
- });
+ const { data } = useQuery(
+ {
+ type: 'account_get',
+ accountId: accountId ?? '',
+ },
+ {
+ enabled: !!accountId,
+ }
+ );
- if (!data) {
+ if (!accountId || !data) {
return <p>Account not found</p>;
}
diff --git a/apps/desktop/src/renderer/components/accounts/email-login.tsx b/apps/desktop/src/renderer/components/accounts/email-login.tsx
index 84f91819..eff2a3f8 100644
--- a/apps/desktop/src/renderer/components/accounts/email-login.tsx
+++ b/apps/desktop/src/renderer/components/accounts/email-login.tsx
@@ -47,8 +47,7 @@ export const EmailLogin = ({ server }: EmailLoginProps) => {
},
onSuccess(output) {
if (output.success) {
- const userId =
- output.workspaces.length > 0 ? output.workspaces[0].id : '';
+ const userId = output.workspaces[0]?.id ?? '';
navigate(`/${output.account.id}/${userId}`);
} else {
toast({
diff --git a/apps/desktop/src/renderer/components/accounts/email-register.tsx b/apps/desktop/src/renderer/components/accounts/email-register.tsx
index 2a1d41b7..6ba92ead 100644
--- a/apps/desktop/src/renderer/components/accounts/email-register.tsx
+++ b/apps/desktop/src/renderer/components/accounts/email-register.tsx
@@ -50,8 +50,7 @@ export const EmailRegister = ({ server }: EmailRegisterProps) => {
},
onSuccess(output) {
if (output.success) {
- const userId =
- output.workspaces.length > 0 ? output.workspaces[0].id : '';
+ const userId = output.workspaces[0]?.id ?? '';
navigate(`/${output.account.id}/${userId}`);
} else {
toast({
diff --git a/apps/desktop/src/renderer/components/accounts/login-form.tsx b/apps/desktop/src/renderer/components/accounts/login-form.tsx
index 91fae18a..c05e792f 100644
--- a/apps/desktop/src/renderer/components/accounts/login-form.tsx
+++ b/apps/desktop/src/renderer/components/accounts/login-form.tsx
@@ -16,7 +16,7 @@ export const LoginForm = ({ accounts, servers }: LoginFormProps) => {
const navigate = useNavigate();
const [showRegister, setShowRegister] = React.useState(false);
- const [server, setServer] = React.useState(servers[0]);
+ const [server, setServer] = React.useState(servers[0]!);
return (
<div className="flex flex-col gap-4">
diff --git a/apps/desktop/src/renderer/components/accounts/login.tsx b/apps/desktop/src/renderer/components/accounts/login.tsx
index 50a8eeda..ebcf913d 100644
--- a/apps/desktop/src/renderer/components/accounts/login.tsx
+++ b/apps/desktop/src/renderer/components/accounts/login.tsx
@@ -29,7 +29,7 @@ export const Login = () => {
Use one of the following methods to login
</p>
</div>
- <LoginForm accounts={accounts} servers={servers} />
+ <LoginForm accounts={accounts ?? []} servers={servers ?? []} />
</div>
</div>
</div>
diff --git a/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx b/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx
index 52da0e33..14a3cb67 100644
--- a/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx
+++ b/apps/desktop/src/renderer/components/avatars/avatar-picker.tsx
@@ -23,7 +23,10 @@ export const AvatarPicker = ({ onPick }: AvatarPickerProps) => {
<TabsContent value="emojis">
<EmojiPicker
onPick={(emoji, skinTone) => {
- onPick(emoji.skins[skinTone].id);
+ const skin = emoji.skins[skinTone];
+ if (skin) {
+ onPick(skin.id);
+ }
}}
/>
</TabsContent>
diff --git a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx
index 9eaf0f06..74d5444a 100644
--- a/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx
+++ b/apps/desktop/src/renderer/components/avatars/avatar-upload.tsx
@@ -74,6 +74,11 @@ export const AvatarUpload = ({ onUpload }: AvatarUploadProps) => {
}
const filePath = result.filePaths[0];
+ if (!filePath) {
+ setIsFileDialogOpen(false);
+ return;
+ }
+
mutate({
input: {
type: 'avatar_upload',
diff --git a/apps/desktop/src/renderer/components/channels/channel-settings.tsx b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
index 5bc01b13..236c630c 100644
--- a/apps/desktop/src/renderer/components/channels/channel-settings.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-settings.tsx
@@ -88,7 +88,7 @@ export const ChannelSettings = ({ channel, role }: ChannelSettingsProps) => {
date={channel.createdAt}
/>
</DropdownMenuItem>
- {channel.updatedBy && (
+ {channel.updatedBy && channel.updatedAt && (
<React.Fragment>
<DropdownMenuSeparator />
<DropdownMenuLabel>Last updated by</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/databases/database-settings.tsx b/apps/desktop/src/renderer/components/databases/database-settings.tsx
index a8ab4299..7359d4cc 100644
--- a/apps/desktop/src/renderer/components/databases/database-settings.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-settings.tsx
@@ -88,7 +88,7 @@ export const DatabaseSettings = ({ database, role }: DatabaseSettingsProps) => {
date={database.createdAt}
/>
</DropdownMenuItem>
- {database.updatedBy && (
+ {database.updatedBy && database.updatedAt && (
<React.Fragment>
<DropdownMenuSeparator />
<DropdownMenuLabel>Last updated by</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/databases/database-views.tsx b/apps/desktop/src/renderer/components/databases/database-views.tsx
index 6d13a900..33168def 100644
--- a/apps/desktop/src/renderer/components/databases/database-views.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-views.tsx
@@ -7,13 +7,13 @@ import { useDatabase } from '@/renderer/contexts/database';
export const DatabaseViews = () => {
const database = useDatabase();
const [activeViewId, setActiveViewId] = React.useState<string>(
- database.views[0].id
+ database.views[0]?.id ?? ''
);
const activeView = database.views.find((view) => view.id === activeViewId);
React.useEffect(() => {
if (!activeView) {
- setActiveViewId(database.views[0].id);
+ setActiveViewId(database.views[0]?.id ?? '');
}
}, [database.views, activeViewId]);
diff --git a/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
index b1bba0f7..69462faa 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
@@ -35,6 +35,10 @@ export const ViewBooleanFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? booleanFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
return (
<Popover
open={view.isFieldFilterOpened(filter.id)}
diff --git a/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx b/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
index 73e01582..194d074d 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
@@ -36,6 +36,10 @@ export const ViewCreatedAtFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? dateFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const dateTextValue = (filter.value as string) ?? null;
const dateValue = dateTextValue ? new Date(dateTextValue) : null;
diff --git a/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
index 2663b67f..de041b32 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
@@ -33,6 +33,10 @@ export const ViewDateFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? dateFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const dateTextValue = filter.value as string | null;
const dateValue = dateTextValue ? new Date(dateTextValue) : null;
diff --git a/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
index 48823728..1273a9dc 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
@@ -36,6 +36,10 @@ export const ViewEmailFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? emailFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const textValue = filter.value as string | null;
const hideInput =
diff --git a/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
index 61f0034b..3acc4067 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
@@ -37,6 +37,10 @@ export const ViewMultiSelectFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? selectFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const selectOptionIds = (filter.value as string[]) ?? [];
const selectedOptions = selectOptions.filter((option) =>
selectOptionIds.includes(option.id)
diff --git a/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
index 32515b7a..e138da6e 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
@@ -36,6 +36,10 @@ export const ViewNumberFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? numberFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const numberValue = filter.value as number | null;
const hideInput =
diff --git a/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
index 758a8b12..3e09fb89 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
@@ -36,6 +36,10 @@ export const ViewPhoneFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? phoneFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const phoneValue = filter.value as string | null;
const hideInput =
diff --git a/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
index 57e5c674..fdc49bf9 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
@@ -37,6 +37,10 @@ export const ViewSelectFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? selectFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const selectOptionIds = (filter.value as string[]) ?? [];
const selectedOptions = selectOptions.filter((option) =>
selectOptionIds.includes(option.id)
diff --git a/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
index d591609d..fadff651 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
@@ -33,6 +33,10 @@ export const ViewTextFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? textFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const textValue = filter.value as string | null;
const hideInput =
diff --git a/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx b/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
index 1bdeef59..0e38f457 100644
--- a/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
+++ b/apps/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
@@ -33,6 +33,10 @@ export const ViewUrlFieldFilter = ({
(operator) => operator.value === filter.operator
) ?? urlFieldFilterOperators[0];
+ if (!operator) {
+ return null;
+ }
+
const urlValue = filter.value as string | null;
const hideInput =
diff --git a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
index d027ab78..4c83fbdf 100644
--- a/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/view-create-dialog.tsx
@@ -33,7 +33,7 @@ import { FieldAttributes, FieldType } from '@colanode/core';
const formSchema = z.object({
name: z.string().min(3, 'Name must be at least 3 characters long.'),
type: z.enum(['table', 'board', 'calendar']),
- groupBy: z.string().optional(),
+ groupBy: z.string().optional().nullable(),
});
interface ViewTypeOption {
diff --git a/apps/desktop/src/renderer/components/databases/view.tsx b/apps/desktop/src/renderer/components/databases/view.tsx
index 09162bed..9e0bb32e 100644
--- a/apps/desktop/src/renderer/components/databases/view.tsx
+++ b/apps/desktop/src/renderer/components/databases/view.tsx
@@ -239,7 +239,7 @@ export const View = ({ view }: ViewProps) => {
type: 'field',
id: fieldId,
fieldId,
- operator: operators[0].value,
+ operator: operators[0]?.value ?? '',
value: null,
};
diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
index 1fdfd307..8e5ad252 100644
--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
@@ -17,6 +17,10 @@ export const EmojiPickerBrowserRow = ({
}: EmojiPickerBrowserRowProps) => {
const rowData = data.rows[index];
+ if (!rowData) {
+ return null;
+ }
+
if (rowData.type === 'label') {
return (
<div
diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
index a5bdecf3..63b1f16a 100644
--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
@@ -1,4 +1,4 @@
-import { EmojiPickerRowData } from '@/shared/types/emojis';
+import { Emoji, EmojiPickerRowData } from '@/shared/types/emojis';
import React from 'react';
import AutoSizer from 'react-virtualized-auto-sizer';
import { FixedSizeList } from 'react-window';
@@ -15,6 +15,10 @@ export const EmojiPickerBrowser = () => {
for (let i = 0; i < data.categories.length; i++) {
const category = data.categories[i];
+ if (!category) {
+ continue;
+ }
+
// Add the category label
rows.push({
type: 'label',
@@ -28,7 +32,14 @@ export const EmojiPickerBrowser = () => {
const start = rowIndex * emojisPerRow;
const end = start + emojisPerRow;
const emojisIds = category.emojis.slice(start, end);
- const emojisInRow = emojisIds.map((id) => data.emojis[id]);
+ const emojisInRow: Emoji[] = [];
+ for (const id of emojisIds) {
+ const emoji = data.emojis[id];
+ if (!emoji) {
+ continue;
+ }
+ emojisInRow.push(emoji);
+ }
rows.push({
type: 'emoji',
diff --git a/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx b/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx
index d16ae050..d8422aaf 100644
--- a/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx
+++ b/apps/desktop/src/renderer/components/emojis/emoji-picker-item.tsx
@@ -9,9 +9,11 @@ interface EmojiPickerItemProps {
export const EmojiPickerItem = ({ emoji }: EmojiPickerItemProps) => {
const { skinTone, onPick: onEmojiClick } = useEmojiPicker();
- let id = emoji.skins[0].id;
- if (skinTone !== 0 && skinTone < emoji.skins.length) {
- id = emoji.skins[skinTone].id;
+ const skin = emoji.skins[skinTone];
+ const id = skin?.id ?? emoji.skins[0]?.id ?? '';
+
+ if (!id) {
+ return null;
}
return (
diff --git a/apps/desktop/src/renderer/components/folders/folder-body.tsx b/apps/desktop/src/renderer/components/folders/folder-body.tsx
index 8ed522ee..6b05ccbf 100644
--- a/apps/desktop/src/renderer/components/folders/folder-body.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-body.tsx
@@ -86,13 +86,20 @@ export const FolderBody = ({ folder }: FolderBodyProps) => {
return;
}
+ const filePath = result.filePaths[0];
+
+ if (!filePath) {
+ isDialogOpenedRef.current = false;
+ return;
+ }
+
mutate({
input: {
type: 'file_create',
accountId: workspace.accountId,
workspaceId: workspace.id,
userId: workspace.userId,
- filePath: result.filePaths[0],
+ filePath,
parentId: folder.id,
},
});
diff --git a/apps/desktop/src/renderer/components/folders/folder-settings.tsx b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
index b5e5ffa5..22e78d99 100644
--- a/apps/desktop/src/renderer/components/folders/folder-settings.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-settings.tsx
@@ -88,7 +88,7 @@ export const FolderSettings = ({ folder, role }: FolderSettingsProps) => {
date={folder.createdAt}
/>
</DropdownMenuItem>
- {folder.updatedBy && (
+ {folder.updatedBy && folder.updatedAt && (
<React.Fragment>
<DropdownMenuSeparator />
<DropdownMenuLabel>Last updated by</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx
index db31d5f3..97b06b9d 100644
--- a/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx
+++ b/apps/desktop/src/renderer/components/icons/icon-picker-browser-row.tsx
@@ -17,6 +17,10 @@ export const IconPickerBrowserRow = ({
}: IconPickerBrowserRowProps) => {
const rowData = data.rows[index];
+ if (!rowData) {
+ return null;
+ }
+
if (rowData.type === 'label') {
return (
<div
diff --git a/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx b/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx
index 128f0b4c..f6582352 100644
--- a/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx
+++ b/apps/desktop/src/renderer/components/icons/icon-picker-browser.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import AutoSizer from 'react-virtualized-auto-sizer';
import { FixedSizeList } from 'react-window';
-import { IconPickerRowData } from '@/shared/types/icons';
+import { Icon, IconPickerRowData } from '@/shared/types/icons';
import { IconPickerBrowserRow } from '@/renderer/components/icons/icon-picker-browser-row';
import { useIconPicker } from '@/renderer/contexts/icon-picker';
@@ -14,6 +14,11 @@ export const IconPickerBrowser = () => {
for (let i = 0; i < data.categories.length; i++) {
const category = data.categories[i];
+
+ if (!category) {
+ continue;
+ }
+
// Add the category label
rows.push({
type: 'label',
@@ -27,7 +32,14 @@ export const IconPickerBrowser = () => {
const start = rowIndex * iconsPerRow;
const end = start + iconsPerRow;
const iconIds = category.icons.slice(start, end);
- const iconsInRow = iconIds.map((id) => data.icons[id]);
+ const iconsInRow: Icon[] = [];
+ for (const id of iconIds) {
+ const icon = data.icons[id];
+ if (!icon) {
+ continue;
+ }
+ iconsInRow.push(icon);
+ }
rows.push({
type: 'icon',
diff --git a/apps/desktop/src/renderer/components/icons/icon-picker.tsx b/apps/desktop/src/renderer/components/icons/icon-picker.tsx
index fdfd9858..bb27bff6 100644
--- a/apps/desktop/src/renderer/components/icons/icon-picker.tsx
+++ b/apps/desktop/src/renderer/components/icons/icon-picker.tsx
@@ -13,6 +13,10 @@ export const IconPicker = ({ onPick }: IconPickerProps) => {
const [query, setQuery] = React.useState('');
const { data, isPending } = useQuery({ type: 'icons_get' });
+ if (!data) {
+ return null;
+ }
+
return (
<IconPickerContext.Provider value={{ data, onPick }}>
<div className="flex flex-col gap-1 p-1">
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
index e6eb7ba0..096eeebf 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
@@ -116,7 +116,11 @@ export function LayoutSidebarFooter() {
<DropdownMenuSeparator />
<DropdownMenuLabel className="mb-1">Accounts</DropdownMenuLabel>
{accounts.map((accountItem) => {
- const state = accountStates[accountItem.id];
+ const state = accountStates[accountItem.id] ?? {
+ importantCount: 0,
+ hasUnseenChanges: false,
+ };
+
return (
<DropdownMenuItem
key={accountItem.id}
diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
index 758fcb25..fc65d550 100644
--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
+++ b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
@@ -39,6 +39,10 @@ export const NodeBreadcrumb = ({ nodes }: NodeBreadcrumbProps) => {
<Breadcrumb>
<BreadcrumbList>
{visibleNodes.map((node, index) => {
+ if (!node) {
+ return null;
+ }
+
const isFirst = index === 0;
const isClickableNode = isClickable(node.type);
diff --git a/apps/desktop/src/renderer/components/messages/message-create.tsx b/apps/desktop/src/renderer/components/messages/message-create.tsx
index bd79f309..1a7f44a8 100644
--- a/apps/desktop/src/renderer/components/messages/message-create.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-create.tsx
@@ -106,6 +106,10 @@ export const MessageCreate = React.forwardRef<MessageCreateRefProps>(
}
const filePath = result.filePaths[0];
+ if (!filePath) {
+ return;
+ }
+
const fileMetadata = await window.colanode.executeQuery({
type: 'file_metadata_get',
path: filePath,
diff --git a/apps/desktop/src/renderer/components/messages/message-list.tsx b/apps/desktop/src/renderer/components/messages/message-list.tsx
index 9c0f117c..7982f0a9 100644
--- a/apps/desktop/src/renderer/components/messages/message-list.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-list.tsx
@@ -39,6 +39,10 @@ export const MessageList = () => {
React.useEffect(() => {
if (messages.length > 0) {
const lastMessage = messages[messages.length - 1];
+ if (!lastMessage) {
+ return;
+ }
+
if (lastMessage.id !== lastMessageId.current) {
lastMessageId.current = lastMessage.id;
conversation.onLastMessageIdChange(lastMessageId.current);
diff --git a/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx b/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
index 7448231f..092b6c22 100644
--- a/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
@@ -24,7 +24,12 @@ export const MessageReactionCreatePopover = ({
<PopoverContent className="w-max p-0" align="end">
<EmojiPicker
onPick={(emoji, skinTone) => {
- onReactionClick(emoji.skins[skinTone].id);
+ const id = emoji.skins[skinTone]?.id;
+ if (!id) {
+ return;
+ }
+
+ onReactionClick(id);
setOpen(false);
}}
/>
diff --git a/apps/desktop/src/renderer/components/pages/page-settings.tsx b/apps/desktop/src/renderer/components/pages/page-settings.tsx
index 1864ced1..464b8b7a 100644
--- a/apps/desktop/src/renderer/components/pages/page-settings.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-settings.tsx
@@ -88,7 +88,7 @@ export const PageSettings = ({ page, role }: PageSettingsProps) => {
date={page.createdAt}
/>
</DropdownMenuItem>
- {page.updatedBy && (
+ {page.updatedBy && page.updatedAt && (
<React.Fragment>
<DropdownMenuSeparator />
<DropdownMenuLabel>Last updated by</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/records/record-provider.tsx b/apps/desktop/src/renderer/components/records/record-provider.tsx
index caf069b2..09dc390e 100644
--- a/apps/desktop/src/renderer/components/records/record-provider.tsx
+++ b/apps/desktop/src/renderer/components/records/record-provider.tsx
@@ -53,131 +53,105 @@ export const RecordProvider = ({
});
},
getBooleanValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'boolean') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'boolean') {
+ return fieldValue.value;
}
return false;
},
getCollaboratorValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'collaborator') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'collaborator') {
+ return fieldValue.value;
}
return null;
},
getDateValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'date') {
- return new Date(fieldValue.value);
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'date') {
+ return new Date(fieldValue.value);
}
return null;
},
getEmailValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'email') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'email') {
+ return fieldValue.value;
}
return null;
},
getFileValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'file') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'file') {
+ return fieldValue.value;
}
return null;
},
getMultiSelectValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'multiSelect') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'multiSelect') {
+ return fieldValue.value;
}
return [];
},
getNumberValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'number') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'number') {
+ return fieldValue.value;
}
return null;
},
getPhoneValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'phone') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'phone') {
+ return fieldValue.value;
}
return null;
},
getRelationValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'relation') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'relation') {
+ return fieldValue.value;
}
return null;
},
getRollupValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'rollup') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'rollup') {
+ return fieldValue.value;
}
return null;
},
getSelectValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'select') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'select') {
+ return fieldValue.value;
}
return null;
},
getTextValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'text') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'text') {
+ return fieldValue.value;
}
return null;
},
getUrlValue: (field) => {
- if (field.id in record.attributes.fields) {
- const fieldValue = record.attributes.fields[field.id];
- if (fieldValue.type === 'url') {
- return fieldValue.value;
- }
+ const fieldValue = record.attributes.fields[field.id];
+ if (fieldValue?.type === 'url') {
+ return fieldValue.value;
}
return null;
diff --git a/apps/desktop/src/renderer/components/records/record-settings.tsx b/apps/desktop/src/renderer/components/records/record-settings.tsx
index 4a01cce6..6a351525 100644
--- a/apps/desktop/src/renderer/components/records/record-settings.tsx
+++ b/apps/desktop/src/renderer/components/records/record-settings.tsx
@@ -59,7 +59,7 @@ export const RecordSettings = ({ record, role }: RecordSettingsProps) => {
date={record.createdAt}
/>
</DropdownMenuItem>
- {record.updatedBy && (
+ {record.updatedBy && record.updatedAt && (
<React.Fragment>
<DropdownMenuSeparator />
<DropdownMenuLabel>Last updated by</DropdownMenuLabel>
diff --git a/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx b/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx
index 7bdc2fee..de6511f6 100644
--- a/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx
+++ b/apps/desktop/src/renderer/components/records/values/record-updated-by-value.tsx
@@ -16,7 +16,7 @@ export const RecordUpdatedByValue = ({ field }: RecordUpdatedByValueProps) => {
const { data } = useQuery(
{
type: 'node_get',
- nodeId: record.updatedBy,
+ nodeId: record.updatedBy!,
userId: workspace.userId,
},
{
@@ -40,7 +40,7 @@ export const RecordUpdatedByValue = ({ field }: RecordUpdatedByValueProps) => {
{updatedBy && (
<React.Fragment>
<Avatar
- id={record.updatedBy}
+ id={record.updatedBy!}
name={updatedBy.name}
avatar={updatedBy.avatar}
size="small"
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx
index 99736495..cb7c6aae 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-form.tsx
@@ -94,6 +94,11 @@ export const WorkspaceForm = ({
}
const filePath = result.filePaths[0];
+ if (!filePath) {
+ setIsFileDialogOpen(false);
+ return;
+ }
+
mutate({
input: {
type: 'avatar_upload',
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx
index ba007af2..10b8004b 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace-redirect.tsx
@@ -14,10 +14,11 @@ export const WorkspaceRedirect = (): React.ReactNode => {
})
.then((data) => {
const workspaces = data ?? [];
- if (workspaces.length === 0) {
- navigate(`/${account.id}/create`);
+ const firstWorkspace = workspaces[0];
+ if (firstWorkspace) {
+ navigate(`/${account.id}/${firstWorkspace.id}`);
} else {
- navigate(`/${account.id}/${workspaces[0].id}`);
+ navigate(`/${account.id}/create`);
}
});
}, [navigate]);
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
index e6120088..e595e9cc 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -14,10 +14,10 @@ export const Workspace = () => {
const [openSettings, setOpenSettings] = React.useState(false);
- const { data, isPending } = useQuery({
+ const { data } = useQuery({
type: 'workspace_get',
accountId: account.id,
- workspaceId,
+ workspaceId: workspaceId!,
});
const workspace = data ?? null;
diff --git a/apps/desktop/src/renderer/editor/commands/file.tsx b/apps/desktop/src/renderer/editor/commands/file.tsx
index 11407070..1ad0e3b9 100644
--- a/apps/desktop/src/renderer/editor/commands/file.tsx
+++ b/apps/desktop/src/renderer/editor/commands/file.tsx
@@ -27,10 +27,15 @@ export const FileCommand: EditorCommand = {
return;
}
+ const filePath = result.filePaths[0];
+ if (!filePath) {
+ return;
+ }
+
const { userId, documentId } = context;
const output = await window.colanode.executeMutation({
type: 'file_create',
- filePath: result.filePaths[0],
+ filePath,
userId,
parentId: documentId,
generateIndex: false,
diff --git a/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx b/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx
index 1bf23e64..ef071676 100644
--- a/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx
+++ b/apps/desktop/src/renderer/editor/extensions/trailing-node.tsx
@@ -38,7 +38,7 @@ export const TrailingNode = Extension.create<TrailingNodeOptions>({
const endPosition = doc.content.size;
const type = schema.nodes[this.options.node];
- if (!shouldInsertNodeAtEnd) {
+ if (!shouldInsertNodeAtEnd || !type) {
return null;
}
diff --git a/apps/desktop/src/shared/lib/databases.ts b/apps/desktop/src/shared/lib/databases.ts
index ea5f81c8..b222b33b 100644
--- a/apps/desktop/src/shared/lib/databases.ts
+++ b/apps/desktop/src/shared/lib/databases.ts
@@ -139,9 +139,10 @@ export const getSelectOptionLightColorClass = (color: string): string => {
};
export const getRandomSelectOptionColor = (): string => {
- return selectOptionColors[
- Math.floor(Math.random() * selectOptionColors.length)
- ].value;
+ const randomIndex = Math.floor(Math.random() * selectOptionColors.length);
+ const randomColor = selectOptionColors[randomIndex] ?? selectOptionColors[0]!;
+
+ return randomColor.value;
};
export interface FieldFilterOperator {
@@ -1045,6 +1046,10 @@ export const generateViewFieldIndex = (
let nextIndex: string | null = null;
if (after === 'name') {
const lowestIndex = mergedIndexes[0];
+ if (!lowestIndex) {
+ return null;
+ }
+
nextIndex = lowestIndex.viewIndex ?? lowestIndex.databaseIndex;
} else {
const afterFieldArrayIndex = mergedIndexes.findIndex((f) => f.id === after);
@@ -1052,14 +1057,14 @@ export const generateViewFieldIndex = (
return null;
}
+ const afterFieldIndex = mergedIndexes[afterFieldArrayIndex];
previousIndex =
- mergedIndexes[afterFieldArrayIndex].viewIndex ??
- mergedIndexes[afterFieldArrayIndex].databaseIndex;
+ afterFieldIndex?.viewIndex ?? afterFieldIndex?.databaseIndex ?? null;
if (afterFieldArrayIndex < mergedIndexes.length) {
+ const nextFieldIndex = mergedIndexes[afterFieldArrayIndex + 1];
nextIndex =
- mergedIndexes[afterFieldArrayIndex + 1].viewIndex ??
- mergedIndexes[afterFieldArrayIndex + 1].databaseIndex;
+ nextFieldIndex?.viewIndex ?? nextFieldIndex?.databaseIndex ?? null;
}
}
@@ -1067,7 +1072,7 @@ export const generateViewFieldIndex = (
const lastDatabaseField = mergedIndexes.sort((a, b) =>
compareString(a.databaseIndex, b.databaseIndex)
- )[mergedIndexes.length - 1];
+ )[mergedIndexes.length - 1]!;
const newPotentialFieldIndex = generateNodeIndex(
lastDatabaseField.databaseIndex,
@@ -1173,12 +1178,13 @@ const generateCollaboratorValue = (
return { type: 'collaborator', value: [userId] };
}
- if (
- filter.operator === 'is_in' &&
- Array.isArray(filter.value) &&
- filter.value.length > 0
- ) {
- return { type: 'collaborator', value: [filter.value[0]] };
+ if (filter.operator === 'is_in' && Array.isArray(filter.value)) {
+ const firstValue = filter.value[0];
+ if (!firstValue) {
+ return null;
+ }
+
+ return { type: 'collaborator', value: [firstValue] };
}
if (filter.operator === 'is_not_empty') {
@@ -1252,7 +1258,12 @@ const generateFileValue = (
filter: ViewFieldFilterAttributes
): FieldValue | null => {
if (filter.operator === 'is_in' && Array.isArray(filter.value)) {
- return { type: 'file', value: [filter.value[0]] };
+ const firstValue = filter.value[0];
+ if (!firstValue) {
+ return null;
+ }
+
+ return { type: 'file', value: [firstValue] };
}
return null;
@@ -1263,7 +1274,12 @@ const generateMultiSelectValue = (
filter: ViewFieldFilterAttributes
): FieldValue | null => {
if (filter.operator === 'is_in' && Array.isArray(filter.value)) {
- return { type: 'multiSelect', value: [filter.value[0]] };
+ const firstValue = filter.value[0];
+ if (!firstValue) {
+ return null;
+ }
+
+ return { type: 'multiSelect', value: [firstValue] };
}
if (
@@ -1272,6 +1288,10 @@ const generateMultiSelectValue = (
Object.keys(field.options).length > 0
) {
const firstOption = Object.values(field.options)[0];
+ if (!firstOption) {
+ return null;
+ }
+
return { type: 'multiSelect', value: [firstOption.id] };
}
@@ -1339,7 +1359,12 @@ const generateSelectValue = (
filter: ViewFieldFilterAttributes
): FieldValue | null => {
if (filter.operator === 'is_in' && Array.isArray(filter.value)) {
- return { type: 'select', value: filter.value[0] };
+ const firstValue = filter.value[0];
+ if (!firstValue) {
+ return null;
+ }
+
+ return { type: 'select', value: firstValue };
}
if (
@@ -1348,6 +1373,10 @@ const generateSelectValue = (
Object.keys(field.options).length > 0
) {
const firstOption = Object.values(field.options)[0];
+ if (!firstOption) {
+ return null;
+ }
+
return { type: 'select', value: firstOption.id };
}
diff --git a/apps/desktop/src/shared/lib/editor.ts b/apps/desktop/src/shared/lib/editor.ts
index 532b1920..885e85c6 100644
--- a/apps/desktop/src/shared/lib/editor.ts
+++ b/apps/desktop/src/shared/lib/editor.ts
@@ -159,28 +159,39 @@ const validateBlocksIndexes = (blocks: Block[]) => {
//group by parentId
const groupedBlocks: { [key: string]: Block[] } = {};
for (const block of blocks) {
- if (!groupedBlocks[block.parentId]) {
- groupedBlocks[block.parentId] = [];
- }
- groupedBlocks[block.parentId].push(block);
+ const parentBlocks = groupedBlocks[block.parentId] ?? [];
+ parentBlocks.push(block);
+ groupedBlocks[block.parentId] = parentBlocks;
}
for (const parentId in groupedBlocks) {
const blocks = groupedBlocks[parentId];
+ if (!blocks) {
+ continue;
+ }
+
for (let i = 1; i < blocks.length; i++) {
- const currentIndex = blocks[i].index;
- const beforeIndex = blocks[i - 1].index;
+ const currentBlock = blocks[i];
+ const beforeBlock = blocks[i - 1];
+
+ if (!currentBlock || !beforeBlock) {
+ continue;
+ }
+
+ const currentIndex = currentBlock.index;
+ const beforeIndex = beforeBlock.index;
if (currentIndex <= beforeIndex) {
- let afterIndex = i < blocks.length - 1 ? blocks[i + 1].index : null;
+ const afterBlock = i < blocks.length - 1 ? blocks[i + 1] : null;
+ const afterIndex = afterBlock?.index ?? null;
if (
afterIndex &&
afterIndex > currentIndex &&
afterIndex > beforeIndex
) {
- blocks[i].index = generateNodeIndex(beforeIndex, afterIndex);
+ currentBlock.index = generateNodeIndex(beforeIndex, afterIndex);
} else {
- blocks[i].index = generateNodeIndex(beforeIndex, null);
+ currentBlock.index = generateNodeIndex(beforeIndex, null);
}
}
}
diff --git a/apps/desktop/src/shared/lib/emojis.ts b/apps/desktop/src/shared/lib/emojis.ts
index 7f07d75f..3bb92d87 100644
--- a/apps/desktop/src/shared/lib/emojis.ts
+++ b/apps/desktop/src/shared/lib/emojis.ts
@@ -1,6 +1,10 @@
import { EmojiData, Emoji } from '@/shared/types/emojis';
-export const getEmojiUrl = (id: string): string => {
+export const getEmojiUrl = (id: string | null | undefined): string => {
+ if (!id) {
+ return '';
+ }
+
return `asset://emojis/${id}.svg`;
};
diff --git a/apps/desktop/src/shared/lib/utils.ts b/apps/desktop/src/shared/lib/utils.ts
index ebb0fd70..78cb2b0f 100644
--- a/apps/desktop/src/shared/lib/utils.ts
+++ b/apps/desktop/src/shared/lib/utils.ts
@@ -147,6 +147,8 @@ export const isValidEmail = (email: string) => {
const account = emailParts[0];
const address = emailParts[1];
+ if (!account || !address) return false;
+
if (account.length > 64) return false;
if (address.length > 255) return false;
diff --git a/apps/desktop/src/shared/mutations/channel-create.ts b/apps/desktop/src/shared/mutations/channel-create.ts
index eae7c790..02e8ee60 100644
--- a/apps/desktop/src/shared/mutations/channel-create.ts
+++ b/apps/desktop/src/shared/mutations/channel-create.ts
@@ -3,7 +3,7 @@ export type ChannelCreateMutationInput = {
userId: string;
spaceId: string;
name: string;
- avatar?: string;
+ avatar?: string | null;
};
export type ChannelCreateMutationOutput = {
diff --git a/apps/desktop/src/shared/mutations/channel-update.ts b/apps/desktop/src/shared/mutations/channel-update.ts
index ceae7c1c..8e62c0fd 100644
--- a/apps/desktop/src/shared/mutations/channel-update.ts
+++ b/apps/desktop/src/shared/mutations/channel-update.ts
@@ -3,7 +3,7 @@ export type ChannelUpdateMutationInput = {
userId: string;
channelId: string;
name: string;
- avatar?: string;
+ avatar?: string | null;
};
export type ChannelUpdateMutationOutput = {
diff --git a/apps/desktop/src/shared/mutations/folder-create.ts b/apps/desktop/src/shared/mutations/folder-create.ts
index f5a3180d..582c0408 100644
--- a/apps/desktop/src/shared/mutations/folder-create.ts
+++ b/apps/desktop/src/shared/mutations/folder-create.ts
@@ -3,7 +3,7 @@ export type FolderCreateMutationInput = {
userId: string;
parentId: string;
name: string;
- avatar: string | null;
+ avatar?: string | null;
generateIndex: boolean;
};
diff --git a/apps/desktop/src/shared/mutations/folder-update.ts b/apps/desktop/src/shared/mutations/folder-update.ts
index 6292cff2..250a215e 100644
--- a/apps/desktop/src/shared/mutations/folder-update.ts
+++ b/apps/desktop/src/shared/mutations/folder-update.ts
@@ -3,7 +3,7 @@ export type FolderUpdateMutationInput = {
userId: string;
folderId: string;
name: string;
- avatar: string | null;
+ avatar?: string | null;
};
export type FolderUpdateMutationOutput = {
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index e9d7a786..0f91f8d3 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -1,23 +1,22 @@
{
+ "$schema": "https://json.schemastore.org/tsconfig",
+ "display": "Desktop",
+ "extends": "../../tsconfig.base.json",
"compilerOptions": {
- "target": "ESNext",
"module": "commonjs",
- "allowJs": true,
- "skipLibCheck": true,
- "esModuleInterop": true,
"noImplicitAny": true,
"sourceMap": true,
- "baseUrl": ".",
"outDir": "dist",
"moduleResolution": "node",
"resolveJsonModule": true,
"jsx": "react-jsx",
"paths": {
"@/*": ["src/*"]
- }
+ },
},
"references": [
{ "path": "../../packages/core/tsconfig.json" },
{ "path": "../../packages/crdt/tsconfig.json" }
- ]
+ ],
+ "include": ["src", "forge.env.d.ts"]
}