From 1771514c98cb4bfa4d442f6c3f889ea7d23d3110 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 14 Nov 2022 09:37:52 +0100 Subject: [PATCH 1/2] feat: various fixes --- src/lib/layout/logs.svelte | 13 +++++-------- .../collection-[collection]/wizard/step1.svelte | 2 +- .../collection-[collection]/wizard/step2.svelte | 2 +- .../function-[function]/[[page]]/+page.svelte | 8 ++++---- .../executions/[[page]]/+page.svelte | 2 -- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 6ec59687d..4ba527597 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -80,8 +80,6 @@
{$log.data.status} - -
@@ -147,7 +145,6 @@

Triggered by: {$log.data.trigger}

-

Type: TBI

{$log.data.status} @@ -162,16 +159,16 @@ on:click={() => (selectedTab = 'response')}> Response - (selectedTab = 'errors')}> - Errors - (selectedTab = 'logs')}> Logs + (selectedTab = 'errors')}> + Errors +
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte index 0f84965e4..e9da37025 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step1.svelte @@ -26,7 +26,7 @@ - Create document data + Create data Provide document data based on attributes you created earlier. diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte index e987e8254..3467716aa 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/wizard/step2.svelte @@ -5,7 +5,7 @@ - Set Permissions + Permissions Assign read or write permissions at the Collection Level or Document Level. If collection Level permissions are assigned, permissions applied to diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte index bd389bbcb..fb694f4df 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte @@ -133,7 +133,9 @@ $log.show = true; $log.func = $func; $log.data = activeDeployment; - }}>Logs + }}> + Build logs + @@ -154,7 +156,6 @@ Deployment ID Created Status - Build time Size @@ -179,8 +180,7 @@ {deployment.status} - - TBI + {calculateSize(deployment.size)} diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte index 8e03241e9..9814c33b2 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte @@ -55,7 +55,6 @@ Created Status Trigger - Type Duration @@ -86,7 +85,6 @@ {execution.trigger} - TBI {calculateTime(execution.duration)} From 5b419545f8b663da1e793146bff708d61c1bf044 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 14 Nov 2022 10:14:19 +0100 Subject: [PATCH 2/2] fix: event modal --- src/lib/components/eventModal.svelte | 124 +++++++++++++-------------- 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte index f812d7ceb..b6e931be3 100644 --- a/src/lib/components/eventModal.svelte +++ b/src/lib/components/eventModal.svelte @@ -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; @@ -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', { @@ -77,46 +76,43 @@ }); } - //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; @@ -124,8 +120,8 @@ $: eventString = createEventString( selectedService, - selectedRequest, - selectedEvent, + selectedResource, + selectedAction, selectedAttribute ); $: copyValue = @@ -135,8 +131,8 @@ .join('.'); $: if (selectedService) { - selectedRequest = null; - selectedEvent = null; + selectedResource = null; + selectedAction = null; selectedAttribute = null; helper = null; } @@ -146,8 +142,8 @@ $: if (!show) { selectedService = null; - selectedRequest = null; - selectedEvent = null; + selectedResource = null; + selectedAction = null; selectedAttribute = null; helper = null; inputData = null; @@ -177,40 +173,40 @@
{#if selectedService}
-

Choose a request (optional)

+

Choose a resource (optional)

- {#each selectedService.requests as request} + {#each selectedService.resources as resource} { - selectedRequest === request - ? (selectedRequest = null) - : (selectedRequest = request); + selectedResource === resource + ? (selectedResource = null) + : (selectedResource = resource); inputData = null; - }}>{request.name} + }}>{resource.name} {/each}
-

Choose an event (optional)

+

Choose an action (optional)

- {#each selectedRequest?.events ?? selectedService?.events as event} + {#each selectedResource?.actions ?? selectedService?.actions as action} { - selectedEvent === event - ? (selectedEvent = null) - : (selectedEvent = event); + selectedAction === action + ? (selectedAction = null) + : (selectedAction = action); inputData = null; - }}>{event} + }}>{action} {/each}
- {#if selectedService?.name === 'users' && !selectedRequest?.name} + {#if selectedService?.name === 'users' && !selectedResource?.name}

Choose an attribute (optional)