-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
Fix/ Edge Browser: support textbox input when the edit invitation is not an enum #2095
Open
xkopenreview
wants to merge
14
commits into
master
Choose a base branch
from
feature/edge-browser-textbox
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
3ca0c77
add edit edge textbox
xkopenreview 7e49fd9
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview 517bebd
fallback to default weight when delete custom max papers edge
xkopenreview e07234d
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview 8261ce8
delay update; add loading spinner
xkopenreview 9ad7562
handle 0 custom max papers
xkopenreview 0ee360b
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview b2577af
fix lint
xkopenreview 47edbb1
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview f3d05d8
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview 890a107
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview 66d69b3
update error handling and button style
xkopenreview de55f04
Merge branch 'master' into feature/edge-browser-textbox
xkopenreview 223940c
Merge branch 'master' into feature/edge-browser-textbox
celestemartinez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* eslint-disable jsx-a11y/anchor-is-valid */ | ||
/* eslint-disable react/destructuring-assignment */ | ||
/* globals $: false */ | ||
|
||
import { getTooltipTitle } from '../../lib/edge-utils' | ||
|
||
export default function EditEdgeTextbox(props) { | ||
const showTrashButton = props.existingEdge?.writers?.length !== 0 | ||
|
||
const handleHover = (target) => { | ||
if (!props.existingEdge) return | ||
const title = getTooltipTitle(props.existingEdge) | ||
$(target).tooltip({ | ||
title, | ||
trigger: 'hover', | ||
container: 'body', | ||
}) | ||
} | ||
|
||
if (!props.existingEdge && !props.canAddEdge) return null | ||
return ( | ||
<div | ||
className="edit-controls full-width" | ||
onClick={(e) => { | ||
e.stopPropagation() | ||
}} | ||
> | ||
<label onMouseEnter={(e) => handleHover(e.target)}>{props.label}:</label> | ||
<div className="btn-group edit-edge-textbox"> | ||
<input | ||
type="text" | ||
className="form-control edit-edge-input" | ||
value={props.selected} | ||
onClick={(e) => e.stopPropagation()} | ||
onChange={(e) => { | ||
e.stopPropagation() | ||
props.addEdge({ | ||
e, | ||
existingEdge: props.existingEdge, | ||
editEdgeTemplate: props.editEdgeTemplate, | ||
updatedEdgeFields: { [props.type]: Number(e.target.value) }, | ||
}) | ||
}} | ||
/> | ||
</div> | ||
{props.existingEdge && showTrashButton && ( | ||
<a | ||
href="#" | ||
className="edit-edge-remove" | ||
onClick={(e) => { | ||
e.stopPropagation() | ||
props.removeEdge() | ||
}} | ||
> | ||
<span className="glyphicon glyphicon-trash" /> | ||
</a> | ||
)} | ||
</div> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
data loading is updated to avoid state update conflict
reloadColumnEntities update was overwritting state update from updateChildColumns