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 last fixes #522

Merged
merged 10 commits into from
Aug 29, 2023
Merged

fix: qa last fixes #522

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d51aeed
fix: add notification to email reset
ArmanNik Aug 29, 2023
36f8439
fix: placeholder
ArmanNik Aug 29, 2023
eb3e6bd
fix: function variables use input password now
ArmanNik Aug 29, 2023
a1eb691
fix: create variables
ArmanNik Aug 29, 2023
879a020
fix: code example
ArmanNik Aug 29, 2023
319a728
Merge branch 'main' of github.com:appwrite/console into fix-qa-last-f…
ArmanNik Aug 29, 2023
a65c65f
fix: code example overflow
ArmanNik Aug 29, 2023
a47aa55
feat: variables are input is set dinamically
ArmanNik Aug 29, 2023
8f50e84
fix: remove min for password lenght
ArmanNik Aug 29, 2023
b697b6f
fix: make use of promise.all
ArmanNik Aug 29, 2023
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
4 changes: 0 additions & 4 deletions src/lib/components/code.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@
overflow: auto;
}

pre {
padding-inline-end: 7rem !important; // Add space for label and copy btn
}

code,
pre {
&[class*='language-'] {
Expand Down
127 changes: 85 additions & 42 deletions src/lib/stores/marketplace.ts
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/lib/wizards/functions/components/appwriteVariable.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts">
import { Box } from '$lib/components';
import { FormList, Helper, InputChoice, InputText } from '$lib/elements/forms';
import { FormList, Helper, InputChoice, InputPassword } from '$lib/elements/forms';
import type { Variable } from '$lib/stores/marketplace';
import { templateConfig } from '../store';

Expand All @@ -10,10 +10,11 @@
<Box radius="small" padding={16}>
<FormList>
<div>
<InputText
<InputPassword
id={appwriteVariable.name}
label={appwriteVariable.name}
placeholder={appwriteVariable.placeholder ?? 'Enter value'}
showPasswordButton
required={appwriteVariable.required && !$templateConfig.generateKey}
bind:value={$templateConfig.appwriteApiKey}
disabled={!!$templateConfig.generateKey} />
Expand Down
12 changes: 12 additions & 0 deletions src/lib/wizards/functions/createTemplate.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
);
$templateConfig.variables['APPWRITE_API_KEY'] = key.secret;
}

const response = await sdk.forProject.functions.create(
$templateConfig.$id || ID.unique(),
$templateConfig.name,
Expand All @@ -54,6 +55,17 @@
runtimeDetail.providerRootDirectory,
$template.providerBranch
);

