Skip to content

Patch Right Side Crash #33

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

Open
manaal-k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Patch Right Side Crash #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions src/components/data-panel/RightDataPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { useLocation } from 'react-router-dom';
export default function RightDataPanel(props) {
const [{ data, columns, selectedRows: selectedRightRows, nameColumn: rightNameColumn, emailColumn: rightEmailColumn}, setRightData] = useRecoilState(rightDataState);
const { data: leftData, selectedRows: selectedLeftRows, matchColumn: leftMatchColumn, nameColumn: leftNameColumn, emailColumn: leftEmailColumn} = useRecoilValue(leftDataState);
const selectedLeftRow = selectedLeftRows.length > 0 ? selectedLeftRows[0] : null;

const matchingEnabled = props.matchingEnabled;

Expand Down Expand Up @@ -43,7 +44,6 @@ export default function RightDataPanel(props) {
// If the right row matches the selected left row, it is "selected-matched-row"
// Be careful to make sure selectedLeftRow AND selectedLeftRow[leftMatchColumn.key] are non-NULL
// Otherwise, this will explode
const selectedLeftRow = selectedLeftRows[0];

if (matchingEnabled) {
if (selectedLeftRow && selectedLeftRow[leftMatchColumn.key] &&
Expand All @@ -58,17 +58,21 @@ export default function RightDataPanel(props) {
}

// Check if selected
if (selectedRightRows.map(r => r.key).includes(row.key)) {
// if (selectedRightRows.map(r => r.key).includes(row.key) && !(selectedLeftRow)) {
// window.alert("Please select a left row to continue.")
// }

if (selectedRightRows.map(r => r.key).includes(row.key)){
return "selected-row"
}

// Otherwise, just leave unmatched
return "unmatched-row"

}
}


function addDistanceColumnIfNecessary(columns) {
if (selectedLeftRows.length == 0) return columns; // no one is selected
if (selectedLeftRow == null) return columns; // no one is selected
if (!isAnyEnabledDistanceRule(rules)) return columns; // no enabled distance rule

const distanceColumn = {
Expand Down Expand Up @@ -114,16 +118,17 @@ export default function RightDataPanel(props) {
<div className="SelectionDisplay">
{selectedRightRows.map((row, i) => {
let name = rightNameColumn ? row[rightNameColumn.key] : "Right Card";

function generateButton() {
if (matchingEnabled) {
if (props.rightMatchedToSpecificLeft(row, selectedLeftRows[0])) {
if (props.rightMatchedToSpecificLeft(row, selectedLeftRow)) {
//Unmatch
return <Button onClick = {() => props.unmatch(row)}danger={true}>{"Unmatch!"}</Button>;
}

// HivesForHeroes (newbees (left) can be matched to multiple people on right)
if (isHivesForHeroes()) {
const rightRows = props.getEachRightMatchedByLeft(selectedLeftRows[0]);
const rightRows = props.getEachRightMatchedByLeft(selectedLeftRow);
const leftRows = props.getEachLeftMatchedByRight(row);
// NewBEE can only match to a single mentor
if (rightRows && rightRows.length > 0) {
Expand Down Expand Up @@ -158,7 +163,7 @@ export default function RightDataPanel(props) {
return (<div key={i}>
<FormattedCard
title={name}
extra={generateButton()}
extra={selectedLeftRow && generateButton()}
key={i}
style={{ width: 300 }}
row={row}
Expand Down