test: fix test cases

bcgov · Jul 4, 2024 · 4ceab66 · 4ceab66
1 parent 13fccd4
commit 4ceab66
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 13 deletions.
diff --git a/frontend/src/__test__/components/OpeningScreenDataTable.test.tsx b/frontend/src/__test__/components/OpeningScreenDataTable.test.tsx
@@ -13,7 +13,7 @@ const rows: RecentOpening[] = [{
   cutBlock: '1',
   grossAreaHa: 1,
   statusDesc: 'Approved',
-  categoryDesc: 'Another',
+  categoryDesc: 'Another:Another',
   disturbanceStart: '1',
   entryTimestamp: '1',
   updateTimestamp: '1',

diff --git a/frontend/src/components/BCHeader/index.tsx b/frontend/src/components/BCHeader/index.tsx
@@ -30,8 +30,8 @@ const BCHeader: React.FC = () => {
         <HeaderContainer
           render={({ isSideNavExpanded, onClickSideNavExpand }: HeaderContainerProps) => (
             <Header aria-label="React TS Carbon QuickStart"
-            className="spar-header"
-            data-testid="header">
+              className="spar-header"
+              data-testid="bc-header__header">
               <SkipToContent />
               <HeaderMenuButton
                 aria-label={isSideNavExpanded ? 'Close menu' : 'Open menu'}

diff --git a/frontend/src/components/MyRecentActions/index.tsx b/frontend/src/components/MyRecentActions/index.tsx
@@ -45,8 +45,22 @@ const MyRecentActions: React.FC = () => {
     <div className="recent-actions">
       <Tabs>
         <TabList activation="manual" aria-label="List of tabs">
-          <Tab><div className="tab-header-recent">Recent</div></Tab>
-          <Tab><div className="tab-header-recent">Files and Docs</div></Tab>
+          <Tab>
+            <div
+              className="tab-header-recent"
+              data-testid={"my-recent-actions__recent-tab-header"}
+            >
+              Recent
+            </div>
+          </Tab>
+          <Tab>
+            <div
+              className="tab-header-recent"
+              data-testid={"my-recent-actions__files-tab-header"}
+            >
+              Files and Docs
+            </div>
+          </Tab>
         </TabList>
         <TabPanels>
           <TabPanel className="tab-content">

diff --git a/frontend/src/components/OpeningScreenDataTable/index.tsx b/frontend/src/components/OpeningScreenDataTable/index.tsx
@@ -221,11 +221,7 @@ const OpeningScreenDataTable: React.FC<IOpeningScreenDataTable> = ({
                               size="md"
                             />
                           </>
-                        )
-                        : cell.info.header === "category" ?(
-                          cell.value.split(':')[0]
-                        ) 
-                        : (
+                        ) : (
                           cell.value
                         )}
                       </TableCell>

diff --git a/frontend/src/services/OpeningService.ts b/frontend/src/services/OpeningService.ts
@@ -7,6 +7,25 @@ import { RecentOpening } from '../types/RecentOpening';
 
 const backendUrl = env.VITE_BACKEND_URL;
 
+interface statusCategory {
+  code: string;
+  description: string;
+}
+
+interface RecentOpeningApi {
+  openingId: number;
+  fileId: string;
+  cuttingPermit: string | null;
+  timberMark: string | null;
+  cutBlock: string | null;
+  grossAreaHa: number | null;
+  status: statusCategory | null;
+  category: statusCategory | null;
+  disturbanceStart: string | null;
+  entryTimestamp: string | null;
+  updateTimestamp: string | null;
+}
+
 /**
  * Fetch recent openings data from backend.
  *
@@ -26,16 +45,16 @@ export async function fetchRecentOpenings(): Promise<RecentOpening[]> {
 
       if (data.data) {
         // Extracting row information from the fetched data
-        const rows: RecentOpening[] = data.data.map((opening: RecentOpening) => ({
+        const rows: RecentOpening[] = data.data.map((opening: RecentOpeningApi) => ({
           id: opening.openingId.toString(),
           openingId: opening.openingId.toString(),
           fileId: opening.fileId ? opening.fileId : '-',
           cuttingPermit: opening.cuttingPermit ? opening.cuttingPermit : '-',
           timberMark: opening.timberMark ? opening.timberMark : '-',
           cutBlock: opening.cutBlock ? opening.cutBlock : '-',
           grossAreaHa: opening.grossAreaHa ? opening.grossAreaHa.toString() : '-',
-          status: opening.statusDesc ? opening.statusDesc : '-',
-          category: opening.categoryDesc ? opening.categoryDesc : '-',
+          status: opening.status && opening.status.description? opening.status.description : '-',
+          category: opening.category && opening.category.description? opening.category.description : '-',
           disturbanceStart: opening.disturbanceStart ? opening.disturbanceStart : '-',
           entryTimestamp: opening.entryTimestamp ? opening.entryTimestamp.split('T')[0] : '-',
           updateTimestamp: opening.updateTimestamp ? opening.updateTimestamp.split('T')[0] : '-'