[arvados-workbench2] updated: 2.6.0-24-ge7139d6d
git repository hosting
git at public.arvados.org
Wed May 10 14:08:42 UTC 2023
Summary of changes:
src/components/data-table/data-table.tsx | 68 ++++++++++++++++++--------------
1 file changed, 38 insertions(+), 30 deletions(-)
via e7139d6d1f00eaeb998a3fc5efaaa247436ee4df (commit)
via 0b8032ec5be5dd474b47842b7630075c1d9413c2 (commit)
from ef8fb604ad4a868cae8ed6ad31c1fd1520dd73e0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit e7139d6d1f00eaeb998a3fc5efaaa247436ee4df
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Wed May 10 10:08:37 2023 -0400
15768: fixed setState warning Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 66242de5..2f0cf410 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -124,9 +124,11 @@ const styles: StyleRulesCallback<CssRules> = (theme: Theme) => ({
},
});
+export type TCheckedList = Record<string, boolean>;
+
type DataTableState = {
isSelected: boolean;
- checkedList: Record<string, boolean>;
+ checkedList: TCheckedList;
};
type DataTableProps<T> = DataTableDataProps<T> & WithStyles<CssRules>;
@@ -144,14 +146,13 @@ export const DataTable = withStyles(styles)(
componentDidUpdate(prevProps: Readonly<DataTableProps<T>>, prevState: DataTableState) {
const { items, toggleMSToolbar } = this.props;
- const { checkedList } = this.state;
+ const { isSelected, checkedList } = this.state;
if (!arraysAreCongruent(prevProps.items, items)) {
- this.state.isSelected = false;
+ if (isSelected === true) this.setState({ isSelected: false });
+ if (items.length) this.initializeCheckedList(items);
toggleMSToolbar(false);
- this.initializeCheckedList(items);
}
if (prevState.checkedList !== checkedList) {
- console.log(this.isAnySelected());
toggleMSToolbar(this.isAnySelected() ? true : false);
window.localStorage.setItem('selectedRows', JSON.stringify(checkedList));
}
@@ -175,28 +176,29 @@ export const DataTable = withStyles(styles)(
};
multiselectOptions: DataTableMultiselectOption[] = [
- { name: 'All', fn: () => this.handleSelectAll() },
- { name: 'None', fn: () => this.handleSelectNone() },
- { name: 'Invert', fn: () => this.handleInvertSelect() },
+ { name: 'All', fn: (list) => this.handleSelectAll(list) },
+ { name: 'None', fn: (list) => this.handleSelectNone(list) },
+ { name: 'Invert', fn: (list) => this.handleInvertSelect(list) },
];
initializeCheckedList = (uuids: any[]): void => {
- console.log('INIT LIIST');
- const { checkedList } = this.state;
+ const newCheckedList = { ...this.state.checkedList };
+
uuids.forEach((uuid) => {
- if (!checkedList.hasOwnProperty(uuid)) {
- checkedList[uuid] = false;
+ if (!newCheckedList.hasOwnProperty(uuid)) {
+ newCheckedList[uuid] = false;
}
});
- for (const key in checkedList) {
+ for (const key in newCheckedList) {
if (!uuids.includes(key)) {
- delete checkedList[key];
+ delete newCheckedList[key];
}
}
- window.localStorage.setItem('selectedRows', JSON.stringify(checkedList));
+ this.setState({ checkedList: newCheckedList });
+ window.localStorage.setItem('selectedRows', JSON.stringify(newCheckedList));
};
- isAllSelected = (list: Record<string, boolean>): boolean => {
+ isAllSelected = (list: TCheckedList): boolean => {
for (const key in list) {
if (list[key] === false) return false;
}
@@ -220,14 +222,14 @@ export const DataTable = withStyles(styles)(
};
handleSelectorSelect = (): void => {
+ const { checkedList } = this.state;
const { isSelected } = this.state;
- isSelected ? this.handleSelectNone() : this.handleSelectAll();
+ isSelected ? this.handleSelectNone(checkedList) : this.handleSelectAll(checkedList);
};
- handleSelectAll = (): void => {
- const { checkedList } = this.state;
- if (Object.keys(checkedList).length) {
- const newCheckedList = { ...checkedList };
+ handleSelectAll = (list: TCheckedList): void => {
+ if (Object.keys(list).length) {
+ const newCheckedList = { ...list };
for (const key in newCheckedList) {
newCheckedList[key] = true;
}
@@ -235,21 +237,19 @@ export const DataTable = withStyles(styles)(
}
};
- handleSelectNone = (): void => {
- const { checkedList } = this.state;
- const newCheckedList = { ...checkedList };
+ handleSelectNone = (list: TCheckedList): void => {
+ const newCheckedList = { ...list };
for (const key in newCheckedList) {
newCheckedList[key] = false;
}
this.setState({ isSelected: false, checkedList: newCheckedList });
};
- handleInvertSelect = (): void => {
- const { checkedList } = this.state;
- if (Object.keys(checkedList).length) {
- const newCheckedList = { ...checkedList };
+ handleInvertSelect = (list: TCheckedList): void => {
+ if (Object.keys(list).length) {
+ const newCheckedList = { ...list };
for (const key in newCheckedList) {
- newCheckedList[key] = !checkedList[key];
+ newCheckedList[key] = !list[key];
}
this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
}
commit 0b8032ec5be5dd474b47842b7630075c1d9413c2
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue May 9 12:15:48 2023 -0400
15768: fixed selectAll-after-sort bug Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index 7f0e93ca..66242de5 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -147,9 +147,11 @@ export const DataTable = withStyles(styles)(
const { checkedList } = this.state;
if (!arraysAreCongruent(prevProps.items, items)) {
this.state.isSelected = false;
+ toggleMSToolbar(false);
this.initializeCheckedList(items);
}
if (prevState.checkedList !== checkedList) {
+ console.log(this.isAnySelected());
toggleMSToolbar(this.isAnySelected() ? true : false);
window.localStorage.setItem('selectedRows', JSON.stringify(checkedList));
}
@@ -179,6 +181,7 @@ export const DataTable = withStyles(styles)(
];
initializeCheckedList = (uuids: any[]): void => {
+ console.log('INIT LIIST');
const { checkedList } = this.state;
uuids.forEach((uuid) => {
if (!checkedList.hasOwnProperty(uuid)) {
@@ -202,6 +205,7 @@ export const DataTable = withStyles(styles)(
isAnySelected = (): boolean => {
const { checkedList } = this.state;
+ if (!Object.keys(checkedList).length) return false;
for (const key in checkedList) {
if (checkedList[key] === true) return true;
}
@@ -222,11 +226,13 @@ export const DataTable = withStyles(styles)(
handleSelectAll = (): void => {
const { checkedList } = this.state;
- const newCheckedList = { ...checkedList };
- for (const key in newCheckedList) {
- newCheckedList[key] = true;
+ if (Object.keys(checkedList).length) {
+ const newCheckedList = { ...checkedList };
+ for (const key in newCheckedList) {
+ newCheckedList[key] = true;
+ }
+ this.setState({ isSelected: true, checkedList: newCheckedList });
}
- this.setState({ isSelected: true, checkedList: newCheckedList });
};
handleSelectNone = (): void => {
@@ -240,11 +246,13 @@ export const DataTable = withStyles(styles)(
handleInvertSelect = (): void => {
const { checkedList } = this.state;
- const newCheckedList = { ...checkedList };
- for (const key in newCheckedList) {
- newCheckedList[key] = !checkedList[key];
+ if (Object.keys(checkedList).length) {
+ const newCheckedList = { ...checkedList };
+ for (const key in newCheckedList) {
+ newCheckedList[key] = !checkedList[key];
+ }
+ this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
}
- this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
};
render() {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list