From 100fc7a14a3ee357dc577941de09625187b9d1ea Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Mon, 30 Jan 2023 20:02:32 +0000
Subject: [PATCH] fix: type-checking in multiple files

---
 src/lib/charts/base.svelte                    |  2 +-
 src/lib/components/eventModal.svelte          |  3 +-
 src/lib/components/permissions/row.svelte     | 11 +++--
 src/lib/elements/forms/inputCheckbox.svelte   |  5 ++-
 src/lib/elements/forms/inputSelect.svelte     |  3 +-
 src/lib/elements/forms/inputURL.svelte        |  6 ++-
 src/lib/helpers/type.ts                       | 14 +++++++
 src/lib/layout/progress.svelte                |  2 +-
 src/lib/layout/wizard.svelte                  |  2 +-
 src/lib/layout/wizardStep.svelte              |  2 +-
 src/lib/stores/project-services.ts            |  4 +-
 src/routes/+layout.svelte                     | 24 +++++------
 .../auth/security/+page.svelte                | 11 +++--
 .../document-[document]/attributeForm.svelte  | 41 ++++++++++++-------
 .../attributes/boolean.svelte                 |  3 +-
 .../document-[document]/attributes/url.svelte |  3 +-
 .../settings/updateName.svelte                |  9 ++--
 .../settings/updatePermissions.svelte         |  6 ++-
 .../settings/updateSecurity.svelte            |  6 ++-
 .../settings/updateStatus.svelte              |  6 ++-
 .../settings/updateEvents.svelte              |  4 +-
 .../webhooks/[webhook]/updateEvents.svelte    |  2 +
 .../webhooks/[webhook]/updateName.svelte      |  9 ++--
 .../webhooks/[webhook]/updateSecurity.svelte  | 13 +++---
 .../webhooks/[webhook]/updateURL.svelte       |  9 ++--
 src/routes/console/project-[project]/store.ts |  6 +--
 src/service-worker.ts                         |  4 +-
 27 files changed, 138 insertions(+), 72 deletions(-)

diff --git a/src/lib/charts/base.svelte b/src/lib/charts/base.svelte
index 09f5b5ee2..d8eb25e3a 100644
--- a/src/lib/charts/base.svelte
+++ b/src/lib/charts/base.svelte
@@ -13,7 +13,7 @@
     registerTheme('light', { ...base, ...light });
     registerTheme('dark', { ...base, ...dark });
 
-    export let options: EChartsOption;
+    export let options: EChartsOption | null;
     export let series: (BarSeriesOption | LineSeriesOption)[];
 
     let chart: ECharts;
diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte
index 544d409fa..72eb12ba2 100644
--- a/src/lib/components/eventModal.svelte
+++ b/src/lib/components/eventModal.svelte
@@ -15,10 +15,11 @@
     } from '$lib/constants';
     import { tooltip } from '$lib/actions/tooltip';
     import { objectKeys } from '$lib/helpers/object';
+    import type { Nullable } from '$lib/helpers/type';
 
     // Props
     export let show = false;
-    export let initialValue = '';
+    export let initialValue: Nullable<string> = '';
 
     // Constants
     const serviceNames = services.map((s) => s.name);
diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte
index e69f66616..3cef701f6 100644
--- a/src/lib/components/permissions/row.svelte
+++ b/src/lib/components/permissions/row.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
     import { tooltip } from '$lib/actions/tooltip';
+    import type { PromiseValue } from '$lib/helpers/type';
     import { sdkForProject } from '$lib/stores/sdk';
     import type { Models } from '@aw-labs/appwrite-console';
     import { tick } from 'svelte';
@@ -9,14 +10,16 @@
     export let role: string;
 
     let content: HTMLDivElement;
