Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent get_<DATA_ASSET> permissions - Dashboards #1729

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Consistent get_<DATA_ASSET> permissions - Dashboards #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions backend/dataall/modules/dashboards/api/resolvers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions backend/dataall/modules/dashboards/api/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=[
Expand All @@ -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'),
Expand Down
6 changes: 5 additions & 1 deletion backend/dataall/modules/dashboards/services/dashboard_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Dashboards/components/DashboardListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
</Typography>
</Grid>
</Grid>
Expand All @@ -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}
</Typography>
</Grid>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/modules/Dashboards/components/DashboardOverview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
organization={dashboard.environment.organization}
owner={dashboard.owner}
admins={dashboard.SamlGroupName || '-'}
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/modules/Dashboards/components/DashboardViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
Expand All @@ -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(() => {
Expand All @@ -50,7 +53,10 @@ export const DashboardViewer = ({ dashboard }) => {
}
}, [client, dispatch, fetchReaderSessionUrl, sessionUrl]);

if (!sessionUrl) {
if (!sessionUrl && !loading) {
return null;
}
if (loading) {
return <CircularProgress />;
}
return (
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/modules/Dashboards/services/getDashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ export const getDashboard = (dashboardUri) => ({
userRoleForDashboard
DashboardId
upvotes
restricted {
region
AwsAccountId
}
environment {
environmentUri
label
region
organization {
organizationUri
label
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/modules/Dashboards/services/searchDashboards.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ export const searchDashboards = (filter) => ({
name
owner
SamlGroupName
AwsAccountId
restricted {
region
AwsAccountId
}
description
label
created
Expand All @@ -27,7 +30,6 @@ export const searchDashboards = (filter) => ({
environment {
environmentUri
label
region
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/modules/Dashboards/views/DashboardView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: dispatch all errors if no data

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the case of Dashboards if there are errors in getting the dashboard (=no data returned), the errors for the restricted information are not very relevant

setDashboard(response.data.getDashboard);
setUpvotes(response.data.getDashboard.upvotes);
setIsAdmin(
Expand Down
1 change: 0 additions & 1 deletion tests/modules/dashboards/test_dashboards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def test_get_dashboard(client, env_fixture, db, dashboard, group):
environment {
environmentUri
label
region
organization {
organizationUri
label
Expand Down
11 changes: 8 additions & 3 deletions tests_new/integration_tests/modules/dashboards/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -65,10 +67,13 @@ def get_dashboard(client, dashboardUri):
created
tags
userRoleForDashboard
restricted {
region
AwsAccountId
}
environment {
environmentUri
label
region
organization {
organizationUri
label
Expand Down
Loading