From 0377c1c96a2695f84182663dd422dd07a755588b Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Fri, 5 Jul 2024 08:15:04 +0300
Subject: [PATCH 1/2] cleanup code

---
 .../OrganizationAddModify.js                  | 43 -------------------
 1 file changed, 43 deletions(-)

diff --git a/frontend/src/components/admin/OrganizationManagement/OrganizationAddModify.js b/frontend/src/components/admin/OrganizationManagement/OrganizationAddModify.js
index 840f55493..367f32057 100644
--- a/frontend/src/components/admin/OrganizationManagement/OrganizationAddModify.js
+++ b/frontend/src/components/admin/OrganizationManagement/OrganizationAddModify.js
@@ -703,49 +703,6 @@ function OrganizationAddModify() {
                   </TableContainer>
                 )}
               </DataTable>
-              {/* <Pagination
-                onChange={handlePageChange}
-                page={page}
-                pageSize={pageSize}
-                pageSizes={[5, 10, 20]}
-                totalItems={typeOfActivityShow.length}
-                forwardText={intl.formatMessage({
-                  id: "pagination.forward",
-                })}
-                backwardText={intl.formatMessage({
-                  id: "pagination.backward",
-                })}
-                itemRangeText={(min, max, total) =>
-                  intl.formatMessage(
-                    { id: "pagination.item-range" },
-                    { min: min, max: max, total: total },
-                  )
-                }
-                itemsPerPageText={intl.formatMessage({
-                  id: "pagination.items-per-page",
-                })}
-                itemText={(min, max) =>
-                  intl.formatMessage(
-                    { id: "pagination.item" },
-                    { min: min, max: max },
-                  )
-                }
-                pageNumberText={intl.formatMessage({
-                  id: "pagination.page-number",
-                })}
-                pageRangeText={(_current, total) =>
-                  intl.formatMessage(
-                    { id: "pagination.page-range" },
-                    { total: total },
-                  )
-                }
-                pageText={(page, pagesUnknown) =>
-                  intl.formatMessage(
-                    { id: "pagination.page" },
-                    { page: pagesUnknown ? "" : page },
-                  )
-                }
-              /> */}
               <br />
             </Column>
           </Grid>

From 17e43b18710374582772b1d2992e1802c3cc58ba Mon Sep 17 00:00:00 2001
From: mozzy11 <mozzymutesa@gmail.com>
Date: Fri, 5 Jul 2024 08:24:47 +0300
Subject: [PATCH 2/2] minor fixes

---
 .../OrganizationManagement/OrganizationManagement.js   |  2 +-
 .../components/admin/userManagement/UserAddModify.js   |  2 +-
 .../components/admin/userManagement/UserManagement.js  | 10 ++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/admin/OrganizationManagement/OrganizationManagement.js b/frontend/src/components/admin/OrganizationManagement/OrganizationManagement.js
index 1cace5f24..9cb0d76c2 100644
--- a/frontend/src/components/admin/OrganizationManagement/OrganizationManagement.js
+++ b/frontend/src/components/admin/OrganizationManagement/OrganizationManagement.js
@@ -123,7 +123,7 @@ function OrganizationManagement() {
     });
     setTimeout(() => {
       window.location.reload();
-    }, 2000);
+    }, 200);
   };
 
   const handlePageChange = ({ page, pageSize }) => {
diff --git a/frontend/src/components/admin/userManagement/UserAddModify.js b/frontend/src/components/admin/userManagement/UserAddModify.js
index 902447a79..6d99faf6c 100644
--- a/frontend/src/components/admin/userManagement/UserAddModify.js
+++ b/frontend/src/components/admin/userManagement/UserAddModify.js
@@ -68,7 +68,7 @@ function UserAddModify() {
   const [selectedTestSectionLabUnits, setSelectedTestSectionLabUnits] =
     useState({});
 
-  // this keeps the order of the test section lab roles 
+  // this keeps the order of the test section lab roles
   const [selectedTestSectionList, setSelectedTestSectionList] = useState([]);
 
   const ID = (() => {
diff --git a/frontend/src/components/admin/userManagement/UserManagement.js b/frontend/src/components/admin/userManagement/UserManagement.js
index abd1740dc..b8ae04f06 100644
--- a/frontend/src/components/admin/userManagement/UserManagement.js
+++ b/frontend/src/components/admin/userManagement/UserManagement.js
@@ -141,7 +141,7 @@ function UserManagement() {
       });
       setTimeout(() => {
         window.location.reload();
-      }, 2000);
+      }, 200);
     } else {
       addNotification({
         kind: NotificationKinds.error,
@@ -151,7 +151,7 @@ function UserManagement() {
       setNotificationVisible(true);
       setTimeout(() => {
         window.location.reload();
-      }, 2000);
+      }, 200);
     }
   }
 
@@ -429,7 +429,7 @@ function UserManagement() {
             <Column lg={6} md={6} sm={3}>
               <Select
                 id="filters"
-                noLabel={true}
+                labelText={<FormattedMessage id="menu.label.filter.role" />}
                 defaultValue={
                   testSectionsShow && testSectionsShow.length > 0
                     ? testSectionsShow[0].id
@@ -437,7 +437,7 @@ function UserManagement() {
                 }
                 onChange={handleTestSectionsSelectChange}
               >
-                <SelectItem key="" value="" text="Not Selected" />
+                <SelectItem key="" value="" text="" />
                 {testSectionsShow && testSectionsShow.length > 0 ? (
                   testSectionsShow.map((section) => (
                     <SelectItem
@@ -454,8 +454,6 @@ function UserManagement() {
                   />
                 )}
               </Select>
-              <br />
-              <FormattedMessage id="menu.label.filter.role" />
             </Column>
             <Column lg={8} md={8} sm={4}>
               <CustomCheckBox