diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ab33a8f37..91c98b81f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,6 +42,7 @@ jobs: "PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}" "PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}" "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" + "SENTRY_RELEASE=${{ github.event.release.tag_name }}" publish-cloud-stage: runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 9827b2fb1..9c33636a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN npm i -g corepack@latest RUN corepack enable +RUN corepack prepare pnpm@10.0.0 --activate ADD ./package.json /app/package.json ADD ./pnpm-lock.yaml /app/pnpm-lock.yaml @@ -25,12 +26,14 @@ ARG PUBLIC_GROWTH_ENDPOINT ARG PUBLIC_STRIPE_KEY ARG SENTRY_AUTH_TOKEN ARG PUBLIC_PROJECT_PROFILE +ARG SENTRY_RELEASE ENV PUBLIC_APPWRITE_ENDPOINT=$PUBLIC_APPWRITE_ENDPOINT ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN +ENV SENTRY_RELEASE=$SENTRY_RELEASE ENV PUBLIC_PROJECT_PROFILE=$PUBLIC_PROJECT_PROFILE ENV NODE_OPTIONS=--max_old_space_size=8192 @@ -41,4 +44,4 @@ FROM nginx:1.27-alpine EXPOSE 80 COPY docker/nginx.conf /etc/nginx/conf.d/default.conf -COPY --from=build /app/build /usr/share/nginx/html/console \ No newline at end of file +COPY --from=build /app/build /usr/share/nginx/html/console diff --git a/package.json b/package.json index d7988c84a..2671ca225 100644 --- a/package.json +++ b/package.json @@ -22,20 +22,21 @@ }, "dependencies": { "@appwrite.io/console": "https://pkg.pr.new/appwrite/appwrite/@appwrite.io/console@e2f082e", + "@appwrite.io/pink": "0.25.0", "@appwrite.io/pink-icons": "0.25.0", - "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@207628e", + "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@bd21ff7f", "@appwrite.io/pink-legacy": "^1.0.3", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@16d19d7", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@cbf05a1", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", "ai": "^2.2.37", "analytics": "^0.8.16", + "@ai-sdk/svelte": "^1.1.22", "cron-parser": "^4.9.0", "dayjs": "^1.11.13", "deep-equal": "^2.2.3", "echarts": "^5.6.0", - "envfile": "^7.1.0", "ignore": "^6.0.2", "monaco-editor": "^0.52.2", "nanoid": "^5.1.5", @@ -50,7 +51,7 @@ }, "devDependencies": { "@eslint/compat": "^1.2.7", - "@eslint/js": "^9.23.0", + "@eslint/js": "^9.24.0", "@melt-ui/pp": "^0.3.2", "@melt-ui/svelte": "^0.86.5", "@playwright/test": "^1.51.1", @@ -86,7 +87,7 @@ "svelte-sequential-preprocessor": "^2.0.2", "tslib": "^2.8.1", "typescript": "^5.8.2", - "typescript-eslint": "^8.29.1", + "typescript-eslint": "^8.30.1", "vite": "^6.2.3", "vitest": "^3.0.0" }, diff --git a/playwright.config.ts b/playwright.config.ts index bad8f9fca..de119fa1f 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -13,7 +13,7 @@ const config: PlaywrightTestConfig = { webServer: { timeout: 120000, env: { - PUBLIC_APPWRITE_ENDPOINT: 'https://console-testing-2.appwrite.org/v1', + PUBLIC_APPWRITE_ENDPOINT: 'https://stage.cloud.appwrite.io/v1', PUBLIC_CONSOLE_MODE: 'cloud', PUBLIC_STRIPE_KEY: 'pk_test_51LT5nsGYD1ySxNCyd7b304wPD8Y1XKKWR6hqo6cu3GIRwgvcVNzoZv4vKt5DfYXL1gRGw4JOqE19afwkJYJq1g3K004eVfpdWn' diff --git a/src/lib/actions/analytics.ts b/src/lib/actions/analytics.ts index 6b359f6dd..78e7551b7 100644 --- a/src/lib/actions/analytics.ts +++ b/src/lib/actions/analytics.ts @@ -6,6 +6,7 @@ import { user } from '$lib/stores/user'; import { ENV, MODE, VARS, isCloud } from '$lib/system'; import { AppwriteException } from '@appwrite.io/console'; import { browser } from '$app/environment'; +import { getReferrerAndUtmSource } from '$lib/helpers/utm'; function plausible(domain: string): AnalyticsPlugin { if (!browser) return { name: 'analytics-plugin-plausible' }; @@ -64,6 +65,8 @@ export function trackEvent(name: string, data: object = null): void { }; } + data = { ...data, ...getReferrerAndUtmSource() }; + if (ENV.DEV || ENV.PREVIEW) { console.debug(`[Analytics] Event ${name} ${path}`, data); } else { @@ -138,6 +141,8 @@ export function isTrackingAllowed() { } export enum Click { + BackupCopyIdClick = 'click_backup_copy_id', + BackupDeleteClick = 'click_backup_delete', BackupRestoreClick = 'click_backup_restore', BreadcrumbClick = 'click_breadcrumb', ConnectRepositoryClick = 'click_connect_repository', diff --git a/src/lib/charts/legend.svelte b/src/lib/charts/legend.svelte index 2e72c1410..47489efb2 100644 --- a/src/lib/charts/legend.svelte +++ b/src/lib/charts/legend.svelte @@ -8,16 +8,23 @@
{#each legendData as { name, value }, index} - {@const formattedValue = typeof value === 'number' ? formatNumberWithCommas(value) : value} + {@const formattedValue = + typeof value === 'number' + ? numberFormat === 'comma' + ? formatNumberWithCommas(value) + : abbreviateNumber(value, decimalsForAbbreviate) + : value} {name} ({formattedValue}) diff --git a/src/lib/commandCenter/panels/ai.svelte b/src/lib/commandCenter/panels/ai.svelte index 586c523d3..9bda77da8 100644 --- a/src/lib/commandCenter/panels/ai.svelte +++ b/src/lib/commandCenter/panels/ai.svelte @@ -7,7 +7,7 @@ import { AvatarInitials, Code, LoadingDots, SvgIcon } from '$lib/components'; import { user } from '$lib/stores/user'; - import { useCompletion } from 'ai/svelte'; + import { useCompletion } from '@ai-sdk/svelte'; import { subPanels } from '../subPanels'; import { isLanguage, type Language } from '$lib/components/code.svelte'; @@ -20,7 +20,8 @@ headers: { 'x-appwrite-project': 'console' }, - credentials: 'include' + credentials: 'include', + streamProtocol: 'text' }); const examples = [ @@ -179,7 +180,7 @@ {#if $isLoading || answer}
-
{getInitials($user.name)}
+
{getInitials($user.name || $user.email)}

{previousQuestion}

diff --git a/src/lib/components/billing/alerts/newDevUpgradePro.svelte b/src/lib/components/billing/alerts/newDevUpgradePro.svelte index 29296189a..ab48d3798 100644 --- a/src/lib/components/billing/alerts/newDevUpgradePro.svelte +++ b/src/lib/components/billing/alerts/newDevUpgradePro.svelte @@ -2,7 +2,7 @@ import { base } from '$app/paths'; import { page } from '$app/state'; import { Click, trackEvent } from '$lib/actions/analytics'; - import { BillingPlan } from '$lib/constants'; + import { BillingPlan, NEW_DEV_PRO_UPGRADE_COUPON } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { organization } from '$lib/stores/organization'; import { activeHeaderAlert } from '$routes/(console)/store'; @@ -29,7 +29,7 @@ secondary fullWidthMobile class="u-line-height-1" - href={`${base}/apply-credit?code=appw50&org=${$organization.$id}`} + href={`${base}/apply-credit?code=${NEW_DEV_PRO_UPGRADE_COUPON}&org=${$organization.$id}`} on:click={() => { trackEvent(Click.CreditsRedeemClick, { from: 'button', diff --git a/src/lib/components/billing/alerts/paymentFailed.svelte b/src/lib/components/billing/alerts/paymentFailed.svelte new file mode 100644 index 000000000..9646864a9 --- /dev/null +++ b/src/lib/components/billing/alerts/paymentFailed.svelte @@ -0,0 +1,25 @@ + + +{#if $failedInvoice && $failedInvoice.teamId === $organization.$id && isOnProjects} + + To avoid service disruptions in your projects, please verify your payment details and try + again. + + + + +{/if} diff --git a/src/lib/components/billing/couponInput.svelte b/src/lib/components/billing/couponInput.svelte index 8217b23fc..85e73411c 100644 --- a/src/lib/components/billing/couponInput.svelte +++ b/src/lib/components/billing/couponInput.svelte @@ -3,6 +3,7 @@ import { formatCurrency } from '$lib/helpers/numbers'; import type { Coupon } from '$lib/sdk/billing'; import { sdk } from '$lib/stores/sdk'; + import { Layout } from '@appwrite.io/pink-svelte'; import { createEventDispatcher } from 'svelte'; const dispatch = createEventDispatcher(); @@ -17,7 +18,7 @@ async function addCoupon() { try { - const response = await sdk.forConsole.billing.getCoupon(coupon); + const response = await sdk.forConsole.billing.getCouponAccount(coupon); couponData = response; dispatch('validation', couponData); coupon = null; @@ -36,17 +37,19 @@ } - + + + - + {#if couponData?.status === 'error'}
diff --git a/src/lib/components/billing/discountsApplied.svelte b/src/lib/components/billing/discountsApplied.svelte new file mode 100644 index 000000000..e77bf3ca3 --- /dev/null +++ b/src/lib/components/billing/discountsApplied.svelte @@ -0,0 +1,49 @@ + + +{#if value > 0} + +
+

+ + + {label} + +

+ {#if !fixedCoupon && label.toLowerCase() === 'credits'} + + {/if} +
+ {#if value >= 100} +

Credits applied

+ {:else} + -{formatCurrency(value)} + {/if} + +{/if} diff --git a/src/lib/components/billing/estimatedTotal.svelte b/src/lib/components/billing/estimatedTotal.svelte new file mode 100644 index 000000000..7e7e84803 --- /dev/null +++ b/src/lib/components/billing/estimatedTotal.svelte @@ -0,0 +1,144 @@ + + +{#if estimation} + + + {#if estimation} + {#each estimation.items ?? [] as item} + {#if item.value > 0} + +

{item.label}

+

{formatCurrency(item.value)}

+ + {/if} + {/each} + {#each estimation.discounts ?? [] as item} + + {/each} +
+ +

Total due

+

+ {formatCurrency(estimation.grossAmount)} +

+ + +

+ You'll pay {formatCurrency(estimation.grossAmount)} now. + {#if couponData?.code}Once your credits run out,{:else}Then{/if} you'll be charged + {formatCurrency(estimation.amount)} every 30 days. +

+ {/if} + + + {#if budgetEnabled} +
+ +
+ {/if} + + +{/if} diff --git a/src/lib/components/billing/estimatedTotalBox.svelte b/src/lib/components/billing/estimatedTotalBox.svelte index e8adcb489..112d506c1 100644 --- a/src/lib/components/billing/estimatedTotalBox.svelte +++ b/src/lib/components/billing/estimatedTotalBox.svelte @@ -43,7 +43,7 @@ Additional seats ({collaborators?.length}) + >Additional seats ({collaborators?.length ?? 0}) {formatCurrency(extraSeatsCost)} diff --git a/src/lib/components/billing/index.ts b/src/lib/components/billing/index.ts index 266d217d8..1cc70d3d9 100644 --- a/src/lib/components/billing/index.ts +++ b/src/lib/components/billing/index.ts @@ -2,8 +2,9 @@ export { default as PaymentBoxes } from './paymentBoxes.svelte'; export { default as CouponInput } from './couponInput.svelte'; export { default as SelectPaymentMethod } from './selectPaymentMethod.svelte'; export { default as UsageRates } from './usageRates.svelte'; -export { default as EstimatedTotalBox } from './estimatedTotalBox.svelte'; export { default as PlanComparisonBox } from './planComparisonBox.svelte'; export { default as EmptyCardCloud } from './emptyCardCloud.svelte'; export { default as CreditsApplied } from './creditsApplied.svelte'; export { default as PlanSelection } from './planSelection.svelte'; +export { default as EstimatedTotal } from './estimatedTotal.svelte'; +export { default as SelectPlan } from './selectPlan.svelte'; diff --git a/src/lib/components/billing/planExcess.svelte b/src/lib/components/billing/planExcess.svelte index f2f874d5e..02793dc70 100644 --- a/src/lib/components/billing/planExcess.svelte +++ b/src/lib/components/billing/planExcess.svelte @@ -2,19 +2,17 @@ import { calculateExcess, plansInfo, tierToPlan, type Tier } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; import { toLocaleDate } from '$lib/helpers/date'; - import { Button } from '$lib/elements/forms'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { abbreviateNumber } from '$lib/helpers/numbers'; import { formatNum } from '$lib/helpers/string'; import { onMount } from 'svelte'; - import type { OrganizationUsage } from '$lib/sdk/billing'; + import type { Aggregation } from '$lib/sdk/billing'; import { sdk } from '$lib/stores/sdk'; import { BillingPlan } from '$lib/constants'; import { Alert, Icon, Table, Tooltip } from '@appwrite.io/pink-svelte'; import { IconInfo } from '@appwrite.io/pink-icons-svelte'; export let tier: Tier; - export let members: number; const plan = $plansInfo?.get(tier); let excess: { @@ -24,16 +22,15 @@ executions?: number; members?: number; } = null; - let usage: OrganizationUsage = null; + let aggregation: Aggregation = null; let showExcess = false; onMount(async () => { - usage = await sdk.forConsole.billing.listUsage( + aggregation = await sdk.forConsole.billing.getAggregation( $organization.$id, - $organization.billingCurrentInvoiceDate, - new Date().toISOString() + $organization.billingAggregationId ); - excess = calculateExcess(usage, plan, members); + excess = calculateExcess(aggregation, plan); showExcess = Object.values(excess).some((value) => value > 0); }); @@ -41,22 +38,16 @@ {#if showExcess} - Following payment of your final invoice, your organization will switch to the {tierToPlan( - BillingPlan.FREE - ).name} plan. {#if excess?.members > 0}All team members except the owner will be removed on - that date.{/if} Service disruptions may occur unless resource usage is reduced. - - - - + You will retain access to {tierToPlan($organization.billingPlan).name} plan features until your + billing period ends. After that, + {#if excess?.members > 0} + all team members except the owner will be removed, + {:else} + your organization will be limited to Free plan resources, + {/if} and service disruptions may occur if usage exceeds Free plan limits. @@ -73,7 +64,7 @@ {#if excess?.members} Organization members - {plan.members} members + {plan.addons.seats.limit} members

diff --git a/src/lib/components/billing/selectPaymentMethod.svelte b/src/lib/components/billing/selectPaymentMethod.svelte index afcd3246e..dac287731 100644 --- a/src/lib/components/billing/selectPaymentMethod.svelte +++ b/src/lib/components/billing/selectPaymentMethod.svelte @@ -57,12 +57,13 @@ data: [method.brand] }; })} /> -

+ -
+ + {:else} @@ -79,6 +80,7 @@ Add + {/if} diff --git a/src/lib/components/billing/selectPlan.svelte b/src/lib/components/billing/selectPlan.svelte new file mode 100644 index 000000000..8aae2f0ac --- /dev/null +++ b/src/lib/components/billing/selectPlan.svelte @@ -0,0 +1,51 @@ + + +{#if billingPlan} +
    + {#each $plansInfo.values() as plan} +
  • + + +
    +

    + {plan.name} + {#if $organization?.billingPlan === plan.$id && !isNewOrg} + Current plan + {/if} +

    +

    + {plan.desc} +

    +

    + {formatCurrency(plan?.price ?? 0)} +

    +
    +     +     +
    • + {/each} +
+{/if} diff --git a/src/lib/components/billing/usageRates.svelte b/src/lib/components/billing/usageRates.svelte index e835284c2..4635a1d5a 100644 --- a/src/lib/components/billing/usageRates.svelte +++ b/src/lib/components/billing/usageRates.svelte @@ -43,6 +43,13 @@ ]; $: isFree = org.billingPlan === BillingPlan.FREE; + + // equal or above means unlimited! + $: getCorrectSeatsCountValue = (count: number): string | number => { + // php int max is always larger than js + const exceedsSafeLimit = count >= Number.MAX_SAFE_INTEGER; + return exceedsSafeLimit ? 'Unlimited' : count || 0; + }; @@ -75,10 +82,10 @@ {usage.resource} - {plan[usage.id] || 'Unlimited'} + {getCorrectSeatsCountValue(plan.addons.seats.limit)} - {formatCurrency(plan.addons?.member?.price)}/{usage?.unit} + {formatCurrency(plan.addons?.seats?.price)}/{usage?.unit} {:else} diff --git a/src/lib/components/billing/validateCreditModal.svelte b/src/lib/components/billing/validateCreditModal.svelte index ebdf09acb..130532a7b 100644 --- a/src/lib/components/billing/validateCreditModal.svelte +++ b/src/lib/components/billing/validateCreditModal.svelte @@ -19,7 +19,8 @@ async function addCoupon() { try { - const response = await sdk.forConsole.billing.getCoupon(coupon); + // const response = await sdk.forConsole.billing.getCoupon(coupon); + const response = await sdk.forConsole.billing.getCouponAccount(coupon); //TODO: double check that this is the correct method if (response.onlyNewOrgs && !isNewOrg) { show = false; @@ -37,6 +38,14 @@ message: 'Credits applied successfully' }); } + couponData = response; + dispatch('validation', couponData); + coupon = null; + show = false; + addNotification({ + type: 'success', + message: 'Credits applied successfully' + }); } catch (e) { error = e.message; } diff --git a/src/lib/components/boxAvatar.svelte b/src/lib/components/boxAvatar.svelte index c2400d897..7ba70c789 100644 --- a/src/lib/components/boxAvatar.svelte +++ b/src/lib/components/boxAvatar.svelte @@ -4,7 +4,7 @@ - +
diff --git a/src/lib/components/columnSelector.svelte b/src/lib/components/columnSelector.svelte new file mode 100644 index 000000000..37c1640ad --- /dev/null +++ b/src/lib/components/columnSelector.svelte @@ -0,0 +1,89 @@ + + +{#if $columns?.length} + + {@render children(toggle, selectedColumnsNumber)} + + + {#each $columns as column} + {#if !column?.exclude} + (column.hide = !column.hide)} + disabled={allowNoColumns + ? false + : selectedColumnsNumber <= 1 && column.hide !== true}> + + (column.hide = !column.hide)} /> + {column.title} + + + {/if} + {/each} + + + +{/if} diff --git a/src/lib/components/domains/cnameTable.svelte b/src/lib/components/domains/cnameTable.svelte index ca985afc6..9880f5ebf 100644 --- a/src/lib/components/domains/cnameTable.svelte +++ b/src/lib/components/domains/cnameTable.svelte @@ -54,8 +54,7 @@ - {$consoleVariables._APP_DOMAIN_TARGET_CNAME} + text={$consoleVariables._APP_DOMAIN_TARGET_CNAME} /> diff --git a/src/lib/components/domains/nameserverTable.svelte b/src/lib/components/domains/nameserverTable.svelte index be059890f..da5375bce 100644 --- a/src/lib/components/domains/nameserverTable.svelte +++ b/src/lib/components/domains/nameserverTable.svelte @@ -37,8 +37,7 @@ NS - - {nameserver} + {/each} diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte index dba63ac6d..f39dea986 100644 --- a/src/lib/components/domains/recordTable.svelte +++ b/src/lib/components/domains/recordTable.svelte @@ -63,8 +63,7 @@ {variant.toUpperCase()} {subdomain || '@'} - - {setTarget()} + diff --git a/src/lib/components/dualTimeView.svelte b/src/lib/components/dualTimeView.svelte index e6ee84fb0..81862b475 100644 --- a/src/lib/components/dualTimeView.svelte +++ b/src/lib/components/dualTimeView.svelte @@ -69,7 +69,7 @@ if (!isMouseOverTooltip) { hideTooltip(); } - }, 50); + }, 150); } $: timeToString = time ? timeDifference(time) : 'Invalid time'; diff --git a/src/lib/components/emptyCardImageCloud.svelte b/src/lib/components/emptyCardImageCloud.svelte index 53f6c2124..2063c3388 100644 --- a/src/lib/components/emptyCardImageCloud.svelte +++ b/src/lib/components/emptyCardImageCloud.svelte @@ -7,13 +7,10 @@ export let noAspectRatio = false; - - + + {#if $$slots?.image} -
+
{/if} diff --git a/src/lib/components/emptySearch.svelte b/src/lib/components/emptySearch.svelte index 220a79f3c..fac974d5e 100644 --- a/src/lib/components/emptySearch.svelte +++ b/src/lib/components/emptySearch.svelte @@ -26,7 +26,7 @@ alignItems="center" wrap="wrap">

Total results: 0

- + {/if} diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte index 9fc52afd3..2d1a7623c 100644 --- a/src/lib/components/feedback/feedback.svelte +++ b/src/lib/components/feedback/feedback.svelte @@ -11,6 +11,7 @@ import { addNotification } from '$lib/stores/notifications'; import { page } from '$app/state'; import { Typography } from '@appwrite.io/pink-svelte'; + import { project } from '$routes/(console)/project-[project]/store'; $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type); @@ -24,8 +25,11 @@ page.url.href, $user.name, $user.email, - $organization.billingPlan, - $feedbackData.value + $organization?.billingPlan, + $feedbackData.value, + $organization?.$id, + $project?.$id, + $user.$id ); addNotification({ type: 'success', diff --git a/src/lib/components/filters/filtersBottomSheet.svelte b/src/lib/components/filters/filtersBottomSheet.svelte new file mode 100644 index 000000000..3d61e8b6b --- /dev/null +++ b/src/lib/components/filters/filtersBottomSheet.svelte @@ -0,0 +1,118 @@ + + + diff --git a/src/lib/components/filters/index.ts b/src/lib/components/filters/index.ts index eb4bd0f3d..5eed4dc72 100644 --- a/src/lib/components/filters/index.ts +++ b/src/lib/components/filters/index.ts @@ -4,3 +4,4 @@ export { default as CustomFilters } from './customFilters.svelte'; export { default as QuickFilters } from './quickFilters.svelte'; export { default as ParsedTagList } from './parsedTagList.svelte'; export { hasPageQueries, queryParamToMap, queries } from '$lib/components/filters/store'; +export { default as FiltersBottomSheet } from './filtersBottomSheet.svelte'; diff --git a/src/lib/components/filters/parsedTagList.svelte b/src/lib/components/filters/parsedTagList.svelte index 4b1faa05d..edbd5161e 100644 --- a/src/lib/components/filters/parsedTagList.svelte +++ b/src/lib/components/filters/parsedTagList.svelte @@ -8,7 +8,7 @@ {#if $parsedTags?.length} - {#each $parsedTags as tag} + {#each $parsedTags as tag (tag.tag)} ; export let analyticsSource: string; + export let openBottomSheet = false; - let openBottomSheet = false; + //TODO: remove this when all header are replace with `ResponsiveContainerHeader` let filterCols = $columns .map((col) => (col.filter !== false ? buildFilterCol(col) : null)) .filter((f) => f?.options); @@ -35,101 +30,6 @@ setFilters(localTags, filterCols, $columns); filterCols = filterCols; }); - - $: subSheets = filterCols.map((col) => { - return { - title: col.title, - top: { - title: col.title, - trailingIcon: IconChevronRight, - items: col.options.map((o) => { - return { - title: capitalize(o.label), - name: capitalize(o.label), - options: col.options, - checked: o.checked, - onClick: () => { - addFilterAndApply( - col.id, - col.title, - col.operator, - o.value, - generateFilterArrayValue(col, o.value), - $columns, - analyticsSource - ); - } - }; - }) - }, - bottom: { - name: 'Back', - items: [ - { - name: 'Back', - leadingIcon: IconChevronLeft, - navigatePrevious: true, - onClick: () => { - // navigate to the previous menu - } - } - ] - } - }; - }); - - $: organizationsBottomSheet = { - top: { - title: 'Filters', - items: filterCols.map((col) => { - return { - name: col.title, - onClick: () => - console.log(subSheets.find((sheet) => sheet?.title === col?.title)), - subMenu: subSheets.find((sheet) => sheet?.title === col?.title), - trailingIcon: IconChevronRight - }; - }) - }, - bottom: { - name: 'Clear All', - items: [ - { - name: 'Clear All', - onClick: () => { - filterCols.forEach((col) => { - addFilterAndApply( - col.id, - col.title, - col.operator, - null, - [], - $columns, - analyticsSource - ); - }); - } - } - ] - } - }; - - function generateFilterArrayValue(col: FilterData, value: string) { - if (!col?.array) return []; - - if (col.options?.find((opt) => opt.value === value)?.checked) { - return col.options - ?.filter((opt) => opt?.checked) - .map((opt) => opt.value) - .filter((item) => item !== value); - } else { - let arrayValue = - col.options?.filter((opt) => opt?.checked)?.map((opt) => opt.value) ?? []; - arrayValue = [...arrayValue, value]; - - return arrayValue; - } - } {#if $isSmallViewport} @@ -161,7 +61,7 @@ {/if} - {#each filterCols as filter} + {#each filterCols as filter (filter.title + filter.id)} {#if filter.options} + {/if} diff --git a/src/lib/components/filters/quickFilters.ts b/src/lib/components/filters/quickFilters.ts index fc09619b0..dce8e823d 100644 --- a/src/lib/components/filters/quickFilters.ts +++ b/src/lib/components/filters/quickFilters.ts @@ -25,7 +25,7 @@ export function buildFilterCol(col: Column, customOperator = null): FilterData { return { value: (element?.value ?? element) as string, label: (element?.label ?? element) as string, - checked: false + checked: undefined }; }) }; diff --git a/src/lib/components/filters/quickfiltersSubMenu.svelte b/src/lib/components/filters/quickfiltersSubMenu.svelte index a3aee392d..b49bef07e 100644 --- a/src/lib/components/filters/quickfiltersSubMenu.svelte +++ b/src/lib/components/filters/quickfiltersSubMenu.svelte @@ -43,7 +43,7 @@
- {#each filter.options as option (option.value + option.checked)} + {#each filter.options as option (filter.title + option.value + option.label + option.checked)} {#if variant === 'radio'}
diff --git a/src/lib/components/git/repositories.svelte b/src/lib/components/git/repositories.svelte index ef4d65d48..28091632c 100644 --- a/src/lib/components/git/repositories.svelte +++ b/src/lib/components/git/repositories.svelte @@ -79,7 +79,6 @@ selectedRepository = $repositories.repositories[0].id; $repository = $repositories.repositories[0]; } - return $repositories.repositories; } @@ -173,7 +172,10 @@ {:then response} {#if response?.length} - {#snippet children(paginatedItems)} + {#snippet children( + paginatedItems: Models.ProviderRepositoryRuntime[] & + Models.ProviderRepositoryFramework[] + )} {#each paginatedItems as repo} diff --git a/src/lib/components/git/selectRootModal.svelte b/src/lib/components/git/selectRootModal.svelte index 61524aa37..90fc85aac 100644 --- a/src/lib/components/git/selectRootModal.svelte +++ b/src/lib/components/git/selectRootModal.svelte @@ -4,9 +4,10 @@ import { iconPath } from '$lib/stores/app'; import { sdk } from '$lib/stores/sdk'; import { installation, repository } from '$lib/stores/vcs'; - import { VCSDetectionType } from '@appwrite.io/console'; + import { VCSDetectionType, type Models } from '@appwrite.io/console'; import { DirectoryPicker } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import { writable } from 'svelte/store'; type Directory = { title: string; @@ -14,6 +15,7 @@ fileCount: number; thumbnailUrl: string; children?: Directory[]; + loading?: boolean; }; export let show = false; @@ -27,10 +29,13 @@ fullPath: './', fileCount: 0, thumbnailUrl: 'root', - children: [] + children: [], + loading: false } ]; let currentPath: string = './'; + let currentDir: Directory; + export let expanded = writable(['lib-0', 'tree-0']); onMount(async () => { try { @@ -47,8 +52,10 @@ title: dir.name, fullPath: currentPath + dir.name, fileCount: undefined, - thumbnailUrl: dir.name + thumbnailUrl: dir.name, + loading: false })); + currentDir = directories[0]; // console.log(directories); isLoading = false; } catch (e) { @@ -57,47 +64,70 @@ }); async function fetchContents(e: CustomEvent) { - const path = e.detail.fullPath; + const path = e.detail.fullPath as string; currentPath = path; - try { - const content = await sdk.forProject.vcs.getRepositoryContents( - $installation.$id, - $repository.id, - path - ); - // console.log(content); - const fileCount = content.contents?.length ?? 0; - const contentDirectories = content.contents.filter((e) => e.isDirectory); - if (contentDirectories.length === 0) { - return; - } - let currentDir = directories[0]; - for (let i = 1; i < path.split('/').length; i++) { - const dir = path.split('/')[i]; - currentDir = currentDir.children.find((d) => d.title === dir); - } + const pathSegments = path.split('/').filter((segment) => segment !== '.' && segment !== ''); + let traversedDir = directories[0]; // Start at root - currentDir.fileCount = fileCount; - currentDir.children = contentDirectories.map((dir) => ({ - title: dir.name, - fullPath: path + '/' + dir.name, - fileCount: undefined, - thumbnailUrl: undefined - })); - const runtime = await sdk.forProject.vcs.createRepositoryDetection( - $installation.$id, - $repository.id, - product === 'sites' ? VCSDetectionType.Framework : VCSDetectionType.Runtime, - path - ); - //TODO: Fix runtime after passing type: runtime.framework || runtime.runtime - currentDir.children.forEach((dir) => { - dir.thumbnailUrl = $iconPath(runtime.framework, 'color'); - }); + for (const segment of pathSegments) { + const nextDir = traversedDir.children?.find((dir) => dir.title === segment); + if (!nextDir) break; + traversedDir = nextDir; + } + + currentDir = traversedDir; + + if (!currentDir.fileCount) { + currentDir.loading = true; directories = [...directories]; - } catch (error) { - console.error(error); + + try { + const content = await sdk.forProject.vcs.getRepositoryContents( + $installation.$id, + $repository.id, + path + ); + // console.log(content); + const fileCount = content.contents?.length ?? 0; + const contentDirectories = content.contents.filter((e) => e.isDirectory); + + if (contentDirectories.length === 0) { + return; + } + + currentDir.fileCount = fileCount; + currentDir.children = contentDirectories.map((dir) => ({ + title: dir.name, + fullPath: path + '/' + dir.name, + fileCount: undefined, + thumbnailUrl: undefined + })); + const runtime = await sdk.forProject.vcs.createRepositoryDetection( + $installation.$id, + $repository.id, + product === 'sites' ? VCSDetectionType.Framework : VCSDetectionType.Runtime, + path + ); + if (product === 'sites') { + currentDir.children.forEach((dir) => { + dir.thumbnailUrl = $iconPath(runtime.framework, 'color'); + }); + } else if (product === 'functions') { + currentDir.children.forEach((dir) => { + dir.thumbnailUrl = $iconPath( + (runtime as unknown as Models.DetectionRuntime).runtime, + 'color' + ); + }); + } + directories = [...directories]; + $expanded = [...$expanded, path]; + } catch (error) { + console.error(error); + } finally { + currentDir.loading = false; + } } } @@ -105,15 +135,13 @@ rootDir = currentPath; show = false; } - - // $: console.log(rootDir); Select the directory where your site code is located using the menu below. - + diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts index e94338e5a..0e077aedb 100644 --- a/src/lib/components/index.ts +++ b/src/lib/components/index.ts @@ -81,4 +81,5 @@ export { default as Sidebar } from './sidebar.svelte'; export { default as BottomSheet } from './bottom-sheet/index'; export { default as Confirm } from './confirm.svelte'; export { default as UsageCard } from './usageCard.svelte'; +export { default as ViewToggle } from './viewToggle.svelte'; export { default as Terminal } from './studio/terminal.svelte'; diff --git a/src/lib/components/modalWrapper.svelte b/src/lib/components/modalWrapper.svelte index 09129b01c..73ae9566a 100644 --- a/src/lib/components/modalWrapper.svelte +++ b/src/lib/components/modalWrapper.svelte @@ -79,7 +79,9 @@ on:cancel|preventDefault {style}> {#if show} - +
+ +
{/if} diff --git a/src/lib/components/pagination.svelte b/src/lib/components/pagination.svelte index 5d4a7bd27..ff338c213 100644 --- a/src/lib/components/pagination.svelte +++ b/src/lib/components/pagination.svelte @@ -20,4 +20,4 @@ } - + diff --git a/src/lib/components/paginator.svelte b/src/lib/components/paginator.svelte index 113be0097..de410b087 100644 --- a/src/lib/components/paginator.svelte +++ b/src/lib/components/paginator.svelte @@ -1,7 +1,8 @@ - - + {@render children(paginatedItems, limit)} {#if !hideFooter} - + {#if hasLimit} {:else} diff --git a/src/lib/components/permissions/permissions.svelte b/src/lib/components/permissions/permissions.svelte index cfd2a2f5c..1dabdb0ba 100644 --- a/src/lib/components/permissions/permissions.svelte +++ b/src/lib/components/permissions/permissions.svelte @@ -18,7 +18,7 @@ import Row from './row.svelte'; import { Icon, Selector, Table } from '@appwrite.io/pink-svelte'; import { IconPlus, IconX } from '@appwrite.io/pink-icons-svelte'; - import type { Column } from '@appwrite.io/pink-svelte/dist/table'; + import type { PinkColumn } from '$lib/helpers/types'; export let withCreate = false; export let permissions: string[] = []; @@ -126,7 +126,7 @@ return a.localeCompare(b); } - const columns: Column[] = [ + const columns: PinkColumn[] = [ { id: 'role', width: { min: 100 } }, { id: 'create', width: { min: 100 }, hide: !withCreate }, { id: 'read', width: { min: 100 } }, @@ -226,3 +226,14 @@
{/if} + + diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index 3d421e7d2..3e1cf353f 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -107,7 +107,7 @@

Total results: {results?.total}

- +
{:else if search} diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index 771548e83..b2a78515c 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -141,7 +141,7 @@

Total results: {results?.total}

- + {:else if search} diff --git a/src/lib/components/progressBarBig.svelte b/src/lib/components/progressBarBig.svelte index 54ed44d8c..c521e7f95 100644 --- a/src/lib/components/progressBarBig.svelte +++ b/src/lib/components/progressBarBig.svelte @@ -7,7 +7,7 @@ export let maxValue: string | undefined = undefined; export let maxUnit: string | undefined = undefined; export let progressValue: number; - export let progressMax: number; + export let progressMax: number | undefined = undefined; export let showBar = true; export let progressBarData: Array = []; @@ -15,7 +15,7 @@
- {#if currentValue !== undefined && currentUnit !== undefined && progress !== undefined && maxValue !== undefined} + {#if currentValue !== undefined && currentUnit !== undefined && progress !== undefined}
@@ -23,14 +23,18 @@ {currentValue} {currentUnit} - - {maxValue} - {maxUnit ? maxUnit : ''} - + {#if maxValue !== undefined} + + {maxValue} + {maxUnit ? maxUnit : ''} + + {/if} -
- -
+ {#if progressMax !== undefined} +
+ +
+ {/if}
{/if} diff --git a/src/lib/components/regionCard.svelte b/src/lib/components/regionCard.svelte index 3e1964802..795451e46 100644 --- a/src/lib/components/regionCard.svelte +++ b/src/lib/components/regionCard.svelte @@ -1,9 +1,12 @@
diff --git a/src/lib/layout/usageMultiple.svelte b/src/lib/layout/usageMultiple.svelte index 4b5db9588..421b0892b 100644 --- a/src/lib/layout/usageMultiple.svelte +++ b/src/lib/layout/usageMultiple.svelte @@ -13,6 +13,7 @@ export let count: Models.Metric[][]; export let legendData: LegendData[]; export let showHeader: boolean = true; + export let legendNumberFormat: 'comma' | 'abbreviate' = 'comma';
@@ -55,7 +56,10 @@ }))} /> {#if legendData} - + {/if}
{/if} diff --git a/src/lib/layout/wizardSecondaryContent.svelte b/src/lib/layout/wizardSecondaryContent.svelte index 6afa25335..f4e9ea882 100644 --- a/src/lib/layout/wizardSecondaryContent.svelte +++ b/src/lib/layout/wizardSecondaryContent.svelte @@ -1,8 +1,12 @@ + +
- {#if $$slots.aside} + {#if !hideSidebar}
diff --git a/src/lib/pages/domains/index.svelte b/src/lib/pages/domains/index.svelte index de095d0c7..95f043a0e 100644 --- a/src/lib/pages/domains/index.svelte +++ b/src/lib/pages/domains/index.svelte @@ -31,7 +31,6 @@ import { page } from '$app/state'; import { base } from '$app/paths'; - export let search: string = null; export let rules: Models.ProxyRuleList; export let dependency: Dependencies; @@ -58,7 +57,7 @@ {#if $canWriteRules} - + + {/if} + + +
- {#if !selectedCoupon?.code} - - {/if} {/if} diff --git a/src/routes/(console)/organization-[organization]/+layout.ts b/src/routes/(console)/organization-[organization]/+layout.ts index 650990e86..cd1968ea8 100644 --- a/src/routes/(console)/organization-[organization]/+layout.ts +++ b/src/routes/(console)/organization-[organization]/+layout.ts @@ -27,7 +27,7 @@ export const load: LayoutLoad = async ({ params, depends }) => { const res = await sdk.forConsole.billing.getRoles(params.organization); roles = res.roles; scopes = res.scopes; - currentPlan = await sdk.forConsole.billing.getPlan(params.organization); + currentPlan = await sdk.forConsole.billing.getOrganizationPlan(params.organization); if (scopes.includes('billing.read')) { await failedInvoice.load(params.organization); if (get(failedInvoice)) { diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte index 238250d31..ab80f5ae5 100644 --- a/src/routes/(console)/organization-[organization]/+page.svelte +++ b/src/routes/(console)/organization-[organization]/+page.svelte @@ -24,7 +24,6 @@ import { ID, Region } from '@appwrite.io/console'; import { openImportWizard } from '../project-[project]/settings/migrations/(import)'; import { readOnly } from '$lib/stores/billing'; - import type { RegionList } from '$lib/sdk/billing'; import { onMount, type ComponentType } from 'svelte'; import { canWriteProjects } from '$lib/stores/roles'; import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect'; @@ -48,14 +47,15 @@ } from '@appwrite.io/pink-icons-svelte'; import { getPlatformInfo } from '$lib/helpers/platform'; import CreateProjectCloud from './createProjectCloud.svelte'; + import { regions as regionsStore } from '$routes/(console)/organization-[organization]/store'; import type { Column } from '@appwrite.io/pink-svelte/dist/table'; import { timeFromNow } from '$lib/helpers/date'; export let data; - let addOrganization = false; let showCreate = false; let showCreateProjectCloud = false; + let addOrganization = false; async function allServiceDisabled(project: Models.Project) { let disabled = true; @@ -140,21 +140,18 @@ } }; - let regions: RegionList; onMount(async () => { if (isCloud) { - regions = await sdk.forConsole.billing.listRegions(); + const regions = await sdk.forConsole.billing.listRegions(); + regionsStore.set(regions); checkPricingRefAndRedirect(page.url.searchParams); } - - const searchParams = page.url.searchParams; - if (searchParams.has('create-project')) { - handleCreateProject(); - } }); function findRegion(project: Models.Project) { - return regions.regions.find((region) => region.$id === project.region); + return $regionsStore?.regions?.find( + (region) => region.$id === (project as Models.Project & { region: string }).region + ); } const columns: Column[] = [{ id: 'name' }, { id: 'updated' }]; @@ -243,41 +240,39 @@ {/if} {/await} - {#each platforms as platform, i} - {#if i < 3} - {@const icon = getIconForPlatform(platform.icon)} - - - - {/if} - {/each} - {#if platforms?.length > 3} - + {#each platforms as platform, i} + {#if i < 3} + {@const icon = getIconForPlatform(platform.icon)} + + + {/if} - - {#if isCloud && regions} - {@const region = findRegion(project)} - - {region?.name} - - {/if} - - - {/each} - -

Create a new project

- - - {:else} - - {/if} + {/each} + {#if platforms?.length > 3} + + {/if} + + {#if isCloud && $regionsStore?.regions} + {@const region = findRegion(project)} + + {region?.name} + + {/if} + + + {/each} + +

Create a new project

+ + + {:else} + + {/if} {#if showCreateProjectCloud} - + {/if} diff --git a/src/routes/(console)/organization-[organization]/billing/+page.svelte b/src/routes/(console)/organization-[organization]/billing/+page.svelte index a6fa6b745..1915fb8d7 100644 --- a/src/routes/(console)/organization-[organization]/billing/+page.svelte +++ b/src/routes/(console)/organization-[organization]/billing/+page.svelte @@ -1,7 +1,6 @@ @@ -91,6 +94,11 @@ Upgrade to a Pro plan to manage when you receive billing alerts for your organization. + {:else if !$currentPlan.budgetCapEnabled} + + Budget caps are not supported on your current plan. For more information, please + reach out to your customer success manager. + {:else} {#if alerts.length >= 4} diff --git a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte index 2982bc43d..32a0be64a 100644 --- a/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte +++ b/src/routes/(console)/organization-[organization]/billing/budgetCap.svelte @@ -10,13 +10,14 @@ import { sdk } from '$lib/stores/sdk'; import { Alert, Link } from '@appwrite.io/pink-svelte'; import { onMount } from 'svelte'; + import BudgetAlert from './budgetAlert.svelte'; let capActive = false; let budget: number; onMount(() => { budget = $organization?.billingBudget; - capActive = !!$organization?.billingBudget; + capActive = $organization?.billingBudget !== null; }); async function updateBudget() { @@ -26,7 +27,7 @@ budget, $organization.budgetAlerts ); - invalidate(Dependencies.ORGANIZATION); + await invalidate(Dependencies.ORGANIZATION); addNotification({ type: 'success', isHtml: true, @@ -45,7 +46,7 @@ } $: if (!capActive) { - budget = 0; + budget = null; } @@ -64,6 +65,11 @@ target="_blank" rel="noopener noreferrer">view our pricing guide. + {:else if !$currentPlan.budgetCapEnabled} + + Budget caps are not supported on your current plan. For more information, please + reach out to your customer success manager. + {:else} @@ -105,3 +111,5 @@ + + 0} /> diff --git a/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte b/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte new file mode 100644 index 000000000..44c9c9710 --- /dev/null +++ b/src/routes/(console)/organization-[organization]/billing/cancelDowngradeModal.svelte @@ -0,0 +1,42 @@ + + + +

+ Your organization is set to change to + {tierToPlan($organization?.billingPlanDowngrade).name} + plan on {toLocaleDate($organization.billingNextInvoiceDate)}. Are you sure + you want to cancel this change and keep your current plan? +

+ + + + + diff --git a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte index 9e268be74..ddf7206a4 100644 --- a/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/(console)/organization-[organization]/billing/paymentHistory.svelte @@ -5,7 +5,7 @@ import { toLocaleDate } from '$lib/helpers/date'; import { formatCurrency } from '$lib/helpers/numbers'; import type { Invoice, InvoiceList } from '$lib/sdk/billing'; - import { getApiEndpoint, sdk } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { Query } from '@appwrite.io/console'; import { onMount } from 'svelte'; import { trackEvent } from '$lib/actions/analytics'; @@ -28,8 +28,7 @@ IconExternalLink, IconRefresh } from '@appwrite.io/pink-icons-svelte'; - - // let isLoadingInvoices = true; + import { base } from '$app/paths'; let offset = 0; let invoiceList: InvoiceList = { @@ -38,7 +37,6 @@ }; const limit = 5; - const endpoint = getApiEndpoint(); onMount(request); @@ -47,11 +45,13 @@ invoiceList = await sdk.forConsole.billing.listInvoices(page.params.organization, [ Query.limit(limit), Query.offset(offset), - Query.notEqual('from', $organization.billingCurrentInvoiceDate), - Query.notEqual('status', 'pending'), Query.orderDesc('$createdAt') ]); - // isLoadingInvoices = false; + } + + $: if (page.url.searchParams.get('type') === 'validate-invoice') { + window.history.replaceState({}, '', page.url.pathname); + request(); } function retryPayment(invoice: Invoice) { @@ -135,12 +135,12 @@ + href={`${base}/organizations/${page.params.organization}/invoices/${invoice.$id}/view`}> View invoice + href={`${base}/organizations/${page.params.organization}/invoices/${invoice.$id}/download`}> Download PDF {#if status === 'overdue' || status === 'failed'} @@ -165,7 +165,7 @@ {#if invoiceList.total > limit}

Total results: {invoiceList.total}

- +
{/if} {:else} diff --git a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte index b03133998..c007b40f5 100644 --- a/src/routes/(console)/organization-[organization]/billing/planSummary.svelte +++ b/src/routes/(console)/organization-[organization]/billing/planSummary.svelte @@ -3,14 +3,13 @@ import { CardGrid } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { toLocaleDate } from '$lib/helpers/date'; - import { plansInfo, tierToPlan, upgradeURL } from '$lib/stores/billing'; + import { plansInfo, upgradeURL } from '$lib/stores/billing'; import { organization } from '$lib/stores/organization'; - import type { CreditList, Invoice, Plan } from '$lib/sdk/billing'; + import type { Aggregation, CreditList, Invoice, Plan } from '$lib/sdk/billing'; import { abbreviateNumber, formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers'; import { humanFileSize } from '$lib/helpers/sizeConvertion'; import { BillingPlan } from '$lib/constants'; import { Click, trackEvent } from '$lib/actions/analytics'; - import { type Models } from '@appwrite.io/console'; import { Accordion, Card, @@ -21,14 +20,15 @@ Typography } from '@appwrite.io/pink-svelte'; import { IconInfo, IconTag } from '@appwrite.io/pink-icons-svelte'; + import CancelDowngradeModel from './cancelDowngradeModal.svelte'; - export let invoices: Array; - export let members: Models.MembershipList; export let currentPlan: Plan; export let creditList: CreditList; + export let currentInvoice: Invoice | undefined = undefined; + export let currentAggregation: Aggregation | undefined = undefined; + + let showCancel: boolean = false; - const currentInvoice: Invoice | undefined = invoices.length > 0 ? invoices[0] : undefined; - const extraMembers = members.total > 1 ? members.total - 1 : 0; const availableCredit = creditList.available; const today = new Date(); const isTrial = @@ -60,15 +60,13 @@ exclude accumulated credits and applicable taxes.

- Billing period: {toLocaleDate($organization?.billingCurrentInvoiceDate)} - {toLocaleDate( - $organization?.billingNextInvoiceDate - )} + Due at: {toLocaleDate($organization?.billingNextInvoiceDate)}

- {tierToPlan($organization?.billingPlan)?.name} plan + {currentPlan.name} plan {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION @@ -79,36 +77,40 @@ - {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0} + {#if currentPlan.budgeting && extraUsage > 0} + badge={(currentAggregation.additionalMembers > 0 + ? currentInvoice.usage.length + 1 + : currentInvoice.usage.length + ).toString()}> {formatCurrency(extraUsage >= 0 ? extraUsage : 0)} - {#if extraMembers} + {#if currentAggregation.additionalMembers} Additional members - {formatCurrency( - extraMembers * - (currentPlan?.addons?.member?.price ?? 0) - )} + + {formatCurrency( + currentAggregation.additionalMemberAmount + )} + - {extraMembers} + {currentAggregation.additionalMembers} {/if} {#if currentInvoice?.usage} {#each currentInvoice.usage as excess, i} - {#if i > 0 || extraMembers} + {#if i > 0 || currentAggregation.additionalMembers} {/if} {#if ['storage', 'bandwidth'].includes(excess.name)} @@ -180,7 +182,7 @@ {/if} - {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0} + {#if currentPlan.supportsCredits && availableCredit > 0} @@ -188,7 +190,7 @@ >Credits to be applied - {formatCurrency( + -{formatCurrency( Math.min(availableCredit, currentInvoice?.amount ?? 0) )} @@ -245,17 +247,21 @@ {:else}
- + {#if $organization?.billingPlanDowngrade !== null} + + {:else} + + {/if} @@ -265,6 +271,8 @@ {/if} + + diff --git a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte index 9e5c41155..a1fdc9b10 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/[platform]/web.svelte @@ -8,6 +8,7 @@ import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; + import { hostnameRegex } from '$lib/helpers/string'; let hostname: string = null; @@ -28,7 +29,7 @@ await invalidate(Dependencies.PLATFORM); addNotification({ type: 'success', - message: 'Platform Hostname has been updated' + message: 'Platform hostname has been updated' }); } catch (error) { addNotification({ @@ -48,6 +49,8 @@ id="hostname" label="Hostname" bind:value={hostname} + pattern={hostnameRegex} + patternError="Please enter a valid hostname" required placeholder="myapp.com" /> diff --git a/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte b/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte index a9d1fc878..446cc6f78 100644 --- a/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte +++ b/src/routes/(console)/project-[project]/overview/platforms/components/OnboardingPlatformCard.svelte @@ -1,7 +1,8 @@ diff --git a/src/routes/(console)/project-[project]/promoteVariableModal.svelte b/src/routes/(console)/project-[project]/promoteVariableModal.svelte index d250984ef..fdb26c011 100644 --- a/src/routes/(console)/project-[project]/promoteVariableModal.svelte +++ b/src/routes/(console)/project-[project]/promoteVariableModal.svelte @@ -22,16 +22,12 @@ {#if isConflicting}

Promoting this variable will overwrite your global variable with the same name. Are you - sure you want to promote {selectedVar.key}? + sure you want to promote ?

{:else}

- Are you sure you want to promote {selectedVar.key}? This will convert it to a global variable that can be accessed by other resources in - your project. + Are you sure you want to promote ? This will + convert it to a global variable that can be accessed by other resources in your project.

{/if} diff --git a/src/routes/(console)/project-[project]/rawVariableEditor.svelte b/src/routes/(console)/project-[project]/rawVariableEditor.svelte index 1b17ccc2b..ae1a72f2a 100644 --- a/src/routes/(console)/project-[project]/rawVariableEditor.svelte +++ b/src/routes/(console)/project-[project]/rawVariableEditor.svelte @@ -5,7 +5,7 @@ import Button from '$lib/elements/forms/button.svelte'; import { addNotification } from '$lib/stores/notifications'; import type { Models } from '@appwrite.io/console'; - import { parse } from 'envfile'; + import { parse } from '$lib/helpers/envfile'; import { Icon, InlineCode, Layout, Tabs } from '@appwrite.io/pink-svelte'; import { InputTextarea } from '$lib/elements/forms'; import { IconDownload, IconDuplicate } from '@appwrite.io/pink-icons-svelte'; diff --git a/src/routes/(console)/project-[project]/settings/domains/+page.svelte b/src/routes/(console)/project-[project]/settings/domains/+page.svelte index 8f9a83cce..5c8b43a11 100644 --- a/src/routes/(console)/project-[project]/settings/domains/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/domains/+page.svelte @@ -16,7 +16,7 @@ - +
- + + {:else} + +
+ +

No data to show

+
+ + {/if} + + + + Image transformations + Total unique image transformations in your project. + + {#if imageTransformations} + {@const current = formatNum(imageTransformationsTotal)} +
+
+

+ {current} + Transformations +

+
+
+ [e.date, e.value])] + } + ]} /> {:else} diff --git a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte index 275b626c7..e83787f88 100644 --- a/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte +++ b/src/routes/(console)/project-[project]/settings/webhooks/+page.svelte @@ -94,7 +94,7 @@ single href="https://appwrite.io/docs/advanced/platform/webhooks" target="webhook" - on:click={() => goto(`${base}/projects-${projectId}/settings/webhooks/create`)} /> + on:click={() => goto(`${base}/project-${projectId}/settings/webhooks/create`)} /> {/if} diff --git a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte index d5aaed10d..415652cdd 100644 --- a/src/routes/(console)/project-[project]/sites/(components)/logs.svelte +++ b/src/routes/(console)/project-[project]/sites/(components)/logs.svelte @@ -1,4 +1,4 @@ - diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte index 0c66efe9f..e44848416 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deploymentsOverview.svelte @@ -46,10 +46,10 @@ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts b/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts index e70b57452..386ebfbf0 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/store.ts @@ -7,38 +7,23 @@ export const columns = writable([ id: 'requestPath', title: 'Path', type: 'string', - width: { min: 500 }, + width: { min: 480 }, format: 'string' }, - { - id: 'trigger', - title: 'Trigger', - type: 'string', - exclude: true, - array: true, - format: 'enum', - elements: [ - { value: 'http', label: 'HTTP' }, - { value: 'schedule', label: 'Schedule' }, - { value: 'event', label: 'Event' } - ], - filter: false - }, { id: 'requestMethod', title: 'Method', type: 'string', - exclude: true, array: true, format: 'enum', - elements: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'] + elements: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'], + width: { min: 70, max: 150 } }, { id: 'responseStatusCode', title: 'Status code', type: 'integer', - exclude: true, format: 'integer', elements: [ { @@ -58,9 +43,25 @@ export const columns = writable([ label: 'Server error (500-599)' } ], + width: { min: 90, max: 150 }, filter: false //TODO: re-enable }, + { + id: 'trigger', + title: 'Trigger', + type: 'string', + exclude: true, + array: true, + format: 'enum', + elements: [ + { value: 'http', label: 'HTTP' }, + { value: 'schedule', label: 'Schedule' }, + { value: 'event', label: 'Event' } + ], + filter: false + }, + { id: 'duration', title: 'Duration', @@ -86,7 +87,7 @@ export const columns = writable([ { id: '$createdAt', title: 'Created', - width: { min: 150, max: 180 }, + width: { min: 120, max: 180 }, type: 'datetime', format: 'datetime', elements: [ diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte index d7f95b70f..d87008b87 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/logs/table.svelte @@ -35,25 +35,23 @@ {#key column.id} {log.$id} {/key} + {:else if column.id === 'requestMethod'} + + {log.requestMethod} + + {:else if column.id === 'responseStatusCode'} +
+ = 400 ? 'error' : 'success'} + content={log.responseStatusCode.toString()} /> +
+ {:else if column.id === 'requestPath'} + + {log.requestPath} + {:else if column.id === '$createdAt'} - {:else if column.id === 'responseStatusCode'} - {log.responseStatusCode} - {:else if column.id === 'requestPath'} - -
- = 400 ? 'error' : 'success'} - content={log.responseStatusCode.toString()} /> -
- - {log.requestMethod} - - - {log.requestPath} - - {/if} {/each} diff --git a/src/routes/(console)/project-[project]/storage/+page.svelte b/src/routes/(console)/project-[project]/storage/+page.svelte index 52740b74b..db145e480 100644 --- a/src/routes/(console)/project-[project]/storage/+page.svelte +++ b/src/routes/(console)/project-[project]/storage/+page.svelte @@ -35,7 +35,7 @@ - + - import { invalidate } from '$app/navigation'; + import { goto, invalidate } from '$app/navigation'; import { base } from '$app/paths'; import { page } from '$app/state'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; @@ -88,7 +88,7 @@ - + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index b65dd2122..39a4b3db9 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -54,6 +54,19 @@ if (ref || referrer || utmSource || utmCampaign || utmMedium) { sdk.forConsole.sources.create(ref, referrer, utmSource, utmCampaign, utmMedium); } + + if (referrer || ref) { + sessionStorage.setItem('utmReferral', referrer ? referrer : (ref ?? '')); + } + if (utmSource) { + sessionStorage.setItem('utmSource', utmSource); + } + if (utmMedium) { + sessionStorage.setItem('utmMedium', utmMedium); + } + if (utmCampaign) { + sessionStorage.setItem('utmCampaign', utmCampaign); + } } if (page.url.searchParams.has('migrate')) { @@ -69,7 +82,7 @@ .getCampaign(coupon.campaign) .catch(() => null); if (campaign && $user) { - goto(`${base}/apply-credit?code=${code}`); + goto(`${base}/apply-credit?${page.url.searchParams}`); loading.set(false); return; } @@ -82,7 +95,8 @@ .getCampaign(campaignId) .catch(() => null); if (campaign) { - goto(`${base}/apply-credit?campaign=${campaign.$id}`); + goto(`${base}/apply-credit?${page.url.searchParams}`); + loading.set(false); return; } diff --git a/static/images/campaigns/general_50/dark.png b/static/images/campaigns/general_50/dark.png new file mode 100644 index 000000000..88b548041 Binary files /dev/null and b/static/images/campaigns/general_50/dark.png differ diff --git a/static/images/campaigns/general_50/light.png b/static/images/campaigns/general_50/light.png new file mode 100644 index 000000000..5f4fe3061 Binary files /dev/null and b/static/images/campaigns/general_50/light.png differ diff --git a/vitest-setup-client.ts b/vitest-setup-client.ts index 43dc6800e..a6d211c31 100644 --- a/vitest-setup-client.ts +++ b/vitest-setup-client.ts @@ -16,16 +16,14 @@ Object.defineProperty(window, 'matchMedia', { }); beforeAll(() => { - vi.mock('$app/environment', () => ({ - browser: true - })); vi.mock('$app/navigation', () => ({ goto: vi.fn(), beforeNavigate: vi.fn() })); vi.mock('$app/environment', () => ({ dev: true, - browser: true + browser: true, + building: true })); vi.mock('$env/static/public', () => import.meta.env); vi.mock('$env/dynamic/public', () => ({