From cfb599fda00db550c92845787391121c6b46ea51 Mon Sep 17 00:00:00 2001
From: gtarpenning <griffin.tarpenning@wandb.com>
Date: Tue, 14 Jan 2025 11:59:12 -0800
Subject: [PATCH 1/5] refactor(ui): move objects/ops related pages into folders

---
 .../PagePanelComponents/Home/Browse3.tsx      | 14 +++---
 .../Home/Browse3/context.tsx                  |  4 +-
 .../Browse3/datasets/DatasetVersionPage.tsx   |  4 +-
 .../LeaderboardListingPage.tsx                |  2 +-
 .../pages/{ => ObjectsPage}/ObjectPage.tsx    |  2 +-
 .../{ => ObjectsPage}/ObjectVersionPage.tsx   | 50 +++++++++----------
 .../{ => ObjectsPage}/ObjectVersionsPage.tsx  | 46 ++++++++---------
 .../pages/{ => ObjectsPage}/ObjectsPage.tsx   |  2 +-
 .../{ => ObjectsPage/Tabs}/TabUseDataset.tsx  | 14 +++---
 .../{ => ObjectsPage/Tabs}/TabUseModel.tsx    | 12 ++---
 .../{ => ObjectsPage/Tabs}/TabUseObject.tsx   | 10 ++--
 .../{ => ObjectsPage/Tabs}/TabUsePrompt.tsx   | 12 ++---
 .../Browse3/pages/{ => OpsPage}/OpPage.tsx    |  2 +-
 .../pages/{ => OpsPage}/OpVersionPage.tsx     | 28 +++++------
 .../pages/{ => OpsPage}/OpVersionsPage.tsx    | 30 +++++------
 .../Browse3/pages/{ => OpsPage}/OpsPage.tsx   |  2 +-
 .../pages/{ => OpsPage/Tabs}/TabUseOp.tsx     | 10 ++--
 .../pages/ScorersPage/AnnotationsTab.tsx      |  2 +-
 .../pages/ScorersPage/CoreScorersTab.tsx      |  2 +-
 .../pages/ScorersPage/LLMJudgesTab.tsx        |  2 +-
 .../Home/Browse3/pages/common/Links.tsx       |  4 +-
 21 files changed, 127 insertions(+), 127 deletions(-)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage}/ObjectPage.tsx (91%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage}/ObjectVersionPage.tsx (93%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage}/ObjectVersionsPage.tsx (94%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage}/ObjectsPage.tsx (88%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage/Tabs}/TabUseDataset.tsx (84%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage/Tabs}/TabUseModel.tsx (86%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage/Tabs}/TabUseObject.tsx (77%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage/Tabs}/TabUsePrompt.tsx (79%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => OpsPage}/OpPage.tsx (90%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => OpsPage}/OpVersionPage.tsx (89%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => OpsPage}/OpVersionsPage.tsx (90%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => OpsPage}/OpsPage.tsx (88%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => OpsPage/Tabs}/TabUseOp.tsx (76%)

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
index c0192ddbe9f6..2a498c0088fb 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
@@ -72,16 +72,16 @@ import {CompareEvaluationsPage} from './Browse3/pages/CompareEvaluationsPage/Com
 import {LeaderboardListingPage} from './Browse3/pages/LeaderboardPage/LeaderboardListingPage';
 import {LeaderboardPage} from './Browse3/pages/LeaderboardPage/LeaderboardPage';
 import {ModsPage} from './Browse3/pages/ModsPage';
-import {ObjectPage} from './Browse3/pages/ObjectPage';
-import {ObjectVersionPage} from './Browse3/pages/ObjectVersionPage';
+import {ObjectPage} from './Browse3/pages/ObjectsPage/ObjectPage';
+import {ObjectVersionPage} from './Browse3/pages/ObjectsPage/ObjectVersionPage';
 import {
   ObjectVersionsPage,
   WFHighLevelObjectVersionFilter,
-} from './Browse3/pages/ObjectVersionsPage';
-import {OpPage} from './Browse3/pages/OpPage';
-import {OpsPage} from './Browse3/pages/OpsPage';
-import {OpVersionPage} from './Browse3/pages/OpVersionPage';
-import {OpVersionsPage} from './Browse3/pages/OpVersionsPage';
+} from './Browse3/pages/ObjectsPage/ObjectVersionsPage';
+import {OpPage} from './Browse3/pages/OpsPage/OpPage';
+import {OpsPage} from './Browse3/pages/OpsPage/OpsPage';
+import {OpVersionPage} from './Browse3/pages/OpsPage/OpVersionPage';
+import {OpVersionsPage} from './Browse3/pages/OpsPage/OpVersionsPage';
 import {PlaygroundPage} from './Browse3/pages/PlaygroundPage/PlaygroundPage';
 import {ScorersPage} from './Browse3/pages/ScorersPage/ScorersPage';
 import {TablePage} from './Browse3/pages/TablePage';
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
index fc522c0a9611..b0c457314c78 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
@@ -16,8 +16,8 @@ import React, {
 import {useHistory, useLocation} from 'react-router-dom';
 
 import {WFHighLevelCallFilter} from './pages/CallsPage/callsTableFilter';
-import {WFHighLevelObjectVersionFilter} from './pages/ObjectVersionsPage';
-import {WFHighLevelOpVersionFilter} from './pages/OpVersionsPage';
+import {WFHighLevelObjectVersionFilter} from './pages/ObjectsPage/ObjectVersionsPage';
+import {WFHighLevelOpVersionFilter} from './pages/OpsPage/OpVersionsPage';
 import {useURLSearchParamsDict} from './pages/util';
 import {
   AWL_ROW_EDGE_NAME,
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
index 1fd637d20d44..d6b126dbf6b9 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
@@ -13,8 +13,8 @@ import {
   ScrollableTabContent,
   SimplePageLayoutWithHeader,
 } from '../pages/common/SimplePageLayout';
-import {DeleteObjectButtonWithModal} from '../pages/ObjectVersionPage';
-import {TabUseDataset} from '../pages/TabUseDataset';
+import {DeleteObjectButtonWithModal} from '../pages/ObjectsPage/ObjectVersionPage';
+import {TabUseDataset} from '../pages/ObjectsPage/Tabs/TabUseDataset';
 import {useWFHooks} from '../pages/wfReactInterface/context';
 import {objectVersionKeyToRefUri} from '../pages/wfReactInterface/utilities';
 import {ObjectVersionSchema} from '../pages/wfReactInterface/wfDataModelHooksInterface';
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
index 6d495ec96292..e582e2e68418 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
@@ -9,7 +9,7 @@ import {useWeaveflowRouteContext} from '../../context';
 import {Empty} from '../common/Empty';
 import {EMPTY_PROPS_LEADERBOARDS} from '../common/EmptyContent';
 import {SimplePageLayout} from '../common/SimplePageLayout';
-import {ObjectVersionsTable} from '../ObjectVersionsPage';
+import {ObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
 import {
   useBaseObjectInstances,
   useCreateBuiltinObjectInstance,
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
similarity index 91%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
index 67b1681dcf03..01eba7c0cddd 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {SimplePageLayout} from './common/SimplePageLayout';
+import {SimplePageLayout} from '../common/SimplePageLayout';
 import {FilterableObjectVersionsTable} from './ObjectVersionsPage';
 
 export const ObjectPage: React.FC<{
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
similarity index 93%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
index d1a2543a63bc..ffe439f9036f 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
@@ -3,49 +3,49 @@ import {Button} from '@wandb/weave/components/Button';
 import {useObjectViewEvent} from '@wandb/weave/integrations/analytics/useViewEvents';
 import React, {useMemo, useState} from 'react';
 
-import {maybePluralizeWord} from '../../../../../core/util/string';
-import {Icon, IconName} from '../../../../Icon';
-import {LoadingDots} from '../../../../LoadingDots';
-import {Tailwind} from '../../../../Tailwind';
-import {Tooltip} from '../../../../Tooltip';
-import {useClosePeek} from '../context';
-import {DatasetVersionPage} from '../datasets/DatasetVersionPage';
-import {NotFoundPanel} from '../NotFoundPanel';
-import {CustomWeaveTypeProjectContext} from '../typeViews/CustomWeaveTypeDispatcher';
-import {WeaveCHTableSourceRefContext} from './CallPage/DataTableView';
-import {ObjectViewerSection} from './CallPage/ObjectViewerSection';
-import {WFHighLevelCallFilter} from './CallsPage/callsTableFilter';
-import {DeleteModal, useShowDeleteButton} from './common/DeleteModal';
+import {maybePluralizeWord} from '../../../../../../core/util/string';
+import {Icon, IconName} from '../../../../../Icon';
+import {LoadingDots} from '../../../../../LoadingDots';
+import {Tailwind} from '../../../../../Tailwind';
+import {Tooltip} from '../../../../../Tooltip';
+import {useClosePeek} from '../../context';
+import {DatasetVersionPage} from '../../datasets/DatasetVersionPage';
+import {NotFoundPanel} from '../../NotFoundPanel';
+import {CustomWeaveTypeProjectContext} from '../../typeViews/CustomWeaveTypeDispatcher';
+import {WeaveCHTableSourceRefContext} from '../CallPage/DataTableView';
+import {ObjectViewerSection} from '../CallPage/ObjectViewerSection';
+import {WFHighLevelCallFilter} from '../CallsPage/callsTableFilter';
+import {DeleteModal, useShowDeleteButton} from '../common/DeleteModal';
 import {
   CallLink,
   CallsLink,
   ObjectVersionsLink,
   objectVersionText,
   OpVersionLink,
-} from './common/Links';
-import {CenteredAnimatedLoader} from './common/Loader';
+} from '../common/Links';
+import {CenteredAnimatedLoader} from '../common/Loader';
 import {
   ScrollableTabContent,
   SimpleKeyValueTable,
   SimplePageLayoutWithHeader,
-} from './common/SimplePageLayout';
-import {EvaluationLeaderboardTab} from './LeaderboardTab';
-import {TabPrompt} from './TabPrompt';
-import {TabUseModel} from './TabUseModel';
-import {TabUseObject} from './TabUseObject';
-import {TabUsePrompt} from './TabUsePrompt';
-import {KNOWN_BASE_OBJECT_CLASSES} from './wfReactInterface/constants';
-import {useWFHooks} from './wfReactInterface/context';
+} from '../common/SimplePageLayout';
+import {EvaluationLeaderboardTab} from '../LeaderboardTab';
+import {TabPrompt} from '../TabPrompt';
+import {KNOWN_BASE_OBJECT_CLASSES} from '../wfReactInterface/constants';
+import {useWFHooks} from '../wfReactInterface/context';
 import {
   isObjDeleteError,
   objectVersionKeyToRefUri,
   refUriToOpVersionKey,
-} from './wfReactInterface/utilities';
+} from '../wfReactInterface/utilities';
 import {
   CallSchema,
   KnownBaseObjectClassType,
   ObjectVersionSchema,
-} from './wfReactInterface/wfDataModelHooksInterface';
+} from '../wfReactInterface/wfDataModelHooksInterface';
+import {TabUseModel} from './Tabs/TabUseModel';
+import {TabUseObject} from './Tabs/TabUseObject';
+import {TabUsePrompt} from './Tabs/TabUsePrompt';
 
 type ObjectIconProps = {
   baseObjectClass: KnownBaseObjectClassType;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
similarity index 94%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionsPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
index e9fee11f3e27..14d30f576d11 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectVersionsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
@@ -23,20 +23,20 @@ import _ from 'lodash';
 import React, {useEffect, useMemo, useState} from 'react';
 import {useHistory} from 'react-router-dom';
 
-import {TEAL_600} from '../../../../../common/css/color.styles';
-import {Button} from '../../../../Button';
-import {ErrorPanel} from '../../../../ErrorPanel';
-import {Loading} from '../../../../Loading';
-import {LoadingDots} from '../../../../LoadingDots';
-import {Timestamp} from '../../../../Timestamp';
+import {TEAL_600} from '../../../../../../common/css/color.styles';
+import {Button} from '../../../../../Button';
+import {ErrorPanel} from '../../../../../ErrorPanel';
+import {Loading} from '../../../../../Loading';
+import {LoadingDots} from '../../../../../LoadingDots';
+import {Timestamp} from '../../../../../Timestamp';
 import {
   useWeaveflowCurrentRouteContext,
   useWeaveflowRouteContext,
-} from '../context';
-import {StyledDataGrid} from '../StyledDataGrid';
-import {basicField} from './common/DataTable';
-import {DeleteModal} from './common/DeleteModal';
-import {Empty} from './common/Empty';
+} from '../../context';
+import {StyledDataGrid} from '../../StyledDataGrid';
+import {basicField} from '../common/DataTable';
+import {DeleteModal} from '../common/DeleteModal';
+import {Empty} from '../common/Empty';
 import {
   EMPTY_PROPS_ACTION_SPECS,
   EMPTY_PROPS_ANNOTATIONS,
@@ -46,35 +46,35 @@ import {
   EMPTY_PROPS_OBJECTS,
   EMPTY_PROPS_PROGRAMMATIC_SCORERS,
   EMPTY_PROPS_PROMPTS,
-} from './common/EmptyContent';
+} from '../common/EmptyContent';
 import {
   CustomLink,
   ObjectVersionLink,
   ObjectVersionsLink,
   objectVersionText,
-} from './common/Links';
-import {FilterLayoutTemplate} from './common/SimpleFilterableDataTable';
-import {SimplePageLayout} from './common/SimplePageLayout';
+} from '../common/Links';
+import {FilterLayoutTemplate} from '../common/SimpleFilterableDataTable';
+import {SimplePageLayout} from '../common/SimplePageLayout';
 import {
   buildDynamicColumns,
   prepareFlattenedDataForTable,
-} from './common/tabularListViews/columnBuilder';
-import {TypeVersionCategoryChip} from './common/TypeVersionCategoryChip';
-import {useControllableState, useURLSearchParamsDict} from './util';
+} from '../common/tabularListViews/columnBuilder';
+import {TypeVersionCategoryChip} from '../common/TypeVersionCategoryChip';
+import {useControllableState, useURLSearchParamsDict} from '../util';
 import {
   KNOWN_BASE_OBJECT_CLASSES,
   OBJECT_ATTR_EDGE_NAME,
-} from './wfReactInterface/constants';
-import {useWFHooks} from './wfReactInterface/context';
+} from '../wfReactInterface/constants';
+import {useWFHooks} from '../wfReactInterface/context';
 import {
   isTableRef,
   makeRefExpandedPayload,
-} from './wfReactInterface/tsDataModelHooksCallRefExpansion';
-import {objectVersionKeyToRefUri} from './wfReactInterface/utilities';
+} from '../wfReactInterface/tsDataModelHooksCallRefExpansion';
+import {objectVersionKeyToRefUri} from '../wfReactInterface/utilities';
 import {
   KnownBaseObjectClassType,
   ObjectVersionSchema,
-} from './wfReactInterface/wfDataModelHooksInterface';
+} from '../wfReactInterface/wfDataModelHooksInterface';
 
 const DATASET_BASE_OBJECT_CLASS = 'Dataset';
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectsPage.tsx
similarity index 88%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectsPage.tsx
index 0da05c2644d6..1a774520c0cf 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectsPage.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect} from 'react';
 import {useHistory} from 'react-router-dom';
 
