mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-01 23:20:51 +00:00
[share] offered 'internal link' for files and folders in encrypted libraries (#4621)
* offered 'share' for encrypted library in 'dir view' page
This commit is contained in:
@@ -51,14 +51,22 @@ class ShareDialog extends React.Component {
|
||||
}
|
||||
|
||||
getInitialActiveTab = () => {
|
||||
const { repoEncrypted, userPerm, enableDirPrivateShare } = this.props;
|
||||
let { repoEncrypted, userPerm, enableDirPrivateShare, itemType } = this.props;
|
||||
const enableShareLink = !repoEncrypted && canGenerateShareLink;
|
||||
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw';
|
||||
|
||||
// for encrypted repo, 'dir private share' is only enabled for the repo itself,
|
||||
// not for the folders in it.
|
||||
if (repoEncrypted) {
|
||||
enableDirPrivateShare = itemType == 'library';
|
||||
}
|
||||
|
||||
if (enableShareLink) {
|
||||
return 'shareLink';
|
||||
} else if (enableUploadLink) {
|
||||
return 'uploadLink';
|
||||
} else if (itemType == 'file' || itemType == 'dir') {
|
||||
return 'internalLink';
|
||||
} else if (enableDirPrivateShare) {
|
||||
return 'shareToUser';
|
||||
}
|
||||
@@ -77,10 +85,16 @@ class ShareDialog extends React.Component {
|
||||
}
|
||||
|
||||
let activeTab = this.state.activeTab;
|
||||
const { repoEncrypted, userPerm, enableDirPrivateShare, itemType } = this.props;
|
||||
let { repoEncrypted, userPerm, enableDirPrivateShare, itemType } = this.props;
|
||||
const enableShareLink = !repoEncrypted && canGenerateShareLink;
|
||||
const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw';
|
||||
|
||||
// for encrypted repo, 'dir private share' is only enabled for the repo itself,
|
||||
// not for the folders in it.
|
||||
if (repoEncrypted) {
|
||||
enableDirPrivateShare = itemType == 'library';
|
||||
}
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div className="share-dialog-side">
|
||||
@@ -184,17 +198,20 @@ class ShareDialog extends React.Component {
|
||||
|
||||
renderFileContent = () => {
|
||||
let activeTab = this.state.activeTab;
|
||||
const { itemType } = this.props;
|
||||
const { itemType, itemName, repoEncrypted } = this.props;
|
||||
const enableShareLink = !repoEncrypted && canGenerateShareLink;
|
||||
|
||||
return (
|
||||
<Fragment>
|
||||
<div className="share-dialog-side">
|
||||
<Nav pills>
|
||||
{enableShareLink &&
|
||||
<NavItem>
|
||||
<NavLink className={activeTab === 'shareLink' ? 'active' : ''} onClick={(this.toggle.bind(this, 'shareLink'))}>
|
||||
{gettext('Share Link')}
|
||||
</NavLink>
|
||||
</NavItem>
|
||||
}
|
||||
<NavItem>
|
||||
<NavLink className={activeTab === 'internalLink' ? 'active' : ''} onClick={this.toggle.bind(this, 'internalLink')}>
|
||||
{gettext('Internal Link')}
|
||||
@@ -204,7 +221,7 @@ class ShareDialog extends React.Component {
|
||||
</div>
|
||||
<div className="share-dialog-main">
|
||||
<TabContent activeTab={this.state.activeTab}>
|
||||
{activeTab === 'shareLink' &&
|
||||
{enableShareLink && activeTab === 'shareLink' &&
|
||||
<TabPane tabId="shareLink">
|
||||
<GenerateShareLink
|
||||
itemPath={this.props.itemPath}
|
||||
@@ -239,8 +256,7 @@ class ShareDialog extends React.Component {
|
||||
}
|
||||
|
||||
render() {
|
||||
const { itemType, itemName, repoEncrypted } = this.props;
|
||||
const enableShareLink = !repoEncrypted && canGenerateShareLink;
|
||||
const { itemType, itemName } = this.props;
|
||||
return (
|
||||
<div>
|
||||
<Modal isOpen={true} style={{maxWidth: '760px'}} className="share-dialog" toggle={this.props.toggleDialog}>
|
||||
@@ -250,7 +266,7 @@ class ShareDialog extends React.Component {
|
||||
</ModalHeader>
|
||||
<ModalBody className="share-dialog-content">
|
||||
{(itemType === 'library' || itemType === 'dir') && this.renderDirContent()}
|
||||
{(itemType === 'file' && enableShareLink) && this.renderFileContent()}
|
||||
{itemType === 'file' && this.renderFileContent()}
|
||||
</ModalBody>
|
||||
</Modal>
|
||||
</div>
|
||||
|
@@ -766,7 +766,7 @@ class DirentListItem extends React.Component {
|
||||
itemPath={direntPath}
|
||||
userPerm={dirent.permission}
|
||||
repoID={this.props.repoID}
|
||||
repoEncrypted={false}
|
||||
repoEncrypted={this.props.repoEncrypted}
|
||||
enableDirPrivateShare={this.props.enableDirPrivateShare}
|
||||
isGroupOwnedRepo={this.props.isGroupOwnedRepo}
|
||||
toggleDialog={this.closeSharedDialog}
|
||||
|
@@ -63,8 +63,9 @@ class FileToolbar extends React.Component {
|
||||
}
|
||||
|
||||
let showShareBtn = false;
|
||||
if (!repoEncrypted &&
|
||||
(filePerm == 'rw' || filePerm == 'r') && canGenerateShareLink) {
|
||||
if (repoEncrypted) {
|
||||
showShareBtn = true; // for internal link
|
||||
} else if ((filePerm == 'rw' || filePerm == 'r') && canGenerateShareLink) {
|
||||
showShareBtn = true;
|
||||
}
|
||||
|
||||
@@ -212,7 +213,7 @@ class FileToolbar extends React.Component {
|
||||
itemPath={filePath}
|
||||
userPerm={filePerm}
|
||||
repoID={repoID}
|
||||
repoEncrypted={false}
|
||||
repoEncrypted={repoEncrypted}
|
||||
toggleDialog={this.toggleShareDialog}
|
||||
/>
|
||||
</ModalPortal>
|
||||
|
@@ -398,7 +398,7 @@ class MultipleDirOperationToolbar extends React.Component {
|
||||
itemPath={direntPath}
|
||||
userPerm={dirent.permission}
|
||||
repoID={repoID}
|
||||
repoEncrypted={false}
|
||||
repoEncrypted={this.props.repoEncrypted}
|
||||
enableDirPrivateShare={this.props.enableDirPrivateShare}
|
||||
isGroupOwnedRepo={this.props.isGroupOwnedRepo}
|
||||
toggleDialog={this.toggleCancel}
|
||||
|
@@ -118,7 +118,7 @@ class ViewFileToolbar extends React.Component {
|
||||
{gettext('More')}
|
||||
</DropdownToggle>
|
||||
<DropdownMenu>
|
||||
{this.props.showShareBtn && canGenerateShareLink &&
|
||||
{this.props.showShareBtn &&
|
||||
<DropdownItem onClick={this.onShareToggle}>{gettext('Share')}</DropdownItem>
|
||||
}
|
||||
<DropdownItem onClick={this.onEditFileTagToggle}>{gettext('Tags')}</DropdownItem>
|
||||
@@ -174,4 +174,4 @@ class ViewFileToolbar extends React.Component {
|
||||
|
||||
ViewFileToolbar.propTypes = propTypes;
|
||||
|
||||
export default ViewFileToolbar;
|
||||
export default ViewFileToolbar;
|
||||
|
Reference in New Issue
Block a user