-    let data = null;
+    let data: PromiseValue<ReturnType<typeof getData>> | null = null;
     let isFetching = false;
 
     async function getData(
         permission: string
-    ): Promise<Partial<Models.User<Record<string, unknown>> & Models.Team>> {
+    ): Promise<Partial<Models.User<Record<string, unknown>> & Models.Team> | undefined> {
         const role = permission.split(':')[0];
-        const id = permission.split(':')[1].split('/')[0];
+        const id = permission.split(':')[1]?.split('/')[0];
+        if (!id) return;
+
         if (role === 'user') {
             const user = await sdkForProject.users.get(id);
             return user;
@@ -88,7 +91,7 @@
                                         ? data?.phone
                                         : '-'}
                                 </span>
-                                <Output value={data.$id}>{role}</Output>
+                                <Output value={data.$id ?? ''}>{role}</Output>
                             </span>
                             {#if (isUser && (data?.email || data?.phone)) || isTeam}
                                 <span class="user-profile-sep" />
diff --git a/src/lib/elements/forms/inputCheckbox.svelte b/src/lib/elements/forms/inputCheckbox.svelte
index 4c9088a07..a8fd57d99 100644
--- a/src/lib/elements/forms/inputCheckbox.svelte
+++ b/src/lib/elements/forms/inputCheckbox.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
+    import type { Nullable } from '$lib/helpers/type';
     import { FormItem, Helper } from '.';
 
     export let label: string;
     export let optionalText: string | undefined = undefined;
     export let showLabel = true;
     export let id: string;
-    export let value = false;
+    export let value: Nullable<boolean> = false;
     export let required = false;
     export let disabled = false;
 
     let element: HTMLInputElement;
-    let error: string;
+    let error: Nullable<string>;
 
     const handleInvalid = (event: Event) => {
         event.preventDefault();
diff --git a/src/lib/elements/forms/inputSelect.svelte b/src/lib/elements/forms/inputSelect.svelte
index 40a11d3e7..85cbd659c 100644
--- a/src/lib/elements/forms/inputSelect.svelte
+++ b/src/lib/elements/forms/inputSelect.svelte
@@ -1,11 +1,12 @@
 <script lang="ts">
+    import type { Nullable } from '$lib/helpers/type';
     import { FormItem, Helper } from '.';
 
     export let id: string;
     export let label: string;
     export let optionalText: string | undefined = undefined;
     export let showLabel = true;
-    export let value: string | null | undefined;
+    export let value: Nullable<unknown>;
     export let placeholder = '';
     export let required = false;
     export let disabled = false;
diff --git a/src/lib/elements/forms/inputURL.svelte b/src/lib/elements/forms/inputURL.svelte
index 41f64234c..6358a6d74 100644
--- a/src/lib/elements/forms/inputURL.svelte
+++ b/src/lib/elements/forms/inputURL.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
+    import type { Nullable } from '$lib/helpers/type';
     import { onMount } from 'svelte';
+
     import { FormItem, Helper } from '.';
 
     export let label: string;
     export let showLabel = true;
     export let id: string;
-    export let value = '';
+    export let value: Nullable<string> = '';
     export let placeholder = '';
     export let required = false;
     export let disabled = false;
@@ -15,7 +17,7 @@
     export let maxlength: number | null = null;
 
     let element: HTMLInputElement;
-    let error: string;
+    let error: Nullable<string>;
 
     onMount(() => {
         if (element && autofocus) {
diff --git a/src/lib/helpers/type.ts b/src/lib/helpers/type.ts
index 4b7ea46da..25a07ab07 100644
--- a/src/lib/helpers/type.ts
+++ b/src/lib/helpers/type.ts
@@ -2,6 +2,8 @@ import { objectEntries } from './object';
 
 export type Nullable<T> = T | null | undefined;
 
+export type PromiseValue<T> = T extends Promise<infer U> ? U : T;
+
 export function isNonNullable<T>(value: T): value is NonNullable<T> {
     return value !== null && value !== undefined;
 }
@@ -136,3 +138,15 @@ export const isObjectType = <T>(
 
     return true;
 };
+
+/**
+ * Casts value as any. Useful for Svelte templates, since they don't support
+ * type-casting and TS expressions in general.
+ *
+ * @param {unknown} value
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function Anyify(value: unknown): any {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return value as any;
+}
diff --git a/src/lib/layout/progress.svelte b/src/lib/layout/progress.svelte
index c573706bd..f9d5e6e6f 100644
--- a/src/lib/layout/progress.svelte
+++ b/src/lib/layout/progress.svelte
@@ -17,7 +17,7 @@
         }
         updater = setInterval(() => {
             const randomStep = stepSizes[Math.floor(Math.random() * stepSizes.length)];
-            const step = getIncrement(width) + randomStep;
+            const step = getIncrement(width) + (randomStep ?? 0);
             if (width < maximum) {
                 width = width + step;
             }
diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte
index 180f0ebcb..213b157c5 100644
--- a/src/lib/layout/wizard.svelte
+++ b/src/lib/layout/wizard.svelte
@@ -116,7 +116,7 @@
             {/each}
             <div class="form-footer">
                 <div class="u-flex u-main-end u-gap-12">
-                    {#if !isLastStep && sortedSteps[currentStep - 1][1].optional}
+                    {#if !isLastStep && sortedSteps[currentStep - 1]?.[1].optional}
                         <Button text on:click={() => dispatch('finish')}>
                             Skip optional steps
                         </Button>
diff --git a/src/lib/layout/wizardStep.svelte b/src/lib/layout/wizardStep.svelte
index 6ba9de776..d8307fe2e 100644
--- a/src/lib/layout/wizardStep.svelte
+++ b/src/lib/layout/wizardStep.svelte
@@ -5,7 +5,7 @@
     /**
      * Pass callback that is run before the Form submit, can be canceled with throwing an exception.
      */
-    export let beforeSubmit: () => Promise<void> | null = null;
+    export let beforeSubmit: (() => Promise<void>) | null = null;
 
     if (beforeSubmit) {
         wizard.setInterceptor(beforeSubmit);
diff --git a/src/lib/stores/project-services.ts b/src/lib/stores/project-services.ts
index ea8f9d43f..5b3ad3fa5 100644
--- a/src/lib/stores/project-services.ts
+++ b/src/lib/stores/project-services.ts
@@ -120,7 +120,9 @@ function createServices() {
                 {
                     label: 'GraphQL',
                     method: 'graphql',
-                    value: project.serviceStatusForGraphql
+                    // TODO: verify this is correct
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    value: (project as any).serviceStatusForGraphql
                 }
             ];
             set({ list });
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index b550cdf7f..11ca5c7fa 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,20 +1,20 @@
 <script lang="ts">
-    import { afterNavigate, goto } from '$app/navigation';
-    import { page } from '$app/stores';
-    import { user } from '$lib/stores/user';
-    import { onCLS, onFID, onLCP, onFCP, onINP, onTTFB } from 'web-vitals';
-    import { reportWebVitals } from '$lib/helpers/vitals';
-    import { onMount } from 'svelte';
-    import { base } from '$app/paths';
     import { browser, dev } from '$app/environment';
-    import { app } from '$lib/stores/app';
-    import { Progress, Notifications } from '$lib/layout';
-    import { loading } from './store';
-    import Loading from './loading.svelte';
+    import { afterNavigate, goto } from '$app/navigation';
+    import { base } from '$app/paths';
+    import { page } from '$app/stores';
     import { trackPageView } from '$lib/actions/analytics';
+    import { isString } from '$lib/helpers/type';
+    import { reportWebVitals } from '$lib/helpers/vitals';
+    import { Notifications, Progress } from '$lib/layout';
+    import { app } from '$lib/stores/app';
+    import { user } from '$lib/stores/user';
     import * as Sentry from '@sentry/svelte';
     import { BrowserTracing } from '@sentry/tracing';
-    import { isString } from '$lib/helpers/type';
+    import { onMount } from 'svelte';
+    import { onCLS, onFCP, onFID, onINP, onLCP, onTTFB } from 'web-vitals';
+    import Loading from './loading.svelte';
+    import { loading } from './store';
 
     if (browser) {
         window.VERCEL_ANALYTICS_ID = import.meta.env.VERCEL_ANALYTICS_ID?.toString() ?? false;
diff --git a/src/routes/console/project-[project]/auth/security/+page.svelte b/src/routes/console/project-[project]/auth/security/+page.svelte
index 6168b6002..eae6e68f5 100644
--- a/src/routes/console/project-[project]/auth/security/+page.svelte
+++ b/src/routes/console/project-[project]/auth/security/+page.svelte
@@ -12,6 +12,7 @@
     import { trackEvent } from '$lib/actions/analytics';
     import { timeToSeconds } from '$lib/helpers/timeConversion';
     import { writable } from 'svelte/store';
+    import { Anyify } from '$lib/helpers/type';
 
     const projectId = $project.$id;
     let isLimited = $project.authLimit === 0 ? 'unlimited' : 'limited';
@@ -20,7 +21,8 @@
     let timeInSec = time;
     let period = writable('s');
     let btnActive = false;
-    let maxSessions = $project.authSessionsLimit;
+    // TODO: verify if this is the correct way to get the max sessions
+    let maxSessions = ($project as any).authSessionsLimit;
 
     let options = [
         { label: 'days', value: 'd' },
@@ -84,7 +86,8 @@
     }
     async function updateSessionsLimit() {
         try {
-            await sdkForConsole.projects.updateAuthSessionsLimit(projectId, maxSessions);
+            // TODO: verify if this is the correct way to update the max sessions
+            await (sdkForConsole.projects as any)?.updateAuthSessionsLimit(projectId, maxSessions);
 
             addNotification({
                 type: 'success',
@@ -227,7 +230,9 @@
             </svelte:fragment>
 
             <svelte:fragment slot="actions">
-                <Button disabled={maxSessions === $project.authSessionsLimit} submit>Update</Button>
+                <!-- TODO: verify types for $project -->
+                <Button disabled={maxSessions === Anyify($project).authSessionsLimit} submit
+                    >Update</Button>
             </svelte:fragment>
         </CardGrid>
     </Form>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
index 298282f79..56be1d1e6 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributeForm.svelte
@@ -8,23 +8,29 @@
     import Attribute from './attribute.svelte';
 
     export let attributes: Attributes[] = [];
-    export let formValues: object = {};
+
+    // Svelte templates do not support type casting, making type-checking impossible
+    // in certain scenarios. For example, the following has a type error that could be
+    // confidently fixed by type-casting:
+    // {# if formValues[attribute.key] } <input bind:value={formValues[attribute.key][index]} /> {/if}
+    export let formValues: any = {};
     export let customId: string | null | undefined = undefined;
     export let gap: '16' | '32' = '32';
 
     let showCustomId = false;
 
     function removeArrayItem(key: string, index: number) {
+        if (!formValues[key]) return;
         formValues = {
             ...formValues,
-            [key]: formValues[key].filter((_, i) => i !== index)
+            [key]: formValues[key]?.filter((_: any, i: any) => i !== index)
         };
     }
 
     function addArrayItem(key: string) {
         formValues = {
             ...formValues,
-            [key]: [...formValues[key], null]
+            [key]: [...(formValues[key] ?? []), null]
         };
     }
 
@@ -32,6 +38,11 @@
         if (isAttributeEnum(attribute)) return 'Enum';
         return `${capitalize(attribute.type)}${attribute.array ? '[]' : ''}`;
     }
+
+    function keys(arr?: unknown[]): number[] {
+        if (!arr) return [];
+        return [...arr.keys()];
+    }
 </script>
 
 {#if attributes.length}
@@ -39,7 +50,7 @@
         {#each attributes as attribute}
             {@const label = attribute.required ? `${attribute.key}*` : attribute.key}
             {#if attribute.array}
-                {#if formValues[attribute.key].length === 0}
+                {#if formValues[attribute.key]?.length === 0}
                     <div class="u-flex u-cross-center u-main-space-between">
                         <span class="label u-margin-0">
                             {label}
@@ -55,19 +66,21 @@
                     </div>
                 {/if}
 
-                {#if formValues[attribute.key].length !== 0}
+                {#if formValues[attribute.key]?.length !== 0}
                     <ul class="u-grid u-gap-8">
-                        {#each [...formValues[attribute.key].keys()] as index}
+                        {#each keys(formValues[attribute.key]) as index}
                             <li class="form-item is-multiple">
                                 <div class="form-item-part u-stretch">
-                                    <Attribute
-                                        {attribute}
-                                        id={`${attribute.key}-${index}`}
-                                        optionalText={index === 0
-                                            ? getAttributeType(attribute)
-                                            : undefined}
-                                        label={index === 0 ? label : ''}
-                                        bind:value={formValues[attribute.key][index]} />
+                                    {#if formValues[attribute.key]}
+                                        <Attribute
+                                            {attribute}
+                                            id={`${attribute.key}-${index}`}
+                                            optionalText={index === 0
+                                                ? getAttributeType(attribute)
+                                                : undefined}
+                                            label={index === 0 ? label : ''}
+                                            bind:value={formValues[attribute.key][index]} />
+                                    {/if}
                                 </div>
                                 <div class="form-item-part u-cross-child-end">
                                     <Button
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
index dd705b075..a633e3acc 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/boolean.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
     import { InputCheckbox, InputSelect } from '$lib/elements/forms';
+    import type { Nullable } from '$lib/helpers/type';
     import type { Models } from '@aw-labs/appwrite-console';
 
     export let id: string;
     export let label: string;
-    export let value: boolean;
+    export let value: Nullable<boolean>;
     export let attribute: Models.AttributeBoolean;
     export let optionalText: string | undefined = undefined;
 </script>
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
index d7bb9e193..2b875612d 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/attributes/url.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
     import InputURL from '$lib/elements/forms/inputURL.svelte';
+    import type { Nullable } from '$lib/helpers/type';
     import type { Models } from '@aw-labs/appwrite-console';
 
     export let id: string;
     export let label: string;
-    export let value: string | null;
+    export let value: Nullable<string>;
     export let attribute: Models.AttributeUrl;
 </script>
 
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
index e98422453..912c477b3 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte
@@ -5,6 +5,7 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, Form, InputText } from '$lib/elements/forms';
+    import { isNonNullableObject, type Nullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForProject } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -12,18 +13,20 @@
 
     const databaseId = $page.params.database;
 
-    let collectionName: string = null;
+    let collectionName: Nullable<string> = null;
 
     onMount(() => {
         collectionName ??= $collection.name;
     });
 
     async function updateName() {
+        const args = { databaseId, collectionName };
+        if (!isNonNullableObject(args)) return;
         try {
             await sdkForProject.databases.updateCollection(
-                databaseId,
+                args.databaseId,
                 $collection.$id,
-                collectionName,
+                args.collectionName,
                 $collection.$permissions,
                 $collection.documentSecurity,
                 $collection.enabled
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
index 6589c22c0..2deca4cbb 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte
@@ -7,6 +7,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { symmetricDifference } from '$lib/helpers/array';
+    import { isNonNullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForProject } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -16,19 +17,20 @@
 
     let arePermsDisabled = true;
 
-    let collectionPermissions: string[] = null;
+    let collectionPermissions: string[] | null = null;
 
     onMount(() => {
         collectionPermissions ??= $collection.$permissions;
     });
 
     async function updatePermissions() {
+        if (!isNonNullable(databaseId)) return;
         try {
             await sdkForProject.databases.updateCollection(
                 databaseId,
                 $collection.$id,
                 $collection.name,
-                collectionPermissions,
+                collectionPermissions ?? undefined,
                 $collection.documentSecurity,
                 $collection.enabled
             );
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
index 87d601be6..a16c0e371 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte
@@ -5,6 +5,7 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, FormList, InputSwitch } from '$lib/elements/forms';
+    import { isNonNullable, type Nullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForProject } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -12,20 +13,21 @@
 
     const databaseId = $page.params.database;
 
-    let collectionDocumentSecurity: boolean = null;
+    let collectionDocumentSecurity: Nullable<boolean> = null;
 
     onMount(() => {
         collectionDocumentSecurity ??= $collection.documentSecurity;
     });
 
     async function updateSecurity() {
+        if (!isNonNullable(databaseId)) return;
         try {
             await sdkForProject.databases.updateCollection(
                 databaseId,
                 $collection.$id,
                 $collection.name,
                 $collection.$permissions,
-                collectionDocumentSecurity,
+                collectionDocumentSecurity ?? undefined,
                 $collection.enabled
             );
             invalidate(Dependencies.COLLECTION);
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
index 6c1353320..7ff085277 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte
@@ -6,6 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, InputSwitch } from '$lib/elements/forms';
     import { toLocaleDateTime } from '$lib/helpers/date';
+    import { isNonNullable, type Nullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForProject } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -13,13 +14,14 @@
 
     const databaseId = $page.params.database;
 
-    let enabled: boolean = null;
+    let enabled: Nullable<boolean> = null;
 
     onMount(() => {
         enabled ??= $collection.enabled;
     });
 
     async function toggleCollection() {
+        if (!isNonNullable(databaseId)) return;
         try {
             await sdkForProject.databases.updateCollection(
                 databaseId,
@@ -27,7 +29,7 @@
                 $collection.name,
                 $collection.$permissions,
                 $collection.documentSecurity,
-                enabled
+                enabled ?? undefined
             );
             invalidate(Dependencies.COLLECTION);
             addNotification({
diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte
index 901b53c73..bbcb97ec9 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte
@@ -19,15 +19,17 @@
     import { Button } from '$lib/elements/forms';
     import DropList from '$lib/components/dropList.svelte';
     import DropListItem from '$lib/components/dropListItem.svelte';
+    import { isNonNullable, type Nullable } from '$lib/helpers/type';
 
     const functionId = $page.params.function;
     const eventSet: Writable<Set<string>> = writable(new Set($func.events));
     let showEvents = false;
-    let eventValue: string;
+    let eventValue: Nullable<string>;
     let isDisabled = true;
     let showDropdown: boolean[] = [];
 
     async function updateEvents() {
+        if (!isNonNullable(functionId)) return;
         try {
             await sdkForProject.functions.update(
                 functionId,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
index 919d21402..f0be9be96 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
@@ -7,6 +7,7 @@
     import { Button, Form } from '$lib/elements/forms';
     import { TableCell, TableCellText, TableList } from '$lib/elements/table';
     import { symmetricDifference } from '$lib/helpers/array';
+    import { isNonNullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
@@ -24,6 +25,7 @@
     });
 
     async function updateEvents() {
+        if (!isNonNullable(projectId)) return;
         try {
             await sdkForConsole.projects.updateWebhook(
                 projectId,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
index 1d4fcd0cf..b853c91ec 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
@@ -5,24 +5,27 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
+    import { isNonNullableObject, type Nullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
     const projectId = $page.params.project;
-    let name: string = null;
+    let name: Nullable<string> = null;
 
     onMount(async () => {
         name ??= $webhook.name;
     });
 
     async function updateName() {
+        const args = { projectId, name };
+        if (!isNonNullableObject(args)) return;
         try {
             await sdkForConsole.projects.updateWebhook(
-                projectId,
+                args.projectId,
                 $webhook.$id,
-                name,
+                args.name,
                 $webhook.events,
                 $webhook.url,
                 $webhook.security,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
index dc1d1d8ce..fc7e35483 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
@@ -12,14 +12,15 @@
         InputPassword,
         InputText
     } from '$lib/elements/forms';
+    import { isNonNullableObject, type Nullable } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
     const projectId = $page.params.project;
-    let httpUser: string = null;
-    let httpPass: string = null;
+    let httpUser: string | null = null;
+    let httpPass: Nullable<string> = null;
     let security = false;
 
     onMount(async () => {
@@ -29,16 +30,18 @@
     });
 
     async function updateSecurity() {
+        const args = { projectId, httpUser, httpPass };
+        if (!isNonNullableObject(args)) return;
         try {
             await sdkForConsole.projects.updateWebhook(
-                projectId,
+                args.projectId,
                 $webhook.$id,
                 $webhook.name,
                 $webhook.events,
                 $webhook.url,
                 security,
-                httpUser,
-                httpPass
+                args.httpUser,
+                args.httpPass
             );
             invalidate(Dependencies.WEBHOOK);
             addNotification({
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
index ff775045d..8eda5392f 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
@@ -5,26 +5,29 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
+    import { isNonNullableObject } from '$lib/helpers/type';
     import { addNotification } from '$lib/stores/notifications';
     import { sdkForConsole } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
     const projectId = $page.params.project;
-    let url: string = null;
+    let url: string | null = null;
 
     onMount(async () => {
         url ??= $webhook.url;
     });
 
     async function updateUrl() {
+        const args = { projectId, url };
+        if (!isNonNullableObject(args)) return;
         try {
             await sdkForConsole.projects.updateWebhook(
-                projectId,
+                args.projectId,
                 $webhook.$id,
                 $webhook.name,
                 $webhook.events,
-                url,
+                args.url,
                 $webhook.security,
                 $webhook.httpUser,
                 $webhook.httpPass
diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/console/project-[project]/store.ts
index 5443d45b6..34b33907a 100644
--- a/src/routes/console/project-[project]/store.ts
+++ b/src/routes/console/project-[project]/store.ts
@@ -1,7 +1,7 @@
-import { derived, writable } from 'svelte/store';
 import { page } from '$app/stores';
 import type { Models } from '@aw-labs/appwrite-console';
 import type { BarSeriesOption } from 'echarts/charts';
+import { derived, writable } from 'svelte/store';
 
 export const project = derived(page, ($page) => $page.data.project as Models.Project);
 export const onboarding = derived(
@@ -14,11 +14,11 @@ function createStats() {
 
     return {
         subscribe,
-        add: (projectId: string, data: BarSeriesOption['data'][number]) =>
+        add: (projectId: string, data: Array<string | number | Date>) =>
             update((n) => {
                 let series = n.get(projectId) ?? [];
 
-                if (series.length === 0) {
+                if (series.length === 0 && data[0]) {
                     const date = new Date(data[0]);
                     for (let i = 0; i < 12; i++) {
                         series.push([date.toISOString(), 0]);
diff --git a/src/service-worker.ts b/src/service-worker.ts
index 84273f8d2..fd1e0cbb3 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -27,7 +27,7 @@ self.addEventListener('fetch', (event: FetchEvent) => {
 
     if (url.origin === location.origin && cachedFiles.includes(url.pathname)) {
         // always return build files from cache
-        event.respondWith(cached);
+        event.respondWith(cached as Promise<Response>);
     } else if (url.protocol === 'https:' || location.hostname === 'localhost') {
         // hit the network for everything else...
         const promise = fetch(request);
@@ -44,6 +44,6 @@ self.addEventListener('fetch', (event: FetchEvent) => {
         });
 
         // ...but if it fails, fall back to cache if available
-        event.respondWith(promise.catch(() => cached || promise));
+        event.respondWith(promise.catch(() => (cached as Promise<Response>) || promise));
     }
 });