Skip to content

Fix variable settings pagination #3041

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

Merged
HarshMN2345 merged 2 commits into from
May 12, 2026
Merged

Fix variable settings pagination #3041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8cba9a
Fix variable settings pagination
HarshMN2345 May 12, 2026
8785d17
Merge main into variable pagination branch
HarshMN2345 May 12, 2026
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
11 changes: 11 additions & 0 deletions .../(console)/project-[region]-[project]/functions/function-[function]/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@
.functions.deleteVariable({ functionId: data.function.$id, variableId });
await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.FUNCTION)]);
};

const sdkListVariables = async (queries: string[]) =>
sdk.forProject(page.params.region, page.params.project).functions.listVariables({
functionId: data.function.$id,
queries
});
</script>

<Container>
Expand Down Expand Up @@ -105,9 +111,14 @@
{sdkCreateVariable}
{sdkUpdateVariable}
{sdkDeleteVariable}
{sdkListVariables}
isGlobal={false}
globalVariableList={data.globalVariables}
variableList={data.variables}
backendPagination
reloadPageOnPagination={false}
variablesOffset={data.variablesOffset}
variablesLimit={data.limit}
project={data.project}
analyticsSource="function_settings" />
<UpdateBuildCommand func={data.function} />
Expand Down
21 changes: 16 additions & 5 deletions ...utes/(console)/project-[region]-[project]/functions/function-[function]/settings/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import { sdk } from '$lib/stores/sdk';
import { Dependencies } from '$lib/constants';
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import { Query } from '@appwrite.io/console';

const VARIABLES_LIMIT = 100;

