dtable upgrade

frontend/src/app.js

@@ -37,7 +37,6 @@ import './css/search.css';
 const FilesActivitiesWrapper = MainContentWrapper(FilesActivities);
 const DraftsViewWrapper = MainContentWrapper(DraftsView);
 const StarredWrapper = MainContentWrapper(Starred);
-const DTableWrapper = MainContentWrapper(DTable);
 const LinkedDevicesWrapper = MainContentWrapper(LinkedDevices);
 const SharedLibrariesWrapper = MainContentWrapper(SharedLibraries);
 const ShareAdminLibrariesWrapper = MainContentWrapper(ShareAdminLibraries);
@@ -235,7 +234,7 @@ class App extends Component {
                 />
               </DraftsViewWrapper>
               <StarredWrapper path={siteRoot + 'starred'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
-              <DTableWrapper path={siteRoot + 'dtable'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
+              <DTable path={siteRoot + 'dtable'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
               <LinkedDevicesWrapper path={siteRoot + 'linked-devices'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
               <ShareAdminLibrariesWrapper path={siteRoot + 'share-admin-libs'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />
               <ShareAdminFoldersWrapper path={siteRoot + 'share-admin-folders'} onShowSidePanel={this.onShowSidePanel} onSearchedClick={this.onSearchedClick} />

frontend/src/components/dialog/create-workspace-dialog.js

@@ -1,7 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Button, Modal, ModalHeader, Input, ModalBody, ModalFooter, Form, FormGroup, Label, Alert } from 'reactstrap';
+import Select from 'react-select';
+import makeAnimated from 'react-select/lib/animated';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
 import { gettext } from '../../utils/constants';
+import { seafileAPI } from '../../utils/seafile-api.js';
 
 
 const propTypes = {
@@ -9,88 +12,68 @@ const propTypes = {
   onAddWorkspace: PropTypes.func.isRequired,
 };
 
+const NoOptionsMessage = (props) => {
+  return (
+    <div {...props.innerProps} style={{margin: '6px 10px', textAlign: 'center', color: 'hsl(0,0%,50%)'}}>{gettext('Group not found')}</div>
+  );
+};
+
 class CreateWorkspaceDialog extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      workspaceName: '',
-      errMessage: '',
-      isSubmitBtnActive: false,
+      selectedOption: null,
+      options:[],
     };
-    this.newInput = React.createRef();
   }
 
-  handleNameChange = (e) => {
-    if (!e.target.value.trim()) {
-      this.setState({isSubmitBtnActive: false});
-    } else {
-      this.setState({isSubmitBtnActive: true});
+  componentDidMount() {
+    seafileAPI.listGroups().then((res) => {
+      let options = [];
+      for (let i = 0 ; i < res.data.length; i++) {
+        let obj = {};
+        obj.value = res.data[i].name;
+        obj.email = res.data[i].id + '@seafile_group';
+        obj.label = res.data[i].name;
+        options.push(obj);
+      }
+      this.setState({options: options});
+    });
   }
 
-    this.setState({workspaceName: e.target.value});
+  handleSelectChange = (option) => {
+    this.setState({selectedOption: option});
   }
 
-  handleSubmit = () => {
-    let isValid= this.validateInputParams();
-    if (isValid) {
-      let workspaceName = this.state.workspaceName.trim();
-      this.props.createWorkspace(workspaceName);
-    }
-  } 
-
-  handleKeyPress = (e) => {
-    if (e.key === 'Enter') {
-      this.handleSubmit();
-      e.preventDefault();
-    }
+  submit = () => {
+    let owner = this.state.selectedOption;
+    this.props.createWorkspace(owner.email);
   } 
 
   toggle = () => {
     this.props.onAddWorkspace();
   }
 
-  componentDidMount() {
-    this.newInput.focus();
-  }
-
-  validateInputParams() {
-    let errMessage = '';
-    let workspaceName = this.state.workspaceName.trim();
-    if (!workspaceName.length) {
-      errMessage = gettext('Name is required');
-      this.setState({errMessage: errMessage});
-      return false;
-    }
-    if (workspaceName.indexOf('/') > -1) {
-      errMessage = gettext('Name should not include \'/\'.');
-      this.setState({errMessage: errMessage});
-      return false;
-    }
-    return true;
-  }
-
   render() {
     return (
       <Modal isOpen={true} toggle={this.toggle}>
-        <ModalHeader toggle={this.toggle}>{gettext('New Workspace')}</ModalHeader>
+        <ModalHeader toggle={this.toggle}>{gettext('New DTable')}</ModalHeader>
         <ModalBody>
-          <Form>
-            <FormGroup>
-              <Label for="workspaceName">{gettext('Name')}</Label>
-              <Input 
-                id="workspaceName"
-                onKeyPress={this.handleKeyPress} 
-                innerRef={input => {this.newInput = input;}} 
-                value={this.state.workspaceName} 
-                onChange={this.handleNameChange}
+          <Select
+            isClearable
+            isMulti={false}
+            maxMenuHeight={200}
+            hideSelectedOptions={true}
+            components={makeAnimated()}
+            placeholder={gettext('Select a owner')}
+            options={this.state.options}
+            onChange={this.handleSelectChange}
+            components={{ NoOptionsMessage }}
           />
-            </FormGroup>
-          </Form>
-          {this.state.errMessage && <Alert color="danger">{this.state.errMessage}</Alert>}
         </ModalBody>
         <ModalFooter>
           <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
-          <Button color="primary" onClick={this.handleSubmit} disabled={!this.state.isSubmitBtnActive}>{gettext('Submit')}</Button>
+          <Button color="primary" onClick={this.submit}>{gettext('Submit')}</Button>
         </ModalFooter>
       </Modal>
     );

frontend/src/components/dialog/delete-workspace-dialog.js

@@ -1,39 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { gettext } from '../../utils/constants';
-import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
-
-const propTypes = {
-  currentWorkspace: PropTypes.object.isRequired,
-  deleteCancel: PropTypes.func.isRequired,
-  handleSubmit: PropTypes.func.isRequired,
-};
-
-class DeleteWorkspaceDialog extends React.Component {
-
-  toggle = () => {
-    this.props.deleteCancel();
-  }
-  
-  render() {
-    let currentWorkspace = this.props.currentWorkspace;
-    let name = currentWorkspace.name;
-
-    return (
-      <Modal isOpen={true} toggle={this.toggle}>
-        <ModalHeader toggle={this.toggle}>{gettext('Delete Workspace')}</ModalHeader>
-        <ModalBody>
-          <p>{gettext('Are you sure to delete')}{' '}<b>{name}</b> ?</p>
-        </ModalBody>
-        <ModalFooter>
-          <Button color="secondary" onClick={this.toggle}>{gettext('Cancel')}</Button>
-          <Button color="primary" onClick={this.props.handleSubmit}>{gettext('Delete')}</Button>
-        </ModalFooter>
-      </Modal>
-    );
-  }
-}
-
-DeleteWorkspaceDialog.propTypes = propTypes;
-
-export default DeleteWorkspaceDialog;

frontend/src/pages/dtable/dtable.js

@@ -1,12 +1,13 @@
 import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
-import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
+import MediaQuery from 'react-responsive';
+import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem, Button } from 'reactstrap';
 import moment from 'moment';
 import { seafileAPI } from '../../utils/seafile-api';
 import { gettext, siteRoot } from '../../utils/constants';
+import CommonToolbar from '../../components/toolbar/common-toolbar';
 import Loading from '../../components/loading';
 import CreateWorkspaceDialog from '../../components/dialog/create-workspace-dialog';
-import DeleteWorkspaceDialog from '../../components/dialog/delete-workspace-dialog';
 import CreateTableDialog from '../../components/dialog/create-table-dialog';
 import DeleteTableDialog from '../../components/dialog/delete-table-dialog';
 import Rename from '../../components/rename';
@@ -146,8 +147,6 @@ Table.propTypes = tablePropTypes;
 
 const workspacePropTypes = {
   workspace: PropTypes.object.isRequired,
-  renameWorkspace: PropTypes.func.isRequired,
-  deleteWorkspace: PropTypes.func.isRequired,
 };
 
 class Workspace extends Component {
@@ -157,10 +156,7 @@ class Workspace extends Component {
     this.state = {
       tableList: this.props.workspace.table_list,
       errorMsg: '',
-      isWorkspaceRenaming: false,
-      isWorkspaceDeleting: false,
       isShowAddTableDialog: false,
-      dropdownOpen: false,
       isItemFreezed: false,
     };
   }
@@ -223,30 +219,6 @@ class Workspace extends Component {
     });
   }
 
-  onRenameWorkspaceCancel = () => {
-    this.setState({isWorkspaceRenaming: !this.state.isWorkspaceRenaming});
-  }
-
-  onRenameWorkspaceConfirm = (newName) => {
-    let workspace = this.props.workspace;
-    this.props.renameWorkspace(workspace, newName);
-    this.onRenameWorkspaceCancel();
-  }
-
-  onDeleteWorkspaceCancel = () => {
-    this.setState({isWorkspaceDeleting: !this.state.isWorkspaceDeleting});
-  }
-
-  onDeleteWorkspaceSubmit = () => {
-    let workspace = this.props.workspace;
-    this.props.deleteWorkspace(workspace);
-    this.onDeleteWorkspaceCancel();
-  }
-
-  dropdownToggle = () => {
-    this.setState({ dropdownOpen: !this.state.dropdownOpen });
-  }
-
   componentWillReceiveProps(nextProps) {
     if (nextProps.workspace.table_list !== this.props.workspace.table_list) {
       this.setState({
@@ -260,42 +232,7 @@ class Workspace extends Component {
 
     return(
       <div className="workspace my-2">
-        <Fragment>
-          {this.state.isWorkspaceRenaming &&
-            <Rename
-              hasSuffix={false}
-              name={workspace.name}
-              onRenameConfirm={this.onRenameWorkspaceConfirm}
-              onRenameCancel={this.onRenameWorkspaceCancel}
-            />
-          }
-          {!this.state.isWorkspaceRenaming &&
-            <span className="mb-2 workspace-name-container">
-              <span className="workspace-name">{workspace.name}</span>
-              <Dropdown isOpen={this.state.dropdownOpen} toggle={this.dropdownToggle} direction="down">
-                <DropdownToggle
-                  caret={true}
-                  tag='i'
-                  title={gettext('More Operations')}
-                  data-toggle="dropdown" 
-                  aria-expanded={this.state.dropdownOpen}
-                >
-                </DropdownToggle>
-                <DropdownMenu className="drop-list" right={true}>
-                  <DropdownItem onClick={this.onRenameWorkspaceCancel}>{gettext('Rename')}</DropdownItem>
-                  <DropdownItem onClick={this.onDeleteWorkspaceCancel}>{gettext('Delete')}</DropdownItem>
-                </DropdownMenu>
-              </Dropdown>
-              {this.state.isWorkspaceDeleting &&
-                <DeleteWorkspaceDialog
-                  currentWorkspace={workspace}
-                  deleteCancel={this.onDeleteWorkspaceCancel}
-                  handleSubmit={this.onDeleteWorkspaceSubmit}
-                />
-              }
-            </span>
-          }
-        </Fragment>
+        <div>{workspace.owner_name}</div>
         <div className="d-flex add-table-btn-container">
           <div className="add-table-btn cursor-pointer" onClick={this.onAddTable}>
             <i className="fa fa-plus"></i>
@@ -336,6 +273,12 @@ class Workspace extends Component {
 
 Workspace.propTypes = workspacePropTypes;
 
+
+const dtablePropTypes = {
+  onShowSidePanel: PropTypes.func.isRequired,
+  onSearchedClick: PropTypes.func.isRequired,
+};
+
 class DTable extends Component {
   constructor(props) {
     super(props);
@@ -353,8 +296,8 @@ class DTable extends Component {
     });
   }
 
-  createWorkspace = (name) => {
-    seafileAPI.createWorkspace(name).then((res) => {
+  createWorkspace = (owner) => {
+    seafileAPI.createWorkspace(owner).then((res) => {
       this.state.workspaceList.push(res.data.workspace);
       this.setState({workspaceList: this.state.workspaceList});
     }).catch((error) => {
@@ -365,37 +308,6 @@ class DTable extends Component {
     this.onAddWorkspace();
   }
 
-  renameWorkspace = (workspace, name) => {
-    let workspaceID = workspace.id;
-    seafileAPI.renameWorkspace(workspaceID, name).then((res) => {
-      let workspaceList = this.state.workspaceList.map((workspace) => {
-        if (workspace.id === workspaceID) {
-          workspace = res.data.workspace;
-        }
-        return workspace;
-      });
-      this.setState({workspaceList: workspaceList});
-    }).catch((error) => {
-      if(error.response) {
-        this.setState({errorMsg: gettext('Error')});
-      }
-    });
-  }
-
-  deleteWorkspace = (workspace) => {
-    let workspaceID = workspace.id;
-    seafileAPI.deleteWorkspace(workspaceID).then(() => {
-      let workspaceList = this.state.workspaceList.filter(workspace => {
-        return workspace.id !== workspaceID;
-      });
-      this.setState({workspaceList: workspaceList});
-    }).catch((error) => {
-      if(error.response) {
-        this.setState({errorMsg: gettext('Error')});
-      }
-    });
-  }
-
   componentDidMount() {
     seafileAPI.listWorkspaces().then((res) => {
       this.setState({
@@ -419,6 +331,23 @@ class DTable extends Component {
 
   render() {
     return (
+      <Fragment>
+        <div className="main-panel-north border-left-show">
+          <div className="cur-view-toolbar">
+            <span className="sf2-icon-menu side-nav-toggle hidden-md-up d-md-none" title="Side Nav Menu" onClick={this.props.onShowSidePanel}></span>
+            <div className="operation">
+              <Fragment>
+                <MediaQuery query="(min-width: 768px)">
+                  <Button className="btn btn-secondary operation-item" onClick={this.onAddWorkspace}>{gettext('New DTable')}</Button>
+                </MediaQuery>
+                <MediaQuery query="(max-width: 767.8px)">
+                  <Button className="btn btn-secondary operation-item my-1" onClick={this.onAddWorkspace}>{gettext('New DTable')}</Button>
+                </MediaQuery>
+              </Fragment>
+            </div>
+          </div>
+          <CommonToolbar onSearchedClick={this.props.onSearchedClick} />
+        </div>
         <div className="main-panel-center">
           <div className="cur-view-container" id="starred">
             <div className="cur-view-path">
@@ -442,9 +371,6 @@ class DTable extends Component {
                     );
                   })}
                   <div className="my-2">
-                  <span className="add-workspace cursor-pointer" onClick={this.onAddWorkspace}>
-                    <i className="fa fa-plus"></i>{' '}{gettext('Add a Workspace')}
-                  </span>
                     {this.state.isShowAddWorkspaceDialog &&
                       <CreateWorkspaceDialog
                         createWorkspace={this.createWorkspace}
@@ -457,8 +383,11 @@ class DTable extends Component {
             </div>
           </div>
         </div>
+      </Fragment>
     );
   }
 }
 
+DTable.propTypes = dtablePropTypes;
+
 export default DTable;

seahub/api2/endpoints/dtable.py

@@ -13,7 +13,7 @@ from django.shortcuts import render
 from django.utils.translation import ugettext as _
 
 from pysearpc import SearpcError
-from seaserv import seafile_api, edit_repo
+from seaserv import seafile_api, ccnet_api
 
 from seahub.api2.authentication import TokenAuthentication
 from seahub.api2.throttling import UserRateThrottle
@@ -23,6 +23,7 @@ from seahub.dtable.models import Workspaces
 from seahub.tags.models import FileUUIDMap
 from seahub.base.templatetags.seahub_tags import email2nickname
 from seahub.utils.timeutils import timestamp_to_isoformat_timestr
+from seahub.group.utils import group_id_to_name
 from seahub.utils import is_valid_dirent_name, is_org_context, normalize_file_path, \
     check_filename_with_rename, render_error, render_permission_error, gen_file_upload_url, \
     gen_file_get_url, get_file_type_and_ext, IMAGE
@@ -47,16 +48,63 @@ class WorkspacesView(APIView):
     def get(self, request):
         """get all workspaces
         """
-        owner = request.user.username
+        username = request.user.username
+
+        org_id = -1
+        if is_org_context(request):
+            org_id = request.user.org.org_id
+
+        if org_id > 0:
+            groups = ccnet_api.get_org_groups_by_user(org_id, username)
+        else:
+            groups = ccnet_api.get_groups(username, return_ancestors=True)
+
+        owners = list()
+        owners.append(username)
+        for group in groups:
+            group_user = '%s@seafile_group' % group.id
+            owners.append(group_user)
+
+        workspace_list = list()
+        for owner in owners:
             try:
-            workspaces = Workspaces.objects.get_workspaces_by_owner(owner)
+                workspace = Workspaces.objects.get_workspace_by_owner(owner)
             except Exception as e:
                 logger.error(e)
                 error_msg = 'Internal Server Error.'
                 return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
 
-        workspace_list = []
-        for workspace in workspaces:
+            if not workspace:
+                if '@seafile_group' in owner:
+                    continue
+
+                # permission check
+                if not request.user.permissions.can_add_repo():
+                    error_msg = 'Permission denied.'
+                    return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+                try:
+                    if org_id > 0:
+                        repo_id = seafile_api.create_org_repo(
+                            _("My Workspace"),
+                            _("My Workspace"),
+                            "dtable@seafile",
+                            org_id
+                        )
+                    else:
+                        repo_id = seafile_api.create_repo(
+                            _("My Workspace"),
+                            _("My Workspace"),
+                            "dtable@seafile"
+                        )
+                except Exception as e:
+                    logger.error(e)
+                    error_msg = 'Internal Server Error.'
+                    return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+
+                workspace = Workspaces.objects.create_workspace(owner, repo_id)
+
+            # resource check
             repo_id = workspace.repo_id
             repo = seafile_api.get_repo(repo_id)
             if not repo:
@@ -75,24 +123,34 @@ class WorkspacesView(APIView):
                 table_list.append(table)
 
             res = workspace.to_dict()
+            if '@seafile_group' in owner:
+                group_id = int(owner.split('@')[0])
+                owner_name = group_id_to_name(group_id)
+            else:
+                owner_name = email2nickname(owner)
+            res["owner_name"] = owner_name
             res["table_list"] = table_list
             res["updated_at"] = workspace.updated_at
             workspace_list.append(res)
 
-        return Response({"workspace_list": workspace_list}, status=status.HTTP_200_OK)
+        resp = dict()
+        resp["workspace_list"] = workspace_list
+
+        return Response(resp, status=status.HTTP_200_OK)
 
     def post(self, request):
         """create a workspace
         """
         # argument check
-        name = request.POST.get('name')
-        if not name:
-            error_msg = 'name invalid.'
+        owner = request.POST.get('owner')
+        if not owner:
+            error_msg = 'owner invalid.'
             return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
 
-        if not is_valid_dirent_name(name):
-            error_msg = 'name invalid.'
-            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+        # resource check
+        workspace = Workspaces.objects.get_workspace_by_owner(owner)
+        if workspace:
+            return Response({'success': True}, status=status.HTTP_200_OK)
 
         # permission check
         if not request.user.permissions.can_add_repo():
@@ -105,151 +163,44 @@ class WorkspacesView(APIView):
 
         try:
             if org_id > 0:
-                repo_id = seafile_api.create_org_repo(name, '', "dtable@seafile", org_id)
+                repo_id = seafile_api.create_org_repo(
+                    _("My Workspace"),
+                    _("My Workspace"),
+                    "dtable@seafile",
+                    org_id
+                )
             else:
-                repo_id = seafile_api.create_repo(name, '', "dtable@seafile")
+                repo_id = seafile_api.create_repo(
+                    _("My Workspace"),
+                    _("My Workspace"),
+                    "dtable@seafile"
+                )
         except Exception as e:
             logger.error(e)
             error_msg = 'Internal Server Error.'
             return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
 
-        owner = request.user.username
         try:
-            workspace = Workspaces.objects.create_workspace(name, owner, repo_id)
+            workspace = Workspaces.objects.create_workspace(owner, repo_id)
         except Exception as e:
             logger.error(e)
             error_msg = 'Internal Server Error.'
             return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
 
+        if '@seafile_group' in owner:
+            group_id = int(owner.split('@')[0])
+            owner_name = group_id_to_name(group_id)
+        else:
+            owner_name = email2nickname(owner)
+
         res = workspace.to_dict()
+        res["owner_name"] = owner_name
         res["table_list"] = []
         res["updated_at"] = workspace.updated_at
 
         return Response({"workspace": res}, status=status.HTTP_201_CREATED)
 
 
-class WorkspaceView(APIView):
-
-    authentication_classes = (TokenAuthentication, SessionAuthentication)
-    permission_classes = (IsAuthenticated, )
-    throttle_classes = (UserRateThrottle, )
-
-    def put(self, request, workspace_id):
-        """rename a workspace
-        """
-        # argument check
-        workspace_name = request.data.get('name')
-        if not workspace_name:
-            error_msg = 'name invalid.'
-            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
-        if not is_valid_dirent_name(workspace_name):
-            error_msg = 'name invalid.'
-            return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
-        # resource check
-        workspace = Workspaces.objects.get_workspace_by_id(workspace_id)
-        if not workspace:
-            error_msg = 'Workspace %s not found.' % workspace_id
-            return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
-        repo_id = workspace.repo_id
-        repo = seafile_api.get_repo(repo_id)
-        if not repo:
-            error_msg = 'Library %s not found.' % repo_id
-            return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
-        # permission check
-        username = request.user.username
-        owner = workspace.owner
-        if username != owner:
-            error_msg = 'Permission denied.'
-            return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
-        # repo status check
-        repo_status = repo.status
-        if repo_status != 0:
-            error_msg = 'Permission denied.'
-            return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
-        try:
-            edit_repo(repo_id, workspace_name, '', username)
-        except Exception as e:
-            logger.error(e)
-            error_msg = 'Internal Server Error.'
-            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
-        try:
-            workspace.name = workspace_name
-            workspace.save()
-        except Exception as e:
-            logger.error(e)
-            error_msg = 'Internal Server Error.'
-            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
-        table_objs = seafile_api.list_dir_by_path(repo_id, '/')
-        table_list = list()
-        for table_obj in table_objs:
-            if table_obj.obj_name[-7:] != FILE_TYPE:
-                continue
-            table = dict()
-            table["name"] = table_obj.obj_name[:-7]
-            table["mtime"] = timestamp_to_isoformat_timestr(table_obj.mtime)
-            table["modifier"] = email2nickname(table_obj.modifier) if table_obj.modifier else email2nickname(owner)
-            table_list.append(table)
-
-        res = workspace.to_dict()
-        res["table_list"] = table_list
-        res["updated_at"] = workspace.updated_at
-
-        return Response({"workspace": res}, status=status.HTTP_200_OK)
-
-    def delete(self, request, workspace_id):
-        """delete a workspace
-        """
-        # resource check
-        workspace = Workspaces.objects.get_workspace_by_id(workspace_id)
-        if not workspace:
-            return Response({'success': True}, status=status.HTTP_200_OK)
-
-        repo_id = workspace.repo_id
-        repo = seafile_api.get_repo(repo_id)
-        if not repo:
-            logger.warning('Library %s not found.' % repo_id)
-
-        # permission check
-        username = request.user.username
-        owner = workspace.owner
-        if username != owner:
-            error_msg = 'Permission denied.'
-            return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
-        if repo:
-
-            # repo status check
-            repo_status = repo.status
-            if repo_status != 0:
-                error_msg = 'Permission denied.'
-                return api_error(status.HTTP_403_FORBIDDEN, error_msg)
-
-            # remove repo
-            try:
-                seafile_api.remove_repo(repo_id)
-            except Exception as e:
-                logger.error(e)
-                error_msg = 'Internal Server Error.'
-                return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
-        try:
-            Workspaces.objects.delete_workspace(workspace_id)
-        except Exception as e:
-            logger.error(e)
-            error_msg = 'Internal Server Error.'
-            return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
-
-        return Response({"success": "true"}, status=status.HTTP_200_OK)
-
-
 class DTableView(APIView):
 
     authentication_classes = (TokenAuthentication, SessionAuthentication)

seahub/dtable/migrations/0002_auto_20190621_0937.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.15 on 2019-06-21 09:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dtable', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='workspaces',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True),
+        ),
+        migrations.AlterField(
+            model_name='workspaces',
+            name='name',
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name='workspaces',
+            name='owner',
+            field=models.CharField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name='workspaces',
+            name='repo_id',
+            field=models.CharField(max_length=36, unique=True),
+        ),
+        migrations.AlterUniqueTogether(
+            name='workspaces',
+            unique_together=set([]),
+        ),
+    ]

seahub/dtable/models.py

@@ -9,9 +9,9 @@ from seahub.utils.timeutils import timestamp_to_isoformat_timestr, datetime_to_i
 
 class WorkspacesManager(models.Manager):
 
-    def get_workspaces_by_owner(self, owner):
+    def get_workspace_by_owner(self, owner):
         try:
-            return super(WorkspacesManager, self).filter(owner=owner)
+            return super(WorkspacesManager, self).get(owner=owner)
         except self.model.DoesNotExist:
             return None
 
@@ -21,11 +21,11 @@ class WorkspacesManager(models.Manager):
         except self.model.DoesNotExist:
             return None
 
-    def create_workspace(self, name, owner, repo_id):
+    def create_workspace(self, owner, repo_id):
         try:
-            return super(WorkspacesManager, self).get(name=name, owner=owner, repo_id=repo_id)
+            return super(WorkspacesManager, self).get(owner=owner, repo_id=repo_id)
         except self.model.DoesNotExist:
-            workspace = self.model(name=name, owner=owner, repo_id=repo_id)
+            workspace = self.model(owner=owner, repo_id=repo_id)
             workspace.save()
             return workspace
 
@@ -40,15 +40,14 @@ class WorkspacesManager(models.Manager):
 
 class Workspaces(models.Model):
 
-    name = models.CharField(max_length=255)
-    owner = models.CharField(max_length=255)
-    repo_id = models.CharField(max_length=36, db_index=True)
-    created_at = models.DateTimeField(auto_now_add=True, db_index=True)
+    name = models.CharField(max_length=255, null=True)
+    owner = models.CharField(max_length=255, unique=True)
+    repo_id = models.CharField(max_length=36, unique=True)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     objects = WorkspacesManager()
 
     class Meta:
-        unique_together = (('owner', 'repo_id'),)
         db_table = 'workspaces'
 
     @property
@@ -65,8 +64,6 @@ class Workspaces(models.Model):
 
         return {
             'id': self.pk,
-            'name': self.name,
-            'owner': self.owner,
             'repo_id': self.repo_id,
             'created_at': datetime_to_isoformat_timestr(self.created_at),
         }

seahub/urls.py

@@ -88,7 +88,7 @@ from seahub.api2.endpoints.related_files import RelatedFilesView, RelatedFileVie
 from seahub.api2.endpoints.webdav_secret import WebdavSecretView
 from seahub.api2.endpoints.starred_items import StarredItems
 from seahub.api2.endpoints.markdown_lint import MarkdownLintView
-from seahub.api2.endpoints.dtable import WorkspacesView, WorkspaceView, DTableView, \
+from seahub.api2.endpoints.dtable import WorkspacesView, DTableView, \
      DTableUpdateLinkView, DTableAssetUploadLinkView, dtable_file_view, dtable_asset_access
 
 # Admin
@@ -359,7 +359,6 @@ urlpatterns = [
 
     # user: workspaces
     url(r'^api/v2.1/workspaces/$', WorkspacesView.as_view(), name='api-v2.1-workspaces'),
-    url(r'^api/v2.1/workspace/(?P<workspace_id>\d+)/$', WorkspaceView.as_view(), name='api-v2.1-workspace'),
     url(r'^api/v2.1/workspace/(?P<workspace_id>\d+)/dtable/$', DTableView.as_view(), name='api-v2.1-workspace-dtable'),
     url(r'^api/v2.1/workspace/(?P<workspace_id>\d+)/dtable-update-link/$', DTableUpdateLinkView.as_view(), name='api-v2.1-workspace-dtable-update-link'),
     url(r'^api/v2.1/workspace/(?P<workspace_id>\d+)/dtable-asset-upload-link/$', DTableAssetUploadLinkView.as_view(), name='api-v2.1-workspace-dtable-asset-upload-link'),