iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Keep chosen columns sort option when changing a column (#15918) 

* Keep sorting

* Fix adding new column
This commit is contained in:
Geido 2021-07-28 16:19:58 +02:00 committed by GitHub
parent 11b0249803
commit bdfc2dc9d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
superset-frontend/src/CRUD/CollectionTable.tsx
View File

@ -67,15 +67,20 @@ function createCollectionArray(collection: object) {
}
function createKeyedCollection(arr: Array<object>) {
const newArr = arr.map((o: any) => ({
const collectionArray = arr.map((o: any) => ({
...o,
id: o.id || shortid.generate(),
}));
const map = {};
newArr.forEach((o: any) => {
map[o.id] = o;
const collection = {};
collectionArray.forEach((o: any) => {
collection[o.id] = o;
});
return map;
return {
collection,
collectionArray,
};
}
const CrudTableWrapper = styled.div<{ stickyHeader?: boolean }>`
@ -114,11 +119,13 @@ export default class CRUDCollection extends React.PureComponent<
constructor(props: CRUDCollectionProps) {
super(props);
const collection = createKeyedCollection(props.collection);
const { collection, collectionArray } = createKeyedCollection(
props.collection,
);
this.state = {
expandedColumns: {},
collection,
collectionArray: createCollectionArray(collection),
collectionArray,
sortColumn: '',
sort: 0,
};
@ -135,10 +142,12 @@ export default class CRUDCollection extends React.PureComponent<
UNSAFE_componentWillReceiveProps(nextProps: CRUDCollectionProps) {
if (nextProps.collection !== this.props.collection) {
const collection = createKeyedCollection(nextProps.collection);
const { collection, collectionArray } = createKeyedCollection(
nextProps.collection,
);
this.setState({
collection,
collectionArray: createCollectionArray(collection),
collectionArray,
});
}
}
@ -159,10 +168,7 @@ export default class CRUDCollection extends React.PureComponent<
if (!newItem.id) {
newItem = { ...newItem, id: shortid.generate() };
}
this.changeCollection({
...this.state.collection,
[newItem.id]: newItem,
});
this.changeCollection(this.state.collection, newItem);
}
}
@ -183,10 +189,18 @@ export default class CRUDCollection extends React.PureComponent<
return label;
}
changeCollection(collection: any) {
changeCollection(collection: any, newItem?: object) {
this.setState({ collection });
if (this.props.onChange) {
this.props.onChange(Object.keys(collection).map(k => collection[k]));
const collectionArray = this.state.collectionArray
.map((c: { id: number }) => collection[c.id])
// filter out removed items
.filter(c => c !== undefined);
if (newItem) {
collectionArray.unshift(newItem);
}
this.props.onChange(collectionArray);
}
}
@ -227,29 +241,29 @@ export default class CRUDCollection extends React.PureComponent<
if (sortColumns?.includes(col)) {
// display in unsorted order if no sort specified
if (sort === SortOrder.unsort) {
const collection = createKeyedCollection(this.props.collection);
const { collection } = createKeyedCollection(this.props.collection);
const collectionArray = createCollectionArray(collection);
this.setState({
collectionArray: createCollectionArray(collection),
collectionArray,
sortColumn: '',
sort,
});
return;
}
this.setState(prevState => {
// newly ordered collection
const sorted = [
...prevState.collectionArray,
].sort((a: object, b: object) => compareSort(a[col], b[col]));
const newCollection =
sort === SortOrder.asc ? sorted : sorted.reverse();
return {
...prevState,
collectionArray: newCollection,
sortColumn: col,
sort,
};
});
// newly ordered collection
const sorted = [
...this.state.collectionArray,
].sort((a: object, b: object) => compareSort(a[col], b[col]));
const newCollection =
sort === SortOrder.asc ? sorted : sorted.reverse();
this.setState(prevState => ({
...prevState,
collectionArray: newCollection,
sortColumn: col,
sort,
}));
}
};
}