Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/BrowserCell/BrowserCell.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class BrowserCell extends Component {
);
let value = this.props.value;
let dataValue = this.props.value.id || this.props.value.objectId;
if (defaultPointerKey !== 'objectId') {
if (defaultPointerKey !== 'objectId' && typeof this.props.value.get === 'function') {
dataValue = this.props.value.get(defaultPointerKey);
if (dataValue && typeof dataValue === 'object') {
if (dataValue instanceof Date) {
Expand Down
16 changes: 9 additions & 7 deletions src/components/BrowserRow/BrowserRow.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ export default class BrowserRow extends Component {
return acc;
}, requiredCols);
// for dynamically changing required field on _User class
if (
obj.className === '_User' &&
(obj.get('username') !== undefined || obj.get('password') !== undefined)
) {
requiredCols = ['username', 'password'];
} else if (obj.className === '_User' && obj.get('authData') !== undefined) {
requiredCols = ['authData'];
if (!isUnique) {
if (
obj.className === '_User' &&
(obj.get('username') !== undefined || obj.get('password') !== undefined)
) {
requiredCols = ['username', 'password'];
} else if (obj.className === '_User' && obj.get('authData') !== undefined) {
requiredCols = ['authData'];
}
}
const highlightColor = '#eef4fb';
const stickyHighlightColor = '#d6e4f0';
Expand Down
25 changes: 25 additions & 0 deletions src/lib/tests/BrowserRow.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,29 @@ describe('BrowserRow', () => {
expect(checkboxCell.props.style.background).toBe('#ffffff');
});
});

describe('Unique filter', () => {
beforeAll(() => {
global.localStorage = {
getItem: () => null,
setItem: () => {},
removeItem: () => {},
};
});

it('does not crash rendering a unique _User pointer value', () => {
const rawUserPointer = { __type: 'Pointer', className: '_User', objectId: 'user1' };
expect(() =>
renderer.create(
<BrowserRow
{...defaultProps}
isUnique={true}
obj={rawUserPointer}
columns={{ owner: { type: 'Pointer', targetClass: '_User' } }}
order={[{ name: 'owner', width: 150, visible: true }]}
/>
)
).not.toThrow();
});
});
});
Loading