From 29b0d48a31e675880359fe01501c955f3faa5393 Mon Sep 17 00:00:00 2001
From: Zhang Ziqing <zhangziqing9926@gmail.com>
Date: Wed, 9 Nov 2022 00:55:24 +0800
Subject: [PATCH] [offers][fix] fix redirection to offer table

---
 .../offers/offerAnalysis/OfferAnalysis.tsx      |  4 ++--
 .../src/components/offers/table/OffersTable.tsx | 17 ++++++-----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/apps/portal/src/components/offers/offerAnalysis/OfferAnalysis.tsx b/apps/portal/src/components/offers/offerAnalysis/OfferAnalysis.tsx
index 1d8aa2ae..0c8d67cd 100644
--- a/apps/portal/src/components/offers/offerAnalysis/OfferAnalysis.tsx
+++ b/apps/portal/src/components/offers/offerAnalysis/OfferAnalysis.tsx
@@ -73,8 +73,8 @@ function OfferAnalysisContent({
           <Button
             href={
               tab === OVERALL_TAB
-                ? `/offers?jobTitleId=${title}&sortBy=-totalCompensation&yoeCategory=${yoeCategory}`
-                : `/offers?companyId=${companyId}&companyName=${companyName}&jobTitleId=${title}&sortBy=-totalCompensation&yoeCategory=${yoeCategory}`
+                ? `/offers?jobTitleId=${title}&sortDirection=-&sortType=totalCompensation&yoeCategory=${yoeCategory}`
+                : `/offers?companyId=${companyId}&companyName=${companyName}&jobTitleId=${title}&sortDirection=-&sortType=totalCompensation&yoeCategory=${yoeCategory}`
             }
             icon={ArrowUpRightIcon}
             label="View more offers"
diff --git a/apps/portal/src/components/offers/table/OffersTable.tsx b/apps/portal/src/components/offers/table/OffersTable.tsx
index 54d9fe3c..97c2ce3c 100644
--- a/apps/portal/src/components/offers/table/OffersTable.tsx
+++ b/apps/portal/src/components/offers/table/OffersTable.tsx
@@ -126,10 +126,6 @@ export default function OffersTable({
     pathname,
   ]);
 
-  useEffect(() => {
-    setSelectedSortDirection(OFFER_TABLE_SORT_ORDER.UNSORTED);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedYoeCategory]);
   const topRef = useRef<HTMLDivElement>(null);
   const { showToast } = useToast();
   const { isLoading: isResultsLoading } = trpc.useQuery(
@@ -141,7 +137,6 @@ export default function OffersTable({
         currency,
         limit: NUMBER_OF_OFFERS_PER_PAGE,
         offset: pagination.currentPage,
-        // SortBy: selectedSortBy ?? '-monthYearReceived',
         sortBy:
           selectedSortDirection && selectedSortType
             ? `${selectedSortDirection}${selectedSortType}`
@@ -204,6 +199,7 @@ export default function OffersTable({
               label={itemLabel}
               onClick={() => {
                 setSelectedYoeCategory(value);
+                setSelectedSortDirection(OFFER_TABLE_SORT_ORDER.UNSORTED);
                 gaEvent({
                   action: `offers.table_filter_yoe_category_${value}`,
                   category: 'engagement',
@@ -291,12 +287,11 @@ export default function OffersTable({
             <Spinner display="block" size="lg" />
           </div>
         )}
-        {(!isLoading && !offers) ||
-          (offers.length === 0 && (
-            <div className="py-16 text-lg">
-              <div className="flex justify-center">No data yet 🥺</div>
-            </div>
-          ))}
+        {!isLoading && (!offers || offers.length === 0) && (
+          <div className="py-16 text-lg">
+            <div className="flex justify-center">No data yet 🥺</div>
+          </div>
+        )}
       </div>
       <OffersTablePagination
         endNumber={