projects
/
arvados-workbench2.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0b8032e
)
15768: fixed setState warning Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox...
author
Lisa Knox <lisaknox83@gmail.com>
Wed, 10 May 2023 14:08:37 +0000
(10:08 -0400)
committer
Lisa Knox <lisaknox83@gmail.com>
Wed, 10 May 2023 14:08:37 +0000
(10:08 -0400)
src/components/data-table/data-table.tsx
patch
|
blob
|
history
diff --git
a/src/components/data-table/data-table.tsx
b/src/components/data-table/data-table.tsx
index 66242de56bfeafb3e2de689075eb285463895e4a..2f0cf410052f28c21783eb729b68505c78414543 100644
(file)
--- 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;
type DataTableState = {
isSelected: boolean;
- checkedList:
Record<string, boolean>
;
+ checkedList:
TCheckedList
;
};
type DataTableProps<T> = DataTableDataProps<T> & WithStyles<CssRules>;
};
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;
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)) {
if (!arraysAreCongruent(prevProps.items, items)) {
- this.state.isSelected = false;
+ if (isSelected === true) this.setState({ isSelected: false });
+ if (items.length) this.initializeCheckedList(items);
toggleMSToolbar(false);
toggleMSToolbar(false);
- this.initializeCheckedList(items);
}
if (prevState.checkedList !== checkedList) {
}
if (prevState.checkedList !== checkedList) {
- console.log(this.isAnySelected());
toggleMSToolbar(this.isAnySelected() ? true : false);
window.localStorage.setItem('selectedRows', JSON.stringify(checkedList));
}
toggleMSToolbar(this.isAnySelected() ? true : false);
window.localStorage.setItem('selectedRows', JSON.stringify(checkedList));
}
@@
-175,28
+176,29
@@
export const DataTable = withStyles(styles)(
};
multiselectOptions: DataTableMultiselectOption[] = [
};
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 => {
];
initializeCheckedList = (uuids: any[]): void => {
- cons
ole.log('INIT LIIST')
;
- const { checkedList } = this.state;
+ cons
t newCheckedList = { ...this.state.checkedList }
;
+
uuids.forEach((uuid) => {
uuids.forEach((uuid) => {
- if (!
c
heckedList.hasOwnProperty(uuid)) {
-
c
heckedList[uuid] = false;
+ if (!
newC
heckedList.hasOwnProperty(uuid)) {
+
newC
heckedList[uuid] = false;
}
});
}
});
- for (const key in
c
heckedList) {
+ for (const key in
newC
heckedList) {
if (!uuids.includes(key)) {
if (!uuids.includes(key)) {
- delete
c
heckedList[key];
+ delete
newC
heckedList[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;
}
for (const key in list) {
if (list[key] === false) return false;
}
@@
-220,14
+222,14
@@
export const DataTable = withStyles(styles)(
};
handleSelectorSelect = (): void => {
};
handleSelectorSelect = (): void => {
+ const { checkedList } = this.state;
const { isSelected } = 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;
}
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 });
};
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) {
for (const key in newCheckedList) {
- newCheckedList[key] = !
checkedL
ist[key];
+ newCheckedList[key] = !
l
ist[key];
}
this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
}
}
this.setState({ checkedList: newCheckedList, isSelected: this.isAllSelected(newCheckedList) });
}