From 2d230988f0c91d088e68bc0aecb1fd91d52c1f1f Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 24 May 2022 11:39:27 -0300 Subject: [PATCH] 16115: Adds warning notice for private visibility with active sharing urls. Also, shows the number of sharing links on the tab's label. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../sharing-dialog-component.tsx | 21 +++++++++++++++---- .../sharing-dialog/sharing-dialog.tsx | 18 ++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/views-components/sharing-dialog/sharing-dialog-component.tsx b/src/views-components/sharing-dialog/sharing-dialog-component.tsx index b54b3455..15d7f660 100644 --- a/src/views-components/sharing-dialog/sharing-dialog-component.tsx +++ b/src/views-components/sharing-dialog/sharing-dialog-component.tsx @@ -45,6 +45,8 @@ export interface SharingDialogDataProps { loading: boolean; saveEnabled: boolean; sharedResourceUuid: string; + sharingURLsNr: number; + privateAccess: boolean; } export interface SharingDialogActionProps { onClose: () => void; @@ -58,6 +60,7 @@ enum SharingDialogTab { } export default (props: SharingDialogDataProps & SharingDialogActionProps) => { const { open, loading, saveEnabled, sharedResourceUuid, + sharingURLsNr, privateAccess, onClose, onSave, onCreateSharingToken, refreshPermissions } = props; const showTabs = extractUuidObjectType(sharedResourceUuid) === ResourceObjectType.COLLECTION; const [tabNr, setTabNr] = React.useState(SharingDialogTab.PERMISSIONS); @@ -96,7 +99,7 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => { setTabNr(tb)} }> - + 0 ? '('+sharingURLsNr+')' : ''}`} disabled={saveEnabled} /> } @@ -119,7 +122,8 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => { { tabNr === SharingDialogTab.PERMISSIONS && - } + + } { tabNr === SharingDialogTab.URLS && withExpiration && <> @@ -145,7 +149,15 @@ export default (props: SharingDialogDataProps & SharingDialogActionProps) => { Maximum expiration date may be limited by the cluster configuration. - } + + } + { tabNr === SharingDialogTab.PERMISSIONS && privateAccess && sharingURLsNr > 0 && + + + Although there aren't specific permissions set, this is publicly accessible via Sharing URL(s). + + + } { tabNr === SharingDialogTab.URLS && <> { Create sharing URL - } + + } { tabNr === SharingDialogTab.PERMISSIONS &&