Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3706 from appsmithorg/fix/filteredData-columnProperties

Browse Source 
Fix #3381: Table column properties now map correctly when filtering, sorting or searching
This commit is contained in:
abhishek nayak 2021-03-26 01:30:03 +05:30 committed by GitHub
commit 5114ca75c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/client/src/widgets/TableWidget/derived.js
View File

@ -182,7 +182,7 @@ export default {
if (!props.sanitizedTableData || !props.sanitizedTableData.length) {
return [];
}
const derivedTableData = [...props.sanitizedTableData];
let derivedTableData = [...props.sanitizedTableData];
if (props.primaryColumns && _.isPlainObject(props.primaryColumns)) {
const primaryColumns = props.primaryColumns;
const columnIds = Object.keys(props.primaryColumns);
@ -220,6 +220,11 @@ export default {
});
}
derivedTableData = derivedTableData.map((item, index) => ({
...item,
__originalIndex__: index,
}));
const columns = props.columns;
let sortedTableData;
@ -280,9 +285,7 @@ export default {
isExactly: (a, b) => {
return a.toString() === b.toString();
},
empty: (a) => {
return a === "" || a === undefined || a === null;
},
empty: _.isEmpty,
notEmpty: (a) => {
return a !== "" && a !== undefined && a !== null;
},
@ -313,28 +316,35 @@ export default {
return numericA >= numericB;
},
contains: (a, b) => {
if (_.isString(a) && _.isString(b)) {
return a.includes(b);
try {
return a.toString().includes(b.toString());
} catch (e) {
return false;
}
return false;
},
doesNotContain: (a, b) => {
if (_.isString(a) && _.isString(b)) {
return !a.includes(b);
try {
return !this.contains(a, b);
} catch (e) {
return false;
}
return false;
},
startsWith: (a, b) => {
if (_.isString(a) && _.isString(b)) {
return a.indexOf(b) === 0;
try {
return a.toString().indexOf(b.toString()) === 0;
} catch (e) {
return false;
}
return false;
},
endsWith: (a, b) => {
if (_.isString(a) && _.isString(b)) {
return a.length === a.indexOf(b) + b.length;
try {
const _a = a.toString();
const _b = b.toString();
return _a.length === _a.indexOf(_b) + _b.length;
} catch (e) {
return false;
}
return false;
},
is: (a, b) => {
return moment(a).isSame(moment(b), "d");

10
app/client/src/widgets/TableWidget/derived.test.js
View File

@ -519,8 +519,8 @@ describe("Validates Derived Properties", () => {
],
};
const expected = [
{ id: 234, name: "Jane Doe", extra: "Extra2" },
{ id: 123, name: "John Doe", extra: "Extra1" },
{ id: 234, name: "Jane Doe", extra: "Extra2", __originalIndex__: 1 },
{ id: 123, name: "John Doe", extra: "Extra1", __originalIndex__: 0 },
];
let result = getFilteredTableData(input, moment, _);
@ -666,9 +666,9 @@ describe("Validates Derived Properties", () => {
],
};
const expected = [
{ id: 1234, name: "Jim Doe", extra: "" },
{ id: 234, name: "Jane Doe", extra: "Extra2" },
{ id: 123, name: "John Doe", extra: "Extra1" },
{ id: 1234, name: "Jim Doe", extra: "", __originalIndex__: 0 },
{ id: 234, name: "Jane Doe", extra: "Extra2", __originalIndex__: 2 },
{ id: 123, name: "John Doe", extra: "Extra1", __originalIndex__: 1 },
];
let result = getFilteredTableData(input, moment, _);

5
app/client/src/widgets/TableWidget/index.tsx
View File

@ -182,7 +182,10 @@ class TableWidget extends BaseWidget<TableWidgetProps, WidgetState> {
},
columnProperties: columnProperties,
Cell: (props: any) => {
const rowIndex: number = props.cell.row.index;
let rowIndex: number = props.cell.row.index;
const data = this.props.filteredTableData[rowIndex];
if (data && data.__originalIndex__) rowIndex = data.__originalIndex__;
const cellProperties = this.getCellProperties(
columnProperties,
rowIndex,