-import {useWeaveflowCurrentRouteContext} from '../context';
+import {useWeaveflowCurrentRouteContext} from '../../context';
 
 export const ObjectsPage: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseDataset.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
similarity index 84%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseDataset.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
index 861eb15f4434..41d778871b1f 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseDataset.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
@@ -1,16 +1,16 @@
 import {Box} from '@mui/material';
 import React from 'react';
 
-import {isValidVarName} from '../../../../../core/util/var';
-import {parseRef} from '../../../../../react';
-import {abbreviateRef} from '../../../../../util/refs';
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
-import {TabUseBanner} from './TabUseBanner';
+import {isValidVarName} from '../../../../../../../core/util/var';
+import {parseRef} from '../../../../../../../react';
+import {abbreviateRef} from '../../../../../../../util/refs';
+import {CopyableText} from '../../../../../../CopyableText';
+import {DocLink} from '../../common/Links';
+import {TabUseBanner} from '../../TabUseBanner';
 import {
   OBJECT_ATTR_EDGE_NAME,
   TABLE_ID_EDGE_NAME,
-} from './wfReactInterface/constants';
+} from '../../wfReactInterface/constants';
 
 type TabUseDatasetProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseModel.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
similarity index 86%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseModel.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
index 66be4d77390b..417e692b3738 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseModel.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
@@ -1,12 +1,12 @@
 import {Box} from '@mui/material';
 import React from 'react';
 
-import {isValidVarName} from '../../../../../core/util/var';
-import {parseRef} from '../../../../../react';
-import {abbreviateRef} from '../../../../../util/refs';
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
-import {TabUseBanner} from './TabUseBanner';
+import {isValidVarName} from '../../../../../../../core/util/var';
+import {parseRef} from '../../../../../../../react';
+import {abbreviateRef} from '../../../../../../../util/refs';
+import {CopyableText} from '../../../../../../CopyableText';
+import {DocLink} from '../../common/Links';
+import {TabUseBanner} from '../../TabUseBanner';
 
 type TabUseModelProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseObject.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
similarity index 77%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseObject.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
index e81785213169..e81d84dcdee6 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseObject.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
@@ -1,11 +1,11 @@
 import {Box} from '@mui/material';
 import React from 'react';
 
-import {isValidVarName} from '../../../../../core/util/var';
-import {abbreviateRef} from '../../../../../util/refs';
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
-import {TabUseBanner} from './TabUseBanner';
+import {isValidVarName} from '../../../../../../../core/util/var';
+import {abbreviateRef} from '../../../../../../../util/refs';
+import {CopyableText} from '../../../../../../CopyableText';
+import {DocLink} from '../../common/Links';
+import {TabUseBanner} from '../../TabUseBanner';
 
 type TabUseObjectProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUsePrompt.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUsePrompt.tsx
similarity index 79%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUsePrompt.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUsePrompt.tsx
index 1d3c54dba46c..04bf54cb3f52 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUsePrompt.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUsePrompt.tsx
@@ -1,12 +1,12 @@
 import {Box} from '@mui/material';
 import React from 'react';
 
-import {isValidVarName} from '../../../../../core/util/var';
-import {parseRef} from '../../../../../react';
-import {abbreviateRef} from '../../../../../util/refs';
-import {Alert} from '../../../../Alert';
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
+import {isValidVarName} from '../../../../../../../core/util/var';
+import {parseRef} from '../../../../../../../react';
+import {abbreviateRef} from '../../../../../../../util/refs';
+import {Alert} from '../../../../../../Alert';
+import {CopyableText} from '../../../../../../CopyableText';
+import {DocLink} from '../../common/Links';
 
 type Data = Record<string, any>;
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpPage.tsx
similarity index 90%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpPage.tsx
index 621f49b60f96..d56240b9700b 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpPage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {SimplePageLayout} from './common/SimplePageLayout';
+import {SimplePageLayout} from '../common/SimplePageLayout';
 import {FilterableOpVersionsTable} from './OpVersionsPage';
 
 export const OpPage: React.FC<{
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionPage.tsx
similarity index 89%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionPage.tsx
index 6148e5a5bc48..ef7b7dc0fa51 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionPage.tsx
@@ -1,28 +1,28 @@
 import {Button} from '@wandb/weave/components/Button';
 import React, {useMemo, useState} from 'react';
 
-import {Icon} from '../../../../Icon';
-import {LoadingDots} from '../../../../LoadingDots';
-import {Tailwind} from '../../../../Tailwind';
-import {useClosePeek} from '../context';
-import {NotFoundPanel} from '../NotFoundPanel';
-import {OpCodeViewer} from '../OpCodeViewer';
-import {DeleteModal, useShowDeleteButton} from './common/DeleteModal';
+import {Icon} from '../../../../../Icon';
+import {LoadingDots} from '../../../../../LoadingDots';
+import {Tailwind} from '../../../../../Tailwind';
+import {useClosePeek} from '../../context';
+import {NotFoundPanel} from '../../NotFoundPanel';
+import {OpCodeViewer} from '../../OpCodeViewer';
+import {DeleteModal, useShowDeleteButton} from '../common/DeleteModal';
 import {
   CallsLink,
   opNiceName,
   OpVersionsLink,
   opVersionText,
-} from './common/Links';
-import {CenteredAnimatedLoader} from './common/Loader';
+} from '../common/Links';
+import {CenteredAnimatedLoader} from '../common/Loader';
 import {
   ScrollableTabContent,
   SimplePageLayoutWithHeader,
-} from './common/SimplePageLayout';
-import {TabUseOp} from './TabUseOp';
-import {useWFHooks} from './wfReactInterface/context';
-import {opVersionKeyToRefUri} from './wfReactInterface/utilities';
-import {OpVersionSchema} from './wfReactInterface/wfDataModelHooksInterface';
+} from '../common/SimplePageLayout';
+import {useWFHooks} from '../wfReactInterface/context';
+import {opVersionKeyToRefUri} from '../wfReactInterface/utilities';
+import {OpVersionSchema} from '../wfReactInterface/wfDataModelHooksInterface';
+import {TabUseOp} from './Tabs/TabUseOp';
 
 export const OpVersionPage: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
similarity index 90%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionsPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
index c5272f8a8d92..05e33469291d 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpVersionsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
@@ -6,26 +6,26 @@ import {
 } from '@mui/x-data-grid-pro';
 import React, {useEffect, useMemo, useState} from 'react';
 
