Fixes liferay#1330 - Fixes the request retries logic

matuzalemsteles · Dec 4, 2018 · cba5eaf · cba5eaf
1 parent d2a553f
commit cba5eaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/packages/clay-data-provider/src/ClayDataProvider.js b/packages/clay-data-provider/src/ClayDataProvider.js
@@ -90,9 +90,9 @@ class ClayDataProvider extends ClayComponent {
 	 * @protected
 	 */
 	_setRequestRetries(err, requestRetries) {
-		if (this.requestRetries > 0 && requestRetries > this.requestRetries) {
+		if (this.requestRetries > 0 && requestRetries < this.requestRetries) {
 			console.error(
-				`DataProvider: (${requestRetries}/${
+				`DataProvider: (${requestRetries + 1}/${
 					this.requestRetries
 				}) Request attempt failed`,
 				err
@@ -137,7 +137,7 @@ class ClayDataProvider extends ClayComponent {
 	 */
 	filter(query, extract = elem => elem) {
 		if (!this._isResolvedData) {
-			return;
+			return [];
 		}
 
 		return this._dataSource

diff --git a/packages/clay-data-provider/src/utils.js b/packages/clay-data-provider/src/utils.js
@@ -51,15 +51,14 @@ export const timeout = (ms, promise) => {
 		const timeoutId = setTimeout(() => {
 			reject(new Error('timeout'));
 		}, ms);
-		promise.then(
-			res => {
+		promise
+			.then(res => {
 				clearTimeout(timeoutId);
 				resolve(res);
-			},
-			err => {
+			})
+			.catch(err => {
 				clearTimeout(timeoutId);
 				reject(err);
-			}
-		);
+			});
 	});
 };