Skip to content

Commit

Permalink
Merge pull request #524 from appwrite/fix-lastminute-1.4-qa
Browse files Browse the repository at this point in the history 
fix: lastminute 1.4 qa
  • Loading branch information
@TorstenDittmann
TorstenDittmann authored Aug 30, 2023
2 parents 15a0f84 + 7cb6d91 commit 2034c5d
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 27 deletions.
8 changes: 4 additions & 4 deletions src/lib/pages/domains/index.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
{#if rules.total}
<TableScroll>
<TableHeader>
<TableCellHead>Name</TableCellHead>
<TableCellHead width={180}>Verification Status</TableCellHead>
<TableCellHead>Certificate Status</TableCellHead>
<TableCellHead width={150}>Name</TableCellHead>
<TableCellHead width={120}>Verification Status</TableCellHead>
<TableCellHead width={180}>Certificate Status</TableCellHead>
<TableCellHead width={40} />
</TableHeader>
<TableBody>
Expand Down Expand Up @@ -138,7 +138,7 @@
<div class="u-flex u-gap-8 u-cross-center">
<Pill>
<span class="icon-clock u-text-color-gray" aria-hidden="true" />
<p class="text">Waiting to run</p>
<p class="text">Waiting for verification</p>
</Pill>
</div>
{/if}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/wizards/functions/cover.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import { marketplace, type MarketplaceTemplate } from '$lib/stores/marketplace';
import { Button } from '$lib/elements/forms';
import { page } from '$app/stores';
import { runtimes } from '$routes/console/project-[project]/functions/store';
import { runtimesList } from '$routes/console/project-[project]/functions/store';
import { trackEvent } from '$lib/actions/analytics';
import type { Models } from '@appwrite.io/console';
import WizardCover from '$lib/layout/wizardCover.svelte';
Expand Down Expand Up @@ -92,7 +92,7 @@
style:--grid-item-size="8rem"
style:--grid-item-size-small-screens="9rem"
style:--grid-gap=".5rem">
{#await $runtimes}
{#await $runtimesList}
{#each Array(6) as _i}
<li>
<button
Expand Down
4 changes: 2 additions & 2 deletions src/lib/wizards/functions/steps/details.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import { WizardStep } from '$lib/layout';
import { onMount } from 'svelte';
import { createFunction } from '../store';
import { runtimes } from '$routes/console/project-[project]/functions/store';
import { runtimesList } from '$routes/console/project-[project]/functions/store';
let showCustomId = false;
let options = [];
onMount(async () => {
options = (await $runtimes).runtimes.map((runtime) => ({
options = (await $runtimesList).runtimes.map((runtime) => ({
label: `${runtime.name} - ${runtime.version}`,
value: runtime.$id
}));
Expand Down
4 changes: 2 additions & 2 deletions src/lib/wizards/functions/steps/functionConfiguration.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { onMount } from 'svelte';
import { sdk } from '$lib/stores/sdk';
import { choices, createFunction, installation, repository } from '../store';
import { runtimes } from '$routes/console/project-[project]/functions/store';
import { runtimesList } from '$routes/console/project-[project]/functions/store';
let showCustomId = false;
Expand All @@ -29,7 +29,7 @@
let options = [];
onMount(async () => {
options = (await $runtimes).runtimes.map((runtime) => ({
options = (await $runtimesList).runtimes.map((runtime) => ({
label: `${runtime.name} - ${runtime.version}`,
value: runtime.$id
}));
Expand Down
4 changes: 2 additions & 2 deletions src/lib/wizards/functions/steps/templateConfiguration.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { Pill } from '$lib/elements';
import { FormList, InputSelect, InputText } from '$lib/elements/forms';
import { WizardStep } from '$lib/layout';
import { runtimes } from '$routes/console/project-[project]/functions/store';
import { runtimesList } from '$routes/console/project-[project]/functions/store';
import { template, templateConfig } from '../store';
let showCustomId = false;
Expand All @@ -15,7 +15,7 @@
}
async function loadRuntimes() {
const options = (await $runtimes).runtimes
const options = (await $runtimesList).runtimes
.map((runtime) => ({
label: `${runtime.name} - ${runtime.version}`,
value: runtime.$id
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/project-[project]/functions/+layout.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ depends }) => {
return {
header: Header,
breadcrumbs: Breadcrumbs,
runtimes: sdk.forProject.functions.listRuntimes(),
runtimesList: sdk.forProject.functions.listRuntimes(),
installations: sdk.forProject.vcs.listInstallations([Query.limit(100)])
};
};
6 changes: 4 additions & 2 deletions src/routes/console/project-[project]/functions/function-[function]/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
</div>
{#if activeDeployment && !$func.live}
<div class="u-margin-block-start-8">
<Alert type="warning" isStandalone>
<Alert type="warning" isStandalone dismissible>
Some configuration options are not live yet. Redeploy your function to apply
latest changes.
</Alert>
Expand Down Expand Up @@ -150,7 +150,9 @@
on:click={() => {
selectedDeployment = activeDeployment;
showRedeploy = true;
}}>Redeploy</Button>
}}>
Redeploy
</Button>

<Button secondary on:click={() => ($execute = $func)}>Execute now</Button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/routes/console/project-[project]/functions/store.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { page } from '$app/stores';
import { derived } from 'svelte/store';
import type { Models } from '@appwrite.io/console';

export const runtimes = derived(
export const runtimesList = derived(
page,
async ($page) => (await $page.data.runtimes) as Models.RuntimeList
async ($page) => (await $page.data.runtimesList) as Models.RuntimeList
);
15 changes: 7 additions & 8 deletions src/routes/console/project-[project]/functions/templates/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
style="--grid-item-size:22rem; --grid-item-size-small-screens:19rem">
{#each data.templates as template}
{@const displayed = template.runtimes.slice(0, 2)}
{@const hidden = template.runtimes.slice(2, -1)}
{@const hidden = template.runtimes.slice(1, -1)}
<li>
<article class="card u-min-height-100-percent">
<div class="u-flex u-gap-16 u-cross-center">
Expand Down Expand Up @@ -214,16 +214,15 @@
</p>

<div class="u-flex u-gap-16 u-main-end u-margin-block-start-24">
<a
<Button
href={`${base}/console/project-${$page.params.project}/functions/templates/template-${template.id}`}
class="button is-text">
text>
<span class="text">View details</span>
</a>
<button
class="button is-secondary"
on:click={() => connectTemplate(template)}>
</Button>

<Button secondary on:click={() => connectTemplate(template)}>
<span class="text">Create function</span>
</button>
</Button>
</div>
</article>
</li>
Expand Down
4 changes: 2 additions & 2 deletions src/routes/console/project-[project]/functions/wizard/step1.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import { WizardStep } from '$lib/layout';
import { onMount } from 'svelte';
import { createFunction } from './store';
import { runtimes } from '../store';
import { runtimesList } from '../store';
let showCustomId = false;
let options = [];
onMount(async () => {
options = (await $runtimes).runtimes.map((runtime) => ({
options = (await $runtimesList).runtimes.map((runtime) => ({
label: `${runtime.name} - ${runtime.version}`,
value: runtime.$id
}));
Expand Down

3 comments on commit 2034c5d

@vercel
Copy link

@vercel vercel bot commented on 2034c5d Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

console – ./

console-appwrite.vercel.app
svelte-console.vercel.app
console-git-main-appwrite.vercel.app
demo.appwriters.com
brand-new-console.torsten.appwrite.org

@vercel
Copy link

@vercel vercel bot commented on 2034c5d Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

console-preview – ./

console-preview-appwrite.vercel.app
console-preview-git-main-appwrite.vercel.app
console-next.vercel.app

@vercel
Copy link

@vercel vercel bot commented on 2034c5d Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

console-cloud – ./

console-cloud-git-main-appwrite.vercel.app
console-cloud.vercel.app
console-cloud-appwrite.vercel.app

Please sign in to comment.