if ($templateConfig.variables) {
for (const [key, value] of Object.entries($templateConfig.variables)) {
await sdk.forProject.functions.createVariable(
response.$id,
key,
value?.toString()
);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

can we use a Promise.all helper for better performance?

}

goto(
`${base}/console/project-${$page.params.project}/functions/function-${response.$id}`
);
Expand Down
44 changes: 39 additions & 5 deletions src/lib/wizards/functions/steps/templateVariables.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
<script lang="ts">
import InputText from '$lib/elements/forms/inputText.svelte';
import { WizardStep } from '$lib/layout';
import { template, templateConfig } from '../store';
import { FormList, Helper } from '$lib/elements/forms';
import {
FormList,
Helper,
InputPassword,
InputText,
InputURL,
InputPhone,
InputEmail,
InputNumber
} from '$lib/elements/forms';
import { Card, Collapsible, CollapsibleItem } from '$lib/components';
import AppwriteVariable from '../components/appwriteVariable.svelte';
import type { SvelteComponent } from 'svelte';

async function beforeSubmit() {
for (const variable of $template.variables) {
Expand All @@ -23,6 +32,27 @@

$: requiredVariables = $template?.variables?.filter((v) => v.required);
$: optionalVariables = $template?.variables?.filter((v) => !v.required);

function selectComponent(
variableType: 'password' | 'text' | 'number' | 'email' | 'url' | 'phone'
): typeof SvelteComponent {
switch (variableType) {
case 'password':
return InputPassword;
case 'text':
return InputText;
case 'url':
return InputURL;
case 'phone':
return InputPhone;
case 'email':
return InputEmail;
case 'number':
return InputNumber;
default:
return InputPassword;
}
}
</script>

<WizardStep {beforeSubmit}>
Expand All @@ -46,14 +76,16 @@
<AppwriteVariable appwriteVariable={variable} />
{:else}
<div>
<InputText
<svelte:component
this={selectComponent(variable.type)}
id={variable.name}
label={variable.name}
placeholder={variable.placeholder ?? 'Enter value'}
required={variable.required}
autocomplete={false}
minlength={variable.type === 'password' ? 0 : null}
showPasswordButton={variable.type === 'password'}
bind:value={$templateConfig.variables[variable.name]} />

<Helper type="neutral">
{@html variable.description}
</Helper>
Expand All @@ -79,12 +111,14 @@
<AppwriteVariable appwriteVariable={variable} />
{:else}
<div>
<InputText
<svelte:component
this={selectComponent(variable.type)}
id={variable.name}
label={variable.name}
placeholder={variable.placeholder ?? 'Enter value'}
required={variable.required}
autocomplete={false}
showPasswordButton={variable.type === 'password'}
bind:value={$templateConfig.variables[variable.name]} />

<Helper type="neutral">
Expand Down
2 changes: 1 addition & 1 deletion src/lib/wizards/functions/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const templateConfig = writable<{
$id: string;
name: string;
runtime: string;
variables: { [key: string]: string };
variables: { [key: string]: unknown };
repositoryBehaviour: 'new' | 'existing';
repositoryName: string;
repositoryPrivate: boolean;
Expand Down
2 changes: 1 addition & 1 deletion src/routes/console/project-[project]/auth/templates/emailTemplate.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
label="Sender name"
bind:value={$emailTemplate.senderName}
tooltip="Set up an SMTP server to edit the sender name"
placeholder={'{{project}}'}
placeholder="Enter sender name"
readonly={!isSmtpEnabled} />
<InputEmail
bind:value={$emailTemplate.senderEmail}
Expand Down
5 changes: 5 additions & 0 deletions src/routes/console/project-[project]/auth/templates/resetEmail.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { Modal } from '$lib/components';
import { Button } from '$lib/elements/forms';
import { addNotification } from '$lib/stores/notifications';
import { sdk } from '$lib/stores/sdk';
import { project } from '../../store';
import { loadEmailTemplate } from './+page.svelte';
Expand All @@ -24,6 +25,10 @@
$emailTemplate.locale
);
$baseEmailTemplate = { ...$emailTemplate };
addNotification({
type: 'success',
message: 'Email template has been reset'
});
trackEvent(Submit.EmailResetTemplate, {
locale: $emailTemplate.locale,
type: $emailTemplate.type
Expand Down
13 changes: 11 additions & 2 deletions src/routes/console/project-[project]/functions/function-[function]/createGit.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,35 @@
language="sh"
withCopy
noMargin
noBoxPadding
code={`git checkout ${$func.providerBranch}`} />
</div>
</NumericListItem>
<NumericListItem fullWidth>
<span class="text"> Create a new commit </span>
<span class="text"> Add your changes</span>
<div class="u-margin-block-start-16">
<Code language="sh" withCopy noMargin noBoxPadding code={`git add .`} />
</div>
</NumericListItem>
<NumericListItem fullWidth>
<span class="text"> Create a new commit </span>
<div class="u-margin-block-start-16 u-min-width-0 u-grid">
<Code
language="sh"
withCopy
noMargin
noBoxPadding
code={`git commit -m "deploying with Appwrite"`} />
</div>
</NumericListItem>
<NumericListItem fullWidth>
<span class="text"> Push your new commit </span>
<span class="text"> Push your new commit</span>
<div class="u-margin-block-start-16">
<Code
language="sh"
withCopy
noMargin
noBoxPadding
code={`git push ${$func.providerBranch}`} />
</div>
</NumericListItem>
Expand Down
Loading