From 2814b6d99108203c8a65c8e0b109ca1fa94ef268 Mon Sep 17 00:00:00 2001 From: ItzNotABug Date: Sun, 22 Sep 2024 13:21:51 +0530 Subject: [PATCH] reformat, misc fixes. --- src/lib/stores/user.ts | 10 +++--- .../backups/createPolicy.svelte | 31 +++++++++++++------ .../database-[database]/backups/policy.svelte | 23 +++++++------- .../database-[database]/backups/table.svelte | 16 ++++++---- 4 files changed, 48 insertions(+), 32 deletions(-) diff --git a/src/lib/stores/user.ts b/src/lib/stores/user.ts index c2fa81557..21f0eb636 100644 --- a/src/lib/stores/user.ts +++ b/src/lib/stores/user.ts @@ -4,10 +4,12 @@ import type { Models } from '@appwrite.io/console'; import { browser } from '$app/environment'; import type { NotificationPrefItem } from '$lib/helpers/notifications'; -export type Account = Models.User<{ - organization?: string; - notificationPrefs: Record -} & Record>; +export type Account = Models.User< + { + organization?: string; + notificationPrefs: Record; + } & Record +>; export const user = derived(page, ($page) => { if (browser) sessionStorage.setItem('account', JSON.stringify($page.data.account)); diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte index 83f0eb483..6656de299 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/createPolicy.svelte @@ -1,6 +1,14 @@ @@ -173,7 +183,8 @@ policyRetention = policy.retained; selectedTime = policy.selectedTime; policyFrequency = policy.plainTextFrequency; - monthlyBackupFrequency = policy.monthlyBackupFrequency; + monthlyBackupFrequency = + policy.monthlyBackupFrequency; // do not show in the list can cause confusion. listOfCustomPolicies = [ @@ -268,8 +279,8 @@ {#if policyRetention === 365 * 100} Every backup created under this policy will be retained forever. + >forever. {:else} Every backup created under this policy will be retained for {backupRetainingOptions.find( @@ -300,7 +311,7 @@ on:click={() => { showCustomPolicy = false; }} - >Cancel + >Cancel Total: ${totalPolicies.length * policyPricing}.00 diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte index 8f56442c6..eb5be1a23 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/backups/policy.svelte @@ -91,13 +91,6 @@ return 'Runs daily'; } }; - - // Switches to UTC for non-hourly, - // keeps local time for hourly schedules. - const isHourlySchedule = (cron: string): boolean => { - const [_, hour, dayOfMonth, month, dayOfWeek] = cron.split(' '); - return hour === '*' && dayOfMonth === '*' && month === '*' && dayOfWeek === '*'; - };
@@ -112,7 +105,7 @@ class:u-padding-block-start-10={index !== 0} class:opacity-gradient-bottom={index === 2} data-show-every={showEveryPolicy} - data-visible={index < 3 || showEveryPolicy}> + data-visible={index <= 3 || showEveryPolicy}>

{policy.name}

@@ -174,7 +167,7 @@ class="u-flex u-gap-4 u-cross-center policy-item-subtitles darker-neutral-color"> {toLocaleDateTime( parseExpression(policy.schedule, { - utc: !isHourlySchedule(policy.schedule) + utc: true }) .next() .toString() @@ -215,7 +208,8 @@ {/each}
- {#if !showEveryPolicy && policies.policies.length > 3} + {#if !showEveryPolicy && policies.policies.length >= 3} +
- +
- {backup.policyId ? backup.policyId : 'Manual'} + {policyName(backup.policyId)}
- +