From b8316730fe32fd983008e6326c0af37bebdcfbf2 Mon Sep 17 00:00:00 2001
From: kriks7iitk <kriks.iitk@gmail.com>
Date: Fri, 12 Jul 2024 11:52:12 +0530
Subject: [PATCH] Viewable apps query modiifcation

---
 .../AppPermissionActionContainer.jsx             |  2 +-
 .../AppResourcePermission.jsx                    |  2 +-
 server/src/helpers/queries.ts                    | 16 +++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/frontend/src/ManageGranularAccess/AddEditResourceModal/AppPermissionActionContainer.jsx b/frontend/src/ManageGranularAccess/AddEditResourceModal/AppPermissionActionContainer.jsx
index cc0ad15c1a..669e59a1a0 100644
--- a/frontend/src/ManageGranularAccess/AddEditResourceModal/AppPermissionActionContainer.jsx
+++ b/frontend/src/ManageGranularAccess/AddEditResourceModal/AppPermissionActionContainer.jsx
@@ -41,7 +41,7 @@ function AppPermissionsActions({
           />
           <div>
             <span className="form-check-label text-muted">View</span>
-            <span className="text-muted tj-text-xsm">Only view deployed version of app</span>
+            <span className="text-muted tj-text-xsm">Only access released version of apps</span>
           </div>
         </label>
         <label className="form-check form-check-inline">
diff --git a/frontend/src/ManageGranularAccess/AppResourcePermission.jsx b/frontend/src/ManageGranularAccess/AppResourcePermission.jsx
index 0b311e64a8..cb947ef7c7 100644
--- a/frontend/src/ManageGranularAccess/AppResourcePermission.jsx
+++ b/frontend/src/ManageGranularAccess/AppResourcePermission.jsx
@@ -102,7 +102,7 @@ function AppResourcePermissions({
             <span className="form-check-label" data-cy="app-delete-label">
               {'View'}
             </span>
-            <span class={`tj-text-xxsm`}>Only view released version of app</span>
+            <span class={`tj-text-xxsm`}>Only access released version of apps</span>
           </label>
           <label className="form-check form-check-inline">
             <input
diff --git a/server/src/helpers/queries.ts b/server/src/helpers/queries.ts
index 359cdd2a84..87a7c5644d 100644
--- a/server/src/helpers/queries.ts
+++ b/server/src/helpers/queries.ts
@@ -31,19 +31,17 @@ export function viewableAppsQueryUsingPermissions(
   searchKey?: string,
   select?: Array<string>
 ): SelectQueryBuilder<AppBase> {
-  let viewableApps = userAppPermissions.hideAll
-    ? [null]
+  const viewableApps = userAppPermissions.hideAll
+    ? [...userAppPermissions.editableAppsId]
     : [
         null,
         ...Array.from(
-          new Set(
-            [...userAppPermissions.editableAppsId, ...userAppPermissions.viewableAppsId].filter(
-              (id) => !userAppPermissions.hiddenAppsId.includes(id)
-            )
-          )
+          new Set([
+            ...userAppPermissions.editableAppsId,
+            ...userAppPermissions.viewableAppsId.filter((id) => !userAppPermissions.hiddenAppsId.includes(id)),
+          ])
         ),
       ];
-  viewableApps = viewableApps.filter((id) => !userAppPermissions.hiddenAppsId.includes(id));
   const viewableAppsQb = manager
     .createQueryBuilder(AppBase, 'viewable_apps')
     .innerJoin('viewable_apps.user', 'user')
@@ -59,7 +57,7 @@ export function viewableAppsQueryUsingPermissions(
       viewableApps,
     });
   }
-  const hiddenApps = userAppPermissions.hiddenAppsId;
+  const hiddenApps = userAppPermissions.hiddenAppsId.filter((id) => !userAppPermissions.editableAppsId.includes(id));
   if (!userAppPermissions.hideAll && viewAll && hiddenApps.length > 0) {
     viewableAppsQb.where('viewable_apps.id NOT IN (:...hiddenApps)', {
       hiddenApps,