From 74862e82c605e5bc9efb74daf0bfeaafd4e72d10 Mon Sep 17 00:00:00 2001 From: Jamie Rasmussen Date: Tue, 28 Jan 2025 20:37:37 -0600 Subject: [PATCH] refactor(ui): move flattenObjectPreservingWeaveTypes into Browse3 --- .../Home/Browse3/datasets/DatasetEditorContext.tsx | 2 +- .../Home/Browse3/datasets/EditableDatasetView.tsx | 2 +- .../Home/{Browse2/browse2Util.ts => Browse3/flattenObject.ts} | 0 .../Home/Browse3/pages/CallPage/DataTableView.tsx | 2 +- .../Home/Browse3/pages/CallsPage/CallsTable.tsx | 2 +- .../sections/ExampleCompareSection/exampleCompareSectionUtil.ts | 2 +- .../pages/LeaderboardPage/leaderboardConfigEditorHooks.ts | 2 +- .../Browse3/pages/common/tabularListViews/columnBuilder.tsx | 2 +- .../Home/Browse3/views/Leaderboard/query/leaderboardQuery.ts | 2 +- 9 files changed, 8 insertions(+), 8 deletions(-) rename weave-js/src/components/PagePanelComponents/Home/{Browse2/browse2Util.ts => Browse3/flattenObject.ts} (100%) diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetEditorContext.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetEditorContext.tsx index 952b69da4ac0..3403e0024e38 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetEditorContext.tsx +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/DatasetEditorContext.tsx @@ -1,7 +1,7 @@ import isEqual from 'lodash/isEqual'; import React, {createContext, useCallback, useContext, useState} from 'react'; -import {flattenObjectPreservingWeaveTypes} from '../../Browse2/browse2Util'; +import {flattenObjectPreservingWeaveTypes} from '../flattenObject'; export interface DatasetRow { [key: string]: any; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/EditableDatasetView.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/EditableDatasetView.tsx index cb03b3c1d1f4..a6764e3d389e 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/EditableDatasetView.tsx +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/datasets/EditableDatasetView.tsx @@ -27,9 +27,9 @@ import {useHistory} from 'react-router-dom'; import {v4 as uuidv4} from 'uuid'; import {isWeaveObjectRef, parseRef, parseRefMaybe} from '../../../../../react'; -import {flattenObjectPreservingWeaveTypes} from '../../Browse2/browse2Util'; import {CellValue} from '../../Browse2/CellValue'; import {useWeaveflowCurrentRouteContext} from '../context'; +import {flattenObjectPreservingWeaveTypes} from '../flattenObject'; import {WeaveCHTableSourceRefContext} from '../pages/CallPage/DataTableView'; import {TABLE_ID_EDGE_NAME} from '../pages/wfReactInterface/constants'; import {useWFHooks} from '../pages/wfReactInterface/context'; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse2/browse2Util.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/flattenObject.ts similarity index 100% rename from weave-js/src/components/PagePanelComponents/Home/Browse2/browse2Util.ts rename to weave-js/src/components/PagePanelComponents/Home/Browse3/flattenObject.ts diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/DataTableView.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/DataTableView.tsx index ac8f56a05c46..267afc846375 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/DataTableView.tsx +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallPage/DataTableView.tsx @@ -34,12 +34,12 @@ import { parseRefMaybe, } from '../../../../../../react'; import {Tooltip} from '../../../../../Tooltip'; -import {flattenObjectPreservingWeaveTypes} from '../../../Browse2/browse2Util'; import {CellValue} from '../../../Browse2/CellValue'; import { useWeaveflowCurrentRouteContext, WeaveflowPeekContext, } from '../../context'; +import {flattenObjectPreservingWeaveTypes} from '../../flattenObject'; import {DEFAULT_PAGE_SIZE} from '../../grid/pagination'; import {StyledDataGrid} from '../../StyledDataGrid'; import {CustomWeaveTypeProjectContext} from '../../typeViews/CustomWeaveTypeDispatcher'; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/CallsTable.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/CallsTable.tsx index fd8ac8c888e6..d783d7bc8bbf 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/CallsTable.tsx +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CallsPage/CallsTable.tsx @@ -50,7 +50,6 @@ import {useHistory} from 'react-router-dom'; import {useViewerInfo} from '../../../../../../common/hooks/useViewerInfo'; import {A, TargetBlank} from '../../../../../../common/util/links'; import {TailwindContents} from '../../../../../Tailwind'; -import {flattenObjectPreservingWeaveTypes} from '../../../Browse2/browse2Util'; import {TableRowSelectionContext} from '../../../TableRowSelectionContext'; import { useWeaveflowCurrentRouteContext, @@ -63,6 +62,7 @@ import { import {OnAddFilter} from '../../filters/CellFilterWrapper'; import {getDefaultOperatorForValue} from '../../filters/common'; import {FilterPanel} from '../../filters/FilterPanel'; +import {flattenObjectPreservingWeaveTypes} from '../../flattenObject'; import {DEFAULT_PAGE_SIZE} from '../../grid/pagination'; import {StyledPaper} from '../../StyledAutocomplete'; import {StyledDataGrid} from '../../StyledDataGrid'; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CompareEvaluationsPage/sections/ExampleCompareSection/exampleCompareSectionUtil.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CompareEvaluationsPage/sections/ExampleCompareSection/exampleCompareSectionUtil.ts index 158e51dcfb3b..3dac1a473213 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CompareEvaluationsPage/sections/ExampleCompareSection/exampleCompareSectionUtil.ts +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/CompareEvaluationsPage/sections/ExampleCompareSection/exampleCompareSectionUtil.ts @@ -1,7 +1,7 @@ import _ from 'lodash'; import {useMemo} from 'react'; -import {flattenObjectPreservingWeaveTypes} from '../../../../../Browse2/browse2Util'; +import {flattenObjectPreservingWeaveTypes} from '../../../../flattenObject'; import { buildCompositeMetricsMap, CompositeScoreMetrics, diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/leaderboardConfigEditorHooks.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/leaderboardConfigEditorHooks.ts index bdcdf2558a34..a889718f465b 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/leaderboardConfigEditorHooks.ts +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/LeaderboardPage/leaderboardConfigEditorHooks.ts @@ -1,7 +1,7 @@ import {parseRefMaybe, refUri} from '@wandb/weave/react'; import {useEffect, useState} from 'react'; -import {flattenObjectPreservingWeaveTypes} from '../../../Browse2/browse2Util'; +import {flattenObjectPreservingWeaveTypes} from '../../flattenObject'; import {ALL_VALUE} from '../../views/Leaderboard/types/leaderboardConfigType'; import {EVALUATE_OP_NAME_POST_PYDANTIC} from '../common/heuristics'; import {useGetTraceServerClientContext} from '../wfReactInterface/traceServerClientContext'; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/tabularListViews/columnBuilder.tsx b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/tabularListViews/columnBuilder.tsx index 294c312dc6a1..f65f4ae360ae 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/tabularListViews/columnBuilder.tsx +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/pages/common/tabularListViews/columnBuilder.tsx @@ -9,7 +9,6 @@ import React from 'react'; import {isWeaveObjectRef, parseRef} from '../../../../../../../react'; import {ErrorBoundary} from '../../../../../../ErrorBoundary'; -import {flattenObjectPreservingWeaveTypes} from '../../../../Browse2/browse2Util'; import {CellValue} from '../../../../Browse2/CellValue'; import {SmallRef} from '../../../../Browse2/SmallRef'; import { @@ -17,6 +16,7 @@ import { OnAddFilter, } from '../../../filters/CellFilterWrapper'; import {isWeaveRef} from '../../../filters/common'; +import {flattenObjectPreservingWeaveTypes} from '../../../flattenObject'; import {NotApplicable} from '../../../NotApplicable'; import {isCustomWeaveTypePayload} from '../../../typeViews/customWeaveType.types'; import {CustomWeaveTypeProjectContext} from '../../../typeViews/CustomWeaveTypeDispatcher'; diff --git a/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/query/leaderboardQuery.ts b/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/query/leaderboardQuery.ts index 68abf27fe899..101c93823426 100644 --- a/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/query/leaderboardQuery.ts +++ b/weave-js/src/components/PagePanelComponents/Home/Browse3/views/Leaderboard/query/leaderboardQuery.ts @@ -1,7 +1,7 @@ import {isWeaveObjectRef, parseRefMaybe} from '@wandb/weave/react'; import _ from 'lodash'; -import {flattenObjectPreservingWeaveTypes} from '../../../../Browse2/browse2Util'; +import {flattenObjectPreservingWeaveTypes} from '../../../flattenObject'; import {EVALUATE_OP_NAME_POST_PYDANTIC} from '../../../pages/common/heuristics'; import {TraceServerClient} from '../../../pages/wfReactInterface/traceServerClient'; import {TraceObjSchema} from '../../../pages/wfReactInterface/traceServerClientTypes';