Implemented restricted information for Dashboards. Fix FE visisbility…

… and tests
data-dot-all · Dec 4, 2024 · a0b897c · a0b897c
1 parent 5438bdb
commit a0b897c
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 17 deletions.
diff --git a/backend/dataall/modules/dashboards/api/resolvers.py b/backend/dataall/modules/dashboards/api/resolvers.py
@@ -48,6 +48,12 @@ def get_dashboard(context: Context, source, dashboardUri: str = None):
     return DashboardService.get_dashboard(uri=dashboardUri)
 
 
+def get_dashboard_restricted_information(context: Context, source: Dashboard):
+    if not source:
+        return None
+    return DashboardService.get_dashboard_restricted_information(uri=source.dashboardUri, dashboard=source)
+
+
 def resolve_user_role(context: Context, source: Dashboard):
     if context.username and source.owner == context.username:
         return DashboardRole.Creator.value

diff --git a/backend/dataall/modules/dashboards/api/types.py b/backend/dataall/modules/dashboards/api/types.py
@@ -1,14 +1,19 @@
 from dataall.base.api import gql
 from dataall.modules.dashboards.api.resolvers import (
     DashboardRole,
-    get_dashboard_organization,
+    get_dashboard_restricted_information,
     resolve_glossary_terms,
     resolve_upvotes,
     resolve_user_role,
 )
 
 from dataall.core.environment.api.resolvers import resolve_environment
 
