fix filter

components/datasets/DataAlter.tsx

@@ -2,23 +2,10 @@ import React, { useState, useEffect } from 'react';
 import { useRouter } from 'next/router';
 import Modal from 'react-modal';
 import { tabbedInterface } from 'utils/index';
+import { formatFilterName } from 'pages/datasets';
 
 Modal.setAppElement('#__next');
 
-function formatFilterName(name: string) {
-  if (name == 'fiscal_year') {
-    return 'fiscal year';
-  } else if (name == 'buyer_name') return 'buyer name';
-  else if (
-    name == 'tender/mainProcurementCategory' ||
-    name == 'tender_mainprocurementcategory'
-  )
-    return 'category';
-  else if (name == 'tender/stage') return 'tender stage';
-  else if (name == 'tender_status') return 'status';
-  else return name;
-}
-
 const sort = [
   {
     id: 'tender_bid_opening_date:asc',

components/datasets/Filter.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Cross } from 'components/icons/shared';
 import { truncate } from 'lodash';
+import { formatFilterName } from 'pages/datasets';
 
 const dataObj = {};
 const filterSearch = {};
@@ -82,18 +83,6 @@ const Filter = ({ data, newFilters, fq }) => {
     }, 100);
   }
 
-  function formatFilterName(name: string) {
-    if (name == 'fiscal_year') {
-      return 'fiscal year';
-    } else if (name == 'organization' || name == 'buyer_name')
-      return 'buyer name';
-    else if (name == 'tender_mainprocurementcategory') return 'type';
-    else if (name == 'tender/mainProcurementCategory') return 'category';
-    else if (name == 'tender/stage') return 'tender stage';
-    else if (name == 'tender_status') return 'status';
-    else return name;
-  }
-
   function handleFilterChange(e: any) {
     const selectedFilter = e.target as HTMLInputElement;
     const type = selectedFilter.dataset.type;

pages/datasets/index.tsx

@@ -26,9 +26,15 @@ type Props = {
   facets: any;
 };
 
-// const list =
-//   '"fiscalYear", "organization", "tender_mainprocurementcategory", "tender_status"';
-const newList = '"organization"';
+const filterList = '"organization", "fiscalYear", "mainProcurementCategory"';
+export function formatFilterName(name: string) {
+  if (name == 'fiscalYear') {
+    return 'fiscal year';
+  } else if (name == 'organization' || name == 'buyer_name')
+    return 'buyer name';
+  else if (name == 'mainProcurementCategory') return 'category';
+  else return name;
+}
 
 const defaultSort = 'tender_bid_opening_date:asc';
 
@@ -284,7 +290,7 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
   const variables = convertToCkanSearchQuery(query);
 
   // fetch fatcets values
-  const facets = await getFilters(newList, variables, 'tender_dataset');
+  const facets = await getFilters(filterList, variables, 'tender_dataset');
 
   // fetch datasets
   const data = await fetchDatasets('tender_dataset', variables);