missed review comments

distributed-system-analysis · May 9, 2023 · ff440b7 · ff440b7
1 parent cfa0f6d
commit ff440b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/dashboard/src/actions/datasetListActions.js b/dashboard/src/actions/datasetListActions.js
@@ -52,20 +52,13 @@ export const fetchPublicDatasets = (page) => async (dispatch, getState) => {
         payload: publicData,
       });
       // in case of last page, next_url is empty
-      if (response.data.next_url) {
-        const urlSearchParams = new URLSearchParams(response.data.next_url);
-        const offset = urlSearchParams.get("offset");
-
-        dispatch({
-          type: TYPES.SET_RESULT_OFFSET,
-          payload: Number(offset),
-        });
-      } else {
-        dispatch({
-          type: TYPES.SET_RESULT_OFFSET,
-          payload: Number(response.data.total),
-        });
-      }
+      const offset = response.data.next_url
+        ? new URLSearchParams(response.data.next_url).get("offset")
+        : response.data.total;
+      dispatch({
+        type: TYPES.SET_RESULT_OFFSET,
+        payload: Number(offset),
+      });
     }
   } catch (error) {
     dispatch(showToast(DANGER, ERROR_MSG));

diff --git a/dashboard/src/modules/components/DatePickerComponent/index.jsx b/dashboard/src/modules/components/DatePickerComponent/index.jsx
@@ -43,13 +43,13 @@ const DatePickerWidget = (props) => {
   const onToChange = (_event, _str, date) => {
     if (isValidDate(date)) {
       dispatch(setFilterKeys(filter.startDate, date));
+      checkEndDate(filter.startDate, date);
+    } else {
+      setIsEndDateError(true);
     }
-    checkEndDate(filter.startDate, date);
   };
   const checkEndDate = (fromDate, toDate) =>
-    new Date(fromDate) >= new Date(toDate)
-      ? setIsEndDateError(true)
-      : setIsEndDateError(false);
+    setIsEndDateError(fromDate >= toDate);
 
   const filterByDate = () => {
     if (filter.startDate) {