Skip to content

Commit 8a708ce

Browse files
Merge branch 'main' into revert-2491-revert-2477-copy-prompt
2 parents 9423fc9 + e662265 commit 8a708ce

File tree

19 files changed

+214
-55
lines changed

19 files changed

+214
-55
lines changed

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@2752",
25+
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@315d6c5",
2626
"@appwrite.io/pink-icons": "0.25.0",
2727
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bd82d9a",
2828
"@appwrite.io/pink-legacy": "^1.0.3",

pnpm-lock.yaml

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

src/lib/actions/analytics.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ export enum Submit {
360360
BucketUpdateSize = 'submit_bucket_update_size',
361361
BucketUpdateCompression = 'submit_bucket_update_compression',
362362
BucketUpdateExtensions = 'submit_bucket_update_extensions',
363+
BucketUpdateTransformations = 'submit_bucket_update_transformations',
363364
FileCreate = 'submit_file_create',
364365
FileDelete = 'submit_file_delete',
365366
FileUpdatePermissions = 'submit_file_update_permissions',

src/lib/sdk/billing.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ export class Billing {
490490
name: string,
491491
billingPlan: string,
492492
paymentMethodId: string,
493-
billingAddressId: string = null,
493+
billingAddressId: string = undefined,
494494
couponId: string = null,
495495
invites: Array<string> = [],
496496
budget: number = undefined,
@@ -628,6 +628,7 @@ export class Billing {
628628
budget,
629629
taxId
630630
};
631+
631632
const uri = new URL(this.client.config.endpoint + path);
632633
return await this.client.call(
633634
'patch',

src/routes/(console)/apply-credit/+page.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
name,
135135
billingPlan,
136136
paymentMethodId,
137-
null,
137+
undefined,
138138
couponData.code ? couponData.code : null,
139139
collaborators,
140140
billingBudget,
@@ -148,7 +148,7 @@
148148
selectedOrg.$id,
149149
billingPlan,
150150
paymentMethodId,
151-
null,
151+
undefined,
152152
couponData.code ? couponData.code : null,
153153
collaborators
154154
);

src/routes/(console)/create-organization/+page.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
ID.unique(),
113113
name,
114114
BillingPlan.FREE,
115-
null,
116115
null
117116
);
118117
} else {
@@ -121,7 +120,7 @@
121120
name,
122121
selectedPlan,
123122
paymentMethodId,
124-
null,
123+
undefined,
125124
selectedCoupon?.code,
126125
collaborators,
127126
billingBudget,

src/routes/(console)/onboarding/create-organization/+page.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
ID.unique(),
2626
organizationName,
2727
BillingPlan.FREE,
28-
null,
2928
null
3029
);
3130

src/routes/(console)/onboarding/create-project/+page.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export const load: PageLoad = async ({ parent }) => {
2929
ID.unique(),
3030
'Personal projects',
3131
BillingPlan.FREE,
32-
null,
3332
null
3433
);
3534
trackEvent(Submit.OrganizationCreate, {

src/routes/(console)/organization-[organization]/change-plan/+page.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@
173173
await sdk.forConsole.billing.updatePlan(
174174
data.organization.$id,
175175
selectedPlan,
176-
paymentMethodId,
177-
null
176+
paymentMethodId
178177
);
179178
180179
// 2) If the target plan has a project limit, apply selected projects now
@@ -254,7 +253,7 @@
254253
data.organization.$id,
255254
selectedPlan,
256255
paymentMethodId,
257-
null,
256+
undefined,
258257
selectedCoupon?.code,
259258
newCollaborators,
260259
billingBudget,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
try {
108108
await sdk
109109
.forProject(page.params.region, page.params.project)
110-
.migrations.createCsvMigration({
110+
.migrations.createCSVImport({
111111
bucketId: file.bucketId,
112112
fileId: file.$id,
113113
resourceId: `${page.params.database}:${page.params.table}`,

0 commit comments

Comments
 (0)