Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI tweak on Merge Network Dialog #425

Merged
merged 4 commits into from
Feb 14, 2025
Merged

UI tweak on Merge Network Dialog #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
833cd68
Format Clean
GAOChengzhan Feb 8, 2025
97828cb
Disable Merge Button when only one network selected and checkbox unse…
GAOChengzhan Feb 8, 2025
7b94dc5
Add warning icon and tooltip for node duplication
GAOChengzhan Feb 8, 2025
d917268
Changed the warning/tooltip text and color
GAOChengzhan Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 92 additions & 56 deletions src/features/MergeNetworks/components/MatchingColumnTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,100 @@
import React from "react";
import { Column } from "../../../models/TableModel/Column";
import { NetworkRecord, Pair } from "../models/DataInterfaceForMerge";
import { MenuItem, Paper, Select, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from "@mui/material"
import useMatchingColumnsStore from "../store/matchingColumnStore";
import useNodeMatchingTableStore from "../store/nodeMatchingTableStore";
import React from 'react'
import { Column } from '../../../models/TableModel/Column'
import { NetworkRecord, Pair } from '../models/DataInterfaceForMerge'
import {
MenuItem,
Paper,
Select,
Table,
TableBody,
TableCell,
TableContainer,
TableHead,
TableRow,
} from '@mui/material'
import useMatchingColumnsStore from '../store/matchingColumnStore'
import useNodeMatchingTableStore from '../store/nodeMatchingTableStore'
import useNodesDuplicationStore from '../store/nodesDuplicationStore'
import { checkDuplication } from '../utils/helper-functions'

interface MatchingTableProps {
networkRecords: Record<string, NetworkRecord>;
toMergeNetworksList: Pair<string, string>[];
matchingCols: Record<string, Column>;
networkRecords: Record<string, NetworkRecord>
toMergeNetworksList: Pair<string, string>[]
matchingCols: Record<string, Column>
}

export const MatchingColumnTable = React.memo(({ networkRecords, toMergeNetworksList, matchingCols }: MatchingTableProps) => {
const placeHolderForMatchingCol = "Please select networks to merge..."
const setMatchingCols = useMatchingColumnsStore(state => state.setMatchingCols);
const updateNodeMatchingTable = useNodeMatchingTableStore(state => state.updateRow);
export const MatchingColumnTable = React.memo(
({
networkRecords,
toMergeNetworksList,
matchingCols,
}: MatchingTableProps) => {
const placeHolderForMatchingCol = 'Please select networks to merge...'
const setMatchingCols = useMatchingColumnsStore(
(state) => state.setMatchingCols,
)
const updateNodeMatchingTable = useNodeMatchingTableStore(
(state) => state.updateRow,
)
const setHasDuplication = useNodesDuplicationStore(
(state) => state.setHasDuplication,
)
// Handler for the 'Matching Columns' dropdown changes
const handleSetMatchingCols = (networkId: string) => (event: React.ChangeEvent<HTMLInputElement>) => {
const colType = networkRecords[networkId]?.nodeTable?.columns.find(col => col.name === event.target.value)?.type || 'None';
if (colType === 'None') return;
const newCol: Column = { name: event.target.value, type: colType };
setMatchingCols({ [networkId]: newCol });
updateNodeMatchingTable(0, networkId, newCol);
};
const handleSetMatchingCols =
(networkId: string) => (event: React.ChangeEvent<HTMLInputElement>) => {
const colType =
networkRecords[networkId]?.nodeTable?.columns.find(
(col) => col.name === event.target.value,
)?.type || 'None'
if (colType === 'None') return
const newCol: Column = { name: event.target.value, type: colType }
setMatchingCols({ [networkId]: newCol })
updateNodeMatchingTable(0, networkId, newCol)
setHasDuplication(
networkId,
checkDuplication(
networkRecords[networkId]?.nodeTable,
event.target.value,
),
)
}

return (
<TableContainer component={Paper}>
<Table>
<TableHead>
{toMergeNetworksList.length > 0 ?
(<TableRow>
{toMergeNetworksList.map(net => (
<TableCell key={net[1]}>{net[0]}</TableCell>
))}
</TableRow>) :
(<TableRow>
<TableCell>{placeHolderForMatchingCol}</TableCell>
</TableRow>)
}
</TableHead>
<TableBody>
<TableRow>
{toMergeNetworksList.map(net => (
<TableCell key={net[1]}>
<Select
value={matchingCols[net[1]]?.name || ''}
onChange={handleSetMatchingCols(net[1])}
>
{networkRecords[net[1]]?.nodeTable.columns.map((column) => (
<MenuItem key={column.name} value={column.name}>
{column.name}
</MenuItem>
)) ?? ''}
</Select>
</TableCell>
))}
</TableRow>
</TableBody>
</Table>
</TableContainer>
<TableContainer component={Paper}>
<Table>
<TableHead>
{toMergeNetworksList.length > 0 ? (
<TableRow>
{toMergeNetworksList.map((net) => (
<TableCell key={net[1]}>{net[0]}</TableCell>
))}
</TableRow>
) : (
<TableRow>
<TableCell>{placeHolderForMatchingCol}</TableCell>
</TableRow>
)}
</TableHead>
<TableBody>
<TableRow>
{toMergeNetworksList.map((net) => (
<TableCell key={net[1]}>
<Select
value={matchingCols[net[1]]?.name || ''}
onChange={handleSetMatchingCols(net[1])}
>
{networkRecords[net[1]]?.nodeTable.columns.map((column) => (
<MenuItem key={column.name} value={column.name}>
{column.name}
</MenuItem>
)) ?? ''}
</Select>
</TableCell>
))}
</TableRow>
</TableBody>
</Table>
</TableContainer>
)
}
)
},
)
Loading