Skip to content

Improve UX for repositories modal #2809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hmacr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Improve UX for repositories modal #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions src/lib/components/git/repositories.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down Expand Up @@ -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({
Expand All @@ -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)
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -300,12 +311,12 @@
alignItems="center"
wrap="wrap">
<Typography.Text variant="m-400" color="--fgcolor-neutral-secondary">
Total results: {$repositories.total}
Total results: {isLoadingRepositories ? 0 : $repositories.total}
</Typography.Text>
<PaginationInline
{limit}
bind:offset
total={$repositories.total}
total={isLoadingRepositories ? 0 : $repositories.total}
hidePages={true}
on:change={loadRepositoryPage} />
</Layout.Stack>
Expand Down
15 changes: 7 additions & 8 deletions src/routes/(console)/project-[region]-[project]/functions/create-function/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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 { installation, repository } from '$lib/stores/vcs';
import { Repositories } from '$lib/components/git';
import {
Expand All @@ -27,10 +27,6 @@

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;
});

let selectedRepository: string;

Expand Down Expand Up @@ -60,7 +56,7 @@
}
</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>
Expand Down Expand Up @@ -105,10 +101,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} />
Expand Down
9 changes: 6 additions & 3 deletions src/routes/(console)/project-[region]-[project]/sites/create-site/repositories/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,12 @@
href="https://appwrite.io/docs/products/sites/deploy-from-git"
external
secondary>Docs</Button>
<Button
href={`https://github.com/${data.installations.installations[0].organization}`}
text>Go to GitHub</Button>
{#if $installation}
<Button
href={`https://github.com/settings/installations/${$installation.providerInstallationId}`}
external
text>Go to GitHub</Button>
{/if}
</Layout.Stack>
{/if}
</Layout.Stack>
Expand Down