Merge pull request #16 from oss-slu/5-define-status-type-enums-for-do…

…nated-items Enums properly defined and nothing broke
oss-slu · Sep 22, 2024 · 7d68bc5 · 7d68bc5
2 parents 0f7b256 + 1e2dec7
commit 7d68bc5
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/client-app/src/Components/DonatedItemsList.js b/client-app/src/Components/DonatedItemsList.js
@@ -3,6 +3,7 @@ import { Link, useNavigate } from 'react-router-dom';
 import { FaSearch, FaPlus } from 'react-icons/fa';
 import Barcode from 'react-barcode';
 import Modal from 'react-modal';
+import ItemStatus from '../constants/Enums.js';
 import '../css/AdminHeader.css';
 import '../css/DonatedItemsList.css';
 import html2canvas from 'html2canvas';
@@ -25,7 +26,7 @@ function DonatedItemsList() {
       item.donor.toLowerCase().includes(searchInput.toLowerCase()) ||
       item.date.includes(searchInput) ||
       item.program.toLowerCase().includes(searchInput.toLowerCase()) ||
-      item.status.toLowerCase().includes(searchInput.toLowerCase())
+      Object.values(ItemStatus).includes(item.status) && item.status.toLowerCase().includes(searchInput.toLowerCase())
     );
     setFilteredItems(filtered);
   };
@@ -95,11 +96,11 @@ function DonatedItemsList() {
 
   // Sample data for demonstration
   const [donatedItems, setDonatedItems] = useState([
-    { id: 811253, name: 'Bicycle', donor: 'Mary', date: '2024-02-25', program: 'Not Assigned', status: 'Donated' },
-    { id: 811249, name: 'Computer', donor: 'James', date: '2024-02-06', program: 'Not Assigned', status: 'In Storage Facility' },
-    { id: 811247, name: 'Computer', donor: 'Vivian', date: '2024-01-26', program: 'Not Assigned', status: 'Refurbished' },
-    { id: 811246, name: 'Bicycle', donor: 'Elizabeth', date: '2024-01-21', program: 'Not Assigned', status: 'Item Sold' },
-    { id: 811240, name: 'Bicycle', donor: 'Peter', date: '2024-01-13', program: 'Not Assigned', status: 'Received' }
+    { id: 811253, name: 'Bicycle', donor: 'Mary', date: '2024-02-25', program: 'Not Assigned', status: ItemStatus.DONATED },
+    { id: 811249, name: 'Computer', donor: 'James', date: '2024-02-06', program: 'Not Assigned', status: ItemStatus.IN_STORAGE },
+    { id: 811247, name: 'Computer', donor: 'Vivian', date: '2024-01-26', program: 'Not Assigned', status: ItemStatus.REFURBISHED },
+    { id: 811246, name: 'Bicycle', donor: 'Elizabeth', date: '2024-01-21', program: 'Not Assigned', status: ItemStatus.SOLD },
+    { id: 811240, name: 'Bicycle', donor: 'Peter', date: '2024-01-13', program: 'Not Assigned', status: ItemStatus.RECEIVED }
     // Add more items here...
   ]);
   const downloadBarcode = (id) => {
@@ -173,11 +174,11 @@ function DonatedItemsList() {
                 <option value="" disabled selected>
                   Filter by Status
                 </option>
-                <option value="Donated">Donated</option>
-                <option value="In Storage Facility">In Storage Facility</option>
-                <option value="Refurbished">Refurbished</option>
-                <option value="Received">Received</option>
-                <option value="Item Sold">Item Sold</option>
+                <option value={ItemStatus.DONATED}>Donated</option>
+                <option value={ItemStatus.IN_STORAGE}>In Storage Facility</option>
+                <option value={ItemStatus.REFURBISHED}>Refurbished</option>
+                <option value={ItemStatus.RECEIVED}>Received</option>
+                <option value={ItemStatus.SOLD}>Item Sold</option>
               </select>
             </div>
           </div>

diff --git a/client-app/src/Components/StatusDisplayPage.js b/client-app/src/Components/StatusDisplayPage.js
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
+import ItemStatus from '../constants/Enums';
 import '../css/StatusDisplayPage.css';
 
 const StatusDisplayPage = () => {
@@ -103,7 +104,7 @@ const StatusDisplayPage = () => {
             checked={donorInfo.status.donated}
             onChange={handleCheckboxChange}
           />
-          Donated
+          {ItemStatus.DONATED} 
         </label>
         <br />
         <label>
@@ -113,7 +114,7 @@ const StatusDisplayPage = () => {
             checked={donorInfo.status.inStorageFacility}
             onChange={handleCheckboxChange}
           />
-          In Storage Facility
+          {ItemStatus.IN_STORAGE}
         </label>
         <br />
         <label>
@@ -123,7 +124,7 @@ const StatusDisplayPage = () => {
             checked={donorInfo.status.refurbished}
             onChange={handleCheckboxChange}
           />
-          Refurbished
+          {ItemStatus.REFURBISHED}
         </label>
         <br />
         <label>
@@ -133,7 +134,7 @@ const StatusDisplayPage = () => {
             checked={donorInfo.status.received}
             onChange={handleCheckboxChange}
           />
-          Received
+          {ItemStatus.RECEIVED}
         </label>
         <br />
         <label>
@@ -143,7 +144,7 @@ const StatusDisplayPage = () => {
             checked={donorInfo.status.sold}
             onChange={handleCheckboxChange}
           />
-          Sold
+          {ItemStatus.SOLD}
         </label>
         <br></br>
         <label>

diff --git a/client-app/src/constants/Enums.js b/client-app/src/constants/Enums.js
@@ -0,0 +1,9 @@
+const ItemStatus = Object.freeze ({
+    DONATED: 'Donated',
+    IN_STORAGE: 'In Storage Facility',
+    REFURBISHED: 'Refurbished',
+    SOLD: 'Item Sold',
+    RECEIVED: 'Received'
+});
+
+export default ItemStatus;