FEAT #12842 TIME 1:00 filter on folders in resources lists

src/app/resource/controllers/ResourceListController.php

@@ -281,6 +281,17 @@ class ResourceListController
             $where[] = 'doctypes.type_id in (?)';
             $queryData[] = explode(',', $args['data']['doctypes']);
         }
+        if (!empty($args['data']['folders'])) {
+            $resourcesInFolders = FolderModel::getWithResources([
+                'select' => ['resources_folders.res_id'],
+                'where'  => ['resources_folders.folder_id in (?)'],
+                'data'   => [explode(',', $args['data']['folders'])]
+            ]);
+            $resourcesInFolders = array_column($resourcesInFolders, 'res_id');
+
+            $where[] = 'res_id in (?)';
+            $queryData[] = $resourcesInFolders;
+        }
 
         if (!empty($args['data']['order']) && strpos($args['data']['order'], 'alt_identifier') !== false) {
             $order = 'order_alphanum(alt_identifier) ' . explode(' ', $args['data']['order'])[1];

src/frontend/service/filtersList.service.ts

@@ -160,6 +160,14 @@ export class FiltersListService {
 
                 filters += '&doctypes=' + doct.join(',');
             }
+            if (this.listsProperties[this.listsPropertiesIndex].folders.length > 0) {
+                let folders: any[] = [];
+                this.listsProperties[this.listsPropertiesIndex].folders.forEach((element: any) => {
+                    folders.push(element.id);
+                });
+
+                filters += '&folders=' + folders.join(',');
+            }
         }
         return filters;
     }