Merge branch 'feat-pink-v2' of https://github.com/appwrite/console into feat-pink-v2

This commit is contained in:
Torsten Dittmann committed 2025-03-12 16:19:11 +04:00
commit 2b07e688a9
13 files changed
+158 -66

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@
"e2e:ui": "playwright test tests/e2e --ui"
},
"dependencies": {
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c",
"@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78",
"@appwrite.io/pink-icons": "0.25.0",
"@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b",
"@appwrite.io/pink-legacy": "^1.0.3",
+5 -5
View File
@@ -9,8 +9,8 @@ importers:
.:
dependencies:
'@appwrite.io/console':
specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c
version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c
specifier: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78
version: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78
'@appwrite.io/pink-icons':
specifier: 0.25.0
version: 0.25.0
@@ -211,8 +211,8 @@ packages:
'@analytics/type-utils@0.6.2':
resolution: {integrity: sha512-TD+xbmsBLyYy/IxFimW/YL/9L2IEnM7/EoV9Aeh56U64Ify8o27HJcKjo38XY9Tcn0uOq1AX3thkKgvtWvwFQg==}
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c':
resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c}
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78':
resolution: {tarball: https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78}
version: 1.2.1
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b':
@@ -4097,7 +4097,7 @@ snapshots:
'@analytics/type-utils@0.6.2': {}
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@640f09c': {}
'@appwrite.io/console@https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@75b3e78': {}
'@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bcb8ad2b(svelte@4.2.19)':
dependencies:
@@ -0,0 +1,41 @@
<script lang="ts">
import { Icon, Layout, Tag, Tooltip } from '@appwrite.io/pink-svelte';
import { queries, tagFormat } from './store';
import { IconX } from '@appwrite.io/pink-icons-svelte';
import { parsedTags } from './setFilters';
import { Button } from '$lib/elements/forms';
$: console.log($parsedTags);
</script>
{#if $parsedTags?.length}
<Layout.Stack direction="row" gap="s" wrap="wrap" alignItems="center" inline>
{#each $parsedTags as tag}
<span>
<Tooltip disabled={Array.isArray(tag.value) ? tag.value?.length < 3 : true}>
<Tag
size="s"
on:click={() => {
queries.removeFilter(tag);
queries.apply();
parsedTags.update((tags) => tags.filter((t) => t.tag !== tag.tag));
}}>
{#key tag.tag}
<span use:tagFormat>{tag.tag}</span>
{/key}
<Icon icon={IconX} size="s" slot="end" />
</Tag>
<span slot="tooltip">{tag?.value?.toString()}</span>
</Tooltip>
</span>
{/each}
<Button
size="s"
text
on:click={() => {
queries.clearAll();
queries.apply();
parsedTags.set([]);
}}>Clear all</Button>
</Layout.Stack>
{/if}
+10 -4
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { Button } from '$lib/elements/forms';
import { Card, Divider, Icon } from '@appwrite.io/pink-svelte';
import { Card, Icon } from '@appwrite.io/pink-svelte';
import { tags } from './store';
import { IconFilterLine } from '@appwrite.io/pink-icons-svelte';
import { createMenubar, melt } from '@melt-ui/svelte';
@@ -33,9 +33,7 @@
<div class="menu" use:melt={$menu}>
<Card.Base padding="xxxs">
<slot />
<div use:melt={$separator}>
<Divider />
</div>
<div class="separator" use:melt={$separator} />
<slot name="end" />
</Card.Base>
</div>
@@ -46,4 +44,12 @@
min-width: 244px;
z-index: 20;
}
.separator {
height: 1px;
margin-block: 2px;
margin-inline-start: calc(var(--base-4) * -1);
width: calc(100% + var(--base-8));
background-color: var(--border-neutral);
}
</style>
+56 -20
View File
@@ -1,6 +1,9 @@
import type { Column } from '$lib/helpers/types';
import { get, writable } from 'svelte/store';
import { resetOptions, type FilterData } from './quickFilters';
import type { TagValue } from './store';
import { tags, type TagValue } from './store';
export const parsedTags = writable<TagValue[]>([]);
export function setFiltersOnNavigate(
tags: TagValue[],
@@ -14,15 +17,15 @@ export function setFiltersOnNavigate(
} else {
filterCols.forEach((filter) => {
if (filter.id === 'buildDuration') {
setTimeFilter(tags, filter, $columns);
setTimeFilter(filter, $columns);
} else if (filter.id.includes('size')) {
setSizeFilter(tags, filter, $columns);
setSizeFilter(filter, $columns);
} else if (filter.id === 'statusCode') {
setStatusCodeFilter(tags, filter, $columns);
setStatusCodeFilter(filter, $columns);
} else if (filter.id === '$createdAt' || filter.id === '$updatedAt') {
setDateFilter(tags, filter, $columns);
setDateFilter(filter, $columns);
} else {
setFilterData(filter, tags);
setFilterData(filter);
}
});
@@ -31,9 +34,11 @@ export function setFiltersOnNavigate(
}
}
export function setFilterData(filter: FilterData, list: TagValue[]) {
const tagData = list.find((tag) => tag.tag.includes(`**${filter.title}**`));
export function setFilterData(filter: FilterData) {
const tagData = get(tags).find((tag) => tag.tag.includes(`**${filter.title}**`));
if (tagData) {
cleanOldTags(filter.title);
filter.tag = tagData.tag;
if (Array.isArray(tagData.value) && tagData.value?.length) {
const values = tagData.value as string[];
@@ -41,16 +46,25 @@ export function setFilterData(filter: FilterData, list: TagValue[]) {
option.checked = values.includes(option.value);
});
}
const newTag = {
tag: tagData.tag.replace(',', ' or '),
value: tagData.value
};
parsedTags.update((tags) => {
tags.push(newTag);
return tags;
});
} else {
filter.tag = null;
resetOptions(filter);
}
}
export function setTimeFilter(localTags: TagValue[], filter: FilterData, columns: Column[]) {
export function setTimeFilter(filter: FilterData, columns: Column[]) {
const col = columns.find((c) => c.id === filter.id);
const timeTag = localTags.find((tag) => tag.tag.includes(`**${filter.title}**`));
const timeTag = get(tags).find((tag) => tag.tag.includes(`**${filter.title}**`));
if (timeTag) {
cleanOldTags(filter.title);
const now = new Date();
const diff = now.getTime() - new Date(timeTag.value as string).getTime();
@@ -62,16 +76,24 @@ export function setTimeFilter(localTags: TagValue[], filter: FilterData, columns
return prev;
});
if (dateRange) {
const newTag = {
tag: `**${filter.title}** is **${dateRange.label}**`,
value: timeTag.value
};
filter.tag = `**${filter.title}** is **${dateRange.label}**`;
filter = filter;
parsedTags.update((tags) => {
tags.push(newTag);
return tags;
});
}
} else {
filter.tag = null;
}
}
export function setSizeFilter(localTags: TagValue[], filter: FilterData, columns: Column[]) {
const sizeTag = localTags.find((tag) => tag.tag.includes(`**${filter.title}**`));
export function setSizeFilter(filter: FilterData, columns: Column[]) {
const sizeTag = get(tags).find((tag) => tag.tag.includes(`**${filter.title}**`));
const col = columns.find((c) => c.id === filter.id);
if (sizeTag) {
const size = sizeTag.value as string;
@@ -92,8 +114,8 @@ export function setSizeFilter(localTags: TagValue[], filter: FilterData, columns
}
}
export function setStatusCodeFilter(localTags: TagValue[], filter: FilterData, columns: Column[]) {
const statusCodeTag = localTags.find((tag) => tag.tag.includes(`**${filter.title}**`));
export function setStatusCodeFilter(filter: FilterData, columns: Column[]) {
const statusCodeTag = get(tags).find((tag) => tag.tag.includes(`**${filter.title}**`));
const col = columns.find((c) => c.id === filter.id);
if (statusCodeTag) {
@@ -109,13 +131,14 @@ export function setStatusCodeFilter(localTags: TagValue[], filter: FilterData, c
}
}
export function setDateFilter(localTags: TagValue[], filter: FilterData, columns: Column[]) {
const dateTeag = localTags.find((tag) => tag.tag.includes(`**${filter.title}**`));
export function setDateFilter(filter: FilterData, columns: Column[]) {
const dateTag = get(tags).find((tag) => tag.tag.includes(`**${filter.title}**`));
const col = columns.find((c) => c.id === filter.id);
if (dateTeag) {
if (dateTag) {
cleanOldTags(filter.title);
const now = new Date();
const diff = now.getTime() - new Date(dateTeag.value as string).getTime();
const diff = now.getTime() - new Date(dateTag.value as string).getTime();
const ranges = col.elements as { value: string; label: string }[];
const dateRange = ranges.reduce((prev, curr) => {
if (parseInt(curr.value) < diff && curr.value > prev.value) {
@@ -124,10 +147,23 @@ export function setDateFilter(localTags: TagValue[], filter: FilterData, columns
return prev;
});
if (dateRange) {
filter.tag = `**${filter.title}** is **${dateRange.label}**`;
filter = filter;
const newTag = {
tag: `**${filter.title}** is **${dateRange.label}**`,
value: dateTag.value
};
parsedTags.update((tags) => {
tags.push(newTag);
return tags;
});
}
} else {
filter.tag = null;
}
}
function cleanOldTags(title: string) {
parsedTags.update((tags) => {
tags = tags.filter((tag) => !tag.tag.includes(`**${title}**`));
return tags;
});
}
+1 -1
View File
@@ -87,7 +87,7 @@
});
}}>
<Layout.Stack direction="row" gap="s">
<Selector.Checkbox bind:checked={option.checked} />
<Selector.Checkbox bind:checked={option.checked} size="s" />
{capitalize(option.label)}
</Layout.Stack>
</ActionMenu.Item.Button>
@@ -19,10 +19,10 @@ export const load: PageLoad = async ({ params, depends, url, route, parent }) =>
offset,
limit,
query,
activeDeployment: data.function.deployment
activeDeployment: data.function.deploymentId
? await sdk.forProject.functions.getDeployment(
params.function,
data.function.deployment
data.function.deploymentId
)
: null,
deploymentList: await sdk.forProject.functions.listDeployments(params.function, [
@@ -9,10 +9,10 @@ export const load: PageLoad = async ({ params, depends, parent }) => {
return {
func: data.function,
activeDeployment: data.function.deployment
activeDeployment: data.function.deploymentId
? await sdk.forProject.functions.getDeployment(
params.function,
data.function.deployment
data.function.deploymentId
)
: null,
proxyRuleList: data.proxyRuleList
@@ -21,8 +21,9 @@
export let show = false;
export let site: Models.Site;
export let callbackState: Record<string, string> = null;
export let onlyExisting = false;
let repositoryBehaviour: 'new' | 'existing' | undefined = undefined;
let repositoryBehaviour: 'new' | 'existing' | undefined = onlyExisting ? 'existing' : undefined;
let repositoryName = '';
let repositoryPrivate = true;
let selectedInstallationId = '';
@@ -75,7 +76,6 @@
undefined,
undefined
);
console.log('test');
invalidate(Dependencies.SITE);
show = false;
dispatch('connect', s);
@@ -100,7 +100,9 @@
</span>
{#if hasInstallations}
<Layout.Stack gap="xl">
<RepositoryBehaviour bind:repositoryBehaviour />
{#if !onlyExisting}
<RepositoryBehaviour bind:repositoryBehaviour />
{/if}
{#if repositoryBehaviour === 'new'}
<NewRepository
bind:repositoryName
@@ -111,6 +113,7 @@
<Repositories
bind:hasInstallations
bind:selectedRepository
product="sites"
action="button"
{callbackState}
on:connect={(e) => {
@@ -188,19 +188,27 @@
{#if behaviour === 'CREATE'}
<Fieldset legend="Configuration">
<Layout.Stack gap="xl">
{#if data.branches?.total}
{#if data.site?.providerRepositoryId}
{@const sortedBranches = sortBranches(data.branches.branches)}
{@const options = sortedBranches.map((branch) => ({
label: branch.name,
value: branch.name
}))}
<InputSelect
{options}
label="Production branch"
id="branch"
required
bind:value={branch}
placeholder="Select branch" />
<Layout.Stack gap="s">
<InputSelect
{options}
label="Production branch"
id="branch"
required
bind:value={branch}
placeholder="Select branch" />
{#if !data.branches?.total}
<Input.Helper state="default">
No branches found in the selected repository. Create a
branch to see it here.
</Input.Helper>
{/if}
</Layout.Stack>
{:else}
<InputSelect
disabled
@@ -210,7 +218,6 @@
required
value="main"
placeholder="Select branch" />
<Alert.Inline title=" There is no repository connected to your site">
<Layout.Stack>
<p>
@@ -287,5 +294,6 @@
<ConnectRepoModal
bind:show={showConnectRepo}
site={data.site}
onlyExisting
callbackState={{ connectRepo: 'true' }} />
{/if}
@@ -11,6 +11,7 @@
import { Card, Empty, Layout } from '@appwrite.io/pink-svelte';
import { View } from '$lib/helpers/load';
import { columns } from './store';
import AppliedFilter from '$lib/components/filters/appliedFilter.svelte';
export let data;
@@ -26,13 +27,16 @@
</script>
<Container>
<Layout.Stack direction="row" justifyContent="space-between">
<QuickFilters {columns} analyticsSource="site_logs" />
{#if data.logs.total}
<ViewSelector view={View.Table} {columns} hideView />
{/if}
</Layout.Stack>
<Layout.Stack>
<Layout.Stack direction="row" justifyContent="space-between">
<QuickFilters {columns} analyticsSource="site_logs" />
{#if data.logs.total}
<ViewSelector view={View.Table} {columns} hideView />
{/if}
</Layout.Stack>
<AppliedFilter />
</Layout.Stack>
{#if data?.logs?.total}
<Table columns={$columns} logs={data.logs} />
@@ -11,7 +11,6 @@ export const load = async ({ params, depends, url, route, parent }) => {
const limit = getLimit(url, route, PAGE_LIMIT);
const offset = pageToOffset(page, limit);
const query = getQuery(url);
const search = getSearch(url);
const parsedQueries = queryParamToMap(query || '[]');
queries.set(parsedQueries);
@@ -20,18 +19,12 @@ export const load = async ({ params, depends, url, route, parent }) => {
offset,
limit,
query,
search,
site,
logs: await sdk.forProject.sites.listLogs(
params.site,
[
// Query.search('requestPath', search),
Query.limit(limit),
Query.offset(offset),
Query.orderDesc(''),
...parsedQueries.values()
],
search
)
logs: await sdk.forProject.sites.listLogs(params.site, [
Query.limit(limit),
Query.offset(offset),
Query.orderDesc(''),
...parsedQueries.values()
])
};
};
@@ -89,6 +89,7 @@ export const columns = writable<Column[]>([
label: 'more than 30 seconds'
}
],
filter: false,
hide: true
},
{