haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00
Code Issues Releases Wiki Activity

add shared group owned repo logic

Browse Source
This commit is contained in:
shanshuirenjia
2018-12-14 21:39:17 +08:00
parent 4dd83c3df7
commit 853659cdc6
5 changed files with 130 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/dialog/share-dialog.js
View File

@@ -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>

88
frontend/src/components/dialog/share-to-group.js
View File

@@ -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,37 +86,74 @@ 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;
} }
} }
seafileAPI.shareFolder(repoID, path, 'group', this.state.permission, groups).then(res => { if (isGroupOwnedRepo) {
if (res.data.failed.length > 0) { seafileAPI.shareGroupOwnedRepoToGroup(repoID, this.state.permission, groups).then(res => {
let errorMsg = []; if (res.data.failed.length > 0) {
for (let i = 0 ; i < res.data.failed.length ; i++) { let errorMsg = [];
errorMsg[i] = res.data.failed[i]; for (let i = 0 ; i < res.data.failed.length ; i++) {
errorMsg[i] = res.data.failed[i];
}
this.setState({
errorMsg: errorMsg
});
} }
this.setState({
errorMsg: errorMsg
});
}
this.setState({ // todo modify api
sharedItems: this.state.sharedItems.concat(res.data.success) 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 => {
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
});
}
this.setState({
sharedItems: this.state.sharedItems.concat(res.data.success)
});
});
}
} }
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;
seafileAPI.deleteShareToGroupItem(repoID, path, 'group', groupID).then(() => { if (this.props.isGroupOwnedRepo) {
this.setState({ seafileAPI.deleteGroupOwnedRepoGroupShared(repoID, groupID).then(() => {
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; }) this.setState({
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; })
});
}); });
}); } else {
seafileAPI.deleteShareToGroupItem(repoID, path, 'group', groupID).then(() => {
this.setState({
sharedItems: this.state.sharedItems.filter(item => { return item.group_info.id !== groupID; })
});
});
}
} }
render() { render() {
@@ -150,14 +188,16 @@ class ShareToGroup extends React.Component {
</td> </td>
</tr> </tr>
<tr> <tr>
{this.state.errorMsg.length > 0 && <td colSpan={3}>
this.state.errorMsg.map((item, index = 0, arr) => { {this.state.errorMsg.length > 0 &&
return ( this.state.errorMsg.map((item, index = 0, arr) => {
<p className="error" key={index}>{this.state.errorMsg[index].group_name} return (
{': '}{this.state.errorMsg[index].error_msg}</p> <p className="error" key={index}>{this.state.errorMsg[index].group_name}
); {': '}{this.state.errorMsg[index].error_msg}</p>
}) );
} })
}
</td>
</tr> </tr>
</thead> </thead>
<GroupList items={this.state.sharedItems} deleteShareItem={this.deleteShareItem} /> <GroupList items={this.state.sharedItems} deleteShareItem={this.deleteShareItem} />

80
frontend/src/components/dialog/share-to-user.js
View File

@@ -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,29 +93,62 @@ class ShareToUser extends React.Component {
users[i] = this.state.selectedOption[i].email; users[i] = this.state.selectedOption[i].email;
} }
} }
seafileAPI.shareFolder(repoID, path, 'user', this.state.permission, users).then(res => { if (this.props.isGroupOwnedRepo) {
if (res.data.failed.length > 0) { seafileAPI.shareGroupOwnedRepoToUser(repoID, this.state.permission, users).then(res => {
let errorMsg = []; if (res.data.failed.length > 0) {
for (let i = 0 ; i < res.data.failed.length ; i++) { let errorMsg = [];
errorMsg[i] = res.data.failed[i]; for (let i = 0 ; i < res.data.failed.length ; i++) {
errorMsg[i] = res.data.failed[i];
}
this.setState({errorMsg: errorMsg});
} }
this.setState({errorMsg: errorMsg}); // todo modify api
}
this.setState({ let items = res.data.success.map(item => {
sharedItems: this.state.sharedItems.concat(res.data.success) 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 => {
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});
}
this.setState({
sharedItems: this.state.sharedItems.concat(res.data.success)
});
}); });
}); }
} }
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;
seafileAPI.deleteShareToUserItem(repoID, path, 'user', username).then(res => { if (this.props.isGroupOwnedRepo) {
this.setState({ seafileAPI.deleteGroupOwnedRepoUserShared(repoID, username).then(res => {
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; }) this.setState({
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; })
});
}); });
}); } else {
seafileAPI.deleteShareToUserItem(repoID, path, 'user', username).then(res => {
this.setState({
sharedItems: this.state.sharedItems.filter( item => { return item.user_info.name !== username; })
});
});
}
} }
render() { render() {
@@ -152,14 +186,16 @@ class ShareToUser extends React.Component {
</td> </td>
</tr> </tr>
<tr> <tr>
{this.state.errorMsg.length > 0 && <td colSpan={3}>
this.state.errorMsg.map((item, index = 0, arr) => { {this.state.errorMsg.length > 0 &&
return ( this.state.errorMsg.map((item, index = 0, arr) => {
<p className="error" key={index}>{this.state.errorMsg[index].email} return (
{': '}{this.state.errorMsg[index].error_msg}</p> <p className="error" key={index}>{this.state.errorMsg[index].email}
); {': '}{this.state.errorMsg[index].error_msg}</p>
}) );
} })
}
</td>
</tr> </tr>
</thead> </thead>
<UserList items={sharedItems} deleteShareItem={this.deleteShareItem} /> <UserList items={sharedItems} deleteShareItem={this.deleteShareItem} />

4
frontend/src/components/shared-repo-list-view/shared-repo-list-item.js
View File

@@ -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>

2
frontend/src/css/groups.css
View File

@@ -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;
} }