Merge branch 'main' into feat-documentsdb

ItzNotABug · ItzNotABug · commit f581e7ab24ce · 2026-01-30T19:51:43.000+05:30
diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte
@@ -49,9 +49,12 @@
     let isLoadingRepositories = $state(null);
     let installationsMap = $state(null);
     let offset = $state(0);
+    let connectingRepositoryId = $state<string | null>(null);
+    let loadRepositoriesRequestId = 0;
     const limit = 5;
 
     onMount(() => {
+        isLoadingRepositories = true;
         loadInstallations();
     });
 
@@ -115,6 +118,8 @@
     }
 
     async function loadRepositories(installationId: string, search: string) {
+        const requestId = ++loadRepositoriesRequestId;
+
         const result = await sdk
             .forProject(page.params.region, page.params.project)
             .vcs.listRepositories({
@@ -125,6 +130,11 @@
                 queries: [Query.limit(limit), Query.offset(offset)]
             });
 
+        // Stale request
+        if (requestId !== loadRepositoriesRequestId) {
+            return;
+        }
+
         $repositories.repositories =
             product === 'functions'
                 ? (result as unknown as Models.ProviderRepositoryRuntimeList)
@@ -186,10 +196,7 @@
                             debouncedLoadRepositories.cancel();
                         }}
                         bind:value={selectedInstallation} />
-                    <InputSearch
-                        placeholder="Search repositories"
-                        bind:value={search}
-                        disabled={!search && !$repositories?.repositories?.length} />
+                    <InputSearch placeholder="Search repositories" bind:value={search} />
                 </Layout.Stack>
             {/if}
         </Layout.Stack>
@@ -266,7 +273,11 @@
                                             size="xs"
                                             variant="secondary"
                                             style="flex-shrink: 0;"
-                                            on:click={() => connect(repo)}>
+                                            disabled={!!connectingRepositoryId}
+                                            on:click={() => {
+                                                connectingRepositoryId = repo.id;
+                                                connect(repo);
+                                            }}>
                                             Connect
                                         </PinkButton.Button>
                                     {/if}
@@ -305,7 +316,7 @@
                     <PaginationInline
                         {limit}
                         bind:offset
-                        total={$repositories.total}
+                        total={isLoadingRepositories ? 0 : $repositories.total}
                         hidePages={true}
                         on:change={loadRepositoryPage} />
                 </Layout.Stack>
diff --git a/src/lib/components/promos/imagine.svelte b/src/lib/components/promos/imagine.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { NoToneMapping } from 'three';
     import { Canvas } from '@threlte/core';
-    import ProductHuntSvg from './product-hunt.svg';
+    import ImagineSvg from './imagine.svg';
     import ImaginationShader from './shader.svelte';
 </script>
 
@@ -12,11 +12,7 @@
         </Canvas>
     </div>
 
-    <!--- Hidden logo
     <img src={ImagineSvg} alt="Imagine" class="imagine-logo" />
-    -->
-
-    <img src={ProductHuntSvg} alt="Product Hunt" class="imagine-logo" />
 </div>
 
 <style>
@@ -38,7 +34,7 @@
         top: 50%;
         left: 50%;
         width: auto;
-        height: 40px;
+        height: 24px;
         position: absolute;
         transform: translate(-50%, -50%);
     }
