fix: do not pass userId in query for non-user-filtered requests page

sct · Mar 29, 2021 · 64494c1 · 64494c1
1 parent 2f92dba
commit 64494c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/server/routes/request.ts b/server/routes/request.ts
@@ -19,7 +19,7 @@ requestRoutes.get('/', async (req, res, next) => {
     const skip = req.query.skip ? Number(req.query.skip) : 0;
     const requestedBy = req.query.requestedBy
       ? Number(req.query.requestedBy)
-      : 0;
+      : null;
 
     let statusFilter: MediaRequestStatus[];
 

diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
@@ -137,7 +137,9 @@ const RequestList: React.FC = () => {
                 setCurrentFilter(e.target.value as Filter);
                 router.push({
                   pathname: router.pathname,
-                  query: { userId: router.query.userId },
+                  query: router.query.userId
+                    ? { userId: router.query.userId }
+                    : {},
                 });
               }}
               value={currentFilter}
@@ -181,7 +183,9 @@ const RequestList: React.FC = () => {
                 setCurrentSort(e.target.value as Sort);
                 router.push({
                   pathname: router.pathname,
-                  query: { userId: router.query.userId },
+                  query: router.query.userId
+                    ? { userId: router.query.userId }
+                    : {},
                 });
               }}
               value={currentSort}
@@ -258,7 +262,9 @@ const RequestList: React.FC = () => {
                       router
                         .push({
                           pathname: router.pathname,
-                          query: { userId: router.query.userId },
+                          query: router.query.userId
+                            ? { userId: router.query.userId }
+                            : {},
                         })
                         .then(() => window.scrollTo(0, 0));
                     }}
@@ -283,7 +289,9 @@ const RequestList: React.FC = () => {
                   .push(
                     {
                       pathname: `${router.pathname}?page=${page - 1}`,
-                      query: { userId: router.query.userId },
+                      query: router.query.userId
+                        ? { userId: router.query.userId }
+                        : {},
                     },
                     undefined,
                     {
@@ -302,7 +310,9 @@ const RequestList: React.FC = () => {
                   .push(
                     {
                       pathname: `${router.pathname}?page=${page + 1}`,
-                      query: { userId: router.query.userId },
+                      query: router.query.userId
+                        ? { userId: router.query.userId }
+                        : {},
                     },
                     undefined,
                     {