-import {TEAL_600} from '../../../../../common/css/color.styles';
-import {ErrorPanel} from '../../../../ErrorPanel';
-import {Loading} from '../../../../Loading';
-import {LoadingDots} from '../../../../LoadingDots';
-import {Timestamp} from '../../../../Timestamp';
-import {StyledDataGrid} from '../StyledDataGrid';
-import {basicField} from './common/DataTable';
-import {Empty} from './common/Empty';
-import {EMPTY_PROPS_OPERATIONS} from './common/EmptyContent';
+import {TEAL_600} from '../../../../../../common/css/color.styles';
+import {ErrorPanel} from '../../../../../ErrorPanel';
+import {Loading} from '../../../../../Loading';
+import {LoadingDots} from '../../../../../LoadingDots';
+import {Timestamp} from '../../../../../Timestamp';
+import {StyledDataGrid} from '../../StyledDataGrid';
+import {basicField} from '../common/DataTable';
+import {Empty} from '../common/Empty';
+import {EMPTY_PROPS_OPERATIONS} from '../common/EmptyContent';
 import {
   CallsLink,
   opNiceName,
   OpVersionLink,
   OpVersionsLink,
-} from './common/Links';
-import {SimplePageLayout} from './common/SimplePageLayout';
-import {useControllableState, useURLSearchParamsDict} from './util';
-import {useWFHooks} from './wfReactInterface/context';
-import {opVersionKeyToRefUri} from './wfReactInterface/utilities';
-import {OpVersionSchema} from './wfReactInterface/wfDataModelHooksInterface';
+} from '../common/Links';
+import {SimplePageLayout} from '../common/SimplePageLayout';
+import {useControllableState, useURLSearchParamsDict} from '../util';
+import {useWFHooks} from '../wfReactInterface/context';
+import {opVersionKeyToRefUri} from '../wfReactInterface/utilities';
+import {OpVersionSchema} from '../wfReactInterface/wfDataModelHooksInterface';
 
 export type WFHighLevelOpVersionFilter = {
   opName?: string | null;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpsPage.tsx
similarity index 88%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpsPage.tsx
index 4a8fa42736da..570c6c72ea28 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpsPage.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect} from 'react';
 import {useHistory} from 'react-router-dom';
 
-import {useWeaveflowCurrentRouteContext} from '../context';
+import {useWeaveflowCurrentRouteContext} from '../../context';
 
 export const OpsPage: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseOp.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
similarity index 76%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseOp.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
index 2370fac74cfe..fc70fc144068 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseOp.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
@@ -1,11 +1,11 @@
 import {Box} from '@mui/material';
 import React from 'react';
 
-import {isValidVarName} from '../../../../../core/util/var';
-import {abbreviateRef} from '../../../../../util/refs';
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
-import {TabUseBanner} from './TabUseBanner';
+import {isValidVarName} from '../../../../../../../core/util/var';
+import {abbreviateRef} from '../../../../../../../util/refs';
+import {CopyableText} from '../../../../../../CopyableText';
+import {DocLink} from '../../common/Links';
+import {TabUseBanner} from '../../TabUseBanner';
 
 type TabUseOpProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
index c514b055b608..8abc4bf9884e 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
 
 export const AnnotationsTab: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
index f760912d47a2..a4bc815aeb4a 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
 
 export const ProgrammaticScorersTab: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
index 2241ec7e7560..f5359c32f4f8 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
 export const LLMJudgesTab: React.FC<{
   entity: string;
   project: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
index 5f84121f0889..da9307558f51 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
@@ -19,8 +19,8 @@ import {
   useWeaveflowRouteContext,
 } from '../../context';
 import {WFHighLevelCallFilter} from '../CallsPage/callsTableFilter';
-import {WFHighLevelObjectVersionFilter} from '../ObjectVersionsPage';
-import {WFHighLevelOpVersionFilter} from '../OpVersionsPage';
+import {WFHighLevelObjectVersionFilter} from '../ObjectsPage/ObjectVersionsPage';
+import {WFHighLevelOpVersionFilter} from '../OpsPage/OpVersionsPage';
 import {Id} from './Id';
 
 type LinkVariant = 'primary' | 'secondary';

From b41794bd2a8f0fdcb540ef90a566c61b8821d6a2 Mon Sep 17 00:00:00 2001
From: gtarpenning <griffin.tarpenning@wandb.com>
Date: Tue, 14 Jan 2025 12:25:43 -0800
Subject: [PATCH 2/5] op page

---
 .../Browse3/pages/{ObjectsPage => OpsPage}/Tabs/TabUsePrompt.tsx  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ObjectsPage => OpsPage}/Tabs/TabUsePrompt.tsx (100%)

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUsePrompt.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUsePrompt.tsx
similarity index 100%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUsePrompt.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUsePrompt.tsx

From 3e44ae473374a8c7f670e7a3b06e969333cc4752 Mon Sep 17 00:00:00 2001
From: gtarpenning <griffin.tarpenning@wandb.com>
Date: Tue, 14 Jan 2025 12:42:21 -0800
Subject: [PATCH 3/5] extract table, types, and buttons

---
 .../PagePanelComponents/Home/Browse3.tsx      |   6 +-
 .../Home/Browse3/context.tsx                  |   2 +-
 .../Browse3/datasets/DatasetVersionPage.tsx   |   2 +-
 .../LeaderboardListingPage.tsx                |   2 +-
 .../pages/ObjectsPage/ObjectDeleteButtons.tsx |  85 +++
 .../Browse3/pages/ObjectsPage/ObjectPage.tsx  |   2 +-
 .../pages/ObjectsPage/ObjectVersionPage.tsx   |  47 +-
 .../pages/ObjectsPage/ObjectVersionsPage.tsx  | 539 +-----------------
 .../pages/ObjectsPage/ObjectVersionsTable.tsx | 482 ++++++++++++++++
 .../pages/ObjectsPage/objectsPageTypes.ts     |   6 +
 .../pages/ScorersPage/AnnotationsTab.tsx      |   2 +-
 .../pages/ScorersPage/CoreScorersTab.tsx      |   2 +-
 .../pages/ScorersPage/LLMJudgesTab.tsx        |   2 +-
 .../Home/Browse3/pages/common/Links.tsx       |   2 +-
 14 files changed, 594 insertions(+), 587 deletions(-)
 create mode 100644 weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectDeleteButtons.tsx
 create mode 100644 weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsTable.tsx
 create mode 100644 weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/objectsPageTypes.ts

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
index 2a498c0088fb..308b59bda119 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3.tsx
@@ -73,11 +73,9 @@ import {LeaderboardListingPage} from './Browse3/pages/LeaderboardPage/Leaderboar
 import {LeaderboardPage} from './Browse3/pages/LeaderboardPage/LeaderboardPage';
 import {ModsPage} from './Browse3/pages/ModsPage';
 import {ObjectPage} from './Browse3/pages/ObjectsPage/ObjectPage';
+import {WFHighLevelObjectVersionFilter} from './Browse3/pages/ObjectsPage/objectsPageTypes';
 import {ObjectVersionPage} from './Browse3/pages/ObjectsPage/ObjectVersionPage';
