Skip to content

chore: hide runtime specifications select for self-hosted. #1755

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

Closed
ChiragAgg5k wants to merge 1 commit into from
Closed

chore: hide runtime specifications select for self-hosted. #1755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 18 additions & 16 deletions src/lib/wizards/functions/steps/manualDetails.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<script lang="ts">
import { CustomId } from '$lib/components';
import { BillingPlan } from '$lib/constants';
import { Pill } from '$lib/elements';
import { InputText, InputSelect, FormList } from '$lib/elements/forms';
import { FormList, InputSelect, InputText } from '$lib/elements/forms';
import { WizardStep } from '$lib/layout';
import { onMount } from 'svelte';
import { createFunction } from '../store';
import { organization } from '$lib/stores/organization';
import { runtimesList } from '$lib/stores/runtimes';
import { specificationsList } from '$lib/stores/specifications';
import { isCloud } from '$lib/system';
import { organization } from '$lib/stores/organization';
import { BillingPlan } from '$lib/constants';
import { onMount } from 'svelte';
import SpecificationsTooltip from '../components/specificationsTooltip.svelte';
import { createFunction } from '../store';
let showCustomId = false;
Expand Down Expand Up @@ -53,17 +53,19 @@
{options}
required />

<InputSelect
label="CPU and memory"
id="specification"
placeholder="Select specification"
required
disabled={specificationOptions.length < 1}
options={specificationOptions}
popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
? SpecificationsTooltip
: null}
bind:value={$createFunction.specification} />
{#if isCloud}
<InputSelect
label="CPU and memory"
id="specification"
placeholder="Select specification"
required
disabled={specificationOptions.length < 1}
options={specificationOptions}
popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
Copy link
Member

@ItzNotABug ItzNotABug Mar 26, 2025

Choose a reason for hiding this comment

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

already isCloud here no?

Also lets move from doing a plan check to checking if the specification list only has one item [Free only has one]. @lohanidamodar makes sense?

? SpecificationsTooltip
: null}
bind:value={$createFunction.specification} />
{/if}

{#if !showCustomId}
<div>
Expand Down
54 changes: 28 additions & 26 deletions src/lib/wizards/functions/steps/templateConfiguration.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<script lang="ts">
import { CustomId } from '$lib/components';
import { BillingPlan } from '$lib/constants';
import { Pill } from '$lib/elements';
import { FormList, InputSelect, InputText } from '$lib/elements/forms';
import { WizardStep } from '$lib/layout';
import { organization } from '$lib/stores/organization';
import { runtimesList } from '$lib/stores/runtimes';
import { specificationsList } from '$lib/stores/specifications';
import { BillingPlan } from '$lib/constants';
import { isCloud } from '$lib/system';
import SpecificationsTooltip from '../components/specificationsTooltip.svelte';
import { template, templateConfig } from '../store';
import { organization } from '$lib/stores/organization';
import { isCloud } from '$lib/system';
let showCustomId = false;
Expand All @@ -18,7 +18,7 @@
throw new Error('Please select a runtime.');
}
if (!$templateConfig.specification) {
if (isCloud && !$templateConfig.specification) {
throw new Error('Please select a specification.');
}
}
Expand Down Expand Up @@ -86,28 +86,30 @@
{options}
bind:value={$templateConfig.runtime} />
{/await}
{#await loadSpecifications()}
<InputSelect
label="CPU and memory"
id="specification"
placeholder="Loading specifications..."
required
disabled
options={[]}
value={null} />
{:then specificationOptions}
<InputSelect
label="CPU and memory"
id="specification"
placeholder="Select specification"
required
disabled={specificationOptions.length < 1}
options={specificationOptions}
popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
? SpecificationsTooltip
: null}
bind:value={$templateConfig.specification} />
{/await}
{#if isCloud}
{#await loadSpecifications()}
<InputSelect
label="CPU and memory"
id="specification"
placeholder="Loading specifications..."
required
disabled
options={[]}
value={null} />
{:then specificationOptions}
<InputSelect
label="CPU and memory"
id="specification"
placeholder="Select specification"
required
disabled={specificationOptions.length < 1}
options={specificationOptions}
popover={$organization?.billingPlan === BillingPlan.FREE
Copy link
Member

@ItzNotABug ItzNotABug Mar 26, 2025

Choose a reason for hiding this comment

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

same as above on what we decide.

? SpecificationsTooltip
: null}
bind:value={$templateConfig.specification} />
{/await}
{/if}
</FormList>

<FormList class="u-margin-block-start-24">
Expand Down
38 changes: 20 additions & 18 deletions ...s/(console)/project-[project]/functions/function-[function]/settings/updateRuntime.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
import { CardGrid, Heading } from '$lib/components';
import { BillingPlan, Dependencies } from '$lib/constants';
import { Button, Form, FormList } from '$lib/elements/forms';
import InputSelect from '$lib/elements/forms/inputSelect.svelte';
import { isValueOfStringEnum } from '$lib/helpers/types';
import { addNotification } from '$lib/stores/notifications';
import { organization } from '$lib/stores/organization';
import { runtimesList } from '$lib/stores/runtimes';
import { sdk } from '$lib/stores/sdk';
import { onMount } from 'svelte';
import { func } from '../store';
import InputSelect from '$lib/elements/forms/inputSelect.svelte';
import { specificationsList } from '$lib/stores/specifications';
import { runtimesList } from '$lib/stores/runtimes';
import { isValueOfStringEnum } from '$lib/helpers/types';
import { Runtime } from '@appwrite.io/console';
import { isCloud } from '$lib/system';
import { organization } from '$lib/stores/organization';
import SpecificationsTooltip from '$lib/wizards/functions/components/specificationsTooltip.svelte';
import { Runtime } from '@appwrite.io/console';
import { onMount } from 'svelte';
import { func } from '../store';
const functionId = $page.params.function;
let runtime: string = null;
Expand Down Expand Up @@ -102,17 +102,19 @@
{options}
required
hideRequired />
<InputSelect
label="CPU and memory"
id="size"
placeholder="Select runtime specification"
bind:value={specification}
options={specificationOptions}
popover={isCloud && $organization?.billingPlan === BillingPlan.FREE
? SpecificationsTooltip
: null}
required
hideRequired />
{#if isCloud}
<InputSelect
label="CPU and memory"
id="size"
placeholder="Select runtime specification"
bind:value={specification}
options={specificationOptions}
popover={$organization?.billingPlan === BillingPlan.FREE
Copy link
Member

@ItzNotABug ItzNotABug Mar 26, 2025

Choose a reason for hiding this comment

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

same..

? SpecificationsTooltip
: null}
required
hideRequired />
{/if}
</FormList>
</svelte:fragment>

Expand Down