Updated status URL parsing to work with strings

cul · Feb 14, 2024 · 27e1647 · 27e1647
1 parent b6fc140
commit 27e1647
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/controllers/api/v1/resources_controller.rb b/app/controllers/api/v1/resources_controller.rb
@@ -48,16 +48,19 @@ def destroy
 
       # GET /resources
       def index
+        statuses = ['pending', 'processing', 'failure', 'ready']
+
         per_page = 50
-        status = params[:status]
+        status = statuses.include?(params[:status].downcase) ? statuses.index(params[:status].downcase) : params[:status]
         page = Integer(params[:page])
         identifier = params[:identifier]
 
         resources = Resource
         identifier && resources = resources.where(identifier: identifier)
-        status && status != 'Any' && resources = resources.where(status: status)
+        status && status.downcase != 'any' && resources = resources.where(status: status)
         resources = resources.limit(per_page).offset((page - 1) * per_page)
-        status && status != 'Any' && resources = resources.order(status)
+        status && status.downcase != 'any' && resources = resources.order(status)
+        puts resources[0].inspect
         render json:
           resources
 

diff --git a/app/javascript/components/resources/ResourceList.jsx b/app/javascript/components/resources/ResourceList.jsx
@@ -21,9 +21,13 @@ export default function ResourceList() {
     (async () => {
       const response = await fetch(fetch_url);
       const data = await response.json();
-      setFilteredResources(data.concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data));
+      // setFilteredResources(data.concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data).concat(data));
       console.log('data:');
       console.log(data);
+      data.forEach(entry => {
+        console.log(entry);
+      })
+      console.log();
       setFilteredResources(data);
     })();
   }, [searchParams]);