Skip to content

GH-1900 Enhance shared datasets view with principal details and improved navigation #1902

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

Open
surya-madhav wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-1900 Enhance shared datasets view with principal details and improved navigation #1902

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
2 changes: 2 additions & 0 deletions backend/dataall/modules/shares_base/api/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@
gql.Field(name='environmentUri', type=gql.NonNullableType(gql.String)),
gql.Field(name='targetEnvironmentUri', type=gql.NonNullableType(gql.String)),
gql.Field(name='principalId', type=gql.NonNullableType(gql.String)),
gql.Field(name='principalName', type=gql.String),
gql.Field(name='principalType', type=gql.String),
gql.Field(name='environmentName', type=gql.NonNullableType(gql.String)),
gql.Field(name='organizationUri', type=gql.NonNullableType(gql.String)),
gql.Field(name='organizationName', type=gql.NonNullableType(gql.String)),
Expand Down
1 change: 1 addition & 0 deletions backend/dataall/modules/shares_base/db/share_object_repositories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ def paginate_shared_datasets(session, env_uri, data, share_item_shared_states):
Environment.name.label('environmentName'),
ShareObject.created.label('created'),
ShareObject.principalId.label('principalId'),
ShareObject.principalName.label('principalName'),
ShareObject.principalType.label('principalType'),
ShareObject.environmentUri.label('targetEnvironmentUri'),
ShareObjectItem.itemType.label('itemType'),
Expand Down
90 changes: 80 additions & 10 deletions frontend/src/modules/Environments/components/EnvironmentSharedDatasets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
import {
Box,
Button,
Card,
CardHeader,
Divider,
IconButton,
InputAdornment,
Table,
TableBody,
TableCell,
TableHead,
TableRow,
TextField
TextField,
Tooltip
} from '@mui/material';
import CircularProgress from '@mui/material/CircularProgress';
import PeopleIcon from '@mui/icons-material/People';
import VpnKeyIcon from '@mui/icons-material/VpnKey';
import PropTypes from 'prop-types';
import { useCallback, useEffect, useState } from 'react';
import { useNavigate } from 'react-router';
import {
ArrowRightIcon,
Defaults,
Pager,
RefreshTableMenu,
Expand Down Expand Up @@ -124,7 +126,7 @@ export const EnvironmentSharedDatasets = ({ environment }) => {
<TableCell>Name</TableCell>
<TableCell>Dataset</TableCell>
<TableCell>Environment</TableCell>
<TableCell>Shared with Team</TableCell>
<TableCell>Shared With</TableCell>
<TableCell>Actions</TableCell>
</TableRow>
</TableHead>
Expand All @@ -139,15 +141,83 @@ export const EnvironmentSharedDatasets = ({ environment }) => {
<TableCell>{item.itemName}</TableCell>
<TableCell>{item.datasetName}</TableCell>
<TableCell>{item.environmentName}</TableCell>
<TableCell>{item.principalId}</TableCell>
<TableCell>
<IconButton
onClick={() => {
navigate(`/console/s3-datasets/${item.datasetUri}`);
<Box
sx={{
display: 'flex',
alignItems: 'center',
gap: 0.5
}}
>
<ArrowRightIcon fontSize="small" />
</IconButton>
<Tooltip
title={
item.principalType === 'Group'
? 'Team'
: 'Consumption Role'
}
>
{item.principalType === 'Group' ? (
<PeopleIcon fontSize="small" color="primary" />
) : (
<VpnKeyIcon fontSize="small" color="secondary" />
)}
</Tooltip>
<Tooltip
title={
item.principalType !== 'Group' &&
item.principalName &&
item.principalId
? item.principalId
: ''
}
componentsProps={{
tooltip: {
sx: {
maxWidth: 'none'
}
}
}}
>
<span>
{item.principalName || item.principalId}
</span>
</Tooltip>
</Box>
</TableCell>
<TableCell>
<Button
color="primary"
size="small"
variant="outlined"
component="a"
href={`/console/shares/${item.shareUri}`}
onClick={(e) => {
if (!e.ctrlKey && !e.metaKey) {
e.preventDefault();
navigate(`/console/shares/${item.shareUri}`);
}
}}
sx={{ mr: 1 }}
>
View Share
</Button>
<Button
color="primary"
size="small"
variant="outlined"
component="a"
href={`/console/s3-datasets/${item.datasetUri}`}
onClick={(e) => {
if (!e.ctrlKey && !e.metaKey) {
e.preventDefault();
navigate(
`/console/s3-datasets/${item.datasetUri}`
);
}
}}
>
View Dataset
</Button>
</TableCell>
</TableRow>
))
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/modules/Environments/services/searchEnvironmentDataItems.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export const searchEnvironmentDataItems = ({ filter, environmentUri }) => ({
itemName
created
principalId
principalName
principalType
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions tests/modules/s3_datasets_shares/test_share.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ def list_datasets_published_in_environment(client, user, group, environmentUri):
itemName
created
principalId
principalName
principalType
}
}
}
Expand Down
Loading