Remove withSubmissionStats.

DataBiosphere · Mar 20, 2024 · 6d3b3f3 · 6d3b3f3
1 parent 4fc9d42
commit 6d3b3f3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 91 deletions.
diff --git a/src/workspaces/list/WorkspacesList.test.ts b/src/workspaces/list/WorkspacesList.test.ts
@@ -4,7 +4,7 @@ import { h } from 'react-hyperscript-helpers';
 import { Ajax } from 'src/libs/ajax';
 import { asMockedFn, renderWithAppContexts as render } from 'src/testing/test-utils';
 import { defaultAzureWorkspace, defaultGoogleWorkspace } from 'src/testing/workspace-fixtures';
-import { useWorkspacesWithSubmissionStats } from 'src/workspaces/list/state/useWorkspacesWithSubmissionStats';
+import { useWorkspaces } from 'src/workspaces/common/state/useWorkspaces';
 import { WorkspacesList } from 'src/workspaces/list/WorkspacesList';
 import { WorkspaceWrapper as Workspace } from 'src/workspaces/utils';
 
@@ -52,12 +52,11 @@ jest.mock<WorkspaceFiltersExports>('src/workspaces/list/WorkspaceFilters', () =>
   WorkspaceFilters: jest.fn().mockReturnValue(null),
 }));
 
-jest.mock<UseWorkspaceWithSubmissionStatsExports>('src/workspaces/list/state/useWorkspacesWithSubmissionStats', () => ({
-  ...jest.requireActual('src/workspaces/list/state/useWorkspacesWithSubmissionStats'),
-  useWorkspacesWithSubmissionStats: jest.fn(),
+type UseWorkspacesExports = typeof import('src/workspaces/common/state/useWorkspaces');
+jest.mock<UseWorkspacesExports>('src/workspaces/common/state/useWorkspaces', () => ({
+  ...jest.requireActual('src/workspaces/common/state/useWorkspaces'),
+  useWorkspaces: jest.fn(),
 }));
-type UseWorkspaceWithSubmissionStatsExports =
-  typeof import('src/workspaces/list/state/useWorkspacesWithSubmissionStats');
 
 describe('WorkspaceList', () => {
   afterEach(() => {
@@ -66,11 +65,10 @@ describe('WorkspaceList', () => {
 
   it('does not poll workspaces that are not deleting', async () => {
     // Arrange
-    asMockedFn(useWorkspacesWithSubmissionStats).mockReturnValue({
+    asMockedFn(useWorkspaces).mockReturnValue({
       workspaces: [defaultAzureWorkspace, defaultGoogleWorkspace],
-      refresh: () => jest.fn(),
-      loadingWorkspaces: false,
-      loadingSubmissionStats: false,
+      refresh: jest.fn(),
+      loading: false,
     });
     const mockDetailsFn = jest.fn();
     const mockAjax: DeepPartial<AjaxContract> = {
@@ -112,11 +110,10 @@ describe('WorkspaceList', () => {
         state: 'Deleting',
       },
     };
-    asMockedFn(useWorkspacesWithSubmissionStats).mockReturnValue({
+    asMockedFn(useWorkspaces).mockReturnValue({
       workspaces: [deletingWorkspace, defaultGoogleWorkspace],
-      refresh: () => jest.fn(),
-      loadingWorkspaces: false,
-      loadingSubmissionStats: false,
+      refresh: jest.fn(),
+      loading: false,
     });
     const mockDetailsFn: ReturnType<AjaxContract['Workspaces']['workspace']>['details'] = jest
       .fn()
@@ -183,11 +180,10 @@ describe('WorkspaceList', () => {
       },
     ];
 
-    asMockedFn(useWorkspacesWithSubmissionStats).mockReturnValue({
+    asMockedFn(useWorkspaces).mockReturnValue({
       workspaces: deletingWorkspaces,
-      refresh: () => jest.fn(),
-      loadingWorkspaces: false,
-      loadingSubmissionStats: false,
+      refresh: jest.fn(),
+      loading: false,
     });
     const mockDetailsFn: ReturnType<AjaxContract['Workspaces']['workspace']>['details'] = jest
       .fn()

diff --git a/src/workspaces/list/WorkspacesList.ts b/src/workspaces/list/WorkspacesList.ts
@@ -13,9 +13,9 @@ import { useOnMount } from 'src/libs/react-utils';
 import { elements as StyleElements } from 'src/libs/style';
 import { newTabLinkProps } from 'src/libs/utils';
 import { useDeletionPolling } from 'src/workspaces/common/state/useDeletionPolling';
+import { useWorkspaces } from 'src/workspaces/common/state/useWorkspaces';
 import { categorizeWorkspaces } from 'src/workspaces/list/CategorizedWorkspaces';
 import { RecentlyViewedWorkspaces } from 'src/workspaces/list/RecentlyViewedWorkspaces';
-import { useWorkspacesWithSubmissionStats } from 'src/workspaces/list/state/useWorkspacesWithSubmissionStats';
 import {
   getWorkspaceFiltersFromQuery,
   WorkspaceFilters,
@@ -32,7 +32,28 @@ export const getWorkspace = (id: string, workspaces: Workspace[]): Workspace =>
   _.find({ workspace: { workspaceId: id } }, workspaces)!;
 
 export const WorkspacesList = (): ReactNode => {
-  const { workspaces, refresh: refreshWorkspaces, loadingWorkspaces } = useWorkspacesWithSubmissionStats();
+  const {
+    workspaces,
+    refresh: refreshWorkspaces,
+    loading: loadingWorkspaces,
+  } = useWorkspaces(
+    [
+      'accessLevel',
+      'public',
+      'workspace.attributes.description',
+      'workspace.attributes.tag:tags',
+      'workspace.authorizationDomain',
+      'workspace.cloudPlatform',
+      'workspace.createdBy',
+      'workspace.lastModified',
+      'workspace.name',
+      'workspace.namespace',
+      'workspace.workspaceId',
+      'workspace.state',
+      'workspace.errorMessage',
+    ],
+    250
+  );
 
   const [featuredList, setFeaturedList] = useState<{ name: string; namespace: string }[]>();
   useDeletionPolling(workspaces);

diff --git a/src/workspaces/list/state/useWorkspacesWithSubmissionStats.ts b/src/workspaces/list/state/useWorkspacesWithSubmissionStats.ts