Skip to content

Commit ff6cc65

Browse files
ItzNotABugItzNotABug
committed
Merge branch 'main' into 'fix-date-typo'.
2 parents 065d6db + 08bffbb commit ff6cc65

File tree

11 files changed

+68
-98
lines changed

11 files changed

+68
-98
lines changed

‎e2e/steps/pro-project.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export async function enterCreditCard(page: Page) {
1414
state: 'visible'
1515
});
1616
await page.getByPlaceholder('cardholder').fill('Test User');
17-
const stripe = page.frameLocator('[title="Secure payment input frame"]');
17+
const stripe = page.locator('[title="Secure payment input frame"]').nth(0).contentFrame();
1818
await stripe.locator('id=Field-numberInput').fill('4242424242424242');
1919
await stripe.locator('id=Field-expiryInput').fill('1250');
2020
await stripe.locator('id=Field-cvcInput').fill('123');

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"dependencies": {
2424
"@ai-sdk/svelte": "^1.1.24",
25-
"@appwrite.io/console": "https://pkg.pr.new/appwrite-labs/cloud/@appwrite.io/console@2289",
25+
"@appwrite.io/console": "^1.10.0",
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "^2.0.0-RC.1",
2828
"@appwrite.io/pink-legacy": "^1.0.3",

‎pnpm-lock.yaml

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/lib/components/filters/content.svelte

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@
8585
</script>
8686

8787
<div>
88-
<form onsubmit={addFilterAndReset}>
88+
<form
89+
onsubmit={(e) => {
90+
e.preventDefault();
91+
addFilterAndReset();
92+
}}>
8993
<Layout.Stack gap="s" direction="row" alignItems="flex-start">
9094
<InputSelect
9195
id="column"

‎src/lib/stores/preferences.ts

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,30 @@ import { page } from '$app/state';
88
import { user } from '$lib/stores/user';
99
import deepEqual from 'deep-equal';
1010

11-
type Preferences = {
11+
type ConsolePreferences = {
1212
limit?: number;
1313
view?: View;
1414
columns?: string[];
15-
};
15+
} /* support a strict + flexible preference type for TS compatibility */ & Record<
16+
string,
17+
string | number | boolean | object | null | unknown
18+
>;
1619

1720
type TeamPreferences = {
1821
names?: string[];
1922
};
2023

21-
type PreferencesStore = {
22-
[key: string]: Preferences;
24+
type ConsolePreferencesStore = {
25+
[key: string]: ConsolePreferences;
2326
collections?: {
24-
[key: string]: Preferences['columns'];
27+
[key: string]: ConsolePreferences['columns'];
2528
};
2629
displayNames?: {
2730
[key: string]: TeamPreferences['names'];
2831
};
2932
} & { hideAiDisclaimer?: boolean };
3033

31-
async function updateConsolePreferences(store: PreferencesStore): Promise<void> {
34+
async function updateConsolePreferences(store: ConsolePreferencesStore): Promise<void> {
3235
const currentPreferences = get(user)?.prefs ?? (await sdk.forConsole.account.getPrefs());
3336
if (!currentPreferences?.console || Array.isArray(currentPreferences.console)) {
3437
currentPreferences.console = {};
@@ -43,8 +46,8 @@ async function updateConsolePreferences(store: PreferencesStore): Promise<void>
4346
}
4447

4548
function createPreferences() {
46-
const { subscribe, set, update } = writable<PreferencesStore>({});
47-
let preferences: PreferencesStore = {};
49+
const { subscribe, set, update } = writable<ConsolePreferencesStore>({});
50+
let preferences: ConsolePreferencesStore = {};
4851

4952
if (browser) {
5053
// fresh fetch.
@@ -73,9 +76,9 @@ function createPreferences() {
7376
/**
7477
* Update the local store and then synchronizes them on user prefs.
7578
*/
76-
function updateAndSync(callback: (prefs: PreferencesStore) => void): Promise<void> {
77-
let oldPrefsSnapshot: PreferencesStore;
78-
let newPrefsSnapshot: PreferencesStore;
79+
function updateAndSync(callback: (prefs: ConsolePreferencesStore) => void): Promise<void> {
80+
let oldPrefsSnapshot: ConsolePreferencesStore;
81+
let newPrefsSnapshot: ConsolePreferencesStore;
7982

8083
update((currentPrefs) => {
8184
oldPrefsSnapshot = structuredClone(currentPrefs);
@@ -96,7 +99,7 @@ function createPreferences() {
9699
subscribe,
97100
set,
98101
update,
99-
get: (route?: Page['route']): Preferences => {
102+
get: (route?: Page['route']): ConsolePreferences => {
100103
const parsedRoute = route ?? page.route;
101104
return (
102105
preferences?.[parsedRoute.id] ?? {
@@ -106,10 +109,10 @@ function createPreferences() {
106109
}
107110
);
108111
},
109-
getCustomCollectionColumns: (collectionId: string): Preferences['columns'] => {
112+
getCustomCollectionColumns: (collectionId: string): ConsolePreferences['columns'] => {
110113
return preferences?.collections?.[collectionId] ?? [];
111114
},
112-
setLimit: (limit: Preferences['limit']) =>
115+
setLimit: (limit: ConsolePreferences['limit']) =>
113116
updateAndSync((n) => {
114117
const path = page.route.id;
115118

@@ -122,7 +125,7 @@ function createPreferences() {
122125

123126
return n;
124127
}),
125-
setView: (view: Preferences['view']) =>
128+
setView: (view: ConsolePreferences['view']) =>
126129
updateAndSync((n) => {
127130
const path = page.route.id;
128131

@@ -135,7 +138,7 @@ function createPreferences() {
135138

136139
return n;
137140
}),
138-
setColumns: (columns: Preferences['columns']) =>
141+
setColumns: (columns: ConsolePreferences['columns']) =>
139142
updateAndSync((n) => {
140143
const path = page.route.id;
141144

@@ -148,7 +151,10 @@ function createPreferences() {
148151

149152
return n;
150153
}),
151-
setCustomCollectionColumns: (collectionId: string, columns: Preferences['columns']) =>
154+
setCustomCollectionColumns: (
155+
collectionId: string,
156+
columns: ConsolePreferences['columns']
157+
) =>
152158
updateAndSync((n) => {
153159
if (!n?.collections?.[collectionId]) {
154160
n ??= {};

‎src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,13 @@
4747
4848
async function updateData() {
4949
try {
50-
const {
51-
$id,
52-
$collectionId,
53-
$databaseId,
54-
$createdAt,
55-
$updatedAt,
56-
$permissions,
57-
$sequence,
58-
...dataOnly
59-
} = $work;
60-
6150
await sdk
6251
.forProject(page.params.region, page.params.project)
6352
.databases.updateDocument(
6453
databaseId,
6554
collectionId,
6655
documentId,
67-
dataOnly,
56+
$work,
6857
$work.$permissions
6958
);
7059

‎src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,24 +52,13 @@
5252
5353
async function updateData() {
5454
try {
55-
const {
56-
$id,
57-
$collectionId,
58-
$databaseId,
59-
$createdAt,
60-
$updatedAt,
61-
$permissions,
62-
$sequence,
63-
...dataOnly
64-
} = $work;
65-
6655
await sdk
6756
.forProject(page.params.region, page.params.project)
6857
.databases.updateDocument(
6958
databaseId,
7059
collectionId,
7160
documentId,
72-
dataOnly,
61+
$work,
7362
$work.$permissions
7463
);
7564
await invalidate(Dependencies.DOCUMENT);

‎src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/document-[document]/settings/+page.svelte

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import { Dependencies } from '$lib/constants';
1414
import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
1515
import { collection } from '../../store';
16-
import { page } from '$app/stores';
16+
import { page } from '$app/state';
1717
import { Alert } from '@appwrite.io/pink-svelte';
1818
1919
let showDelete = false;
@@ -23,24 +23,15 @@
2323
2424
async function updatePermissions() {
2525
try {
26-
const {
27-
$id,
28-
$collectionId,
29-
$databaseId,
30-
$createdAt,
31-
$updatedAt,
32-
$permissions,
33-
$sequence,
34-
...dataOnly
35-
} = $doc;
26+
const { $databaseId, $collectionId, $id: documentId } = $doc;
3627
3728
await sdk
38-
.forProject($page.params.region, $page.params.project)
29+
.forProject(page.params.region, page.params.project)
3930
.databases.updateDocument(
40-
$doc.$databaseId,
41-
$doc.$collectionId,
42-
$doc.$id,
43-
dataOnly,
31+
$databaseId,
32+
$collectionId,
33+
documentId,
34+
undefined,
4435
permissions
4536
);
4637
await invalidate(Dependencies.DOCUMENT);

‎src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.svelte

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,17 @@
5656
await goto(routeBase);
5757
await invalidate(Dependencies.DOMAINS);
5858
} else {
59-
await goto(
60-
`${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}&domain=${domain.$id}`
61-
);
59+
let redirect = `${routeBase}/add-domain/verify-${domainName}?rule=${rule.$id}`;
60+
61+
if (isCloud) {
62+
/**
63+
* Domains are only on cloud!
64+
* Self-hosted instances have rules.
65+
*/
66+
redirect += `&domain=${domain.$id}`;
67+
}
68+
69+
await goto(redirect);
6270
await invalidate(Dependencies.DOMAINS);
6371
}
6472
} catch (error) {

‎src/routes/(console)/project-[region]-[project]/settings/domains/store.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)