diff --git a/frontend/package-lock.json b/frontend/package-lock.json index da32793735..77baf1bb11 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -11325,9 +11325,9 @@ } }, "seafile-js": { - "version": "0.2.110", - "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.110.tgz", - "integrity": "sha512-h9Nc/cnUdg4u9TVpTSDMcBZY+xY1B/HRaruZlLqu9TluoCQeXD2lij3KG+yXS1aPgAfEg2gfCMWbDGw9QneE+g==", + "version": "0.2.111", + "resolved": "https://registry.npmjs.org/seafile-js/-/seafile-js-0.2.111.tgz", + "integrity": "sha512-PsaU3VUledLrs8guKRm0nJ99s0g3bgQmpvIb00b1ESjdsgRIcyvQsgCrG3fTJQYn+fMdGJaSP1tiDbuOZLoqrA==", "requires": { "axios": "^0.18.0", "form-data": "^2.3.2", diff --git a/frontend/package.json b/frontend/package.json index 0b85f7fc3f..ed0d1488be 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -36,7 +36,7 @@ "react-responsive": "^6.1.2", "react-select": "^2.4.1", "reactstrap": "^6.4.0", - "seafile-js": "^0.2.110", + "seafile-js": "^0.2.111", "socket.io-client": "^2.2.0", "sw-precache-webpack-plugin": "0.11.4", "unified": "^7.0.0", diff --git a/frontend/src/components/dialog/internal-link.js b/frontend/src/components/dialog/internal-link.js index b6e1f675a9..075ae4b1f2 100644 --- a/frontend/src/components/dialog/internal-link.js +++ b/frontend/src/components/dialog/internal-link.js @@ -10,6 +10,7 @@ import { Utils } from '../../utils/utils'; const propTypes = { path: PropTypes.string.isRequired, repoID: PropTypes.string.isRequired, + direntType: PropTypes.string }; class InternalLink extends React.Component { @@ -21,9 +22,8 @@ class InternalLink extends React.Component { } componentDidMount() { - let repoID = this.props.repoID; - let path = this.props.path; - seafileAPI.getInternalLink(repoID, path).then(res => { + let { repoID, path, direntType } = this.props; + seafileAPI.getInternalLink(repoID, path, direntType).then(res => { this.setState({ smartLink: res.data.smart_link }); diff --git a/frontend/src/components/dialog/share-dialog.js b/frontend/src/components/dialog/share-dialog.js index 35c6195949..7dc8a423a4 100644 --- a/frontend/src/components/dialog/share-dialog.js +++ b/frontend/src/components/dialog/share-dialog.js @@ -76,7 +76,7 @@ class ShareDialog extends React.Component { } let activeTab = this.state.activeTab; - const {repoEncrypted, userPerm, enableDirPrivateShare} = this.props; + const {repoEncrypted, userPerm, enableDirPrivateShare, itemType} = this.props; const enableShareLink = !repoEncrypted && canGenerateShareLink; const enableUploadLink = !repoEncrypted && canGenerateUploadLink && userPerm == 'rw'; @@ -98,6 +98,11 @@ class ShareDialog extends React.Component { } + + + {gettext('Internal Link')} + + {enableDirPrivateShare && @@ -134,6 +139,13 @@ class ShareDialog extends React.Component { /> } + + + {enableDirPrivateShare &&