Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-08-03 18:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): optimize upgrade to team page (#9099)

Browse Source
This commit is contained in:
JimmFly
2024-12-11 17:59:46 +08:00
committed by GitHub
parent b864cbf9d3
commit 4eb31444a9
16 changed files with 307 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/core/src/modules/cloud/entities/workspace-subscription.ts
+18 -3
View File
@@ -44,7 +44,12 @@ export class WorkspaceSubscription extends Entity {
if (!this.store) {
throw new Error('Subscription store not available');
}
await this.store.mutateResumeSubscription(idempotencyKey, plan);
await this.store.mutateResumeSubscription(
idempotencyKey,
plan,
undefined,
this.workspaceService.workspace.id
);
await this.waitForRevalidation();
}
@@ -52,7 +57,12 @@ export class WorkspaceSubscription extends Entity {
if (!this.store) {
throw new Error('Subscription store not available');
}
await this.store.mutateCancelSubscription(idempotencyKey, plan);
await this.store.mutateCancelSubscription(
idempotencyKey,
plan,
undefined,
this.workspaceService.workspace.id
);
await this.waitForRevalidation();
}
@@ -64,7 +74,12 @@ export class WorkspaceSubscription extends Entity {
if (!this.store) {
throw new Error('Subscription store not available');
}
await this.store.setSubscriptionRecurring(idempotencyKey, recurring, plan);
await this.store.setSubscriptionRecurring(
idempotencyKey,
recurring,
plan,
this.workspaceService.workspace.id
);
await this.waitForRevalidation();
}
packages/frontend/core/src/modules/cloud/stores/subscription.ts
+9 -3
View File
@@ -96,12 +96,14 @@ export class SubscriptionStore extends Store {
async mutateResumeSubscription(
idempotencyKey: string,
plan?: SubscriptionPlan,
abortSignal?: AbortSignal
abortSignal?: AbortSignal,
workspaceId?: string
) {
const data = await this.gqlService.gql({
query: resumeSubscriptionMutation,
variables: {
plan,
workspaceId,
},
context: {
signal: abortSignal,
@@ -116,12 +118,14 @@ export class SubscriptionStore extends Store {
async mutateCancelSubscription(
idempotencyKey: string,
plan?: SubscriptionPlan,
abortSignal?: AbortSignal
abortSignal?: AbortSignal,
workspaceId?: string
) {
const data = await this.gqlService.gql({
query: cancelSubscriptionMutation,
variables: {
plan,
workspaceId,
},
context: {
signal: abortSignal,
@@ -162,13 +166,15 @@ export class SubscriptionStore extends Store {
setSubscriptionRecurring(
idempotencyKey: string,
recurring: SubscriptionRecurring,
plan?: SubscriptionPlan
plan?: SubscriptionPlan,
workspaceId?: string
) {
return this.gqlService.gql({
query: updateSubscriptionMutation,
variables: {
plan,
recurring,
workspaceId,
},
context: {
headers: {