Skip to content
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

Jump to bottom

fix: QA v11 #132

Merged
merged 3 commits into from
Nov 14, 2022
Merged

fix: QA v11 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1771514
feat: various fixes
ArmanNik Nov 14, 2022
5b41954
fix: event modal
ArmanNik Nov 14, 2022
2bf2529
Merge branch 'main' of github.com:appwrite/appwrite-console-poc into …
ArmanNik Nov 14, 2022
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
124 changes: 60 additions & 64 deletions src/lib/components/eventModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

export let show = false;
let selectedService: typeof services[0] = null;
let selectedRequest: typeof selectedService['requests'][0] = null;
let selectedEvent: string = null;
let selectedResource: typeof selectedService['resources'][0] = null;
let selectedAction: string = null;
let selectedAttribute: string = null;
let helper: string = null;
let inputData: string = null;
Expand All @@ -20,55 +20,54 @@
dispatch('created', copyValue);
}

const events = ['create', 'update', 'delete'];
const actions = ['create', 'update', 'delete'];

const services = [
{
name: 'buckets',
requests: [{ name: 'files', events }],
events
resources: [{ name: 'files', actions }],
actions
},
{
name: 'databases',
requests: [
{ name: 'collections', events },
{ name: 'documents', events }
resources: [
{ name: 'collections', actions },
{ name: 'documents', actions }
],
events
actions
},
{
name: 'functions',
requests: [
{ name: 'deployments', events },
{ name: 'executions', events }
resources: [
{ name: 'deployments', actions },
{ name: 'executions', actions }
],
events
actions
},
{
name: 'teams',
requests: [{ name: 'memberships', events }],
events
resources: [{ name: 'memberships', actions }],
actions
},
{
name: 'users',
requests: [
{ name: 'recovery', events: ['create', 'delete'] },
{ name: 'sessions', events: ['create', 'delete'] },
{ name: 'verifications', events: ['create', 'delete'] }
resources: [
{ name: 'recovery', actions: ['create', 'delete'] },
{ name: 'sessions', actions: ['create', 'delete'] },
{ name: 'verifications', actions: ['create', 'delete'] }
],
events,
actions,
attributes: ['email', 'name', 'password', 'status', 'prefs']
}
];

function createEventString(
service: typeof selectedService,
request: typeof selectedRequest,
event: string,
resource: typeof selectedResource,
action: string,
attribute: string
) {
const data = new Map();
//SERVICE
if (service) {
data.set('service', { value: service.name, description: 'service' });
data.set('serviceId', {
Expand All @@ -77,55 +76,52 @@
});
}

//REQUEST
if (request) {
if (request.name === 'documents') {
data.set('request', {
if (resource) {
if (resource.name === 'documents') {
data.set('resource', {
value: 'collections',
description: 'request'
description: 'resource'
});
data.set('requestId', {
data.set('resourceId', {
value: '*',
description: `ID of collection`
});
data.set('secondaryRequest', {
data.set('secondaryResource', {
value: 'documents',
description: 'secondary request'
description: 'secondary resource'
});
data.set('secondaryRequestId', {
data.set('secondaryResourceId', {
value: '*',
description: `ID of document`
});
} else {
data.set('request', {
value: request.name,
description: `request`
data.set('resource', {
value: resource.name,
description: `resource`
});
data.set('requestId', {
data.set('resourceId', {
value: '*',
description: `ID of ${request?.name.slice(0, -1)}`
description: `ID of ${resource?.name.slice(0, -1)}`
});
}
}

//EVENT
if ((event && request?.events?.includes(event)) ?? service?.events?.includes(event)) {
data.set('event', { value: event, description: 'event' });
if ((action && resource?.actions?.includes(action)) ?? service?.actions?.includes(action)) {
data.set('action', { value: action, description: 'action' });
}

//ATTRIBUTE
if (attribute && !request) {
if (attribute && !resource) {
data.set('attribute', { value: attribute, description: 'attribute' });
} else if (event && service.name === 'users' && !request) {
} else if (action && service.name === 'users' && !resource) {
data.set('attribute', { value: '*', description: `attribute` });
}
return data;
}

$: eventString = createEventString(
selectedService,
selectedRequest,
selectedEvent,
selectedResource,
selectedAction,
selectedAttribute
);
$: copyValue =
Expand All @@ -135,8 +131,8 @@
.join('.');

$: if (selectedService) {
selectedRequest = null;
selectedEvent = null;
selectedResource = null;
selectedAction = null;
selectedAttribute = null;
helper = null;
}
Expand All @@ -146,8 +142,8 @@

$: if (!show) {
selectedService = null;
selectedRequest = null;
selectedEvent = null;
selectedResource = null;
selectedAction = null;
selectedAttribute = null;
helper = null;
inputData = null;
Expand Down Expand Up @@ -177,40 +173,40 @@
</div>
{#if selectedService}
<div>
<p class="u-text">Choose a request (optional)</p>
<p class="u-text">Choose a resource (optional)</p>
<div class="u-flex u-gap-8 u-margin-block-start-8">
{#each selectedService.requests as request}
{#each selectedService.resources as resource}
<Pill
disabled={showInput}
selected={request.name === selectedRequest?.name}
selected={resource.name === selectedResource?.name}
button
on:click={() => {
selectedRequest === request
? (selectedRequest = null)
: (selectedRequest = request);
selectedResource === resource
? (selectedResource = null)
: (selectedResource = resource);
inputData = null;
}}>{request.name}</Pill>
}}>{resource.name}</Pill>
{/each}
</div>
</div>
<div>
<p class="u-text">Choose an event (optional)</p>
<p class="u-text">Choose an action (optional)</p>
<div class="u-flex u-gap-8 u-margin-block-start-8">
{#each selectedRequest?.events ?? selectedService?.events as event}
{#each selectedResource?.actions ?? selectedService?.actions as action}
<Pill
disabled={showInput}
selected={selectedEvent === event}
selected={selectedAction === action}
button
on:click={() => {
selectedEvent === event
? (selectedEvent = null)
: (selectedEvent = event);
selectedAction === action
? (selectedAction = null)
: (selectedAction = action);
inputData = null;
}}>{event}</Pill>
}}>{action}</Pill>
{/each}
</div>
</div>
{#if selectedService?.name === 'users' && !selectedRequest?.name}
{#if selectedService?.name === 'users' && !selectedResource?.name}
<div>
<p class="u-text">Choose an attribute (optional)</p>
<div class="u-flex u-gap-8 u-margin-block-start-8">
Expand Down
13 changes: 5 additions & 8 deletions src/lib/layout/logs.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@
</div>
<div class="status u-margin-inline-start-auto">
<Status status={$log.data.status}>{$log.data.status}</Status>

<time>TBI</time>
</div>
</div>
<div class="tabs u-margin-block-start-48 u-sep-block-end">
Expand Down Expand Up @@ -147,7 +145,6 @@
</div>
<div>
<p>Triggered by: {$log.data.trigger}</p>
<p>Type: TBI</p>
</div>
<div class="status u-margin-inline-start-auto">
<Status status={$log.data.status}>{$log.data.status}</Status>
Expand All @@ -162,16 +159,16 @@
on:click={() => (selectedTab = 'response')}>
Response
</Tab>
<Tab
selected={selectedTab === 'errors'}
on:click={() => (selectedTab = 'errors')}>
Errors
</Tab>
<Tab
selected={selectedTab === 'logs'}
on:click={() => (selectedTab = 'logs')}>
Logs
</Tab>
<Tab
selected={selectedTab === 'errors'}
on:click={() => (selectedTab = 'errors')}>
Errors
</Tab>
</Tabs>
</div>
<div class="theme-dark u-stretch u-margin-block-start-32 u-overflow-hidden">
Expand Down
2 changes: 1 addition & 1 deletion ...oject-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</script>

<WizardStep>
<svelte:fragment slot="title">Create document data</svelte:fragment>
<svelte:fragment slot="title">Create data</svelte:fragment>
<svelte:fragment slot="subtitle">
Provide document data based on attributes you created earlier.
</svelte:fragment>
Expand Down
2 changes: 1 addition & 1 deletion ...oject-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</script>

<WizardStep>
<svelte:fragment slot="title">Set Permissions</svelte:fragment>
<svelte:fragment slot="title">Permissions</svelte:fragment>
<svelte:fragment slot="subtitle">
Choose who can access your collection and documents. For more information, check out the <a
href="https://appwrite.io/docs/permissions"
Expand Down
8 changes: 4 additions & 4 deletions src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@
$log.show = true;
$log.func = $func;
$log.data = activeDeployment;
}}>Logs</Button>
}}>
Build logs
</Button>
<Button secondary on:click={() => execute.set($func)}>Execute now</Button>
</svelte:fragment>
</CardGrid>
Expand All @@ -154,7 +156,6 @@
<TableCellHead width={100}>Deployment ID</TableCellHead>
<TableCellHead width={140}>Created</TableCellHead>
<TableCellHead width={100}>Status</TableCellHead>
<TableCellHead width={90}>Build time</TableCellHead>
<TableCellHead width={70}>Size</TableCellHead>
<TableCellHead width={25} />
</TableHeader>
Expand All @@ -179,8 +180,7 @@
{deployment.status}
</Status>
</TableCell>
<!-- TODO: replace with build time, when implemented -->
<TableCellText title="Build Time">TBI</TableCellText>

<TableCellText title="Size">
{calculateSize(deployment.size)}
</TableCellText>
Expand Down
2 changes: 0 additions & 2 deletions .../console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
<TableCellHead width={140}>Created</TableCellHead>
<TableCellHead width={110}>Status</TableCellHead>
<TableCellHead width={90}>Trigger</TableCellHead>
<TableCellHead width={70}>Type</TableCellHead>
<TableCellHead width={100}>Duration</TableCellHead>
</TableHeader>
<TableBody>
Expand Down Expand Up @@ -86,7 +85,6 @@
<span class="text u-trim">{execution.trigger}</span>
</Pill>
</TableCellText>
<TableCellText title="Type">TBI</TableCellText>
<TableCellText title="Duration">
{calculateTime(execution.duration)}</TableCellText>
</TableRowButton>
Expand Down