Appwrite/console
1
0
Fork 0
mirror of https://github.com/appwrite/console.git synced 2026-06-06 19:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-usage-layout-shifts

Browse Source
This commit is contained in:
Darshan
2025-09-10 13:07:09 +05:30
committed by GitHub
parent 60d6eadb8e 5b98696e4a
commit c4b925cec7
28 changed files with 112 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/layout/displaySettingsModal.svelte
+1 -1
View File
@@ -35,7 +35,7 @@
{#if !hideColumns && $columns?.length}
<Layout.Stack gap="xs">
<Typography.Text>Columns</Typography.Text>
<ColumnSelector {columns} {isCustomTable}>
<ColumnSelector ui="new" {columns} {isCustomTable}>
{#snippet children(toggle, selectedColumnsNumber)}
<Button.Button
size="s"
src/lib/layout/gridHeader.svelte
+8 -1
View File
@@ -17,7 +17,14 @@
<header class="grid-header">
<Typography.Title size="m">{title}</Typography.Title>
<div class="u-flex u-gap-16 u-contents-mobile">
<ViewSelector {view} {columns} {isCustomTable} {hideView} {hideColumns} {allowNoColumns} />
<ViewSelector
ui="new"
{view}
{columns}
{isCustomTable}
{hideView}
{hideColumns}
{allowNoColumns} />
<div class="grid-header-col-2">
<slot />
</div>
src/lib/layout/responsiveContainerHeader.svelte
+1 -1
View File
@@ -112,7 +112,7 @@
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
{#if hasDisplaySettings}
<ViewSelector {view} {columns} {hideView} {hideColumns} />
<ViewSelector ui="new" {view} {columns} {hideView} {hideColumns} />
{/if}
{#if children}
{@render children()}
src/lib/system.ts
+9
View File
@@ -39,3 +39,12 @@ export function isMultiRegionSupported(url: URL): boolean {
return false;
}
}
// there can be multiple internal cloud instances.
export function isProductionCloud(url: URL): boolean {
try {
return url.hostname === 'cloud.appwrite.io';
} catch {
return false;
}
}
src/routes/(console)/organization-[organization]/domains/+page.svelte
+1 -1
View File
@@ -49,7 +49,7 @@
<Layout.Stack direction="row" justifyContent="space-between">
<SearchQuery placeholder="Search domains" />
<Layout.Stack direction="row" gap="m" inline>
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
<Button
on:click={() => {
trackEvent(Click.DomainCreateClick, {
src/routes/(console)/organization-[organization]/domains/domain-[domain]/+page.svelte
+1 -1
View File
@@ -84,7 +84,7 @@
</Tooltip>
</Layout.Stack>
<Layout.Stack direction="row" gap="s" inline>
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
<Popover let:toggle padding="none">
<Button secondary on:click={toggle}>Add preset</Button>
<svelte:fragment slot="tooltip" let:toggle>
src/routes/(console)/project-[region]-[project]/auth/+page.svelte
+1 -1
View File
@@ -59,7 +59,7 @@
<SearchQuery placeholder="Search by name, email, phone, or ID" />
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
<Button on:click={() => ($showCreateUser = true)} event="create_user" size="s">
<Icon size="s" icon={IconPlus} slot="start" />
<span class="text">Create user</span>
src/routes/(console)/project-[region]-[project]/auth/createTeam.svelte
+12 -7
View File
@@ -10,12 +10,14 @@
import { Icon, Tag } from '@appwrite.io/pink-svelte';
import { createEventDispatcher } from 'svelte';
export let showCreate = false;
let { showCreate = $bindable(false) }: { showCreate: boolean } = $props();
const dispatch = createEventDispatcher();
let name: string, id: string, error: string;
let showCustomId = false;
let name = $state('');
let id = $state<string | null>(null);
let error = $state<string | null>(null);
let showCustomId = $state(false);
const create = async () => {
try {
@@ -42,10 +44,13 @@
}
};
$: if (!showCreate) {
showCustomId = false;
error = null;
}
$effect(() => {
if (!showCreate) {
showCustomId = false;
id = null;
error = null;
}
});
</script>
<Modal title="Create team" {error} size="m" bind:show={showCreate} onSubmit={create}>
src/routes/(console)/project-[region]-[project]/auth/user-[user]/identities/+page.svelte
+2 -2
View File
@@ -52,13 +52,13 @@
<div class="u-flex u-main-end u-gap-16 is-not-mobile">
<Filters query={data.query} {columns} />
<div>
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
</div>
</div>
</div>
<div class="u-flex u-gap-16 is-only-mobile u-margin-block-start-16">
<div class="u-flex-basis-50-percent">
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
</div>
<div class="u-flex-basis-50-percent">
<Filters query={data.query} {columns} fullWidthMobile />
src/routes/(console)/project-[region]-[project]/auth/user-[user]/targets/+page.svelte
+1 -1
View File
@@ -33,7 +33,7 @@
<div class="u-flex u-main-end u-gap-16 is-not-mobile">
<Filters query={data.query} {columns} />
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
</div>
</div>
</div>
src/routes/(console)/project-[region]-[project]/databases/+page.svelte
+1
View File
@@ -52,6 +52,7 @@
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector
ui="new"
{columns}
view={data.view}
hideColumns={!data.databases.total}
src/routes/(console)/project-[region]-[project]/databases/database-[database]/+page.svelte
+1
View File
@@ -26,6 +26,7 @@
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector
ui="new"
view={data.view}
columns={tableViewColumns}
hideColumns={!data.tables.total}
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/+layout.svelte
+17 -5
View File
@@ -52,7 +52,7 @@
import EditColumn from './columns/edit.svelte';
import RowActivity from './rows/activity.svelte';
import EditRowPermissions from './rows/editPermissions.svelte';
import { Dialog, Layout, Typography } from '@appwrite.io/pink-svelte';
import { Dialog, Layout, Typography, Selector } from '@appwrite.io/pink-svelte';
import { Button, Seekbar } from '$lib/elements/forms';
import { generateFakeRecords, generateColumns } from '$lib/helpers/faker';
import { addNotification } from '$lib/stores/notifications';
@@ -70,6 +70,7 @@
let createIndex: CreateIndex;
let createColumn: CreateColumn;
let selectedOption: Option['name'] = 'String';
let createMoreColumns = false;
/**
* adding a lot of fake data will trigger the realtime below
@@ -327,6 +328,10 @@
spreadsheetRenderKey.set(hash(rowIds));
}
$: if (!$showCreateColumnSheet.show) {
createMoreColumns = false;
}
</script>
<svelte:head>
@@ -336,20 +341,27 @@
<slot />
<SideSheet
closeOnBlur
closeOnBlur={false}
title={$showCreateColumnSheet.title}
titleBadge={selectedOption === 'Relationship' ? 'Experimental' : undefined}
bind:show={$showCreateColumnSheet.show}
submit={{
text: 'Create',
onClick: async () => {
await createColumn?.submit();
},
onClick: async () => await createColumn?.submit(),
disabled: !selectedOption
}}>
{#snippet footer()}
<Layout.Stack inline direction="row" alignItems="center">
<Selector.Switch
id="create-more-columns"
bind:checked={createMoreColumns}
label="Create more" />
</Layout.Stack>
{/snippet}
<CreateColumn
bind:selectedOption
bind:this={createColumn}
bind:createMore={createMoreColumns}
column={$showCreateColumnSheet.column}
columns={$showCreateColumnSheet.columns}
direction={$showCreateColumnSheet.direction}
src/routes/(console)/project-[region]-[project]/databases/database-[database]/table-[table]/createColumn.svelte
+9
View File
@@ -19,6 +19,7 @@
columnId = $bindable(null),
columnsOrder = $bindable(null),
selectedOption = $bindable('String'),
createMore = $bindable(false),
onColumnsReorder = null
}: {
column?: Columns;
@@ -27,6 +28,7 @@
columnsOrder?: string[];
direction: ColumnDirection;
selectedOption: Option['name'];
createMore?: boolean;
onColumnsReorder?: (newOrder: string[]) => void;
} = $props();
@@ -148,12 +150,19 @@
message: `Column ${key ?? data?.key} has been created`
});
trackEvent(Submit.ColumnCreate);
if (createMore) {
init();
return true; // keep sheet open
}
return false; // close sheet
} catch (e) {
addNotification({
type: 'error',
message: e.message
});
trackError(e, Submit.ColumnCreate);
return true; // keep open on error
}
}
src/routes/(console)/project-[region]-[project]/functions/function-[function]/+page.ts
+2 -1
View File
@@ -40,7 +40,8 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
'totalSize',
'buildDuration',
'status',
'type'
'type',
'resourceId'
]),
...parsedQueries.values()
]
src/routes/(console)/project-[region]-[project]/messaging/providers/+page.svelte
+1 -1
View File
@@ -29,7 +29,7 @@
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<Filters query={data.query} {columns} analyticsSource="messaging_providers" />
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
{#if $canWriteProviders}
<CreateProviderDropdown let:toggle>
<Button on:click={toggle} event="create_provider">
src/routes/(console)/project-[region]-[project]/messaging/topics/topic-[topic]/+page.svelte
+1 -1
View File
@@ -92,7 +92,7 @@
<SearchQuery placeholder="Search by type or IDs"></SearchQuery>
<Layout.Stack direction="row" inline>
<Filters query={data.query} {columns} analyticsSource="messaging_topics" />
<ViewSelector view={View.Table} {columns} hideView />
<ViewSelector ui="new" view={View.Table} {columns} hideView />
<Button
on:click={() => {
showAdd = true;
src/routes/(console)/project-[region]-[project]/settings/webhooks/+page.svelte
+1 -1
View File
@@ -27,7 +27,7 @@
<Container>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector {columns} view={View.Table} hideView />
<ViewSelector ui="new" {columns} view={View.Table} hideView />
{#if $canWriteWebhooks}
<Button
href={`${base}/project-${page.params.region}-${page.params.project}/settings/webhooks/create`}
src/routes/(console)/project-[region]-[project]/sites/+page.svelte
+6 -1
View File
@@ -63,7 +63,12 @@
<SearchQuery placeholder="Search by name" />
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector {columns} view={data.view} hideColumns hideView={!data.siteList.total} />
<ViewSelector
ui="new"
{columns}
view={data.view}
hideColumns
hideView={!data.siteList.total} />
{#if $canWriteSites}
<Button on:mousedown={() => (show = true)} event="create_site" size="s">
<Icon icon={IconPlus} slot="start" size="s" />
src/routes/(console)/project-[region]-[project]/sites/site-[site]/+page.ts
+13 -2
View File
@@ -12,7 +12,11 @@ export const load = async ({ params, depends, parent }) => {
const [deploymentList, prodReadyDeployments, proxyRuleList] = await Promise.all([
sdk.forProject(params.region, params.project).sites.listDeployments({
siteId: params.site,
queries: [Query.limit(4), Query.orderDesc(''), Query.select(['status', 'type'])]
queries: [
Query.limit(4),
Query.orderDesc(''),
Query.select(['status', 'type', 'resourceId'])
]
}),
sdk.forProject(params.region, params.project).sites.listDeployments({
siteId: params.site,
@@ -21,7 +25,14 @@ export const load = async ({ params, depends, parent }) => {
Query.equal('activate', true),
Query.limit(1),
Query.orderDesc(''),
Query.select(['buildDuration', 'totalSize', 'sourceSize', 'buildSize', 'type'])
Query.select([
'buildDuration',
'totalSize',
'sourceSize',
'buildSize',
'type',
'resourceId'
])
]
}),
sdk.forProject(params.region, params.project).proxy.listRules({
src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/+page.ts
+2 -1
View File
@@ -28,7 +28,8 @@ export const load = async ({ params, depends, url, route, parent }) => {
'totalSize',
'buildDuration',
'status',
'type'
'type',
'resourceId'
]),
...parsedQueries.values()
]
src/routes/(console)/project-[region]-[project]/storage/+page.svelte
+1
View File
@@ -39,6 +39,7 @@
</Layout.Stack>
<Layout.Stack direction="row" alignItems="center" justifyContent="flex-end">
<ViewSelector
ui="new"
{columns}
view={data.view}
hideColumns={!data.buckets.total}
src/routes/+layout.svelte
+6 -1
View File
@@ -6,7 +6,7 @@
import { trackPageView } from '$lib/actions/analytics';
import { Notifications, Progress } from '$lib/layout';
import { app, type AppStore } from '$lib/stores/app';
import { isCloud } from '$lib/system';
import { isCloud, isProductionCloud } from '$lib/system';
import { onMount } from 'svelte';
import { requestedMigration } from './store';
import { parseIfString } from '$lib/helpers/object';
@@ -173,6 +173,11 @@
<link rel="preload" as="style" type="text/css" href="/console/fonts/cloud.css" />
<link rel="stylesheet" href={`${base}/fonts/cloud.css`} />
{/if}
<!-- add GTM only on main instance -->
{#if isCloud && isProductionCloud(page.url)}
<script defer src={`${base}/scripts/gtm.js`}></script>
{/if}
</svelte:head>
<Root theme={resolveTheme($app.themeInUse)}>
src/themes/dark-cloud.json
+1
View File
@@ -112,6 +112,7 @@
"overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
"overlay-on-neutral": "rgba(255, 255, 255, 20%)",
"overlay-neutral-hover": "rgba(255, 255, 255, 4%)",
"overlay-neutral-hover-solid": "rgba(38, 38, 42, 100%)",
"overlay-neutral-pressed": "rgba(255, 255, 255, 8%)",
"overlay-neutral-selected": "rgba(255, 255, 255, 8%)",
"overlay-scrim": "rgba(0, 0, 0, 48%)",
src/themes/dark.json
+1
View File
@@ -112,6 +112,7 @@
"overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
"overlay-on-neutral": "rgba(255, 255, 255, 20%)",
"overlay-neutral-hover": "rgba(255, 255, 255, 4%)",
"overlay-neutral-hover-solid": "rgba(38, 38, 42, 100%)",
"overlay-neutral-pressed": "rgba(255, 255, 255, 8%)",
"overlay-neutral-selected": "rgba(255, 255, 255, 8%)",
"overlay-scrim": "rgba(0, 0, 0, 48%)",
src/themes/light-cloud.json
+1
View File
@@ -112,6 +112,7 @@
"overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
"overlay-on-neutral": "rgba(0, 0, 0, 6%)",
"overlay-neutral-hover": "rgba(25, 25, 28, 3%)",
"overlay-neutral-hover-solid": "rgba(248, 248, 248, 100%)",
"overlay-neutral-pressed": "rgba(25, 25, 28, 4%)",
"overlay-neutral-selected": "rgba(25, 25, 28, 4%)",
"overlay-scrim": "rgba(25, 25, 28, 80%)",
src/themes/light.json
+1
View File
@@ -112,6 +112,7 @@
"overlay-accent-pressed": "rgba(0, 0, 0, 40%)",
"overlay-on-neutral": "rgba(0, 0, 0, 6%)",
"overlay-neutral-hover": "rgba(25, 25, 28, 3%)",
"overlay-neutral-hover-solid": "rgba(248, 248, 248, 100%)",
"overlay-neutral-pressed": "rgba(25, 25, 28, 4%)",
"overlay-neutral-selected": "rgba(25, 25, 28, 4%)",
"overlay-scrim": "rgba(25, 25, 28, 80%)",
static/scripts/gtm.js
+10
View File
@@ -0,0 +1,10 @@
(function (w, d, s, l, i) {
w[l] = w[l] || [];
w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
var f = d.getElementsByTagName(s)[0],
j = d.createElement(s),
dl = l != 'dataLayer' ? '&l=' + l : '';
j.async = true;
j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
f.parentNode.insertBefore(j, f);
})(window, document, 'script', 'dataLayer', 'GTM-WQ5WKK8');