+DashboardRestrictedInformation = gql.ObjectType(
+    name='DashboardRestrictedInformation',
+    fields=[gql.Field('AwsAccountId', type=gql.String), gql.Field('region', type=gql.String)],
+)
+
 Dashboard = gql.ObjectType(
     name='Dashboard',
     fields=[
@@ -19,10 +24,14 @@
         gql.Field('DashboardId', type=gql.String),
         gql.Field('tags', type=gql.ArrayType(gql.String)),
         gql.Field('created', type=gql.String),
-        gql.Field('AwsAccountId', type=gql.String),
         gql.Field('updated', type=gql.String),
         gql.Field('owner', type=gql.String),
         gql.Field('SamlGroupName', type=gql.String),
+        gql.Field(
+            'restricted',
+            type=DashboardRestrictedInformation,
+            resolver=get_dashboard_restricted_information,
+        ),
         gql.Field(
             'environment',
             type=gql.Ref('EnvironmentSimplified'),

diff --git a/backend/dataall/modules/dashboards/services/dashboard_service.py b/backend/dataall/modules/dashboards/services/dashboard_service.py
@@ -6,7 +6,7 @@
 from dataall.core.permissions.services.tenant_policy_service import TenantPolicyService
 from dataall.modules.catalog.db.glossary_repositories import GlossaryRepository
 from dataall.modules.vote.db.vote_repositories import VoteRepository
-from dataall.base.db.exceptions import UnauthorizedOperation
+from dataall.base.db.exceptions import UnauthorizedOperation, ResourceUnauthorized
 from dataall.modules.dashboards.db.dashboard_repositories import DashboardRepository
 from dataall.modules.dashboards.db.dashboard_models import Dashboard
 from dataall.modules.dashboards.aws.dashboard_quicksight_client import DashboardQuicksightClient
@@ -25,11 +25,15 @@ class DashboardService:
     """Service that serves request related to dashboard"""
 
     @staticmethod
-    @ResourcePolicyService.has_resource_permission(GET_DASHBOARD)
     def get_dashboard(uri: str) -> Dashboard:
         with get_context().db_engine.scoped_session() as session:
             return DashboardRepository.get_dashboard_by_uri(session, uri)
 
+    @staticmethod
+    @ResourcePolicyService.has_resource_permission(GET_DASHBOARD)
+    def get_dashboard_restricted_information(uri:str, dashboard: Dashboard):
+        return dashboard
+
     @staticmethod
     @TenantPolicyService.has_tenant_permission(MANAGE_DASHBOARDS)
     @ResourcePolicyService.has_resource_permission(CREATE_DASHBOARD)

diff --git a/frontend/src/modules/Dashboards/components/DashboardListItem.js b/frontend/src/modules/Dashboards/components/DashboardListItem.js
@@ -159,7 +159,7 @@ export const DashboardListItem = (props) => {
             </Grid>
             <Grid item md={8} xs={6}>
               <Typography color="textPrimary" variant="body2">
-                {dashboard.AwsAccountId}
+                {dashboard.restricted?.AwsAccountId || 'UNAUTHORIZED_INFO'}
               </Typography>
             </Grid>
           </Grid>
@@ -178,7 +178,7 @@ export const DashboardListItem = (props) => {
             </Grid>
             <Grid item md={8} xs={12}>
               <Typography color="textPrimary" variant="body2">
-                {dashboard.environment.region}
+                {dashboard.restricted?.region || 'UNAUTHORIZED_INFO'}
               </Typography>
             </Grid>
           </Grid>

diff --git a/frontend/src/modules/Dashboards/components/DashboardOverview.js b/frontend/src/modules/Dashboards/components/DashboardOverview.js
@@ -30,7 +30,7 @@ export const DashboardOverview = (props) => {
       <Grid item lg={4} xl={3} xs={12}>
         <ObjectMetadata
           environment={dashboard.environment}
-          region={dashboard.environment.region}
+          region={dashboard.restricted?.region || 'UNAUTHORIZED_INFO'}
           organization={dashboard.environment.organization}
           owner={dashboard.owner}
           admins={dashboard.SamlGroupName || '-'}

diff --git a/frontend/src/modules/Dashboards/components/DashboardViewer.js b/frontend/src/modules/Dashboards/components/DashboardViewer.js
@@ -14,8 +14,10 @@ export const DashboardViewer = ({ dashboard }) => {
   const client = useClient();
   const [dashboardRef] = useState(createRef());
   const [sessionUrl, setSessionUrl] = useState(null);
+  const [loading, setLoading] = useState(false);
 
   const fetchReaderSessionUrl = useCallback(async () => {
+    setLoading(true);
     const response = await client.query(
       getReaderSession(dashboard.dashboardUri)
     );
@@ -40,6 +42,7 @@ export const DashboardViewer = ({ dashboard }) => {
     } else {
       dispatch({ type: SET_ERROR, error: response.errors[0].message });
     }
+    setLoading(false);
   }, [client, dispatch, dashboard, dashboardRef]);
 
   useEffect(() => {
@@ -50,7 +53,10 @@ export const DashboardViewer = ({ dashboard }) => {
     }
   }, [client, dispatch, fetchReaderSessionUrl, sessionUrl]);
 
-  if (!sessionUrl) {
+  if (!sessionUrl && !loading) {
+    return null;
+  }
+  if (loading) {
     return <CircularProgress />;
   }
   return (

diff --git a/frontend/src/modules/Dashboards/services/getDashboard.js b/frontend/src/modules/Dashboards/services/getDashboard.js
@@ -18,10 +18,13 @@ export const getDashboard = (dashboardUri) => ({
         userRoleForDashboard
         DashboardId
         upvotes
+        restricted {
+          region
+          AwsAccountId
+        }
         environment {
           environmentUri
           label
-          region
           organization {
             organizationUri
             label

diff --git a/frontend/src/modules/Dashboards/services/searchDashboards.js b/frontend/src/modules/Dashboards/services/searchDashboards.js
@@ -17,7 +17,10 @@ export const searchDashboards = (filter) => ({
           name
           owner
           SamlGroupName
-          AwsAccountId
+          restricted {
+            region
+            AwsAccountId
+          }
           description
           label
           created
@@ -27,7 +30,6 @@ export const searchDashboards = (filter) => ({
           environment {
             environmentUri
             label
-            region
           }
         }
       }

diff --git a/frontend/src/modules/Dashboards/views/DashboardView.js b/frontend/src/modules/Dashboards/views/DashboardView.js
@@ -47,7 +47,7 @@ const DashboardView = () => {
   const client = useClient();
   const { enqueueSnackbar } = useSnackbar();
   const navigate = useNavigate();
-  const [currentTab, setCurrentTab] = useState('viewer');
+  const [currentTab, setCurrentTab] = useState('overview');
   const [loading, setLoading] = useState(true);
   const [isUpVoted, setIsUpVoted] = useState(false);
   const [upVotes, setUpvotes] = useState(null);
@@ -119,7 +119,7 @@ const DashboardView = () => {
   const fetchItem = useCallback(async () => {
     setLoading(true);
     const response = await client.query(getDashboard(params.uri));
-    if (!response.errors) {
+    if (response.data.getDashboard !== null) {
       setDashboard(response.data.getDashboard);
       setUpvotes(response.data.getDashboard.upvotes);
       setIsAdmin(

diff --git a/tests/modules/dashboards/test_dashboards.py b/tests/modules/dashboards/test_dashboards.py
@@ -82,7 +82,6 @@ def test_get_dashboard(client, env_fixture, db, dashboard, group):
                     environment {
                       environmentUri
                       label
-                      region
                       organization {
                         organizationUri
                         label

diff --git a/tests_new/integration_tests/modules/dashboards/queries.py b/tests_new/integration_tests/modules/dashboards/queries.py
@@ -25,16 +25,18 @@ def search_dashboards(client, filter):
                   owner
                   SamlGroupName
                   description
-                  AwsAccountId
                   label
                   created
                   tags
                   userRoleForDashboard
                   upvotes
+                  restricted {
+                    region
+                    AwsAccountId
+                  }
                   environment {
                     environmentUri
                     label
-                    region
                     organization {
                       organizationUri
                       label
@@ -65,10 +67,13 @@ def get_dashboard(client, dashboardUri):
                 created
                 tags
                 userRoleForDashboard
+                restricted {
+                    region
+                    AwsAccountId
+                }
                 environment {
                   environmentUri
                   label
-                  region
                   organization {
                     organizationUri
                     label