From 80d42a8744183438ad0dbeccb621dfee0a714e68 Mon Sep 17 00:00:00 2001 From: dblythy Date: Fri, 27 Nov 2020 03:33:27 +1100 Subject: [PATCH 1/2] Update BrowserCell.react.js --- .../BrowserCell/BrowserCell.react.js | 65 +++++++++++++++++-- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js index fa8c8a0ca3..7a66fe502b 100644 --- a/src/components/BrowserCell/BrowserCell.react.js +++ b/src/components/BrowserCell/BrowserCell.react.js @@ -204,10 +204,11 @@ export default class BrowserCell extends Component { render() { let { type, value, hidden, width, current, onSelect, onEditChange, setCopyableValue, setRelation, onPointerClick, row, col, field, onEditSelectedRow } = this.props; - let content = value; + let content = value, + contentArray = [] this.copyableValue = content; let classes = [styles.cell, unselectable]; - if (hidden) { + if (hidden) { content = '(hidden)'; classes.push(styles.empty); } else if (value === undefined) { @@ -246,7 +247,59 @@ export default class BrowserCell extends Component { this.copyableValue = content = dateStringUTC(value); } else if (type === 'Boolean') { this.copyableValue = content = value ? 'True' : 'False'; - } else if (type === 'Object' || type === 'Bytes' || type === 'Array') { + } else if (type === 'Array') { + + + this.copyableValue = ''; + contentArray.push('['); + for (var i=0;i ); + classes.push(styles.empty); + } else if (val && val.__type === 'Pointer') { + const object = new Parse.Object(val.className); + object.id = val.objectId; + value[i] = object; + val = object; + contentArray.push(onPointerClick ? ( + + + + ) : ( + val.id + )) + this.copyableValue += val.id; + } else if (val && val.__type === 'Date' || new Date(val)) { + if (typeof val === 'object' && val.__type) { + value[i] = new Date(val.iso); + val = value[i]; + } else if (typeof val === 'string' && new Date(val)) { + value[i] = new Date(val); + val = value[i]; + } + this.copyableValue += dateStringUTC(val); + } else if (val && val.__type === 'File') { + const fileName = val._url ? getFileName(val) : 'Uploading\u2026'; + contentArray.push(); + this.copyableValue += fileName; + } else if (type === 'Boolean') { + this.copyableValue += val; + } else { + contentArray.push(JSON.stringify(val)); + this.copyableValue += JSON.stringify(val); + } + if (i+1 != value.length) { + contentArray.push(','); + } + } + contentArray.push(']'); + + + } else if (type === 'Object' || type === 'Bytes') { this.copyableValue = content = JSON.stringify(value); } else if (type === 'File') { const fileName = value.url() ? getFileName(value) : 'Uploading\u2026'; @@ -287,7 +340,9 @@ export default class BrowserCell extends Component { ); this.copyableValue = undefined; } - + if (contentArray.length == 0) { + contentArray = [content]; + } if (current) { classes.push(styles.current); } @@ -319,7 +374,7 @@ export default class BrowserCell extends Component { }} onContextMenu={this.onContextMenu.bind(this)} > - {content} + {contentArray.map((val,index) =>
{val}
)} ); } From ac8e566d8fbcf73828f7dc05374e51efe19bc91d Mon Sep 17 00:00:00 2001 From: dblythy Date: Mon, 1 Feb 2021 13:55:31 +1100 Subject: [PATCH 2/2] Update BrowserCell.react.js --- src/components/BrowserCell/BrowserCell.react.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/BrowserCell/BrowserCell.react.js b/src/components/BrowserCell/BrowserCell.react.js index 7a66fe502b..ad93f90093 100644 --- a/src/components/BrowserCell/BrowserCell.react.js +++ b/src/components/BrowserCell/BrowserCell.react.js @@ -208,7 +208,7 @@ export default class BrowserCell extends Component { contentArray = [] this.copyableValue = content; let classes = [styles.cell, unselectable]; - if (hidden) { + if (hidden) { content = '(hidden)'; classes.push(styles.empty); } else if (value === undefined) { @@ -248,8 +248,6 @@ export default class BrowserCell extends Component { } else if (type === 'Boolean') { this.copyableValue = content = value ? 'True' : 'False'; } else if (type === 'Array') { - - this.copyableValue = ''; contentArray.push('['); for (var i=0;i