feat(core): make permission and invoice offline available (#8123)

Author: EYHN

packages/backend/server/src/core/permission/service.ts

@@ -75,6 +75,14 @@ export class PermissionService {
     return owner.user;
   }
 
+  async getWorkspaceMemberCount(workspaceId: string) {
+    return this.prisma.workspaceUserPermission.count({
+      where: {
+        workspaceId,
+      },
+    });
+  }
+
   async tryGetWorkspaceOwner(workspaceId: string) {
     return this.prisma.workspaceUserPermission.findFirst({
       where: {

packages/backend/server/src/core/quota/storage.ts

@@ -113,6 +113,8 @@ export class QuotaManagementService {
   // quota was apply to owner's account
   async getWorkspaceUsage(workspaceId: string): Promise<QuotaBusinessType> {
     const owner = await this.permissions.getWorkspaceOwner(workspaceId);
+    const memberCount =
+      await this.permissions.getWorkspaceMemberCount(workspaceId);
     const {
       feature: {
         name,
@@ -145,6 +147,7 @@ export class QuotaManagementService {
       humanReadable,
       usedSize,
       unlimited,
+      memberCount,
     };
 
     if (quota.unlimited) {

packages/backend/server/src/core/quota/types.ts

@@ -87,6 +87,9 @@ export class QuotaQueryType {
   @Field(() => SafeIntResolver)
   memberLimit!: number;
 
+  @Field(() => SafeIntResolver)
+  memberCount!: number;
+
   @Field(() => SafeIntResolver)
   storageQuota!: number;
 

packages/backend/server/src/core/workspaces/resolvers/workspace.ts

@@ -115,11 +115,7 @@ export class WorkspaceResolver {
     complexity: 2,
   })
   memberCount(@Parent() workspace: WorkspaceType) {
-    return this.prisma.workspaceUserPermission.count({
-      where: {
-        workspaceId: workspace.id,
-      },
-    });
+    return this.permissions.getWorkspaceMemberCount(workspace.id);
   }
 
   @ResolveField(() => Boolean, {
@@ -388,13 +384,8 @@ export class WorkspaceResolver {
       }
 
       // member limit check
-      const [memberCount, quota] = await Promise.all([
-        this.prisma.workspaceUserPermission.count({
-          where: { workspaceId },
-        }),
-        this.quota.getWorkspaceUsage(workspaceId),
-      ]);
-      if (memberCount >= quota.memberLimit) {
+      const quota = await this.quota.getWorkspaceUsage(workspaceId);
+      if (quota.memberCount >= quota.memberLimit) {
         return new MemberQuotaExceeded();
       }
 

packages/backend/server/src/schema.gql

@@ -603,6 +603,7 @@ type QuotaQueryType {
   copilotActionLimit: SafeInt
   historyPeriod: SafeInt!
   humanReadable: HumanReadableQuotaType!
+  memberCount: SafeInt!
   memberLimit: SafeInt!
   name: String!
   storageQuota: SafeInt!

packages/frontend/component/src/components/member-components/pagination.tsx

@@ -6,19 +6,21 @@ import ReactPaginate from 'react-paginate';
 import * as styles from './styles.css';
 export interface PaginationProps {
   totalCount: number;
+  pageNum?: number;
   countPerPage: number;
-  onPageChange: (skip: number) => void;
+  onPageChange: (skip: number, pageNum: number) => void;
 }
 
 export const Pagination = ({
   totalCount,
   countPerPage,
+  pageNum,
   onPageChange,
 }: PaginationProps) => {
   const handlePageClick = useCallback(
     (e: { selected: number }) => {
       const newOffset = (e.selected * countPerPage) % totalCount;
-      onPageChange(newOffset);
+      onPageChange(newOffset, e.selected);
     },
     [countPerPage, onPageChange, totalCount]
   );
@@ -34,6 +36,7 @@ export const Pagination = ({
       pageRangeDisplayed={3}
       marginPagesDisplayed={2}
       pageCount={pageCount}
+      forcePage={pageNum}
       previousLabel={<ArrowLeftSmallIcon />}
       nextLabel={<ArrowRightSmallIcon />}
       pageClassName={styles.pageItem}