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

fix: enabling context menu for read-only cells #1844

Merged
merged 7 commits into from
Oct 8, 2021
Merged

fix: enabling context menu for read-only cells #1844

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a19341b
Fix: enabling context menu (with filtering options only) for read-onl…
Oct 7, 2021
d5d70fa
Performance optimization: context bind in constructor
Oct 7, 2021
928ef92
Context menu: better way of showing long values by trimming them in t…
Oct 7, 2021
17a614d
Merge branch 'alpha' into fix-context-menu-for-read-only-data
404-html Oct 7, 2021
6385723
Code cleaning
Oct 7, 2021
7242500
Merge branch 'fix-context-menu-for-read-only-data' of https://github.…
Oct 7, 2021
1c6e305
Fixing typo in comment
Oct 7, 2021
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
33 changes: 19 additions & 14 deletions src/components/BrowserCell/BrowserCell.react.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export default class BrowserCell extends Component {
this.state = {
showTooltip: false
}
this.onContextMenu = this.onContextMenu.bind(this);

}

Expand Down Expand Up @@ -97,7 +98,7 @@ export default class BrowserCell extends Component {
}

getContextMenuOptions(constraints) {
let { onEditSelectedRow } = this.props;
let { onEditSelectedRow, readonly } = this.props;
const contextMenuOptions = [];

const setFilterContextMenuOption = this.getSetFilterContextMenuOption(constraints);
Expand All @@ -109,15 +110,15 @@ export default class BrowserCell extends Component {
const relatedObjectsContextMenuOption = this.getRelatedObjectsContextMenuOption();
relatedObjectsContextMenuOption && contextMenuOptions.push(relatedObjectsContextMenuOption);

onEditSelectedRow && contextMenuOptions.push({
!readonly && onEditSelectedRow && contextMenuOptions.push({
text: 'Edit row',
callback: () => {
let { objectId, onEditSelectedRow } = this.props;
onEditSelectedRow(true, objectId);
}
});

if ( this.props.type === 'Pointer' ) {
if (this.props.type === 'Pointer') {
onEditSelectedRow && contextMenuOptions.push({
text: 'Open pointer in new tab',
callback: () => {
Expand All @@ -135,7 +136,10 @@ export default class BrowserCell extends Component {
return {
text: 'Set filter...', items: constraints.map(constraint => {
const definition = Filters.Constraints[constraint];
const text = `${this.props.field} ${definition.name}${definition.comparable ? (' ' + this.copyableValue) : ''}`;
// Smart ellipsis for value - if it's long trim it in the middle: Lorem ipsum dolor si... aliqua
const value = this.copyableValue.length < 30 ? this.copyableValue :
`${this.copyableValue.substr(0, 20)}...${this.copyableValue.substr(this.copyableValue.length - 7)}`;
const text = `${this.props.field} ${definition.name}${definition.comparable ? (' ' + value) : ''}`;
return {
text,
callback: this.pickFilter.bind(this, constraint)
Expand Down Expand Up @@ -264,10 +268,10 @@ export default class BrowserCell extends Component {
this.copyableValue = value.id;
}
else if (type === 'Array') {
if ( value[0] && typeof value[0] === 'object' && value[0].__type === 'Pointer' ) {
if (value[0] && typeof value[0] === 'object' && value[0].__type === 'Pointer') {
const array = [];
value.map( (v, i) => {
if ( typeof v !== 'object' || v.__type !== 'Pointer' ) {
value.map((v, i) => {
if (typeof v !== 'object' || v.__type !== 'Pointer') {
throw new Error('Invalid type found in pointer array');
}
const object = new Parse.Object(v.className);
Expand All @@ -282,10 +286,10 @@ export default class BrowserCell extends Component {
);
});
content = <ul className={styles.hasMore}>
{array.map( a => <li>{a}</li>)}
{array.map(a => <li>{a}</li>)}
</ul>
this.copyableValue = JSON.stringify(value);
if ( array.length > 1 ) {
if (array.length > 1) {
classes.push(styles.removePadding);
}
}
Expand Down Expand Up @@ -339,8 +343,8 @@ export default class BrowserCell extends Component {
<Pill onClick={() => setRelation(value)} value='View relation' followClick={true} />
</div>
) : (
'Relation'
);
'Relation'
);
this.copyableValue = undefined;
}

Expand All @@ -359,7 +363,7 @@ export default class BrowserCell extends Component {
className={classes.join(' ')}
style={{ width }}
onClick={(e) => {
if ( e.metaKey === true && type === 'Pointer') {
if (e.metaKey === true && type === 'Pointer') {
onPointerCmdClick(value);
} else {
onSelect({ row, col });
Expand All @@ -376,6 +380,7 @@ export default class BrowserCell extends Component {
}, 2000);
}
}}
onContextMenu={this.onContextMenu}
>
{isNewRow ? '(auto)' : content}
</span>
Expand All @@ -386,7 +391,7 @@ export default class BrowserCell extends Component {
className={classes.join(' ')}
style={{ width }}
onClick={(e) => {
if ( e.metaKey === true && type === 'Pointer' ) {
if (e.metaKey === true && type === 'Pointer') {
onPointerCmdClick(value);
}
else {
Expand All @@ -411,7 +416,7 @@ export default class BrowserCell extends Component {
onEditChange(true);
}
}}
onContextMenu={this.onContextMenu.bind(this)}
onContextMenu={this.onContextMenu}
>
{content}
</span>
Expand Down