WOR-1235 - fresh branch (#4356)

Author: blakery

src/analysis/Analyses.ts

@@ -854,7 +854,6 @@ const Analyses = _.flow(
     breadcrumbs: (props) => breadcrumbs.commonPaths.workspaceDashboard(props),
     title: 'Analyses',
     activeTab: 'analyses',
-    topBarContent: null,
   }),
   withViewToggle('analysesTab')
 )(BaseAnalyses);

src/components/CloudProviderIcon.ts

@@ -1,7 +1,5 @@
 import { h } from 'react-hyperscript-helpers';
-// @ts-expect-error
 import { ReactComponent as CloudAzureLogo } from 'src/images/cloud_azure_icon.svg';
-// @ts-expect-error
 import { ReactComponent as CloudGcpLogo } from 'src/images/cloud_google_icon.svg';
 import { CloudProvider, cloudProviderLabels } from 'src/libs/workspace-utils';
 

src/libs/routes.js

@@ -31,7 +31,7 @@ import * as WorkflowsList from 'src/pages/workflows/List';
 import * as WorkflowDetails from 'src/pages/workflows/workflow/WorkflowDetails';
 import * as WorkspaceList from 'src/pages/workspaces/List';
 import * as WorkspaceMigration from 'src/pages/workspaces/migration/WorkspaceMigration';
-import * as Dashboard from 'src/pages/workspaces/workspace/Dashboard';
+import * as Dashboard from 'src/pages/workspaces/workspace/Dashboard/Dashboard';
 import * as WorkspaceFiles from 'src/pages/workspaces/workspace/Files';
 import * as JobHistory from 'src/pages/workspaces/workspace/JobHistory';
 import * as SubmissionDetails from 'src/pages/workspaces/workspace/jobHistory/SubmissionDetails';

src/libs/workspace-utils.ts

@@ -32,7 +32,7 @@ interface BaseWorkspaceInfo {
   lastModified: string;
   attributes?: Record<string, unknown>;
   isLocked?: boolean;
-  state?: WorkpaceState;
+  state?: WorkspaceState;
 }
 
 export interface AzureWorkspaceInfo extends BaseWorkspaceInfo {
@@ -71,7 +71,7 @@ export interface WorkspaceSubmissionStats {
   runningSubmissionsCount: number;
 }
 
-export type WorkpaceState =
+export type WorkspaceState =
   | 'Creating'
   | 'CreateFailed'
   | 'Ready'
@@ -81,6 +81,7 @@ export type WorkpaceState =
   | 'DeleteFailed';
 
 export interface BaseWorkspace {
+  owners?: string[];
   accessLevel: WorkspaceAccessLevel;
   canShare: boolean;
   canCompute: boolean;

src/pages/workspaces/WorkspacesList/RenderedWorkspaces.ts

@@ -24,7 +24,7 @@ import {
   WorkspaceInfo,
   WorkspaceWrapper as Workspace,
 } from 'src/libs/workspace-utils';
-import WorkspaceMenu from 'src/pages/workspaces/workspace/WorkspaceMenu';
+import { WorkspaceMenu } from 'src/pages/workspaces/workspace/WorkspaceMenu';
 import { WorkspaceUserActionsContext } from 'src/pages/workspaces/WorkspacesList/WorkspaceUserActions';
 
 // This is actually the sort type from the FlexTable component
@@ -348,7 +348,6 @@ const ActionsCell = (props: ActionsCellProps): ReactNode => {
         iconSize: 20,
         popupLocation: 'left',
         callbacks: { onClone, onShare, onLock, onDelete, onLeave },
-        // @ts-expect-error
         workspaceInfo: { namespace, name },
       }),
     ]),

src/pages/workspaces/WorkspacesList/WorkspacesListTabs.test.ts

@@ -1,9 +1,10 @@
+import { asMockedFn } from '@terra-ui-packages/test-utils';
 import { act, fireEvent, screen } from '@testing-library/react';
 import { h } from 'react-hyperscript-helpers';
 import { updateSearch, useRoute } from 'src/libs/nav';
 import { CategorizedWorkspaces } from 'src/pages/workspaces/WorkspacesList/CategorizedWorkspaces';
 import { WorkspacesListTabs } from 'src/pages/workspaces/WorkspacesList/WorkspacesListTabs';
-import { asMockedFn, renderWithAppContexts as render } from 'src/testing/test-utils';
+import { renderWithAppContexts as render } from 'src/testing/test-utils';
 import { defaultAzureWorkspace, defaultGoogleWorkspace } from 'src/testing/workspace-fixtures';
 
 // the FlexTable uses react-virtualized's AutoSizer to size the table.