diff --git a/frontend/src/components/dialog/internal-link.js b/frontend/src/components/dialog/internal-link.js index 075ae4b1f2..a0e8c9f5c0 100644 --- a/frontend/src/components/dialog/internal-link.js +++ b/frontend/src/components/dialog/internal-link.js @@ -6,6 +6,7 @@ import copy from '@seafile/seafile-editor/dist/utils/copy-to-clipboard'; import { gettext } from '../../utils/constants'; import { seafileAPI } from '../../utils/seafile-api'; import { Utils } from '../../utils/utils'; +import Loading from '../loading'; const propTypes = { path: PropTypes.string.isRequired, @@ -18,6 +19,7 @@ class InternalLink extends React.Component { super(props); this.state = { smartLink: '', + isInternalLoding: true, }; } @@ -25,7 +27,8 @@ class InternalLink extends React.Component { let { repoID, path, direntType } = this.props; seafileAPI.getInternalLink(repoID, path, direntType).then(res => { this.setState({ - smartLink: res.data.smart_link + smartLink: res.data.smart_link, + isInternalLoding: false }); }).catch(error => { let errMessage = Utils.getErrorMsg(error); @@ -42,6 +45,9 @@ class InternalLink extends React.Component { } render() { + if (this.state.isInternalLoding) { + return(); + } return (

diff --git a/frontend/src/components/dialog/share-dialog.js b/frontend/src/components/dialog/share-dialog.js index 7dc8a423a4..cca5b50285 100644 --- a/frontend/src/components/dialog/share-dialog.js +++ b/frontend/src/components/dialog/share-dialog.js @@ -98,11 +98,13 @@ class ShareDialog extends React.Component { } - - - {gettext('Internal Link')} - - + {itemType === 'dir' && + + + {gettext('Internal Link')} + + + } {enableDirPrivateShare && @@ -139,13 +141,13 @@ class ShareDialog extends React.Component { /> } - + {itemType === 'dir' && activeTab === 'internalLink' && - + } {enableDirPrivateShare && @@ -190,12 +192,12 @@ class ShareDialog extends React.Component { closeShareDialog={this.props.toggleDialog} /> - + {activeTab === 'internalLink' && - + }