review updates

Author: AlexTugarev

components/dashboard/src/teams/TeamUsage.tsx

@@ -89,16 +89,14 @@ function TeamUsage() {
         } catch (error) {
             if (error.code === ErrorCodes.PERMISSION_DENIED) {
                 setErrorMessage("Access to usage details is restricted to team owners.");
+            } else {
+                setErrorMessage(`Error: ${error?.message}`);
             }
         } finally {
             setIsLoading(false);
         }
     };
 
-    const handleSetPage = async (page: number) => {
-        await loadPage(page);
-    };
-
     const getType = (type: BillableWorkspaceType) => {
         if (type === "regular") {
             return "Workspace";
@@ -304,7 +302,7 @@ function TeamUsage() {
                                 {usagePage && usagePage.totalPages > 1 && (
                                     <Pagination
                                         currentPage={usagePage.page}
-                                        setPage={(page) => handleSetPage(page)}
+                                        setPage={(page) => loadPage(page)}
                                         totalNumberOfPages={usagePage.totalPages}
                                     />
                                 )}

components/gitpod-protocol/src/usage.ts

@@ -55,7 +55,7 @@ export interface ListBilledUsageResponse {
     sessions: ExtendedBillableSession[];
     totalCreditsUsed: number;
     totalPages: number;
-    total: number;
+    totalSessions: number;
     perPage: number;
     page: number;
 }

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -2196,12 +2196,13 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
                     };
                 }),
         );
+        const pagination = response.getPagination();
         return {
             sessions,
-            total: response.getTotal(),
-            totalPages: response.getTotalPages(),
-            page: response.getPage(),
-            perPage: response.getPerPage(),
+            totalSessions: pagination?.getTotal() || 0,
+            totalPages: pagination?.getTotalPages() || 0,
+            page: pagination?.getPage() || 0,
+            perPage: pagination?.getPerPage() || 0,
             totalCreditsUsed: response.getTotalCreditsUsed(),
         };
     }