mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-09 10:50:24 +00:00
add shared group owned repo logic
This commit is contained in:
@@ -9,6 +9,7 @@ import GenerateUploadLink from './generate-upload-link';
|
|||||||
import '../../css/share-link-dialog.css';
|
import '../../css/share-link-dialog.css';
|
||||||
|
|
||||||
const propTypes = {
|
const propTypes = {
|
||||||
|
isGroupOwnedRepo: PropTypes.bool,
|
||||||
itemType: PropTypes.string.isRequired, // there will be three choose: ['library', 'dir', 'file']
|
itemType: PropTypes.string.isRequired, // there will be three choose: ['library', 'dir', 'file']
|
||||||
itemName: PropTypes.string.isRequired,
|
itemName: PropTypes.string.isRequired,
|
||||||
itemPath: PropTypes.string.isRequired,
|
itemPath: PropTypes.string.isRequired,
|
||||||
@@ -67,10 +68,10 @@ class ShareDialog extends React.Component {
|
|||||||
<GenerateUploadLink itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
<GenerateUploadLink itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
||||||
</TabPane>
|
</TabPane>
|
||||||
<TabPane tabId="shareToUser">
|
<TabPane tabId="shareToUser">
|
||||||
<ShareToUser itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
<ShareToUser isGroupOwnedRepo={this.props.isGroupOwnedRepo} itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
||||||
</TabPane>
|
</TabPane>
|
||||||
<TabPane tabId="shareToGroup">
|
<TabPane tabId="shareToGroup">
|
||||||
<ShareToGroup itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
<ShareToGroup isGroupOwnedRepo={this.props.isGroupOwnedRepo} itemPath={this.props.itemPath} repoID={this.props.repoID} />
|
||||||
</TabPane>
|
</TabPane>
|
||||||
</TabContent>
|
</TabContent>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -8,6 +8,7 @@ import { Utils } from '../../utils/utils';
|
|||||||
import { seafileAPI } from '../../utils/seafile-api.js';
|
import { seafileAPI } from '../../utils/seafile-api.js';
|
||||||
|
|
||||||
const propTypes = {
|
const propTypes = {
|
||||||
|
isGroupOwnedRepo: PropTypes.bool,
|
||||||
itemPath: PropTypes.string.isRequired,
|
itemPath: PropTypes.string.isRequired,
|
||||||
repoID: PropTypes.string.isRequired
|
repoID: PropTypes.string.isRequired
|
||||||
};
|
};
|
||||||
@@ -85,11 +86,39 @@ class ShareToGroup extends React.Component {
|
|||||||
let groups = [];
|
let groups = [];
|
||||||
let path = this.props.itemPath;
|
let path = this.props.itemPath;
|
||||||
let repoID = this.props.repoID;
|
let repoID = this.props.repoID;
|
||||||
|
let isGroupOwnedRepo = this.props.isGroupOwnedRepo;
|
||||||
if (this.state.selectedOption.length > 0 ) {
|
if (this.state.selectedOption.length > 0 ) {
|
||||||
for (let i = 0; i < this.state.selectedOption.length; i ++) {
|
for (let i = 0; i < this.state.selectedOption.length; i ++) {
|
||||||
groups[i] = this.state.selectedOption[i].id;
|
groups[i] = this.state.selectedOption[i].id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (isGroupOwnedRepo) {
|
||||||
|
seafileAPI.shareGroupOwnedRepoToGroup(repoID, this.state.permission, groups).then(res => {
|
||||||
|
if (res.data.failed.length > 0) {
|
||||||
|
let errorMsg = [];
|
||||||
|
for (let i = 0 ; i < res.data.failed.length ; i++) {
|
||||||
|
errorMsg[i] = res.data.failed[i];
|
||||||
|
}
|
||||||
|
this.setState({
|
||||||
|
errorMsg: errorMsg
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// todo modify api
|
||||||
|
let items = res.data.success.map(item => {
|
||||||
|
let sharedItem = {
|
||||||
|
'group_info': { 'id': item.group_id, 'name': item.group_name},
|
||||||
|
'permission': item.permission,
|
||||||
|
'share_type': 'group',
|
||||||
|
};
|
||||||
|
return sharedItem;
|
||||||
|
});
|
||||||
|
|
||||||
|
this.setState({
|
||||||
|
sharedItems: this.state.sharedItems.concat(items)
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
seafileAPI.shareFolder(repoID, path, 'group', this.state.permission, groups).then(res => {
|
seafileAPI.shareFolder(repoID, path, 'group', this.state.permission, groups).then(res => {
|
||||||
if (res.data.failed.length > 0) {
|
if (res.data.failed.length > 0) {
|
||||||
let errorMsg = [];
|
let errorMsg = [];
|
||||||
@@ -106,17 +135,26 @@ class ShareToGroup extends React.Component {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
deleteShareItem = (e, groupID) => {
|
deleteShareItem = (e, groupID) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
let path = this.props.itemPath;
|
let path = this.props.itemPath;
|
||||||
let repoID = this.props.repoID;
|
let repoID = this.props.repoID;
|
||||||
|
if (this.props.isGroupOwnedRepo) {
|
||||||
|
seafileAPI.deleteGroupOwnedRepoGroupShared(repoID, groupID).then(() => {
|
||||||
|
this.setState({
|
||||||
|
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; })
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
seafileAPI.deleteShareToGroupItem(repoID, path, 'group', groupID).then(() => {
|
seafileAPI.deleteShareToGroupItem(repoID, path, 'group', groupID).then(() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; })
|
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; })
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
@@ -150,6 +188,7 @@ class ShareToGroup extends React.Component {
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
<td colSpan={3}>
|
||||||
{this.state.errorMsg.length > 0 &&
|
{this.state.errorMsg.length > 0 &&
|
||||||
this.state.errorMsg.map((item, index = 0, arr) => {
|
this.state.errorMsg.map((item, index = 0, arr) => {
|
||||||
return (
|
return (
|
||||||
@@ -158,6 +197,7 @@ class ShareToGroup extends React.Component {
|
|||||||
);
|
);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<GroupList items={this.state.sharedItems} deleteShareItem={this.deleteShareItem} />
|
<GroupList items={this.state.sharedItems} deleteShareItem={this.deleteShareItem} />
|
||||||
|
@@ -7,6 +7,7 @@ import { Button, Input } from 'reactstrap';
|
|||||||
import { seafileAPI } from '../../utils/seafile-api.js';
|
import { seafileAPI } from '../../utils/seafile-api.js';
|
||||||
|
|
||||||
const propTypes = {
|
const propTypes = {
|
||||||
|
isGroupOwnedRepo: PropTypes.bool,
|
||||||
itemPath: PropTypes.string.isRequired,
|
itemPath: PropTypes.string.isRequired,
|
||||||
repoID: PropTypes.string.isRequired
|
repoID: PropTypes.string.isRequired
|
||||||
};
|
};
|
||||||
@@ -92,6 +93,30 @@ class ShareToUser extends React.Component {
|
|||||||
users[i] = this.state.selectedOption[i].email;
|
users[i] = this.state.selectedOption[i].email;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (this.props.isGroupOwnedRepo) {
|
||||||
|
seafileAPI.shareGroupOwnedRepoToUser(repoID, this.state.permission, users).then(res => {
|
||||||
|
if (res.data.failed.length > 0) {
|
||||||
|
let errorMsg = [];
|
||||||
|
for (let i = 0 ; i < res.data.failed.length ; i++) {
|
||||||
|
errorMsg[i] = res.data.failed[i];
|
||||||
|
}
|
||||||
|
this.setState({errorMsg: errorMsg});
|
||||||
|
}
|
||||||
|
// todo modify api
|
||||||
|
|
||||||
|
let items = res.data.success.map(item => {
|
||||||
|
let sharedItem = {
|
||||||
|
'user_info': { 'nickname': item.user_name, 'name': item.user_email},
|
||||||
|
'permission': item.permission,
|
||||||
|
'share_type': 'user',
|
||||||
|
};
|
||||||
|
return sharedItem;
|
||||||
|
});
|
||||||
|
this.setState({
|
||||||
|
sharedItems: this.state.sharedItems.concat(items)
|
||||||
|
});
|
||||||
|
})
|
||||||
|
} else {
|
||||||
seafileAPI.shareFolder(repoID, path, 'user', this.state.permission, users).then(res => {
|
seafileAPI.shareFolder(repoID, path, 'user', this.state.permission, users).then(res => {
|
||||||
if (res.data.failed.length > 0) {
|
if (res.data.failed.length > 0) {
|
||||||
let errorMsg = [];
|
let errorMsg = [];
|
||||||
@@ -105,17 +130,26 @@ class ShareToUser extends React.Component {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
deleteShareItem = (e, username) => {
|
deleteShareItem = (e, username) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
let path = this.props.itemPath;
|
let path = this.props.itemPath;
|
||||||
let repoID = this.props.repoID;
|
let repoID = this.props.repoID;
|
||||||
|
if (this.props.isGroupOwnedRepo) {
|
||||||
|
seafileAPI.deleteGroupOwnedRepoUserShared(repoID, username).then(res => {
|
||||||
|
this.setState({
|
||||||
|
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; })
|
||||||
|
});
|
||||||
|
});
|
||||||
|
} else {
|
||||||
seafileAPI.deleteShareToUserItem(repoID, path, 'user', username).then(res => {
|
seafileAPI.deleteShareToUserItem(repoID, path, 'user', username).then(res => {
|
||||||
this.setState({
|
this.setState({
|
||||||
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; })
|
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; })
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let { sharedItems } = this.state;
|
let { sharedItems } = this.state;
|
||||||
@@ -152,6 +186,7 @@ class ShareToUser extends React.Component {
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
<td colSpan={3}>
|
||||||
{this.state.errorMsg.length > 0 &&
|
{this.state.errorMsg.length > 0 &&
|
||||||
this.state.errorMsg.map((item, index = 0, arr) => {
|
this.state.errorMsg.map((item, index = 0, arr) => {
|
||||||
return (
|
return (
|
||||||
@@ -160,6 +195,7 @@ class ShareToUser extends React.Component {
|
|||||||
);
|
);
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<UserList items={sharedItems} deleteShareItem={this.deleteShareItem} />
|
<UserList items={sharedItems} deleteShareItem={this.deleteShareItem} />
|
||||||
|
@@ -274,6 +274,7 @@ class SharedRepoListItem extends React.Component {
|
|||||||
renderPCUI = () => {
|
renderPCUI = () => {
|
||||||
let { iconUrl, iconTitle, libPath } = this.getRepoComputeParams();
|
let { iconUrl, iconTitle, libPath } = this.getRepoComputeParams();
|
||||||
let { repo } = this.props;
|
let { repo } = this.props;
|
||||||
|
let isGroupOwnedRepo = repo.owner_email.indexOf('@seafile_group') > -1;
|
||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
|
<tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
|
||||||
@@ -291,6 +292,7 @@ class SharedRepoListItem extends React.Component {
|
|||||||
itemName={repo.repo_name}
|
itemName={repo.repo_name}
|
||||||
itemPath={'/'}
|
itemPath={'/'}
|
||||||
repoID={repo.repo_id}
|
repoID={repo.repo_id}
|
||||||
|
isGroupOwnedRepo={isGroupOwnedRepo}
|
||||||
toggleDialog={this.toggleShareDialog}
|
toggleDialog={this.toggleShareDialog}
|
||||||
/>
|
/>
|
||||||
</ModalPotal>
|
</ModalPotal>
|
||||||
@@ -302,6 +304,7 @@ class SharedRepoListItem extends React.Component {
|
|||||||
renderMobileUI = () => {
|
renderMobileUI = () => {
|
||||||
let { iconUrl, iconTitle, libPath } = this.getRepoComputeParams();
|
let { iconUrl, iconTitle, libPath } = this.getRepoComputeParams();
|
||||||
let { repo } = this.props;
|
let { repo } = this.props;
|
||||||
|
let isGroupOwnedRepo = repo.owner_email.indexOf('@seafile_group') > -1;
|
||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
|
<tr className={this.state.highlight ? 'tr-highlight' : ''} onMouseEnter={this.onMouseEnter} onMouseOver={this.onMouseOver} onMouseLeave={this.onMouseLeave}>
|
||||||
@@ -321,6 +324,7 @@ class SharedRepoListItem extends React.Component {
|
|||||||
itemName={repo.repo_name}
|
itemName={repo.repo_name}
|
||||||
itemPath={'/'}
|
itemPath={'/'}
|
||||||
repoID={repo.repo_id}
|
repoID={repo.repo_id}
|
||||||
|
isGroupOwnedRepo={isGroupOwnedRepo}
|
||||||
toggleDialog={this.toggleShareDialog}
|
toggleDialog={this.toggleShareDialog}
|
||||||
/>
|
/>
|
||||||
</ModalPotal>
|
</ModalPotal>
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
.department-group-icon { /* for cur-view-path*/
|
.department-group-icon {
|
||||||
margin-left: 0.25rem;
|
margin-left: 0.25rem;
|
||||||
color:#888;
|
color:#888;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user