export const load = async ({ params, depends, parent }) => {
depends(Dependencies.VARIABLES);
depends(Dependencies.FUNCTION);

const limit = PAGE_LIMIT;
const variablesOffset = 0;

const { runtimesList, specificationsList, function: fn } = await parent();

const enabledSpecs = specificationsList?.specifications?.filter((s) => s.enabled) ?? [];
Expand All @@ -16,10 +22,13 @@ export const load = async ({ params, depends, parent }) => {
}

const [globalVariables, variables] = await Promise.all([
sdk.forProject(params.region, params.project).projectApi.listVariables(),
sdk
.forProject(params.region, params.project)
.functions.listVariables({ functionId: params.function })
sdk.forProject(params.region, params.project).projectApi.listVariables({
queries: [Query.limit(VARIABLES_LIMIT)]
}),
sdk.forProject(params.region, params.project).functions.listVariables({
functionId: params.function,
queries: [Query.limit(limit), Query.offset(variablesOffset)]
})
]);

// Conflicting variables first
Expand All @@ -43,6 +52,8 @@ export const load = async ({ params, depends, parent }) => {
return {
variables,
globalVariables,
limit,
variablesOffset,
runtimesList,
specificationsList,
function: fn
Expand Down
11 changes: 11 additions & 0 deletions src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@
await Promise.all([invalidate(Dependencies.VARIABLES), invalidate(Dependencies.SITE)]);
};

const sdkListVariables = async (queries: string[]) =>
sdk.forProject(page.params.region, page.params.project).sites.listVariables({
siteId: page.params.site,
queries
});

onMount(async () => {
if (
page.url.searchParams.has('newInstallation') &&
Expand All @@ -75,9 +81,14 @@
{sdkCreateVariable}
{sdkUpdateVariable}
{sdkDeleteVariable}
{sdkListVariables}
isGlobal={false}
globalVariableList={data.globalVariables}
variableList={data.variables}
backendPagination
reloadPageOnPagination={false}
variablesOffset={data.variablesOffset}
variablesLimit={data.limit}
project={data.project}
product="site"
analyticsSource="site_settings" />
Expand Down
20 changes: 15 additions & 5 deletions src/routes/(console)/project-[region]-[project]/sites/site-[site]/settings/+page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
import { sdk } from '$lib/stores/sdk';
import { Dependencies } from '$lib/constants';
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import { isCloud } from '$lib/system';
import { Query } from '@appwrite.io/console';

const VARIABLES_LIMIT = 100;

export const load = async ({ params, depends, parent }) => {
depends(Dependencies.VARIABLES);
depends(Dependencies.SITE);
const limit = PAGE_LIMIT;
const variablesOffset = 0;
const { site } = await parent();

const [globalVariables, variables, frameworks, installations, specificationsList] =
await Promise.all([
sdk.forProject(params.region, params.project).projectApi.listVariables(),
sdk
.forProject(params.region, params.project)
.sites.listVariables({ siteId: params.site }),
sdk.forProject(params.region, params.project).projectApi.listVariables({
queries: [Query.limit(VARIABLES_LIMIT)]
}),
sdk.forProject(params.region, params.project).sites.listVariables({
siteId: params.site,
queries: [Query.limit(limit), Query.offset(variablesOffset)]
}),
sdk.forProject(params.region, params.project).sites.listFrameworks(),
sdk.forProject(params.region, params.project).vcs.listInstallations(),
isCloud
Expand Down Expand Up @@ -51,6 +59,8 @@ export const load = async ({ params, depends, parent }) => {
frameworks,
variables,
globalVariables,
limit,
variablesOffset,
installations,
specificationsList
};
Expand Down
60 changes: 38 additions & 22 deletions src/routes/(console)/project-[region]-[project]/updateVariables.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@
secret?: boolean
) => Promise<unknown>;
export let sdkDeleteVariable: (variableId: string) => Promise<unknown>;
export let sdkListVariables: (queries: string[]) => Promise<Models.VariableList> = (queries) =>
sdk.forProject(page.params.region, page.params.project).projectApi.listVariables({
queries
});
export let product: 'function' | 'site' = 'function';
export let backendPagination = false;
export let reloadPageOnPagination = true;
export let variablesOffset = 0;
export let variablesLimit = 10;
export let disabled = false;
Expand All @@ -76,20 +81,21 @@
let showDeleteModal = false;
let deleteError: string;
let fullVariableList: Models.VariableList | undefined = allVariableList;
let pagedVariableList: Models.VariableList = variableList;
let previousVariableList = variableList;
let offset = 0;
const limit = 10;

async function loadAllVariables() {
const projectSdk = sdk.forProject(page.params.region, page.params.project);
const variables = [...variableList.variables];
let nextOffset = variables.length;
const variables = backendPagination ? [] : [...variableList.variables];
let nextOffset = backendPagination ? 0 : variables.length;
let total = variableList.total;

while (nextOffset < total) {
const response = await projectSdk.projectApi.listVariables({
queries: [Query.limit(variablesLimit), Query.offset(nextOffset)]
});
const response = await sdkListVariables([
Query.limit(variablesLimit),
Query.offset(nextOffset)
]);

total = response.total;

Expand All @@ -100,16 +106,15 @@
}

return {
total: variables.length,
total,
variables
};
}

async function ensureAllVariablesLoaded() {
if (
fullVariableList &&
fullVariableList.variables.length >= variableList.variables.length
) {
const total = backendPagination ? variableList.total : variableList.variables.length;

if (fullVariableList && fullVariableList.variables.length >= total) {
return;
}

Expand Down Expand Up @@ -326,32 +331,35 @@
}
}

$: conflictVariables = globalVariableList
? globalVariableList.variables.filter((globalVariable) => {
return variableList.variables.find((variable) => {
return variable.key === globalVariable.key;
});
})
: [];

$: if (allVariableList && fullVariableList !== allVariableList) {
fullVariableList = allVariableList;
}

$: if (variableList !== previousVariableList) {
pagedVariableList = variableList;
if (backendPagination && !reloadPageOnPagination) {
variablesOffset = 0;
}
fullVariableList = undefined;
previousVariableList = variableList;
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.

$: if (fullVariableList && fullVariableList.variables.length < variableList.variables.length) {
$: if (fullVariableList && fullVariableList.total < variableList.total) {
fullVariableList = undefined;
}

$: editorVariableList = fullVariableList ?? allVariableList ?? variableList;
$: displayedVariables = backendPagination
? variableList.variables
? pagedVariableList.variables
: variableList.variables.slice(offset, offset + limit);
$: variableCount = backendPagination ? variableList.total : variableList.variables.length;
$: variableCount = backendPagination ? pagedVariableList.total : variableList.total;
$: conflictVariables = globalVariableList
? globalVariableList.variables.filter((globalVariable) => {
return displayedVariables.find((variable) => {
return variable.key === globalVariable.key;
});
})
: [];

$: hasConflictOnPage = globalVariableList
? displayedVariables.filter((variable) => {
Expand All @@ -374,6 +382,14 @@
];

async function handleVariablesPageChange() {
if (!reloadPageOnPagination) {
pagedVariableList = await sdkListVariables([
Query.limit(variablesLimit),
Query.offset(variablesOffset)
]);
return;
}

const nextUrl = new URL(page.url);

nextUrl.searchParams.set('variablesOffset', String(variablesOffset));
Expand Down