Merge pull request I-TECH-UW#937 from mozzy11/develop_3x

fix Tab error
Agaba-derrick · Mar 29, 2024 · 5c47518 · 5c47518
2 parents 19a36cc + 561d0df
commit 5c47518
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/frontend/src/components/home/Dashboard.tsx b/frontend/src/components/home/Dashboard.tsx
@@ -19,6 +19,7 @@ import {
   Tab,
   Tabs,
   TabList,
+  Tag
 } from "@carbon/react";
 import "./Dashboard.css";
 import { Minimize, Maximize } from "@carbon/react/icons";
@@ -489,7 +490,6 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                         <Column lg={11} />
                         <Column lg={2}>
                           <Button
-                            type=""
                             id="loadpreviousresults"
                             onClick={loadPreviousResultsPage}
                             disabled={previousPage != null ? false : true}
@@ -499,7 +499,6 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                         </Column>
                         <Column lg={2}>
                           <Button
-                            type=""
                             id="loadnextresults"
                             onClick={loadNextResultsPage}
                             disabled={nextPage != null ? false : true}
@@ -512,6 +511,7 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                     {tilesWithTabs.includes(selectedTile.type) && (
                       <Grid>
                       <Column lg={16}>
+                      {testSections.length > 0 ?( 
                       <Tabs>
                         <TabList aria-label="List of tabs" contained>
                           {testSections?.map((item, idx) => {
@@ -528,6 +528,7 @@ const HomeDashBoard: React.FC<DashBoardProps> = () => {
                           })}
                         </TabList>
                       </Tabs>
+                      ): (<Tag type="red"><FormattedMessage id="label.user.notestsection" /></Tag>)}     
                       </Column>
                     </Grid>
                     )}

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -826,5 +826,6 @@
   "label.audittrailreport.requester": "Requester",
   "label.audittrailreport.requester.firstname": "Requester's First Name",
   "label.audittrailreport.requester.lastname": "Requester's Last Name",
-  "label.audittrailreport.sitename": "Site Name"
+  "label.audittrailreport.sitename": "Site Name" ,
+  "label.user.notestsection": "Current User has no Assined Lab Unit . Please Contact admin" 
 }
diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -768,5 +768,6 @@
   "label.audittrailreport.requester": "Demandeur",
   "label.audittrailreport.requester.firstname": "Prénom du demandeur",
   "label.audittrailreport.requester.lastname": "Nom de famille du demandeur",
-  "label.audittrailreport.sitename": "Nom du site"
+  "label.audittrailreport.sitename": "Nom du site" ,
+  "label.user.notestsection": "L'utilisateur actuel n'a pas d'unité de laboratoire assassinée. Veuillez contacter l'administrateur" 
 }