Fix: Refactor the defaultTableOptions from a constant to a helper (#1013

)
bcgov · Dec 29, 2023 · ec918d1 · ec918d1
1 parent aca2001
commit ec918d1
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 25 deletions.
diff --git a/...c/common/constants/defaultTableOptions.ts → frontend/src/common/helpers/tableHelper.ts b/...c/common/constants/defaultTableOptions.ts → frontend/src/common/helpers/tableHelper.ts
diff --git a/frontend/src/features/idir/search/components/IDIRSearchResults.tsx b/frontend/src/features/idir/search/components/IDIRSearchResults.tsx
@@ -12,11 +12,6 @@ import {
 
 import OnRouteBCContext from "../../../../common/authentication/OnRouteBCContext";
 import { TEN_MINUTES } from "../../../../common/constants/constants";
-import {
-  defaultTableInitialStateOptions,
-  defaultTableOptions,
-  defaultTableStateOptions,
-} from "../../../../common/constants/defaultTableOptions";
 import { Optional } from "../../../../common/types/common";
 import { USER_AUTH_GROUP } from "../../../manageProfile/types/userManagement.d";
 import { hasPermitExpired } from "../../../permits/helpers/permitState";
@@ -26,6 +21,11 @@ import { getDataBySearch } from "../api/idirSearch";
 import { PermitSearchResultColumnDef } from "../table/Columns";
 import { SearchFields } from "../types/types";
 import { IDIRPermitSearchRowActions } from "./IDIRPermitSearchRowActions";
+import {
+  defaultTableInitialStateOptions,
+  defaultTableOptions,
+  defaultTableStateOptions
+} from "../../../../common/helpers/tableHelper";
 import "./IDIRSearchResults.scss";
 
 /**

diff --git a/frontend/src/features/idir/search/table/Columns.tsx b/frontend/src/features/idir/search/table/Columns.tsx
@@ -8,8 +8,8 @@ import { viewPermitPdf } from "../../../permits/helpers/permitPDFHelper";
 import { hasPermitExpired } from "../../../permits/helpers/permitState";
 import {
   dateTimeStringSortingFn,
-  formatCellValuetoDatetime,
-} from "../../../../common/constants/defaultTableOptions";
+  formatCellValuetoDatetime
+} from "../../../../common/helpers/tableHelper";
 
 /*
  *

diff --git a/frontend/src/features/manageProfile/pages/UserManagement.tsx b/frontend/src/features/manageProfile/pages/UserManagement.tsx
@@ -21,10 +21,10 @@ import { UserManagementTableRowActions } from "../components/user-management/Use
 import { UserManagementColumnsDefinition } from "../types/UserManagementColumns";
 import { BCeIDUserStatus, ReadCompanyUser } from "../types/userManagement.d";
 import {
-  defaultTableInitialStateOptions,
   defaultTableOptions,
-  defaultTableStateOptions,
-} from "../../../common/constants/defaultTableOptions";
+  defaultTableInitialStateOptions,
+  defaultTableStateOptions
+} from "../../../common/helpers/tableHelper";
 
 /**
  * User Management Component for CV Client.

diff --git a/frontend/src/features/manageVehicles/components/list/Columns.tsx b/frontend/src/features/manageVehicles/components/list/Columns.tsx
@@ -1,7 +1,6 @@
 import { MRT_ColumnDef } from "material-react-table";
-
 import { VehicleTypes } from "../../types/managevehicles";
-import { formatCellValuetoDatetime } from "../../../../common/constants/defaultTableOptions";
+import { formatCellValuetoDatetime } from "../../../../common/helpers/tableHelper";
 
 const CommonVehicleColumnDefinition: MRT_ColumnDef<VehicleTypes>[] = [
   {

diff --git a/frontend/src/features/manageVehicles/components/list/List.tsx b/frontend/src/features/manageVehicles/components/list/List.tsx
@@ -45,10 +45,10 @@ import {
 } from "../../apiManager/hooks";
 
 import {
-  defaultTableInitialStateOptions,
   defaultTableOptions,
-  defaultTableStateOptions,
-} from "../../../../common/constants/defaultTableOptions";
+  defaultTableInitialStateOptions,
+  defaultTableStateOptions
+} from "../../../../common/helpers/tableHelper";
 
 /**
  * Dynamically set the column based on vehicle type

diff --git a/frontend/src/features/permits/components/list/List.tsx b/frontend/src/features/permits/components/list/List.tsx
@@ -32,10 +32,10 @@ import { ApplicationInProgressColumnDefinition } from "./Columns";
 import { deleteApplications } from "../../apiManager/permitsAPI";
 import { NoRecordsFound } from "../../../../common/components/table/NoRecordsFound";
 import {
-  defaultTableInitialStateOptions,
   defaultTableOptions,
   defaultTableStateOptions,
-} from "../../../../common/constants/defaultTableOptions";
+  defaultTableInitialStateOptions
+} from "../../../../common/helpers/tableHelper";
 
 /**
  * Dynamically set the column

diff --git a/frontend/src/features/permits/components/permit-list/BasePermitList.tsx b/frontend/src/features/permits/components/permit-list/BasePermitList.tsx
@@ -15,15 +15,15 @@ import {
 import { SnackBarContext } from "../../../../App";
 import { NoRecordsFound } from "../../../../common/components/table/NoRecordsFound";
 import { FIVE_MINUTES } from "../../../../common/constants/constants";
-import {
-  defaultTableInitialStateOptions,
-  defaultTableOptions,
-  defaultTableStateOptions,
-} from "../../../../common/constants/defaultTableOptions";
 import { getPermits } from "../../apiManager/permitsAPI";
 import { Permit } from "../../types/permit";
 import { PermitsColumnDefinition } from "./Columns";
 import { PermitRowOptions } from "./PermitRowOptions";
+import {
+  defaultTableInitialStateOptions,
+  defaultTableOptions,
+  defaultTableStateOptions
+} from "../../../../common/helpers/tableHelper";
 
 /**
  * A permit list component with common functionalities that can be shared by

diff --git a/frontend/src/features/permits/components/permit-list/Columns.tsx b/frontend/src/features/permits/components/permit-list/Columns.tsx
@@ -1,9 +1,9 @@
 import Link from "@mui/material/Link";
 import { MRT_ColumnDef } from "material-react-table";
-import { formatCellValuetoDatetime } from "../../../../common/constants/defaultTableOptions";
 import { viewPermitPdf } from "../../helpers/permitPDFHelper";
 import { Permit } from "../../types/permit";
 import { PermitChip } from "./PermitChip";
+import { formatCellValuetoDatetime } from "../../../../common/helpers/tableHelper";
 
 /**
  * The column definition for Permits.

diff --git a/frontend/src/features/permits/pages/Refund/components/TransactionHistoryTable.tsx b/frontend/src/features/permits/pages/Refund/components/TransactionHistoryTable.tsx
@@ -23,8 +23,9 @@ import {
 import {
   defaultTableInitialStateOptions,
   defaultTableOptions,
-  defaultTableStateOptions,
-} from "../../../../../common/constants/defaultTableOptions";
+  defaultTableStateOptions
+} from "../../../../../common/helpers/tableHelper";
+
 
 export const TransactionHistoryTable = ({
   permitHistory,