TypeScript: Updated compile target, addressed issues

[bookstack] / app / Entities / Queries / EntityQueries.php

diff --git a/app/Entities/Queries/EntityQueries.php b/app/Entities/Queries/EntityQueries.php
index 31e5b913ad10fd5c6e53cf5a328ff297cb34c7cc..36dc6c0bc8ac04b2408eaf6a9074b32b44f99dfd 100644 (file)
--- a/app/Entities/Queries/EntityQueries.php
+++ b/app/Entities/Queries/EntityQueries.php
@@ -3,6 +3,8 @@
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Entity;
 namespace BookStack\Entities\Queries;
 
 use BookStack\Entities\Models\Entity;

+use Illuminate\Database\Eloquent\Builder;
+use InvalidArgumentException;

 
 class EntityQueries
 {
 
 class EntityQueries
 {


@@ -25,9 +27,25 @@ class EntityQueries
         $explodedId = explode(':', $identifier);
         $entityType = $explodedId[0];
         $entityId = intval($explodedId[1]);
         $explodedId = explode(':', $identifier);
         $entityType = $explodedId[0];
         $entityId = intval($explodedId[1]);

+        $queries = $this->getQueriesForType($entityType);

 
 

+        return $queries->findVisibleById($entityId);
+    }
+
+    /**
+     * Start a query of visible entities of the given type,
+     * suitable for listing display.
+     */
+    public function visibleForList(string $entityType): Builder
+    {
+        $queries = $this->getQueriesForType($entityType);
+        return $queries->visibleForList();
+    }
+
+    protected function getQueriesForType(string $type): ProvidesEntityQueries
+    {

         /** @var ?ProvidesEntityQueries $queries */
         /** @var ?ProvidesEntityQueries $queries */

-        $queries = match ($entityType) {
+        $queries = match ($type) {

             'page' => $this->pages,
             'chapter' => $this->chapters,
             'book' => $this->books,
             'page' => $this->pages,
             'chapter' => $this->chapters,
             'book' => $this->books,


@@ -36,9 +54,9 @@ class EntityQueries
         };
 
         if (is_null($queries)) {
         };
 
         if (is_null($queries)) {

-            return null;
+            throw new InvalidArgumentException("No entity query class configured for {$type}");

         }
 
         }
 

-        return $queries->findVisibleById($entityId);
+        return $queries;

     }
 }
     }
 }