Fix server side checked items getter and fix useRequest when paginati…

…on is a dependency

Change-type: patch
Signed-off-by: Andrea Rosci <andrear@balena.io>

src/components/Table/TableBase.tsx

@@ -360,15 +360,22 @@ export class TableBase<T extends {}> extends React.Component<
 	);
 
 	private getSelectedRows = (selectedRows: T[]) => {
-		const { rowKey, data } = this.props;
-
-		const selectedKeys = this.$getSelectedIdentifiersSet(selectedRows, rowKey);
-		const checkedItems = this.$getValidatedCheckedItems(
-			data,
-			selectedKeys,
-			rowKey,
-			selectedRows,
-		);
+		const { rowKey, data, pagination } = this.props;
+		let checkedItems;
+		if (!pagination?.serverSide) {
+			const selectedKeys = this.$getSelectedIdentifiersSet(
+				selectedRows,
+				rowKey,
+			);
+			checkedItems = this.$getValidatedCheckedItems(
+				data,
+				selectedKeys,
+				rowKey,
+				selectedRows,
+			);
+		} else {
+			checkedItems = selectedRows;
+		}
 		const checkedState = this.howManyRowsChecked(checkedItems);
 
 		return { checkedItems, checkedState };

src/hooks/useRequest.tsx

@@ -5,6 +5,7 @@ interface UseRequestOptions {
 	polling: boolean;
 	pollInterval?: number;
 	stopExecution?: boolean;
+	resetDataDependencies?: React.DependencyList;
 }
 
 type RequestError = Error | null | undefined;
@@ -103,8 +104,14 @@ export const useRequest = <
 			return;
 		}
 		setData(undefined);
+	}, [...(options?.resetDataDependencies ?? deps), polling]);
+
+	React.useEffect(() => {
+		if (!polling) {
+			return;
+		}
 		forcePoll();
-	}, [...deps, polling]);
+	}, [...deps]);
 
 	const result = [data, loading, error, forcePoll] as UseRequestResult<TResult>;
 	result.data = data;