-import {
-  ObjectVersionsPage,
-  WFHighLevelObjectVersionFilter,
-} from './Browse3/pages/ObjectsPage/ObjectVersionsPage';
+import {ObjectVersionsPage} from './Browse3/pages/ObjectsPage/ObjectVersionsPage';
 import {OpPage} from './Browse3/pages/OpsPage/OpPage';
 import {OpsPage} from './Browse3/pages/OpsPage/OpsPage';
 import {OpVersionPage} from './Browse3/pages/OpsPage/OpVersionPage';
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
index b0c457314c78..75eda6fcb55a 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
@@ -16,7 +16,7 @@ import React, {
 import {useHistory, useLocation} from 'react-router-dom';
 
 import {WFHighLevelCallFilter} from './pages/CallsPage/callsTableFilter';
-import {WFHighLevelObjectVersionFilter} from './pages/ObjectsPage/ObjectVersionsPage';
+import {WFHighLevelObjectVersionFilter} from './pages/ObjectsPage/objectsPageTypes';
 import {WFHighLevelOpVersionFilter} from './pages/OpsPage/OpVersionsPage';
 import {useURLSearchParamsDict} from './pages/util';
 import {
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
index d6b126dbf6b9..0952c7ccf2ae 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetVersionPage.tsx
@@ -13,7 +13,7 @@ import {
   ScrollableTabContent,
   SimplePageLayoutWithHeader,
 } from '../pages/common/SimplePageLayout';
-import {DeleteObjectButtonWithModal} from '../pages/ObjectsPage/ObjectVersionPage';
+import {DeleteObjectButtonWithModal} from '../pages/ObjectsPage/ObjectDeleteButtons';
 import {TabUseDataset} from '../pages/ObjectsPage/Tabs/TabUseDataset';
 import {useWFHooks} from '../pages/wfReactInterface/context';
 import {objectVersionKeyToRefUri} from '../pages/wfReactInterface/utilities';
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
index e582e2e68418..f78bc28db6ae 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/LeaderboardListingPage.tsx
@@ -9,7 +9,7 @@ import {useWeaveflowRouteContext} from '../../context';
 import {Empty} from '../common/Empty';
 import {EMPTY_PROPS_LEADERBOARDS} from '../common/EmptyContent';
 import {SimplePageLayout} from '../common/SimplePageLayout';
-import {ObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
+import {ObjectVersionsTable} from '../ObjectsPage/ObjectVersionsTable';
 import {
   useBaseObjectInstances,
   useCreateBuiltinObjectInstance,
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectDeleteButtons.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectDeleteButtons.tsx
new file mode 100644
index 000000000000..7d9aaf4cee99
--- /dev/null
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectDeleteButtons.tsx
@@ -0,0 +1,85 @@
+import {Button} from '@wandb/weave/components/Button';
+import {maybePluralizeWord} from '@wandb/weave/core/util/string';
+import React, {useState} from 'react';
+
+import {useClosePeek} from '../../context';
+import {DeleteModal} from '../common/DeleteModal';
+import {useWFHooks} from '../wfReactInterface/context';
+import {ObjectVersionSchema} from '../wfReactInterface/wfDataModelHooksInterface';
+
+export const DeleteObjectButtonWithModal: React.FC<{
+  objVersionSchema: ObjectVersionSchema;
+  overrideDisplayStr?: string;
+}> = ({objVersionSchema, overrideDisplayStr}) => {
+  const {useObjectDeleteFunc} = useWFHooks();
+  const closePeek = useClosePeek();
+  const {objectVersionsDelete} = useObjectDeleteFunc();
+  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
+
+  const deleteStr =
+    overrideDisplayStr ??
+    `${objVersionSchema.objectId}:v${objVersionSchema.versionIndex}`;
+
+  return (
+    <>
+      <Button
+        icon="delete"
+        variant="ghost"
+        onClick={() => setDeleteModalOpen(true)}
+      />
+      <DeleteModal
+        open={deleteModalOpen}
+        onClose={() => setDeleteModalOpen(false)}
+        deleteTitleStr={deleteStr}
+        onDelete={() =>
+          objectVersionsDelete(
+            objVersionSchema.entity,
+            objVersionSchema.project,
+            objVersionSchema.objectId,
+            [objVersionSchema.versionHash]
+          )
+        }
+        onSuccess={closePeek}
+      />
+    </>
+  );
+};
+
+export const DeleteObjectVersionsButtonWithModal: React.FC<{
+  entity: string;
+  project: string;
+  objectName: string;
+  objectVersions: string[];
+  disabled?: boolean;
+  onSuccess: () => void;
+}> = ({entity, project, objectName, objectVersions, disabled, onSuccess}) => {
+  const {useObjectDeleteFunc} = useWFHooks();
+  const {objectVersionsDelete} = useObjectDeleteFunc();
+  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
+
+  const numObjects = objectVersions.length;
+  const versionsStr = maybePluralizeWord(numObjects, 'version', 's');
+  const objectDigests = objectVersions.map(v => v.split(':')[1]);
+  const deleteTitleStr = `${numObjects} ${objectName} ${versionsStr}`;
+
+  return (
+    <>
+      <Button
+        icon="delete"
+        variant="ghost"
+        onClick={() => setDeleteModalOpen(true)}
+        disabled={disabled}
+      />
+      <DeleteModal
+        open={deleteModalOpen}
+        onClose={() => setDeleteModalOpen(false)}
+        deleteTitleStr={deleteTitleStr}
+        deleteBodyStrs={objectVersions}
+        onDelete={() =>
+          objectVersionsDelete(entity, project, objectName, objectDigests)
+        }
+        onSuccess={onSuccess}
+      />
+    </>
+  );
+};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
index 01eba7c0cddd..f536482552bf 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectPage.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import {SimplePageLayout} from '../common/SimplePageLayout';
-import {FilterableObjectVersionsTable} from './ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from './ObjectVersionsTable';
 
 export const ObjectPage: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
index ffe439f9036f..63de2f3d2f97 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
@@ -1,21 +1,19 @@
 import Box from '@mui/material/Box';
-import {Button} from '@wandb/weave/components/Button';
 import {useObjectViewEvent} from '@wandb/weave/integrations/analytics/useViewEvents';
-import React, {useMemo, useState} from 'react';
+import React, {useMemo} from 'react';
 
 import {maybePluralizeWord} from '../../../../../../core/util/string';
 import {Icon, IconName} from '../../../../../Icon';
 import {LoadingDots} from '../../../../../LoadingDots';
 import {Tailwind} from '../../../../../Tailwind';
 import {Tooltip} from '../../../../../Tooltip';
-import {useClosePeek} from '../../context';
 import {DatasetVersionPage} from '../../datasets/DatasetVersionPage';
 import {NotFoundPanel} from '../../NotFoundPanel';
 import {CustomWeaveTypeProjectContext} from '../../typeViews/CustomWeaveTypeDispatcher';
 import {WeaveCHTableSourceRefContext} from '../CallPage/DataTableView';
 import {ObjectViewerSection} from '../CallPage/ObjectViewerSection';
 import {WFHighLevelCallFilter} from '../CallsPage/callsTableFilter';
-import {DeleteModal, useShowDeleteButton} from '../common/DeleteModal';
+import {useShowDeleteButton} from '../common/DeleteModal';
 import {
   CallLink,
   CallsLink,
@@ -30,6 +28,7 @@ import {
   SimplePageLayoutWithHeader,
 } from '../common/SimplePageLayout';
 import {EvaluationLeaderboardTab} from '../LeaderboardTab';
+import {TabUsePrompt} from '../OpsPage/Tabs/TabUsePrompt';
 import {TabPrompt} from '../TabPrompt';
 import {KNOWN_BASE_OBJECT_CLASSES} from '../wfReactInterface/constants';
 import {useWFHooks} from '../wfReactInterface/context';
@@ -43,9 +42,9 @@ import {
   KnownBaseObjectClassType,
   ObjectVersionSchema,
 } from '../wfReactInterface/wfDataModelHooksInterface';
+import {DeleteObjectButtonWithModal} from './ObjectDeleteButtons';
 import {TabUseModel} from './Tabs/TabUseModel';
 import {TabUseObject} from './Tabs/TabUseObject';
-import {TabUsePrompt} from './Tabs/TabUsePrompt';
 
 type ObjectIconProps = {
   baseObjectClass: KnownBaseObjectClassType;
@@ -642,41 +641,3 @@ const OpVersionCallsLink: React.FC<{
     </>
   );
 };
-
-export const DeleteObjectButtonWithModal: React.FC<{
-  objVersionSchema: ObjectVersionSchema;
-  overrideDisplayStr?: string;
-}> = ({objVersionSchema, overrideDisplayStr}) => {
-  const {useObjectDeleteFunc} = useWFHooks();
-  const closePeek = useClosePeek();
-  const {objectVersionsDelete} = useObjectDeleteFunc();
-  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
-
-  const deleteStr =
-    overrideDisplayStr ??
-    `${objVersionSchema.objectId}:v${objVersionSchema.versionIndex}`;
-
-  return (
-    <>
-      <Button
-        icon="delete"
-        variant="ghost"
-        onClick={() => setDeleteModalOpen(true)}
-      />
-      <DeleteModal
-        open={deleteModalOpen}
-        onClose={() => setDeleteModalOpen(false)}
-        deleteTitleStr={deleteStr}
-        onDelete={() =>
-          objectVersionsDelete(
-            objVersionSchema.entity,
-            objVersionSchema.project,
-            objVersionSchema.objectId,
-            [objVersionSchema.versionHash]
-          )
-        }
-        onSuccess={closePeek}
-      />
-    </>
-  );
-};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
index 14d30f576d11..d9dbbf7b40be 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsPage.tsx
@@ -8,75 +8,20 @@
  * [ ] Add the ability to sort / filter on expanded values (blocked by general support for expansion operations)
  * [ ] Add sort / filter state to URL
  */
-
-import {
-  GridColDef,
-  GridColumnGroupingModel,
-  GridRowSelectionModel,
-  GridRowsProp,
-} from '@mui/x-data-grid-pro';
 import {useViewerInfo} from '@wandb/weave/common/hooks/useViewerInfo';
-import {Checkbox} from '@wandb/weave/components/Checkbox';
+import {Button} from '@wandb/weave/components/Button';
 import {Tailwind} from '@wandb/weave/components/Tailwind';
-import {maybePluralizeWord} from '@wandb/weave/core/util/string';
 import _ from 'lodash';
-import React, {useEffect, useMemo, useState} from 'react';
+import React, {useMemo, useState} from 'react';
 import {useHistory} from 'react-router-dom';
 
-import {TEAL_600} from '../../../../../../common/css/color.styles';
-import {Button} from '../../../../../Button';
-import {ErrorPanel} from '../../../../../ErrorPanel';
 import {Loading} from '../../../../../Loading';
-import {LoadingDots} from '../../../../../LoadingDots';
-import {Timestamp} from '../../../../../Timestamp';
-import {
-  useWeaveflowCurrentRouteContext,
-  useWeaveflowRouteContext,
-} from '../../context';
-import {StyledDataGrid} from '../../StyledDataGrid';
-import {basicField} from '../common/DataTable';
-import {DeleteModal} from '../common/DeleteModal';
-import {Empty} from '../common/Empty';
-import {
-  EMPTY_PROPS_ACTION_SPECS,
-  EMPTY_PROPS_ANNOTATIONS,
-  EMPTY_PROPS_DATASETS,
-  EMPTY_PROPS_LEADERBOARDS,
-  EMPTY_PROPS_MODEL,
-  EMPTY_PROPS_OBJECTS,
-  EMPTY_PROPS_PROGRAMMATIC_SCORERS,
-  EMPTY_PROPS_PROMPTS,
-} from '../common/EmptyContent';
-import {
-  CustomLink,
-  ObjectVersionLink,
-  ObjectVersionsLink,
-  objectVersionText,
-} from '../common/Links';
-import {FilterLayoutTemplate} from '../common/SimpleFilterableDataTable';
+import {useWeaveflowCurrentRouteContext} from '../../context';
 import {SimplePageLayout} from '../common/SimplePageLayout';
-import {
-  buildDynamicColumns,
-  prepareFlattenedDataForTable,
-} from '../common/tabularListViews/columnBuilder';
-import {TypeVersionCategoryChip} from '../common/TypeVersionCategoryChip';
-import {useControllableState, useURLSearchParamsDict} from '../util';
-import {
-  KNOWN_BASE_OBJECT_CLASSES,
-  OBJECT_ATTR_EDGE_NAME,
-} from '../wfReactInterface/constants';
-import {useWFHooks} from '../wfReactInterface/context';
-import {
-  isTableRef,
-  makeRefExpandedPayload,
-} from '../wfReactInterface/tsDataModelHooksCallRefExpansion';
-import {objectVersionKeyToRefUri} from '../wfReactInterface/utilities';
-import {
-  KnownBaseObjectClassType,
-  ObjectVersionSchema,
-} from '../wfReactInterface/wfDataModelHooksInterface';
-
-const DATASET_BASE_OBJECT_CLASS = 'Dataset';
+import {useControllableState} from '../util';
+import {DeleteObjectVersionsButtonWithModal} from './ObjectDeleteButtons';
+import {WFHighLevelObjectVersionFilter} from './objectsPageTypes';
+import {FilterableObjectVersionsTable} from './ObjectVersionsTable';
 
 export const ObjectVersionsPage: React.FC<{
   entity: string;
@@ -199,473 +144,3 @@ const ObjectVersionsPageHeaderExtra: React.FC<{
     </Tailwind>
   );
 };
-
-export type WFHighLevelObjectVersionFilter = {
-  objectName?: string | null;
-  baseObjectClass?: KnownBaseObjectClassType | null;
-};
-
-export const FilterableObjectVersionsTable: React.FC<{
-  entity: string;
-  project: string;
-  frozenFilter?: WFHighLevelObjectVersionFilter;
-  initialFilter?: WFHighLevelObjectVersionFilter;
-  objectTitle?: string;
-  hideCategoryColumn?: boolean;
-  hideCreatedAtColumn?: boolean;
-  // Setting this will make the component a controlled component. The parent
-  // is responsible for updating the filter.
-  onFilterUpdate?: (filter: WFHighLevelObjectVersionFilter) => void;
-  selectedVersions?: string[];
-  setSelectedVersions?: (selected: string[]) => void;
-}> = props => {
-  const {useRootObjectVersions} = useWFHooks();
-  const {baseRouter} = useWeaveflowRouteContext();
-
-  const effectiveFilter = useMemo(() => {
-    return {...props.initialFilter, ...props.frozenFilter};
-  }, [props.initialFilter, props.frozenFilter]);
-
-  const effectivelyLatestOnly = !effectiveFilter.objectName;
-
-  const filteredObjectVersions = useRootObjectVersions(
-    props.entity,
-    props.project,
-    {
-      baseObjectClasses: effectiveFilter.baseObjectClass
-        ? [effectiveFilter.baseObjectClass]
-        : undefined,
-      objectIds: effectiveFilter.objectName
-        ? [effectiveFilter.objectName]
-        : undefined,
-      latestOnly: effectivelyLatestOnly,
-    },
-    undefined,
-    effectivelyLatestOnly // metadata only when getting latest
-  );
-
-  if (filteredObjectVersions.loading) {
-    return <Loading centered />;
-  }
-  if (filteredObjectVersions.error) {
-    return <ErrorPanel />;
-  }
-
-  // TODO: Only show the empty state if no filters other than baseObjectClass
-  const objectVersions = filteredObjectVersions.result ?? [];
-  const isEmpty = objectVersions.length === 0;
-  if (isEmpty) {
-    let propsEmpty = EMPTY_PROPS_OBJECTS;
-    const base = props.initialFilter?.baseObjectClass;
-    if ('Prompt' === base) {
-      propsEmpty = EMPTY_PROPS_PROMPTS;
-    } else if ('Model' === base) {
-      propsEmpty = EMPTY_PROPS_MODEL;
-    } else if (DATASET_BASE_OBJECT_CLASS === base) {
-      propsEmpty = EMPTY_PROPS_DATASETS;
-    } else if (base === 'Leaderboard') {
-      propsEmpty = EMPTY_PROPS_LEADERBOARDS;
-    } else if (base === 'Scorer') {
-      propsEmpty = EMPTY_PROPS_PROGRAMMATIC_SCORERS;
-    } else if (base === 'ActionSpec') {
-      propsEmpty = EMPTY_PROPS_ACTION_SPECS;
-    } else if (base === 'AnnotationSpec') {
-      propsEmpty = EMPTY_PROPS_ANNOTATIONS;
-    }
-    return <Empty {...propsEmpty} />;
-  }
-
-  return (
-    <FilterLayoutTemplate
-      showFilterIndicator={Object.keys(effectiveFilter ?? {}).length > 0}
-      showPopoutButton={Object.keys(props.frozenFilter ?? {}).length > 0}
-      filterPopoutTargetUrl={baseRouter.objectVersionsUIUrl(
-        props.entity,
-        props.project,
-        effectiveFilter
-      )}>
-      <ObjectVersionsTable
-        objectVersions={objectVersions}
-        objectTitle={props.objectTitle}
-        hidePropsAsColumns={!!effectivelyLatestOnly}
-        hidePeerVersionsColumn={!effectivelyLatestOnly}
-        hideCategoryColumn={props.hideCategoryColumn}
-        hideCreatedAtColumn={props.hideCreatedAtColumn}
-        selectedVersions={props.selectedVersions}
-        setSelectedVersions={props.setSelectedVersions}
-      />
-    </FilterLayoutTemplate>
-  );
-};
-
-export const ObjectVersionsTable: React.FC<{
-  objectVersions: ObjectVersionSchema[];
-  objectTitle?: string;
-  hidePropsAsColumns?: boolean;
-  hidePeerVersionsColumn?: boolean;
-  hideCategoryColumn?: boolean;
-  hideCreatedAtColumn?: boolean;
-  hideVersionSuffix?: boolean;
-  onRowClick?: (objectVersion: ObjectVersionSchema) => void;
-  selectedVersions?: string[];
-  setSelectedVersions?: (selected: string[]) => void;
-}> = props => {
-  // `showPropsAsColumns` probably needs to be a bit more robust
-  const {selectedVersions, setSelectedVersions} = props;
-  const showPropsAsColumns = !props.hidePropsAsColumns;
-  const rows: GridRowsProp = useMemo(() => {
-    const vals = props.objectVersions.map(ov => ov.val);
-    const flat = prepareFlattenedDataForTable(vals);
-
-    return props.objectVersions.map((ov, i) => {
-      let val = flat[i];
-      if (ov.baseObjectClass === DATASET_BASE_OBJECT_CLASS) {
-        // We don't want to show the rows column for datasets
-        // because it is redundant. Probably want a more generic
-        // solution here in the future. Maybe exclude table refs?
-        val = _.omit(val, 'rows');
-      }
-      // Show name, even though it can be = to object id, consider adding back
-      // val = _.omit(val, 'name');
-      return {
-        id: objectVersionKeyToRefUri(ov),
-        obj: {
-          ...ov,
-          val,
-        },
-      };
-    });
-  }, [props.objectVersions]);
-
-  // TODO: We should make this page very robust similar to the CallsTable page.
-  // We will want to do nearly all the same things: URL state management,
-  // sorting, filtering, ref expansion, etc... A lot of common logic should be
-  // extracted and shared.
-  const {cols: columns, groups: columnGroupingModel} = useMemo(() => {
-    let groups: GridColumnGroupingModel = [];
-    const checkboxColumnArr: GridColDef[] =
-      selectedVersions != null && setSelectedVersions
-        ? [
-            {
-              minWidth: 30,
-              width: 34,
-              field: 'CustomCheckbox',
-              sortable: false,
-              disableColumnMenu: true,
-              resizable: false,
-              disableExport: true,
-              display: 'flex',
-              renderHeader: (params: any) => {
-                // TODO: Adding a select all checkbox here not that useful for compare
-                // but might for be for other bulk actions.
-                return null;
-              },
-              renderCell: (params: any) => {
-                const {objectId, versionIndex} = params.row.obj;
-                const objSpecifier = `${objectId}:v${versionIndex}`;
-                const isSelected = selectedVersions.includes(objSpecifier);
-                return (
-                  <Checkbox
-                    size="small"
-                    checked={isSelected}
-                    onCheckedChange={() => {
-                      if (isSelected) {
-                        setSelectedVersions(
-                          selectedVersions.filter(id => id !== objSpecifier)
-                        );
-                      } else {
-                        // Keep the objects in sorted order, regardless of the order checked.
-                        setSelectedVersions(
-                          [...selectedVersions, objSpecifier].sort((a, b) => {
-                            const [aName, aVer] = a.split(':');
-                            const [bName, bVer] = b.split(':');
-                            if (aName !== bName) {
-                              return aName.localeCompare(bName);
-                            }
-                            const aNum = parseInt(aVer.slice(1), 10);
-                            const bNum = parseInt(bVer.slice(1), 10);
-                            return aNum - bNum;
-                          })
-                        );
-                      }
-                    }}
-                  />
-                );
-              },
-            },
-          ]
-        : [];
-    const cols: GridColDef[] = [
-      ...checkboxColumnArr,
-
-      // This field name chosen to reduce possibility of conflict
-      // with the dynamic fields added below.
-      basicField('weave__object_version_link', props.objectTitle ?? 'Object', {
-        hideable: false,
-        renderCell: cellParams => {
-          // Icon to indicate navigation to the object version
-          const obj: ObjectVersionSchema = cellParams.row.obj;
-          if (props.onRowClick) {
-            let text = props.hideVersionSuffix
-              ? obj.objectId
-              : objectVersionText(obj.objectId, obj.versionIndex);
-
-            // This allows us to use the object name as the link text
-            // if it is available. Probably should make this workfor
-            // the object version link as well.
-            if (obj.val.name) {
-              text = obj.val.name;
-            }
-
-            return (
-              <CustomLink text={text} onClick={() => props.onRowClick?.(obj)} />
-            );
-          }
-          return (
-            <ObjectVersionLink
-              entityName={obj.entity}
-              projectName={obj.project}
-              objectName={obj.objectId}
-              version={obj.versionHash}
-              versionIndex={obj.versionIndex}
-              fullWidth={true}
-              color={TEAL_600}
-              hideVersionSuffix={props.hideVersionSuffix}
-            />
-          );
-        },
-      }),
-    ];
-
-    if (showPropsAsColumns) {
-      const dynamicFields: string[] = [];
-      const dynamicFieldSet = new Set<string>();
-      rows.forEach(r => {
-        Object.keys(r.obj.val).forEach(k => {
-          if (!dynamicFieldSet.has(k)) {
-            dynamicFieldSet.add(k);
-            dynamicFields.push(k);
-          }
-        });
-      });
-
-      const {cols: newCols, groupingModel} = buildDynamicColumns<{
-        obj: ObjectVersionSchema;
-      }>(
-        dynamicFields,
-        row => ({
-          entity: row.obj.entity,
-          project: row.obj.project,
-        }),
-        (row, key) => {
-          const obj: ObjectVersionSchema = row.obj;
-          const res = obj.val?.[key];
-          if (isTableRef(res)) {
-            // This whole block is a hack to make the table ref clickable. This
-            // is the same thing that the CallsTable does for expanded fields.
-            // Once we come up with a common pattern for ref expansion, this
-            // will go away.
-            const selfRefUri = objectVersionKeyToRefUri(obj);
-            const targetRefUri =
-              selfRefUri +
-              ('/' +
-                OBJECT_ATTR_EDGE_NAME +
-                '/' +
-                key.split('.').join(OBJECT_ATTR_EDGE_NAME + '/'));
-            return makeRefExpandedPayload(targetRefUri, res);
-          }
-          return res;
-        }
-      );
-      cols.push(...newCols);
-      groups = groupingModel;
-    }
-
-    if (!props.hideCategoryColumn) {
-      cols.push(
-        basicField('baseObjectClass', 'Category', {
-          width: 120,
-          display: 'flex',
-          valueGetter: (unused: any, row: any) => {
-            return row.obj.baseObjectClass;
-          },
-          renderCell: cellParams => {
-            const category = cellParams.value;
-            if (KNOWN_BASE_OBJECT_CLASSES.includes(category)) {
-              return <TypeVersionCategoryChip baseObjectClass={category} />;
-            }
-            return null;
-          },
-        })
-      );
-    }
-
-    if (!props.hideCreatedAtColumn) {
-      cols.push(
-        basicField('createdAtMs', 'Created', {
-          width: 100,
-          valueGetter: (unused: any, row: any) => {
-            return row.obj.createdAtMs;
-          },
-          renderCell: cellParams => {
-            const createdAtMs = cellParams.value;
-            return <Timestamp value={createdAtMs / 1000} format="relative" />;
-          },
-        })
-      );
-    }
-
-    if (!props.hidePeerVersionsColumn) {
-      cols.push(
-        basicField('peerVersions', 'Versions', {
-          width: 100,
-          sortable: false,
-          filterable: false,
-          renderCell: cellParams => {
-            const obj: ObjectVersionSchema = cellParams.row.obj;
-            return <PeerVersionsLink obj={obj} />;
-          },
-        })
-      );
-    }
-
-    return {cols, groups};
-  }, [props, showPropsAsColumns, rows, selectedVersions, setSelectedVersions]);
-
-  // Highlight table row if it matches peek drawer.
-  const query = useURLSearchParamsDict();
-  const {peekPath} = query;
-  const peekId = peekPath ? peekPath.split('/').pop() : null;
-  const rowIds = useMemo(() => {
-    return rows.map(row => row.id);
-  }, [rows]);
-  const [rowSelectionModel, setRowSelectionModel] =
-    useState<GridRowSelectionModel>([]);
-  useEffect(() => {
-    if (rowIds.length === 0) {
-      // Data may have not loaded
-      return;
-    }
-    if (peekId == null) {
-      // No peek drawer, clear any selection
-      setRowSelectionModel([]);
-    } else {
-      // If peek drawer matches a row, select it.
-      // If not, don't modify selection.
-      if (rowIds.includes(peekId)) {
-        setRowSelectionModel([peekId]);
-      }
-    }
-  }, [rowIds, peekId]);
-
-  return (
-    <StyledDataGrid
-      // Start Column Menu
-      // ColumnMenu is only needed when we have other actions
-      // such as filtering.
-      disableColumnMenu={true}
-      // We don't have enough columns to justify filtering
-      disableColumnFilter={true}
-      disableMultipleColumnsFiltering={true}
-      // ColumnPinning seems to be required in DataGridPro, else it crashes.
-      disableColumnPinning={false}
-      // We don't have enough columns to justify re-ordering
-      disableColumnReorder={true}
-      // The columns are fairly simple, so we don't need to resize them.
-      disableColumnResize={false}
-      // We don't have enough columns to justify hiding some of them.
-      disableColumnSelector={true}
-      // We don't have enough columns to justify sorting by multiple columns.
-      disableMultipleColumnsSorting={true}
-      // End Column Menu
-      rows={rows}
-      initialState={{
-        sorting: {
-          sortModel: [{field: 'createdAtMs', sort: 'desc'}],
-        },
-      }}
-      columnHeaderHeight={40}
-      rowHeight={38}
-      columns={columns}
-      disableRowSelectionOnClick
-      rowSelectionModel={rowSelectionModel}
-      columnGroupingModel={columnGroupingModel}
-    />
-  );
-};
-
-const PeerVersionsLink: React.FC<{obj: ObjectVersionSchema}> = props => {
-  const {useRootObjectVersions} = useWFHooks();
-
-  const obj = props.obj;
-  // Here, we really just want to know the count - and it should be calculated
-  // by the server, not by the client. This is a performance optimization. In
-  // the meantime we will just fetch the first 100 versions and display 99+ if
-  // there are at least 100. Someone can come back and add `count` to the 3
-  // query APIs which will make this faster.
-  const objectVersionsNode = useRootObjectVersions(
-    obj.entity,
-    obj.project,
-    {
-      objectIds: [obj.objectId],
-    },
-    100,
-    true // metadataOnly
-  );
-  if (objectVersionsNode.loading) {
-    return <LoadingDots />;
-  }
-  const countValue = objectVersionsNode.result?.length ?? 0;
-  return (
-    <ObjectVersionsLink
-      entity={obj.entity}
-      project={obj.project}
-      filter={{
-        objectName: obj.objectId,
-      }}
-      versionCount={Math.min(countValue, 99)}
-      countIsLimited={countValue === 100}
-      neverPeek
-      variant="secondary"
-    />
-  );
-};
-
-const DeleteObjectVersionsButtonWithModal: React.FC<{
-  entity: string;
-  project: string;
-  objectName: string;
-  objectVersions: string[];
-  disabled?: boolean;
-  onSuccess: () => void;
-}> = ({entity, project, objectName, objectVersions, disabled, onSuccess}) => {
-  const {useObjectDeleteFunc} = useWFHooks();
-  const {objectVersionsDelete} = useObjectDeleteFunc();
-  const [deleteModalOpen, setDeleteModalOpen] = useState(false);
-
-  const numObjects = objectVersions.length;
-  const versionsStr = maybePluralizeWord(numObjects, 'version', 's');
-  const objectDigests = objectVersions.map(v => v.split(':')[1]);
-  const deleteTitleStr = `${numObjects} ${objectName} ${versionsStr}`;
-
-  return (
-    <>
-      <Button
-        icon="delete"
-        variant="ghost"
-        onClick={() => setDeleteModalOpen(true)}
-        disabled={disabled}
-      />
-      <DeleteModal
-        open={deleteModalOpen}
-        onClose={() => setDeleteModalOpen(false)}
-        deleteTitleStr={deleteTitleStr}
-        deleteBodyStrs={objectVersions}
-        onDelete={() =>
-          objectVersionsDelete(entity, project, objectName, objectDigests)
-        }
-        onSuccess={onSuccess}
-      />
-    </>
-  );
-};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsTable.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsTable.tsx
new file mode 100644
index 000000000000..abced38a357f
--- /dev/null
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionsTable.tsx
@@ -0,0 +1,482 @@
+import {
+  GridColDef,
+  GridColumnGroupingModel,
+  GridRowSelectionModel,
+  GridRowsProp,
+} from '@mui/x-data-grid-pro';
+import {Checkbox} from '@wandb/weave/components/Checkbox';
+import _ from 'lodash';
+import React, {useEffect, useMemo, useState} from 'react';
+
+import {TEAL_600} from '../../../../../../common/css/color.styles';
+import {ErrorPanel} from '../../../../../ErrorPanel';
+import {Loading} from '../../../../../Loading';
+import {LoadingDots} from '../../../../../LoadingDots';
+import {Timestamp} from '../../../../../Timestamp';
+import {useWeaveflowRouteContext} from '../../context';
+import {StyledDataGrid} from '../../StyledDataGrid';
+import {basicField} from '../common/DataTable';
+import {Empty} from '../common/Empty';
+import {
+  EMPTY_PROPS_ACTION_SPECS,
+  EMPTY_PROPS_ANNOTATIONS,
+  EMPTY_PROPS_DATASETS,
+  EMPTY_PROPS_LEADERBOARDS,
+  EMPTY_PROPS_MODEL,
+  EMPTY_PROPS_OBJECTS,
+  EMPTY_PROPS_PROGRAMMATIC_SCORERS,
+  EMPTY_PROPS_PROMPTS,
+} from '../common/EmptyContent';
+import {
+  CustomLink,
+  ObjectVersionLink,
+  ObjectVersionsLink,
+  objectVersionText,
+} from '../common/Links';
+import {FilterLayoutTemplate} from '../common/SimpleFilterableDataTable';
+import {
+  buildDynamicColumns,
+  prepareFlattenedDataForTable,
+} from '../common/tabularListViews/columnBuilder';
+import {TypeVersionCategoryChip} from '../common/TypeVersionCategoryChip';
+import {useURLSearchParamsDict} from '../util';
+import {
+  KNOWN_BASE_OBJECT_CLASSES,
+  OBJECT_ATTR_EDGE_NAME,
+} from '../wfReactInterface/constants';
+import {useWFHooks} from '../wfReactInterface/context';
+import {
+  isTableRef,
+  makeRefExpandedPayload,
+} from '../wfReactInterface/tsDataModelHooksCallRefExpansion';
+import {objectVersionKeyToRefUri} from '../wfReactInterface/utilities';
+import {ObjectVersionSchema} from '../wfReactInterface/wfDataModelHooksInterface';
+import {WFHighLevelObjectVersionFilter} from './objectsPageTypes';
+
+const DATASET_BASE_OBJECT_CLASS = 'Dataset';
+
+export const ObjectVersionsTable: React.FC<{
+  objectVersions: ObjectVersionSchema[];
+  objectTitle?: string;
+  hidePropsAsColumns?: boolean;
+  hidePeerVersionsColumn?: boolean;
+  hideCategoryColumn?: boolean;
+  hideCreatedAtColumn?: boolean;
+  hideVersionSuffix?: boolean;
+  onRowClick?: (objectVersion: ObjectVersionSchema) => void;
+  selectedVersions?: string[];
+  setSelectedVersions?: (selected: string[]) => void;
+}> = props => {
+  // `showPropsAsColumns` probably needs to be a bit more robust
+  const {selectedVersions, setSelectedVersions} = props;
+  const showPropsAsColumns = !props.hidePropsAsColumns;
+  const rows: GridRowsProp = useMemo(() => {
+    const vals = props.objectVersions.map(ov => ov.val);
+    const flat = prepareFlattenedDataForTable(vals);
+
+    return props.objectVersions.map((ov, i) => {
+      let val = flat[i];
+      if (ov.baseObjectClass === DATASET_BASE_OBJECT_CLASS) {
+        // We don't want to show the rows column for datasets
+        // because it is redundant. Probably want a more generic
+        // solution here in the future. Maybe exclude table refs?
+        val = _.omit(val, 'rows');
+      }
+      // Show name, even though it can be = to object id, consider adding back
+      // val = _.omit(val, 'name');
+      return {
+        id: objectVersionKeyToRefUri(ov),
+        obj: {
+          ...ov,
+          val,
+        },
+      };
+    });
+  }, [props.objectVersions]);
+
+  // TODO: We should make this page very robust similar to the CallsTable page.
+  // We will want to do nearly all the same things: URL state management,
+  // sorting, filtering, ref expansion, etc... A lot of common logic should be
+  // extracted and shared.
+  const {cols: columns, groups: columnGroupingModel} = useMemo(() => {
+    let groups: GridColumnGroupingModel = [];
+    const checkboxColumnArr: GridColDef[] =
+      selectedVersions != null && setSelectedVersions
+        ? [
+            {
+              minWidth: 30,
+              width: 34,
+              field: 'CustomCheckbox',
+              sortable: false,
+              disableColumnMenu: true,
+              resizable: false,
+              disableExport: true,
+              display: 'flex',
+              renderHeader: (params: any) => {
+                // TODO: Adding a select all checkbox here not that useful for compare
+                // but might for be for other bulk actions.
+                return null;
+              },
+              renderCell: (params: any) => {
+                const {objectId, versionIndex} = params.row.obj;
+                const objSpecifier = `${objectId}:v${versionIndex}`;
+                const isSelected = selectedVersions.includes(objSpecifier);
+                return (
+                  <Checkbox
+                    size="small"
+                    checked={isSelected}
+                    onCheckedChange={() => {
+                      if (isSelected) {
+                        setSelectedVersions(
+                          selectedVersions.filter(id => id !== objSpecifier)
+                        );
+                      } else {
+                        // Keep the objects in sorted order, regardless of the order checked.
+                        setSelectedVersions(
+                          [...selectedVersions, objSpecifier].sort((a, b) => {
+                            const [aName, aVer] = a.split(':');
+                            const [bName, bVer] = b.split(':');
+                            if (aName !== bName) {
+                              return aName.localeCompare(bName);
+                            }
+                            const aNum = parseInt(aVer.slice(1), 10);
+                            const bNum = parseInt(bVer.slice(1), 10);
+                            return aNum - bNum;
+                          })
+                        );
+                      }
+                    }}
+                  />
+                );
+              },
+            },
+          ]
+        : [];
+    const cols: GridColDef[] = [
+      ...checkboxColumnArr,
+
+      // This field name chosen to reduce possibility of conflict
+      // with the dynamic fields added below.
+      basicField('weave__object_version_link', props.objectTitle ?? 'Object', {
+        hideable: false,
+        renderCell: cellParams => {
+          // Icon to indicate navigation to the object version
+          const obj: ObjectVersionSchema = cellParams.row.obj;
+          if (props.onRowClick) {
+            let text = props.hideVersionSuffix
+              ? obj.objectId
+              : objectVersionText(obj.objectId, obj.versionIndex);
+
+            // This allows us to use the object name as the link text
+            // if it is available. Probably should make this workfor
+            // the object version link as well.
+            if (obj.val.name) {
+              text = obj.val.name;
+            }
+
+            return (
+              <CustomLink text={text} onClick={() => props.onRowClick?.(obj)} />
+            );
+          }
+          return (
+            <ObjectVersionLink
+              entityName={obj.entity}
+              projectName={obj.project}
+              objectName={obj.objectId}
+              version={obj.versionHash}
+              versionIndex={obj.versionIndex}
+              fullWidth={true}
+              color={TEAL_600}
+              hideVersionSuffix={props.hideVersionSuffix}
+            />
+          );
+        },
+      }),
+    ];
+
+    if (showPropsAsColumns) {
+      const dynamicFields: string[] = [];
+      const dynamicFieldSet = new Set<string>();
+      rows.forEach(r => {
+        Object.keys(r.obj.val).forEach(k => {
+          if (!dynamicFieldSet.has(k)) {
+            dynamicFieldSet.add(k);
+            dynamicFields.push(k);
+          }
+        });
+      });
+
+      const {cols: newCols, groupingModel} = buildDynamicColumns<{
+        obj: ObjectVersionSchema;
+      }>(
+        dynamicFields,
+        row => ({
+          entity: row.obj.entity,
+          project: row.obj.project,
+        }),
+        (row, key) => {
+          const obj: ObjectVersionSchema = row.obj;
+          const res = obj.val?.[key];
+          if (isTableRef(res)) {
+            // This whole block is a hack to make the table ref clickable. This
+            // is the same thing that the CallsTable does for expanded fields.
+            // Once we come up with a common pattern for ref expansion, this
+            // will go away.
+            const selfRefUri = objectVersionKeyToRefUri(obj);
+            const targetRefUri =
+              selfRefUri +
+              ('/' +
+                OBJECT_ATTR_EDGE_NAME +
+                '/' +
+                key.split('.').join(OBJECT_ATTR_EDGE_NAME + '/'));
+            return makeRefExpandedPayload(targetRefUri, res);
+          }
+          return res;
+        }
+      );
+      cols.push(...newCols);
+      groups = groupingModel;
+    }
+
+    if (!props.hideCategoryColumn) {
+      cols.push(
+        basicField('baseObjectClass', 'Category', {
+          width: 120,
+          display: 'flex',
+          valueGetter: (unused: any, row: any) => {
+            return row.obj.baseObjectClass;
+          },
+          renderCell: cellParams => {
+            const category = cellParams.value;
+            if (KNOWN_BASE_OBJECT_CLASSES.includes(category)) {
+              return <TypeVersionCategoryChip baseObjectClass={category} />;
+            }
+            return null;
+          },
+        })
+      );
+    }
+
+    if (!props.hideCreatedAtColumn) {
+      cols.push(
+        basicField('createdAtMs', 'Created', {
+          width: 100,
+          valueGetter: (unused: any, row: any) => {
+            return row.obj.createdAtMs;
+          },
+          renderCell: cellParams => {
+            const createdAtMs = cellParams.value;
+            return <Timestamp value={createdAtMs / 1000} format="relative" />;
+          },
+        })
+      );
+    }
+
+    if (!props.hidePeerVersionsColumn) {
+      cols.push(
+        basicField('peerVersions', 'Versions', {
+          width: 100,
+          sortable: false,
+          filterable: false,
+          renderCell: cellParams => {
+            const obj: ObjectVersionSchema = cellParams.row.obj;
+            return <PeerVersionsLink obj={obj} />;
+          },
+        })
+      );
+    }
+
+    return {cols, groups};
+  }, [props, showPropsAsColumns, rows, selectedVersions, setSelectedVersions]);
+
+  // Highlight table row if it matches peek drawer.
+  const query = useURLSearchParamsDict();
+  const {peekPath} = query;
+  const peekId = peekPath ? peekPath.split('/').pop() : null;
+  const rowIds = useMemo(() => {
+    return rows.map(row => row.id);
+  }, [rows]);
+  const [rowSelectionModel, setRowSelectionModel] =
+    useState<GridRowSelectionModel>([]);
+  useEffect(() => {
+    if (rowIds.length === 0) {
+      // Data may have not loaded
+      return;
+    }
+    if (peekId == null) {
+      // No peek drawer, clear any selection
+      setRowSelectionModel([]);
+    } else {
+      // If peek drawer matches a row, select it.
+      // If not, don't modify selection.
+      if (rowIds.includes(peekId)) {
+        setRowSelectionModel([peekId]);
+      }
+    }
+  }, [rowIds, peekId]);
+
+  return (
+    <StyledDataGrid
+      // Start Column Menu
+      // ColumnMenu is only needed when we have other actions
+      // such as filtering.
+      disableColumnMenu={true}
+      // We don't have enough columns to justify filtering
+      disableColumnFilter={true}
+      disableMultipleColumnsFiltering={true}
+      // ColumnPinning seems to be required in DataGridPro, else it crashes.
+      disableColumnPinning={false}
+      // We don't have enough columns to justify re-ordering
+      disableColumnReorder={true}
+      // The columns are fairly simple, so we don't need to resize them.
+      disableColumnResize={false}
+      // We don't have enough columns to justify hiding some of them.
+      disableColumnSelector={true}
+      // We don't have enough columns to justify sorting by multiple columns.
+      disableMultipleColumnsSorting={true}
+      // End Column Menu
+      rows={rows}
+      initialState={{
+        sorting: {
+          sortModel: [{field: 'createdAtMs', sort: 'desc'}],
+        },
+      }}
+      columnHeaderHeight={40}
+      rowHeight={38}
+      columns={columns}
+      disableRowSelectionOnClick
+      rowSelectionModel={rowSelectionModel}
+      columnGroupingModel={columnGroupingModel}
+    />
+  );
+};
+
+export const FilterableObjectVersionsTable: React.FC<{
+  entity: string;
+  project: string;
+  frozenFilter?: WFHighLevelObjectVersionFilter;
+  initialFilter?: WFHighLevelObjectVersionFilter;
+  objectTitle?: string;
+  hideCategoryColumn?: boolean;
+  hideCreatedAtColumn?: boolean;
+  // Setting this will make the component a controlled component. The parent
+  // is responsible for updating the filter.
+  onFilterUpdate?: (filter: WFHighLevelObjectVersionFilter) => void;
+  selectedVersions?: string[];
+  setSelectedVersions?: (selected: string[]) => void;
+}> = props => {
+  const {useRootObjectVersions} = useWFHooks();
+  const {baseRouter} = useWeaveflowRouteContext();
+
+  const effectiveFilter = useMemo(() => {
+    return {...props.initialFilter, ...props.frozenFilter};
+  }, [props.initialFilter, props.frozenFilter]);
+
+  const effectivelyLatestOnly = !effectiveFilter.objectName;
+
+  const filteredObjectVersions = useRootObjectVersions(
+    props.entity,
+    props.project,
+    {
+      baseObjectClasses: effectiveFilter.baseObjectClass
+        ? [effectiveFilter.baseObjectClass]
+        : undefined,
+      objectIds: effectiveFilter.objectName
+        ? [effectiveFilter.objectName]
+        : undefined,
+      latestOnly: effectivelyLatestOnly,
+    },
+    undefined,
+    effectivelyLatestOnly // metadata only when getting latest
+  );
+
+  if (filteredObjectVersions.loading) {
+    return <Loading centered />;
+  }
+  if (filteredObjectVersions.error) {
+    return <ErrorPanel />;
+  }
+
+  // TODO: Only show the empty state if no filters other than baseObjectClass
+  const objectVersions = filteredObjectVersions.result ?? [];
+  const isEmpty = objectVersions.length === 0;
+  if (isEmpty) {
+    let propsEmpty = EMPTY_PROPS_OBJECTS;
+    const base = props.initialFilter?.baseObjectClass;
+    if ('Prompt' === base) {
+      propsEmpty = EMPTY_PROPS_PROMPTS;
+    } else if ('Model' === base) {
+      propsEmpty = EMPTY_PROPS_MODEL;
+    } else if (DATASET_BASE_OBJECT_CLASS === base) {
+      propsEmpty = EMPTY_PROPS_DATASETS;
+    } else if (base === 'Leaderboard') {
+      propsEmpty = EMPTY_PROPS_LEADERBOARDS;
+    } else if (base === 'Scorer') {
+      propsEmpty = EMPTY_PROPS_PROGRAMMATIC_SCORERS;
+    } else if (base === 'ActionSpec') {
+      propsEmpty = EMPTY_PROPS_ACTION_SPECS;
+    } else if (base === 'AnnotationSpec') {
+      propsEmpty = EMPTY_PROPS_ANNOTATIONS;
+    }
+    return <Empty {...propsEmpty} />;
+  }
+
+  return (
+    <FilterLayoutTemplate
+      showFilterIndicator={Object.keys(effectiveFilter ?? {}).length > 0}
+      showPopoutButton={Object.keys(props.frozenFilter ?? {}).length > 0}
+      filterPopoutTargetUrl={baseRouter.objectVersionsUIUrl(
+        props.entity,
+        props.project,
+        effectiveFilter
+      )}>
+      <ObjectVersionsTable
+        objectVersions={objectVersions}
+        objectTitle={props.objectTitle}
+        hidePropsAsColumns={!!effectivelyLatestOnly}
+        hidePeerVersionsColumn={!effectivelyLatestOnly}
+        hideCategoryColumn={props.hideCategoryColumn}
+        hideCreatedAtColumn={props.hideCreatedAtColumn}
+        selectedVersions={props.selectedVersions}
+        setSelectedVersions={props.setSelectedVersions}
+      />
+    </FilterLayoutTemplate>
+  );
+};
+
+const PeerVersionsLink: React.FC<{obj: ObjectVersionSchema}> = props => {
+  const {useRootObjectVersions} = useWFHooks();
+
+  const obj = props.obj;
+  // Here, we really just want to know the count - and it should be calculated
+  // by the server, not by the client. This is a performance optimization. In
+  // the meantime we will just fetch the first 100 versions and display 99+ if
+  // there are at least 100. Someone can come back and add `count` to the 3
+  // query APIs which will make this faster.
+  const objectVersionsNode = useRootObjectVersions(
+    obj.entity,
+    obj.project,
+    {
+      objectIds: [obj.objectId],
+    },
+    100,
+    true // metadataOnly
+  );
+  if (objectVersionsNode.loading) {
+    return <LoadingDots />;
+  }
+  const countValue = objectVersionsNode.result?.length ?? 0;
+  return (
+    <ObjectVersionsLink
+      entity={obj.entity}
+      project={obj.project}
+      filter={{
+        objectName: obj.objectId,
+      }}
+      versionCount={Math.min(countValue, 99)}
+      countIsLimited={countValue === 100}
+      neverPeek
+      variant="secondary"
+    />
+  );
+};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/objectsPageTypes.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/objectsPageTypes.ts
new file mode 100644
index 000000000000..5755fab34843
--- /dev/null
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/objectsPageTypes.ts
@@ -0,0 +1,6 @@
+import {KnownBaseObjectClassType} from '../wfReactInterface/wfDataModelHooksInterface';
+
+export type WFHighLevelObjectVersionFilter = {
+  objectName?: string | null;
+  baseObjectClass?: KnownBaseObjectClassType | null;
+};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
index 8abc4bf9884e..200cca2b4241 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/AnnotationsTab.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsTable';
 
 export const AnnotationsTab: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
index a4bc815aeb4a..af3f0295794f 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/CoreScorersTab.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsTable';
 
 export const ProgrammaticScorersTab: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
index f5359c32f4f8..c0e2fb4ac066 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ScorersPage/LLMJudgesTab.tsx
@@ -2,7 +2,7 @@
 
 import React from 'react';
 
-import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsPage';
+import {FilterableObjectVersionsTable} from '../ObjectsPage/ObjectVersionsTable';
 export const LLMJudgesTab: React.FC<{
   entity: string;
   project: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
index da9307558f51..a17f540ba54a 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
@@ -19,7 +19,7 @@ import {
   useWeaveflowRouteContext,
 } from '../../context';
 import {WFHighLevelCallFilter} from '../CallsPage/callsTableFilter';
-import {WFHighLevelObjectVersionFilter} from '../ObjectsPage/ObjectVersionsPage';
+import {WFHighLevelObjectVersionFilter} from '../ObjectsPage/objectsPageTypes';
 import {WFHighLevelOpVersionFilter} from '../OpsPage/OpVersionsPage';
 import {Id} from './Id';
 

From 106e51f13e362ca3014ed26c97c4f6c1fccc6825 Mon Sep 17 00:00:00 2001
From: gtarpenning <griffin.tarpenning@wandb.com>
Date: Tue, 14 Jan 2025 12:45:22 -0800
Subject: [PATCH 4/5] op type extract

---
 .../components/PagePanelComponents/Home/Browse3/context.tsx  | 2 +-
 .../Home/Browse3/pages/OpsPage/OpVersionsPage.tsx            | 5 +----
 .../Home/Browse3/pages/OpsPage/opsPageTypes.ts               | 3 +++
 .../PagePanelComponents/Home/Browse3/pages/common/Links.tsx  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/opsPageTypes.ts

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
index 75eda6fcb55a..9a1dbc18f50c 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/context.tsx
@@ -17,7 +17,7 @@ import {useHistory, useLocation} from 'react-router-dom';
 
 import {WFHighLevelCallFilter} from './pages/CallsPage/callsTableFilter';
 import {WFHighLevelObjectVersionFilter} from './pages/ObjectsPage/objectsPageTypes';
-import {WFHighLevelOpVersionFilter} from './pages/OpsPage/OpVersionsPage';
+import {WFHighLevelOpVersionFilter} from './pages/OpsPage/opsPageTypes';
 import {useURLSearchParamsDict} from './pages/util';
 import {
   AWL_ROW_EDGE_NAME,
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
index 05e33469291d..69e6f029cb2e 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/OpVersionsPage.tsx
@@ -26,10 +26,7 @@ import {useControllableState, useURLSearchParamsDict} from '../util';
 import {useWFHooks} from '../wfReactInterface/context';
 import {opVersionKeyToRefUri} from '../wfReactInterface/utilities';
 import {OpVersionSchema} from '../wfReactInterface/wfDataModelHooksInterface';
-
-export type WFHighLevelOpVersionFilter = {
-  opName?: string | null;
-};
+import {WFHighLevelOpVersionFilter} from './opsPageTypes';
 
 export const OpVersionsPage: React.FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/opsPageTypes.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/opsPageTypes.ts
new file mode 100644
index 000000000000..6c1bab0bda57
--- /dev/null
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/opsPageTypes.ts
@@ -0,0 +1,3 @@
+export type WFHighLevelOpVersionFilter = {
+  opName?: string | null;
+};
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
index a17f540ba54a..8d52fc8052ca 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/Links.tsx
@@ -20,7 +20,7 @@ import {
 } from '../../context';
 import {WFHighLevelCallFilter} from '../CallsPage/callsTableFilter';
 import {WFHighLevelObjectVersionFilter} from '../ObjectsPage/objectsPageTypes';
-import {WFHighLevelOpVersionFilter} from '../OpsPage/OpVersionsPage';
+import {WFHighLevelOpVersionFilter} from '../OpsPage/opsPageTypes';
 import {Id} from './Id';
 
 type LinkVariant = 'primary' | 'secondary';

From b11b8ccd243e8e39c426972fcaa991d2ac10ccfd Mon Sep 17 00:00:00 2001
From: gtarpenning <griffin.tarpenning@wandb.com>
Date: Wed, 15 Jan 2025 15:27:21 -0800
Subject: [PATCH 5/5] more moving, even better

---
 .../Home/Browse3/pages/CallPage/CallPage.tsx              | 2 +-
 .../Home/Browse3/pages/{ => CallPage}/TabUseCall.tsx      | 8 ++++----
 .../Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx  | 2 +-
 .../Browse3/pages/{ => ObjectsPage/Tabs}/TabPrompt.tsx    | 4 ++--
 .../Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx | 2 +-
 .../Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx   | 2 +-
 .../Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx  | 2 +-
 .../Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx          | 2 +-
 .../Home/Browse3/pages/{ => common}/TabUseBanner.tsx      | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => CallPage}/TabUseCall.tsx (93%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => ObjectsPage/Tabs}/TabPrompt.tsx (81%)
 rename weave-js/src/components/PagePanelComponents/Home/Browse3/pages/{ => common}/TabUseBanner.tsx (87%)

diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
index 5219f390c810..1afad3e3eaad 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/CallPage.tsx
@@ -36,7 +36,6 @@ import {
   SimplePageLayoutWithHeader,
 } from '../common/SimplePageLayout';
 import {CompareEvaluationsPageContent} from '../CompareEvaluationsPage/CompareEvaluationsPage';
-import {TabUseCall} from '../TabUseCall';
 import {useURLSearchParamsDict} from '../util';
 import {useWFHooks} from '../wfReactInterface/context';
 import {CallSchema} from '../wfReactInterface/wfDataModelHooksInterface';
@@ -46,6 +45,7 @@ import {CallOverview} from './CallOverview';
 import {CallSummary} from './CallSummary';
 import {CallTraceView, useCallFlattenedTraceTree} from './CallTraceView';
 import {PaginationControls} from './PaginationControls';
+import {TabUseCall} from './TabUseCall';
 
 export const CallPage: FC<{
   entity: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseCall.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/TabUseCall.tsx
similarity index 93%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseCall.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/TabUseCall.tsx
index 3041533f98c8..74a9dc0709b9 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseCall.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/TabUseCall.tsx
@@ -2,10 +2,10 @@ import {Box} from '@mui/material';
 import * as Tabs from '@wandb/weave/components/Tabs';
 import React, {useState} from 'react';
 
-import {CopyableText} from '../../../../CopyableText';
-import {DocLink} from './common/Links';
-import {TabUseBanner} from './TabUseBanner';
-import {CallSchema} from './wfReactInterface/wfDataModelHooksInterface';
+import {CopyableText} from '../../../../../CopyableText';
+import {DocLink} from '../common/Links';
+import {TabUseBanner} from '../common/TabUseBanner';
+import {CallSchema} from '../wfReactInterface/wfDataModelHooksInterface';
 
 type TabUseCallProps = {
   call: CallSchema;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
index 63de2f3d2f97..bf3982054d3c 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/ObjectVersionPage.tsx
@@ -29,7 +29,6 @@ import {
 } from '../common/SimplePageLayout';
 import {EvaluationLeaderboardTab} from '../LeaderboardTab';
 import {TabUsePrompt} from '../OpsPage/Tabs/TabUsePrompt';
-import {TabPrompt} from '../TabPrompt';
 import {KNOWN_BASE_OBJECT_CLASSES} from '../wfReactInterface/constants';
 import {useWFHooks} from '../wfReactInterface/context';
 import {
@@ -43,6 +42,7 @@ import {
   ObjectVersionSchema,
 } from '../wfReactInterface/wfDataModelHooksInterface';
 import {DeleteObjectButtonWithModal} from './ObjectDeleteButtons';
+import {TabPrompt} from './Tabs/TabPrompt';
 import {TabUseModel} from './Tabs/TabUseModel';
 import {TabUseObject} from './Tabs/TabUseObject';
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabPrompt.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabPrompt.tsx
similarity index 81%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabPrompt.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabPrompt.tsx
index 2f2819c3b349..c691651387d0 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabPrompt.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabPrompt.tsx
@@ -1,8 +1,8 @@
 import classNames from 'classnames';
 import React from 'react';
 
-import {Tailwind} from '../../../../Tailwind';
-import {MessageList} from './ChatView/MessageList';
+import {Tailwind} from '../../../../../../Tailwind';
+import {MessageList} from '../../ChatView/MessageList';
 
 type Data = Record<string, any>;
 
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
index 41d778871b1f..6cdf25b18b5f 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseDataset.tsx
@@ -6,7 +6,7 @@ import {parseRef} from '../../../../../../../react';
 import {abbreviateRef} from '../../../../../../../util/refs';
 import {CopyableText} from '../../../../../../CopyableText';
 import {DocLink} from '../../common/Links';
-import {TabUseBanner} from '../../TabUseBanner';
+import {TabUseBanner} from '../../common/TabUseBanner';
 import {
   OBJECT_ATTR_EDGE_NAME,
   TABLE_ID_EDGE_NAME,
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
index 417e692b3738..d16d2cb9a31e 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseModel.tsx
@@ -6,7 +6,7 @@ import {parseRef} from '../../../../../../../react';
 import {abbreviateRef} from '../../../../../../../util/refs';
 import {CopyableText} from '../../../../../../CopyableText';
 import {DocLink} from '../../common/Links';
-import {TabUseBanner} from '../../TabUseBanner';
+import {TabUseBanner} from '../../common/TabUseBanner';
 
 type TabUseModelProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
index e81d84dcdee6..a76ab955afa3 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/ObjectsPage/Tabs/TabUseObject.tsx
@@ -5,7 +5,7 @@ import {isValidVarName} from '../../../../../../../core/util/var';
 import {abbreviateRef} from '../../../../../../../util/refs';
 import {CopyableText} from '../../../../../../CopyableText';
 import {DocLink} from '../../common/Links';
-import {TabUseBanner} from '../../TabUseBanner';
+import {TabUseBanner} from '../../common/TabUseBanner';
 
 type TabUseObjectProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
index fc70fc144068..db5a039eb2fb 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/OpsPage/Tabs/TabUseOp.tsx
@@ -5,7 +5,7 @@ import {isValidVarName} from '../../../../../../../core/util/var';
 import {abbreviateRef} from '../../../../../../../util/refs';
 import {CopyableText} from '../../../../../../CopyableText';
 import {DocLink} from '../../common/Links';
-import {TabUseBanner} from '../../TabUseBanner';
+import {TabUseBanner} from '../../common/TabUseBanner';
 
 type TabUseOpProps = {
   name: string;
diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseBanner.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/TabUseBanner.tsx
similarity index 87%
rename from weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseBanner.tsx
rename to weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/TabUseBanner.tsx
index e6de25d1fe73..e8edc6f02cb1 100644
--- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/TabUseBanner.tsx
+++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/TabUseBanner.tsx
@@ -1,6 +1,6 @@
 import React, {ReactNode} from 'react';
 
-import {Alert} from '../../../../Alert';
+import {Alert} from '../../../../../Alert';
 
 type TabUseBannerProps = {
   children?: ReactNode | undefined;