Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit 2ba4e65

Browse files
committed
fix: switched from mui TreeView to SimpleTreeView for bq table dropdown after dependeny bump
1 parent f7a6827 commit 2ba4e65

File tree

4 files changed

+34
-31
lines changed

4 files changed

+34
-31
lines changed

components/dataproducts/dataset/datasetSourceForm.tsx

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useContext, useState } from 'react'
2-
import { TreeView } from '@mui/x-tree-view/TreeView';
2+
import { SimpleTreeView } from '@mui/x-tree-view/SimpleTreeView';
33
import {
44
FieldErrors,
55
FieldValues,
@@ -36,7 +36,13 @@ export const DataproductSourceForm = ({
3636
const teamProjects = userInfo?.gcpProjects?.filter((project: any) => project.group.email == team)
3737
.map((group: any) => group.id)
3838

39-
const handleNodeSelect = (e: any, node: string) => {
39+
const handleNodeSelect = (e: any, node: string | null) => {
40+
if (node === null) {
41+
setValue('bigquery.projectID', undefined)
42+
setValue('bigquery.dataset', undefined)
43+
setValue('bigquery.table', undefined)
44+
return
45+
}
4046
const [projectID, datasetID, tableID] = node.split('/')
4147
if (projectID && datasetID && tableID) {
4248
setValue('bigquery.projectID', projectID)
@@ -53,10 +59,10 @@ export const DataproductSourceForm = ({
5359
<div className="flex flex-col justify-start gap-2">
5460
<Label>{label}</Label>
5561
{team ? (
56-
<div>
57-
<TreeView
58-
onNodeSelect={handleNodeSelect}
59-
onNodeToggle={(x, n) => setActivePaths(n)}
62+
<div className="border-2 p-1">
63+
<SimpleTreeView
64+
onSelectedItemsChange={handleNodeSelect}
65+
onExpandedItemsChange={(x, n) => setActivePaths(n)}
6066
>
6167
{teamProjects?.map((projectID: any) => (
6268
<Project
@@ -65,7 +71,7 @@ export const DataproductSourceForm = ({
6571
activePaths={activePaths}
6672
/>
6773
))}
68-
</TreeView>
74+
</SimpleTreeView>
6975
{errors.bigquery && (
7076
<div className="flex gap-2 navds-error-message navds-label before:content-['•']">
7177
Velg en tabell eller et view

components/dataproducts/datasource/dataset.tsx

+12-13
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import { Loader } from '@navikt/ds-react'
1010
import { ExpandFilled, NextFilled } from '@navikt/ds-icons'
1111
import Tabell from '../../lib/icons/tabell'
1212

13-
const DataproductTableIconMap: Record<BigQueryType, JSX.Element> = {
14-
materialized_view: <Tabell />,
15-
table: <Tabell />,
16-
view: <Tabell />,
17-
}
13+
// const DataproductTableIconMap: Record<BigQueryType, JSX.Element> = {
14+
// materialized_view: Tabell,
15+
// table: Tabell,
16+
// view: Tabell,
17+
// }
1818

1919
export interface DataproductSourceDatasetProps {
2020
active: boolean
@@ -35,15 +35,15 @@ export const Dataset = ({
3535

3636
const loadingPlaceholder = (
3737
<TreeItem
38-
endIcon={<Loader />}
39-
nodeId={`${projectID}/${datasetID}/loadingPlaceholder`}
38+
slots={{ endIcon: Loader}}
39+
itemId={`${projectID}/${datasetID}/loadingPlaceholder`}
4040
label={'laster...'}
4141
/>
4242
)
4343

4444
const emptyPlaceholder = (
4545
<TreeItem
46-
nodeId={`${projectID}/${datasetID}/emptyPlaceholder`}
46+
itemId={`${projectID}/${datasetID}/emptyPlaceholder`}
4747
label={'ingenting her'}
4848
/>
4949
)
@@ -52,18 +52,17 @@ export const Dataset = ({
5252
contents?.map(({ name, type }) => (
5353
<TreeItem
5454
className="MuiTreeView-leaf"
55-
endIcon={DataproductTableIconMap[type]}
56-
nodeId={`${projectID}/${datasetID}/${name}`}
55+
slots={{ endIcon: Tabell}}
56+
itemId={`${projectID}/${datasetID}/${name}`}
5757
key={`${projectID}/${datasetID}/${name}`}
5858
label={name}
5959
/>
6060
))
6161

6262
return (
6363
<TreeItem
64-
collapseIcon={<ExpandFilled />}
65-
expandIcon={<NextFilled />}
66-
nodeId={`${projectID}/${datasetID}`}
64+
slots={{ collapseIcon: ExpandFilled, expandIcon: NextFilled}}
65+
itemId={`${projectID}/${datasetID}`}
6766
label={datasetID}
6867
>
6968
{loading

components/dataproducts/datasource/project.tsx

+5-6
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,23 @@ export const Project = ({
2222

2323
const emptyPlaceholder = (
2424
<TreeItem
25-
nodeId={`${projectID}/emptyPlaceholder`}
25+
itemId={`${projectID}/emptyPlaceholder`}
2626
label={'ingen datasett i prosjekt'}
2727
/>
2828
)
2929

3030
const loadingPlaceholder = (
3131
<TreeItem
32-
endIcon={<Loader />}
33-
nodeId={`${projectID}/loadingPlaceholder`}
32+
slots={{ endIcon: Loader}}
33+
itemId={`${projectID}/loadingPlaceholder`}
3434
label={'laster...'}
3535
/>
3636
)
3737

3838
return (
3939
<TreeItem
40-
collapseIcon={<ExpandFilled />}
41-
expandIcon={<NextFilled />}
42-
nodeId={projectID}
40+
slots={{ collapseIcon: ExpandFilled, expandIcon: NextFilled}}
41+
itemId={projectID}
4342
label={projectID}
4443
>
4544
{loading

components/stories/newStory.tsx

+4-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import TagsSelector from '../lib/tagsSelector';
1313
import { UserState } from '../../lib/context';
1414
import { CREATE_STORY } from '../../lib/queries/story/createStory';
1515
import { TreeItem } from '@mui/x-tree-view/TreeItem';
16-
import { TreeView } from '@mui/x-tree-view/TreeView';
16+
import { SimpleTreeView } from '@mui/x-tree-view/SimpleTreeView';
1717
import { FileTextFillIcon, FolderFillIcon, TrashIcon } from '@navikt/aksel-icons';
1818
import { UploadFile } from '../../lib/schema/graphql';
1919

@@ -211,7 +211,7 @@ export const NewStoryForm = () => {
211211
return (
212212
<TreeItem
213213
key={nodeName}
214-
nodeId={nodeName + index}
214+
itemId={nodeName + index}
215215
label={
216216
<div className="flex flex-row items-center gap-2">
217217
{isFile ? (
@@ -231,7 +231,6 @@ export const NewStoryForm = () => {
231231
};
232232

233233
const gcpProjects = userData?.gcpProjects as any[] || []
234-
console.log(gcpProjects)
235234

236235
return (
237236
<div className="mt-8 md:w-[46rem]">
@@ -313,9 +312,9 @@ export const NewStoryForm = () => {
313312
<input key={inputKey * 2} ref={folderFileInputRef} type="file" className="hidden" webkitdirectory="" directory="" onChange={handleFileUpload} multiple />
314313
<input key={inputKey * 2 + 1} ref={singleFileInputRef} type="file" className="hidden" onChange={handleFileUpload} multiple />
315314
{storyFiles.length > 0 && (
316-
<TreeView>
315+
<SimpleTreeView>
317316
{renderTree(generateFileTree(storyFiles))}
318-
</TreeView>
317+
</SimpleTreeView>
319318
)}
320319
{backendError && <ErrorMessage error={backendError} />}
321320
<div className="flex flex-row gap-4 mb-16">

0 commit comments

Comments
 (0)