diff --git a/src/lib/components/promos/product-hunt.svg b/src/lib/components/promos/product-hunt.svg
diff --git a/src/routes/(console)/bottomAlerts.ts b/src/routes/(console)/bottomAlerts.ts
@@ -13,15 +13,15 @@ const listOfPromotions: BottomModalAlertItem[] = [];
 
 if (isCloud && SHOW_IMAGINE_PROMO) {
     const imaginePromo: BottomModalAlertItem = {
-        id: 'modal:imagine-ph-launch-console',
+        id: 'modal:imagine.dev',
         backgroundComponent: Imagine,
-        title: 'Imagine is live on Product Hunt',
-        message: 'Ask questions, share feedback, and support the launch',
+        title: 'Introducing Imagine',
+        message: 'The most complete AI builder to date',
         importance: 8,
         scope: 'everywhere',
         plan: 'free',
         cta: {
-            text: 'Head to Product Hunt',
+            text: 'Try it now',
             color: {
                 light: '#FFFFFF',
                 dark: '#000000'
@@ -34,7 +34,7 @@ if (isCloud && SHOW_IMAGINE_PROMO) {
                 light: '#333333',
                 dark: '#CCCCCC'
             },
-            link: () => 'https://apwr.dev/imagine-ph-appwrite-console',
+            link: () => 'https://imagine.dev',
             external: true,
             hideOnClick: true
         },
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -6,7 +6,7 @@
     import { PlanComparisonBox, PlanSelection, SelectPaymentMethod } from '$lib/components/billing';
     import ValidateCreditModal from '$lib/components/billing/validateCreditModal.svelte';
     import { Dependencies, feedbackDowngradeOptions } from '$lib/constants';
-    import { Button, Form, InputSelect, InputTags, InputTextarea } from '$lib/elements/forms';
+    import { Button, Form, InputTags, InputTextarea } from '$lib/elements/forms';
     import { formatCurrency } from '$lib/helpers/numbers.js';
     import { Wizard } from '$lib/layout';
     import {
@@ -449,20 +449,19 @@
                 </Fieldset>
             {/if}
             {#if isDowngrade && selectedPlan.group === BillingPlanGroup.Starter && !data.hasFreeOrgs}
-                <Fieldset legend="Feedback">
+                <Fieldset legend="Reason for plan change">
                     <Layout.Stack gap="xl">
-                        <InputSelect
+                        <!--<InputSelect
                             id="reason"
                             label="Reason for plan change"
                             placeholder="Select one"
                             required
                             options={feedbackDowngradeOptions}
-                            bind:value={feedbackDowngradeReason} />
+                            bind:value={feedbackDowngradeReason} />-->
                         <InputTextarea
                             id="comment"
                             required
-                            label="If you need to elaborate, please do so here"
-                            placeholder="Enter feedback"
+                            placeholder="Please enter your feedback"
                             bind:value={feedbackMessage} />
                     </Layout.Stack>
                 </Fieldset>
diff --git a/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import { base } from '$app/paths';
     import { SvgIcon } from '$lib/components';
     import { page } from '$app/state';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import type { Models } from '@appwrite.io/console';
     import { isSelfHosted } from '$lib/system';
-    import { afterNavigate, goto } from '$app/navigation';
+    import { goto } from '$app/navigation';
+    import { resolveRoute } from '$lib/stores/navigation';
     import { installation, repository } from '$lib/stores/vcs';
     import { Repositories } from '$lib/components/git';
     import {
@@ -26,11 +26,7 @@
     export let data;
 
     const isVcsEnabled = $regionalConsoleVariables?._APP_VCS_ENABLED === true;
-    const wizardBase = `${base}/project-${page.params.region}-${page.params.project}/functions`;
-    let previousPage: string = wizardBase;
-    afterNavigate(({ from }) => {
-        previousPage = from?.url?.pathname || previousPage;
-    });
+    const wizardBase = resolveRoute('/(console)/project-[region]-[project]/functions', page.params);
 
     let selectedRepository: string;
 
@@ -56,11 +52,19 @@
     function connect(e: Models.ProviderRepository) {
         trackEvent(Click.ConnectRepositoryClick, { from: 'cover' });
         repository.set(e);
-        goto(`${wizardBase}/create-function/repository-${e.id}?installation=${$installation.$id}`);
+        goto(
+            resolveRoute(
+                '/(console)/project-[region]-[project]/functions/create-function/repository-[repository]',
+                {
+                    ...page.params,
+                    repository: e.id
+                }
+            ) + `?installation=${$installation.$id}`
+        );
     }
 </script>
 
-<Wizard title="Create function" href={previousPage} column columnSize="l" hideFooter>
+<Wizard title="Create function" href={wizardBase} column columnSize="l" hideFooter>
     <Layout.Stack gap="l">
         <Layout.GridFraction start={4} end={6} gap="l" rowSize="auto">
             <Card.Base>
@@ -105,10 +109,13 @@
                                 }}
                                 {connect} />
                         </Layout.Stack>
-                        {#if data.installations.total}
+                        {#if $installation}
                             <Layout.Stack gap="l">
                                 <Divider />
-                                <Link variant="quiet" href="#/">
+                                <Link
+                                    variant="quiet"
+                                    external
+                                    href={`https://github.com/settings/installations/${$installation.providerInstallationId}`}>
                                     <Layout.Stack direction="row" gap="xs">
                                         Missing a repository? check your permissions <Icon
                                             icon={IconArrowSmRight} />
@@ -140,7 +147,13 @@
                                         runtime: template.name
                                     });
                                 }}
-                                href={`${wizardBase}/create-function/template-${starterTemplate.id}?runtime=${runtimeDetail.$id}`}>
+                                href={resolveRoute(
+                                    '/(console)/project-[region]-[project]/functions/create-function/template-[template]',
+                                    {
+                                        ...page.params,
+                                        template: starterTemplate.id
+                                    }
+                                ) + `?runtime=${runtimeDetail.$id}`}>
                                 <Layout.Stack direction="row" gap="s" alignItems="center">
                                     <Avatar size="xs" alt={template.name} empty={!template.name}>
                                         <SvgIcon name={iconName} iconSize="small" />
@@ -168,7 +181,13 @@
                             <Card.Link
                                 radius="s"
                                 padding="xs"
-                                href={`${wizardBase}/create-function/template-${template.id}`}
+                                href={resolveRoute(
+                                    '/(console)/project-[region]-[project]/functions/create-function/template-[template]',
+                                    {
+                                        ...page.params,
+                                        template: template.id
+                                    }
+                                )}
                                 on:click={() => {
                                     trackEvent('click_connect_template', {
                                         from: 'cover',
@@ -198,7 +217,12 @@
                         {/each}
                     </Layout.Grid>
 
-                    <Link variant="quiet" href={`${wizardBase}/templates`}>
+                    <Link
+                        variant="quiet"
+                        href={resolveRoute(
+                            '/(console)/project-[region]-[project]/functions/templates',
+                            page.params
+                        )}>
                         <Layout.Stack direction="row" gap="xs">
                             Browse all templates <Icon icon={IconArrowSmRight} />
                         </Layout.Stack>
@@ -212,7 +236,10 @@
                 on:click={() => {
                     trackEvent('click_create_function_manual', { from: 'cover' });
                 }}
-                href={`${wizardBase}/create-function/manual`}>manually</Link>
+                href={resolveRoute(
+                    '/(console)/project-[region]-[project]/functions/create-function/manual',
+                    page.params
+                )}>manually</Link>
             or using the CLI.
             <Link href="https://appwrite.io/docs/products/functions/deployment" external
                 >Learn more</Link
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/(components)/deploymentCard.svelte
@@ -16,6 +16,7 @@
     import { func } from '../store';
     import { capitalize } from '$lib/helpers/string';
     import { getEffectiveBuildStatus } from '$lib/helpers/buildTimeout';
+    import { deploymentStatusConverter } from '$lib/stores/git';
     import { regionalConsoleVariables } from '$routes/(console)/project-[region]-[project]/store';
     import { isCloud } from '$lib/system';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
@@ -38,8 +39,11 @@
         footer?: Snippet;
     } = $props();
 
-    let effectiveStatus = $derived(getEffectiveBuildStatus(deployment, $regionalConsoleVariables));
-    let totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
+    const effectiveStatus = $derived(
+        getEffectiveBuildStatus(deployment, $regionalConsoleVariables)
+    );
+    const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus);
+    const totalSize = $derived(humanFileSize(deployment?.totalSize ?? 0));
 </script>
 
 {#snippet titleSnippet(title: string)}
@@ -129,7 +133,9 @@
                         <Layout.Stack gap="xxs" inline>
                             {@render titleSnippet('Status')}
                             <Typography.Text variant="m-400" color="--fgcolor-neutral-primary">
-                                <Status status={effectiveStatus} label={effectiveStatus} />
+                                <Status
+                                    status={deploymentStatusConverter(displayStatus)}
+                                    label={displayStatus} />
                             </Typography.Text>
                         </Layout.Stack>
                     {:else}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/deployment-[deployment]/+page.svelte
@@ -40,9 +40,10 @@
 
     let { data } = $props();
 
-    let effectiveStatus = $derived(
+    const effectiveStatus = $derived(
         getEffectiveBuildStatus(data.deployment, $regionalConsoleVariables)
     );
+    const displayStatus = $derived(effectiveStatus === 'finalizing' ? 'ready' : effectiveStatus);
     let showDelete = $state(false);
     let showCancel = $state(false);
     let showActivate = $state(false);
@@ -157,9 +158,9 @@
     <Card.Base padding="s">
         <Accordion
             title="Deployment logs"
-            badge={capitalize(effectiveStatus)}
+            badge={capitalize(displayStatus)}
             open
-            badgeType={badgeTypeDeployment(effectiveStatus)}
+            badgeType={badgeTypeDeployment(displayStatus)}
             hideDivider>
             <Layout.Stack gap="xl">
                 {#key data.deployment.buildLogs}
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/table.svelte
diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte
