Merge pull request #116 from FindNUS/release/1.4.1

Release/1.4.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "private": true,
   "dependencies": {
     "@emotion/react": "^11.9.0",

src/features/preview_items/PeekContainer.tsx

@@ -1,15 +1,11 @@
 import React from "react";
-import { useAppSelector } from "../../hooks";
 import PreviewFilter from "./PreviewFilter";
 import PreviewItems from "./PreviewItems";
-import { selectPreviewLoading } from "./previewItemsSlice";
 
 const PeekContainer: React.FC = function () {
-  const loading = useAppSelector(selectPreviewLoading);
-
   return (
     <div className="search-container">
-      {!loading && <PreviewFilter isPeek={true} />}
+      <PreviewFilter isPeek={true} />
       <PreviewItems isPeek={true} />
     </div>
   );

src/features/preview_items/PreviewFilter.tsx

@@ -13,6 +13,7 @@ import { useAppDispatch, useAppSelector } from "../../hooks";
 import getDateInputValue from "../../utils/getDateInputValue";
 import {
   resetPreview,
+  resetPreviewPagination,
   selectPreviewCategory,
   selectPreviewDate,
   selectPreviewItemsPerPage,
@@ -38,10 +39,12 @@ const PreviewFilter: React.FC<PreviewFilterProps> = function (
   const handleCategoryChange = (ev: React.FormEvent) => {
     const { value } = ev.target as HTMLSelectElement;
     dispatch(setPreviewCategory(value));
+    dispatch(resetPreviewPagination());
   };
   const handleItemsPerPageChange = (ev: React.FormEvent) => {
     const { value } = ev.target as HTMLSelectElement;
     dispatch(setPreviewItemsPerPage(+value));
+    dispatch(resetPreviewPagination());
   };
 
   const handleResetFilter = () => {
@@ -51,11 +54,13 @@ const PreviewFilter: React.FC<PreviewFilterProps> = function (
   const handleStartDateChange = (ev: React.FormEvent) => {
     const { value } = ev.target as HTMLInputElement;
     dispatch(setPreviewDateStart(value));
+    dispatch(resetPreviewPagination());
   };
 
   const handleEndDateChange = (ev: React.FormEvent) => {
     const { value } = ev.target as HTMLInputElement;
     dispatch(setPreviewDateEnd(value));
+    dispatch(resetPreviewPagination());
   };
 
   // reset previous filters

src/features/preview_items/previewItemsSlice.ts

@@ -51,20 +51,16 @@ export const previewItemsSlice = createSlice({
       state.isLastPage = action.payload;
     },
     setPreviewCategory(state, action: PayloadAction<string>) {
-      if (action.payload === DROPDOWN_DEFAULT_KEY) {
-        state.isValidFilter = false;
-        return;
-      }
-
       state.category = action.payload;
-      state.isValidFilter = true;
+      state.isValidFilter = action.payload !== DROPDOWN_DEFAULT_KEY;
     },
     setPreviewItemsPerPage(state, action: PayloadAction<number>) {
       state.itemsPerPage = action.payload;
     },
     resetPreviewPagination(state) {
       state.isLastPage = initialPreviewItemsState.isLastPage;
       state.offset = initialPreviewItemsState.offset;
+      state.pageNumber = initialPreviewItemsState.pageNumber;
     },
     setPreviewDateStart(state, action: PayloadAction<string>) {
       const currentEnd = new Date(state.dateRange.end);