Fix deleted scope visibility (#42)

Co-authored-by: Jeff Conaway <[email protected]>
apioo · Sep 12, 2024 · 90399a1 · 90399a1
1 parent e8d80f1
commit 90399a1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/src/Backend/View/Scope.php b/src/Backend/View/Scope.php
@@ -48,6 +48,7 @@ public function getCollection(QueryFilter $filter, ContextInterface $context)
         $condition = $filter->getCondition([QueryFilter::COLUMN_SEARCH => Table\Generated\ScopeTable::COLUMN_NAME]);
         $condition->equals(Table\Generated\ScopeTable::COLUMN_TENANT_ID, $context->getTenantId());
         $condition->equals(Table\Generated\ScopeTable::COLUMN_CATEGORY_ID, $context->getUser()->getCategoryId());
+        $condition->equals(Table\Generated\ScopeTable::COLUMN_STATUS, Table\Scope::STATUS_ACTIVE);
 
         $builder = new Builder($this->connection);
 

diff --git a/src/Consumer/View/Scope.php b/src/Consumer/View/Scope.php
@@ -45,6 +45,8 @@ public function getCollection(QueryFilter $filter, ContextInterface $context)
         $condition->equals('user_scope.' . Table\Generated\UserScopeTable::COLUMN_USER_ID, $context->getUser()->getId());
         $condition->equals('scope.' . Table\Generated\ScopeTable::COLUMN_TENANT_ID, $context->getTenantId());
         $condition->equals('scope.' . Table\Generated\ScopeTable::COLUMN_CATEGORY_ID, $context->getUser()->getCategoryId());
+        $condition->equals(Table\Generated\ScopeTable::COLUMN_STATUS, Table\Scope::STATUS_ACTIVE);
+
 
         $queryBuilder = $this->connection->createQueryBuilder()
             ->select([

diff --git a/src/Table/Scope.php b/src/Table/Scope.php
@@ -115,6 +115,7 @@ public function getValidScopes(?string $tenantId, array $names): array
             $condition = Condition::withAnd();
             $condition->equals(self::COLUMN_TENANT_ID, $tenantId);
             $condition->in(self::COLUMN_NAME, $names);
+            $condition->equals(self::COLUMN_STATUS, self::STATUS_ACTIVE);
             return $this->findAll($condition, 0, 1024);
         } else {
             return [];
@@ -126,6 +127,7 @@ public function getAvailableScopes(int $categoryId, ?string $tenantId = null): a
         $condition = Condition::withAnd();
         $condition->equals(self::COLUMN_TENANT_ID, $tenantId);
         $condition->equals(self::COLUMN_CATEGORY_ID, $categoryId);
+        $condition->equals(self::COLUMN_STATUS, self::STATUS_ACTIVE);
 
         $result = $this->findAll($condition, 0, 1024, self::COLUMN_NAME, OrderBy::ASC);
         $scopes = [];