{tags.slice(0, 20).map(tag => {
diff --git a/frontend/src/utils/text-translation.js b/frontend/src/utils/text-translation.js
index 811b7411c98..5f8665a4619 100644
--- a/frontend/src/utils/text-translation.js
+++ b/frontend/src/utils/text-translation.js
@@ -3,187 +3,197 @@ import { gettext } from './constants';
// item --> '' : {key : '', value : gettext('')};
const TextTranslation = {
// app-menu
- 'NEW_FOLDER': {
+ NEW_FOLDER: {
key: 'New Folder',
value: gettext('New Folder')
},
- 'NEW_FILE': {
+ NEW_FILE: {
key: 'New File',
value: gettext('New File')
},
- 'NEW_MARKDOWN_FILE': {
+ NEW_MARKDOWN_FILE: {
key: 'New Markdown File',
value: gettext('New Markdown File')
},
- 'NEW_EXCEL_FILE': {
+ NEW_EXCEL_FILE: {
key: 'New Excel File',
value: gettext('New Excel File')
},
- 'NEW_POWERPOINT_FILE': {
+ NEW_POWERPOINT_FILE: {
key: 'New PowerPoint File',
value: gettext('New PowerPoint File')
},
- 'NEW_WORD_FILE': {
+ NEW_WORD_FILE: {
key: 'New Word File',
value: gettext('New Word File')
},
- 'NEW_SEADOC_FILE': {
+ NEW_SEADOC_FILE: {
key: 'New SeaDoc File',
value: gettext('New SeaDoc File')
},
- 'SHARE': {
+ SHARE: {
key: 'Share',
value: gettext('Share')
},
- 'DOWNLOAD': {
+ DOWNLOAD: {
key: 'Download',
value: gettext('Download')
},
- 'DELETE': {
+ DELETE: {
key: 'Delete',
value: gettext('Delete')
},
- 'RENAME': {
+ RENAME: {
key: 'Rename',
value: gettext('Rename')
},
- 'MOVE': {
+ MOVE: {
key: 'Move',
value: gettext('Move')
},
- 'COPY': {
+ COPY: {
key: 'Copy',
value: gettext('Copy')
},
- 'PERMISSION': {
+ PERMISSION: {
key: 'Permission',
value: gettext('Permission')
},
- 'DETAILS': {
+ DETAILS: {
key: 'Details',
value: gettext('Details')
},
- 'OPEN_VIA_CLIENT': {
+ OPEN_VIA_CLIENT: {
key: 'Open via Client',
value: gettext('Open via Client')
},
- 'LOCK': {
+ LOCK: {
key: 'Lock',
value: gettext('Lock')
},
- 'UNLOCK': {
+ UNLOCK: {
key: 'Unlock',
value: gettext('Unlock')
},
- 'FREEZE_DOCUMENT': {
+ FREEZE_DOCUMENT: {
key: 'Freeze Document',
value: gettext('Freeze Document')
},
- 'UNFREEZE_DOCUMENT': {
+ UNFREEZE_DOCUMENT: {
key: 'Unfreeze Document',
value: gettext('Unfreeze Document')
},
- 'CONVERT_AND_EXPORT': {
+ CONVERT_AND_EXPORT: {
key: 'Convert & Export',
value: gettext('Convert & Export')
},
- 'CONVERT_TO_MARKDOWN': {
+ CONVERT_TO_MARKDOWN: {
key: 'Convert to Markdown',
value: gettext('Convert to Markdown')
},
- 'CONVERT_TO_SDOC': {
+ CONVERT_TO_SDOC: {
key: 'Convert to sdoc',
value: gettext('Convert to sdoc')
},
- 'CONVERT_TO_DOCX': {
+ CONVERT_TO_DOCX: {
key: 'Convert to docx',
value: gettext('Convert to docx')
},
- 'EXPORT_DOCX': {
+ EXPORT_DOCX: {
key: 'Export docx',
value: gettext('Export as docx')
},
- 'HISTORY': {
+ HISTORY: {
key: 'History',
value: gettext('History')
},
- 'ACCESS_LOG': {
+ ACCESS_LOG: {
key: 'Access Log',
value: gettext('Access Log')
},
- 'PROPERTIES': {
+ PROPERTIES: {
key: 'Properties',
value: gettext('Properties')
},
- 'TAGS': {
+ TAGS: {
key: 'Tags',
value: gettext('Tags')
},
- 'TRASH': {
+ TRASH: {
key: 'Trash',
value: gettext('Trash')
},
- 'ONLYOFFICE_CONVERT': {
+ ONLYOFFICE_CONVERT: {
key: 'Convert with ONLYOFFICE',
value: gettext('Convert with ONLYOFFICE')
},
- 'DISPLAY_FILES': {
+ DISPLAY_FILES: {
key: 'Display files',
value: gettext('Display files')
},
- 'EXPORT_SDOC': {
+ EXPORT_SDOC: {
key: 'Export sdoc',
value: gettext('Export as zip')
},
// repo operations
- 'TRANSFER': {
+ TRANSFER: {
key: 'Transfer',
value: gettext('Transfer')
},
- 'FOLDER_PERMISSION': {
+ FOLDER_PERMISSION: {
key: 'Folder Permission',
value: gettext('Folder Permission')
},
- 'SHARE_ADMIN': {
+ SHARE_ADMIN: {
key: 'Share Admin',
value: gettext('Share Admin')
},
- 'CHANGE_PASSWORD': {
+ CHANGE_PASSWORD: {
key: 'Change Password',
value: gettext('Change Password')
},
- 'RESET_PASSWORD': {
+ RESET_PASSWORD: {
key: 'Reset Password',
value: gettext('Reset Password')
},
- 'UNWATCH_FILE_CHANGES': {
+ UNWATCH_FILE_CHANGES: {
key: 'Unwatch File Changes',
value: gettext('Unwatch File Changes')
},
- 'WATCH_FILE_CHANGES': {
+ WATCH_FILE_CHANGES: {
key: 'Watch File Changes',
value: gettext('Watch File Changes')
},
- 'ADVANCED': {
+ ADVANCED: {
key: 'advanced',
value: gettext('Advanced')
},
// advanced operations
- 'API_TOKEN': {
+ API_TOKEN: {
key: 'API Token',
value: gettext('API Token')
},
- 'LABEL_CURRENT_STATE': {
+ LABEL_CURRENT_STATE: {
key: 'Label Current State',
value: gettext('Label Current State')
},
- 'UNSHARE': {
+ UNSHARE: {
key: 'Unshare',
value: gettext('Unshare')
},
+
+ // metadata views
+ ADD_FOLDER: {
+ key: 'ADD_FOLDER',
+ value: gettext('Add Folder')
+ },
+ ADD_VIEW: {
+ key: 'ADD_VIEW',
+ value: gettext('Add view')
+ }
};
export default TextTranslation;
diff --git a/seahub/repo_metadata/apis.py b/seahub/repo_metadata/apis.py
index d8564d6835b..620224ad102 100644
--- a/seahub/repo_metadata/apis.py
+++ b/seahub/repo_metadata/apis.py
@@ -603,6 +603,142 @@ def delete(self, request, repo_id):
return Response({'success': True})
+class MetadataFolders(APIView):
+ authentication_classes = (TokenAuthentication, SessionAuthentication)
+ permission_classes = (IsAuthenticated,)
+ throttle_classes = (UserRateThrottle,)
+
+ def post(self, request, repo_id):
+ # add metadata folder
+ folder_name = request.data.get('name')
+
+ # check view name
+ if not folder_name:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder_name is invalid')
+
+ record = RepoMetadata.objects.filter(repo_id=repo_id).first()
+ if not record or not record.enabled:
+ error_msg = f'The metadata module is disabled for repo {repo_id}.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ 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_folder_permission(request, repo_id, '/')
+ if permission != 'rw':
+ error_msg = 'Permission denied.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ # check metadata_views
+ metadata_views = RepoMetadataViews.objects.filter(repo_id = repo_id).first()
+ if not metadata_views:
+ error_msg = 'The metadata views does not exists.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ try:
+ new_folder = RepoMetadataViews.objects.add_folder(repo_id, folder_name)
+ if not new_folder:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'add folder failed')
+ except Exception as e:
+ logger.exception(e)
+ error_msg = 'Internal Server Error'
+ return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+
+ return Response({'folder': new_folder})
+
+ def put(self, request, repo_id):
+ # update metadata folder: name etc.
+ folder_id = request.data.get('folder_id', None)
+ folder_data = request.data.get('folder_data', None)
+
+ # check folder_id
+ if not folder_id:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder_id is invalid')
+
+ # check folder_data
+ if not folder_data:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder_data is invalid')
+ if folder_data.get('_id') or folder_data.get('type') or folder_data.get('children'):
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder_data is invalid')
+
+ record = RepoMetadata.objects.filter(repo_id=repo_id).first()
+ if not record or not record.enabled:
+ error_msg = f'The metadata module is disabled for repo {repo_id}.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ 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_folder_permission(request, repo_id, '/')
+ if permission != 'rw':
+ error_msg = 'Permission denied.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ # check metadata_views
+ metadata_views = RepoMetadataViews.objects.filter(repo_id = repo_id).first()
+ if not metadata_views:
+ error_msg = 'The metadata views does not exists.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ # check folder exist
+ if folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder %s does not exists.' % folder_id)
+
+ try:
+ result = RepoMetadataViews.objects.update_folder(repo_id, folder_id, folder_data)
+ except Exception as e:
+ logger.exception(e)
+ error_msg = 'Internal Server Error'
+ return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+
+ return Response({'success': True})
+
+ def delete(self, request, repo_id):
+ # delete metadata folder by id
+ # check folder_id
+ folder_id = request.data.get('folder_id', None)
+ if not folder_id:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder_id is invalid')
+
+ record = RepoMetadata.objects.filter(repo_id=repo_id).first()
+ if not record or not record.enabled:
+ error_msg = f'The metadata module is disabled for repo {repo_id}.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ 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_folder_permission(request, repo_id, '/')
+ if permission != 'rw':
+ error_msg = 'Permission denied.'
+ return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+
+ # check metadata_views
+ metadata_views = RepoMetadataViews.objects.filter(repo_id = repo_id).first()
+ if not metadata_views:
+ error_msg = 'The metadata views does not exists.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ # check folder exist
+ if folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder %s does not exists.' % folder_id)
+
+ try:
+ result = RepoMetadataViews.objects.delete_folder(repo_id, folder_id)
+ except Exception as e:
+ logger.exception(e)
+ error_msg = 'Internal Server Error'
+ return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
+
+ return Response({'success': True})
+
+
class MetadataViews(APIView):
authentication_classes = (TokenAuthentication, SessionAuthentication)
permission_classes = (IsAuthenticated,)
@@ -628,15 +764,29 @@ def get(self, request, repo_id):
return Response(metadata_views)
+
def post(self, request, repo_id):
# Add a metadata view
+ metadata_views = RepoMetadataViews.objects.filter(repo_id=repo_id).first()
view_name = request.data.get('name')
+ folder_id = request.data.get('folder_id', None)
view_type = request.data.get('type', 'table')
view_data = request.data.get('data', {})
+
+ # check view name
if not view_name:
error_msg = 'view name is invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+ # check folder exist
+ if folder_id:
+ if not metadata_views:
+ error_msg = 'The metadata views does not exists.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ if folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder %s does not exists' % folder_id)
+
record = RepoMetadata.objects.filter(repo_id=repo_id).first()
if not record or not record.enabled:
error_msg = f'The metadata module is disabled for repo {repo_id}.'
@@ -653,7 +803,9 @@ def post(self, request, repo_id):
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try:
- new_view = RepoMetadataViews.objects.add_view(repo_id, view_name, view_type, view_data)
+ new_view = RepoMetadataViews.objects.add_view(repo_id, view_name, view_type, view_data, folder_id)
+ if not new_view:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'add view failed')
except Exception as e:
logger.exception(e)
error_msg = 'Internal Server Error'
@@ -661,7 +813,6 @@ def post(self, request, repo_id):
return Response({'view': new_view})
-
def put(self, request, repo_id):
# Update a metadata view, including rename, change filters and so on
# by a json data
@@ -686,7 +837,7 @@ def put(self, request, repo_id):
error_msg = 'The metadata views does not exists.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- if view_id not in views.view_ids:
+ if view_id not in views.views_ids:
error_msg = 'view_id %s does not exists.' % view_id
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@@ -713,6 +864,7 @@ def delete(self, request, repo_id):
# Update a metadata view, including rename, change filters and so on
# by a json data
view_id = request.data.get('view_id', None)
+ folder_id = request.data.get('folder_id', None)
if not view_id:
error_msg = 'view_id is invalid.'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@@ -722,17 +874,22 @@ def delete(self, request, repo_id):
error_msg = f'The metadata module is disabled for repo {repo_id}.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- views = RepoMetadataViews.objects.filter(
+ metadata_views = RepoMetadataViews.objects.filter(
repo_id=repo_id
).first()
- if not views:
+ if not metadata_views:
error_msg = 'The metadata views does not exists.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- if view_id not in views.view_ids:
+ # check view exist
+ if view_id not in metadata_views.views_ids:
error_msg = 'view_id %s does not exists.' % view_id
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+ # check folder exist
+ if folder_id and folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder %s does not exists' % folder_id)
+
repo = seafile_api.get_repo(repo_id)
if not repo:
error_msg = 'Library %s not found.' % repo_id
@@ -744,7 +901,7 @@ def delete(self, request, repo_id):
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try:
- result = RepoMetadataViews.objects.delete_view(repo_id, view_id)
+ result = RepoMetadataViews.objects.delete_view(repo_id, view_id, folder_id)
except Exception as e:
logger.exception(e)
error_msg = 'Internal Server Error'
@@ -760,6 +917,7 @@ class MetadataViewsDuplicateView(APIView):
def post(self, request, repo_id):
view_id = request.data.get('view_id')
+ folder_id = request.data.get('folder_id', None)
if not view_id:
error_msg = 'view_id invalid'
return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
@@ -769,17 +927,21 @@ def post(self, request, repo_id):
error_msg = f'The metadata module is disabled for repo {repo_id}.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- views = RepoMetadataViews.objects.filter(
+ metadata_views = RepoMetadataViews.objects.filter(
repo_id=repo_id
).first()
- if not views:
+ if not metadata_views:
error_msg = 'The metadata views does not exists.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- if view_id not in views.view_ids:
+ if view_id not in metadata_views.views_ids:
error_msg = 'view_id %s does not exists.' % view_id
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+ # check folder exist
+ if folder_id and folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'folder %s does not exists' % folder_id)
+
repo = seafile_api.get_repo(repo_id)
if not repo:
error_msg = 'Library %s not found.' % repo_id
@@ -790,13 +952,15 @@ def post(self, request, repo_id):
error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try:
- result = RepoMetadataViews.objects.duplicate_view(repo_id, view_id)
+ new_view = RepoMetadataViews.objects.duplicate_view(repo_id, view_id, folder_id)
+ if not new_view:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'duplicate view failed')
except Exception as e:
logger.exception(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
- return Response({'view': result})
+ return Response({'view': new_view})
class MetadataViewsDetailView(APIView):
@@ -835,37 +999,29 @@ class MetadataViewsMoveView(APIView):
throttle_classes = (UserRateThrottle,)
def post(self, request, repo_id):
- # put view_id in front of target_view_id
- view_id = request.data.get('view_id')
- if not view_id:
- error_msg = 'view_id is invalid.'
- return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
+ # move view or folder to another position
+ source_view_id = request.data.get('source_view_id')
+ source_folder_id = request.data.get('source_folder_id')
target_view_id = request.data.get('target_view_id')
- if not target_view_id:
- error_msg = 'target_view_id is invalid.'
- return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
+ target_folder_id = request.data.get('target_folder_id')
+
+ # must drag view or folder
+ if not source_view_id and not source_folder_id:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'source_view_id and source_folder_id is invalid')
+
+ # must move above to view/folder or move view into folder
+ if not target_view_id and not target_folder_id:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'target_view_id and target_folder_id is invalid')
+
+ # not allowed to drag folder into folder
+ if not source_view_id and source_folder_id and target_view_id and target_folder_id:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'not allowed to drag folder into folder')
record = RepoMetadata.objects.filter(repo_id=repo_id).first()
if not record or not record.enabled:
error_msg = f'The metadata module is disabled for repo {repo_id}.'
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
- views = RepoMetadataViews.objects.filter(
- repo_id=repo_id,
- ).first()
- if not views:
- error_msg = 'The metadata views does not exists.'
- return api_error(status.HTTP_404_NOT_FOUND, error_msg)
-
- if view_id not in views.view_ids:
- error_msg = 'view_id %s does not exists.' % view_id
- return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
- if target_view_id not in views.view_ids:
- error_msg = 'target_view_id %s does not exists.' % target_view_id
- return api_error(status.HTTP_400_BAD_REQUEST, error_msg)
-
repo = seafile_api.get_repo(repo_id)
if not repo:
error_msg = 'Library %s not found.' % repo_id
@@ -876,8 +1032,33 @@ def post(self, request, repo_id):
error_msg = 'Permission denied.'
return api_error(status.HTTP_403_FORBIDDEN, error_msg)
+ metadata_views = RepoMetadataViews.objects.filter(
+ repo_id=repo_id,
+ ).first()
+ if not metadata_views:
+ error_msg = 'The metadata views does not exists.'
+ return api_error(status.HTTP_404_NOT_FOUND, error_msg)
+
+ # check dragged view exist
+ if source_view_id and source_view_id not in metadata_views.views_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'source_view_id %s does not exists.' % source_view_id)
+
+ # check dragged view exist
+ if source_folder_id and source_folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'source_view_id %s does not exists.' % source_view_id)
+
+ # check target view exist
+ if target_view_id and target_view_id not in metadata_views.views_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'target_view_id %s does not exists.' % target_view_id)
+
+ # check target view exist
+ if target_folder_id and target_folder_id not in metadata_views.folders_ids:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'target_folder_id %s does not exists.' % target_folder_id)
+
try:
- results = RepoMetadataViews.objects.move_view(repo_id, view_id, target_view_id)
+ results = RepoMetadataViews.objects.move_view(repo_id, source_view_id, source_folder_id, target_view_id, target_folder_id)
+ if not results:
+ return api_error(status.HTTP_400_BAD_REQUEST, 'move view or folder failed')
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
diff --git a/seahub/repo_metadata/models.py b/seahub/repo_metadata/models.py
index 5f0dbf9f930..4215c956f09 100644
--- a/seahub/repo_metadata/models.py
+++ b/seahub/repo_metadata/models.py
@@ -18,16 +18,16 @@ def generate_random_string_lower_digits(length):
return random_string
-def generate_view_id(length, type, view_ids=None):
+def generate_views_unique_id(length, type, folders_views_ids=None):
if type == 'face_recognition':
return FACE_RECOGNITION_VIEW_ID
- if not view_ids:
+ if not folders_views_ids:
return generate_random_string_lower_digits(length)
while True:
new_id = generate_random_string_lower_digits(length)
- if new_id not in view_ids:
+ if new_id not in folders_views_ids:
break
return new_id
@@ -76,19 +76,37 @@ class Meta:
db_table = 'repo_metadata'
+class RepoFolder(object):
+
+ def __init__(self, name, children=[], folders_views_ids=None):
+ self.name = name
+ self.type = 'folder'
+ self.children = children
+
+ self.init_folder(folders_views_ids)
+
+ def init_folder(self, folders_views_ids=None):
+ self.folder_json = {
+ "_id": generate_views_unique_id(4, self.type, folders_views_ids),
+ "name": self.name,
+ "type": self.type,
+ "children": self.children
+ }
+
+
class RepoView(object):
- def __init__(self, name, type='table', view_data={}, view_ids=None):
+ def __init__(self, name, type='table', view_data={}, folders_views_ids=None):
self.name = name
self.type = type
self.view_data = view_data
self.view_json = {}
- self.init_view(view_ids)
+ self.init_view(folders_views_ids)
- def init_view(self, view_ids=None):
+ def init_view(self, folders_views_ids=None):
self.view_json = {
- "_id": generate_view_id(4, self.type, view_ids),
+ "_id": generate_views_unique_id(4, self.type, folders_views_ids),
"table_id": '0001', # by default
"name": self.name,
"filters": [],
@@ -103,7 +121,57 @@ def init_view(self, view_ids=None):
class RepoMetadataViewsManager(models.Manager):
- def add_view(self, repo_id, view_name, view_type='table', view_data={}):
+ def add_folder(self, repo_id, folder_name):
+ metadata_views = self.filter(repo_id=repo_id).first()
+ if not metadata_views:
+ return None
+
+ view_details = json.loads(metadata_views.details)
+ navigation = view_details.get('navigation', [])
+ exist_folders_views_ids = metadata_views.folders_views_ids
+ new_folder = RepoFolder(folder_name, [], exist_folders_views_ids)
+ folder_json = new_folder.folder_json
+ navigation.append(folder_json)
+ metadata_views.details = json.dumps(view_details)
+ metadata_views.save()
+ return folder_json
+
+ def update_folder(self, repo_id, folder_id, folder_dict):
+ metadata_views = self.filter(repo_id=repo_id).first()
+ folder_dict.pop('_id', '')
+ folder_dict.pop('type', '')
+ folder_dict.pop('children', '')
+ if 'name' in folder_dict:
+ exist_obj_names = metadata_views.folders_names
+ folder_dict['name'] = get_no_duplicate_obj_name(folder_dict['name'], exist_obj_names)
+ view_details = json.loads(metadata_views.details)
+ for folder in view_details['navigation']:
+ if folder.get('type', None) == 'folder' and folder.get('_id') == folder_id:
+ folder.update(folder_dict)
+ break
+ metadata_views.details = json.dumps(view_details)
+ metadata_views.save()
+ return json.loads(metadata_views.details)
+
+ def delete_folder(self, repo_id, folder_id):
+ metadata_views = self.filter(repo_id=repo_id).first()
+ view_details = json.loads(metadata_views.details)
+ navigation = view_details.get('navigation', [])
+ views = view_details.get('views', [])
+ for folder in navigation:
+ if folder.get('_id') == folder_id:
+ # add views which in the folder into navigation
+ if folder.get('children'):
+ navigation.extend(folder.get('children'))
+
+ # remove folder
+ navigation.remove(folder)
+ break
+ metadata_views.details = json.dumps(view_details)
+ metadata_views.save()
+ return json.loads(metadata_views.details)
+
+ def add_view(self, repo_id, view_name, view_type='table', view_data={}, folder_id=None):
metadata_views = self.filter(repo_id=repo_id).first()
if not metadata_views:
from seafevents.repo_metadata.constants import METADATA_TABLE
@@ -126,13 +194,22 @@ def add_view(self, repo_id, view_name, view_type='table', view_data={}):
)
else:
view_details = json.loads(metadata_views.details)
- view_name = get_no_duplicate_obj_name(view_name, metadata_views.view_names)
- exist_view_ids = metadata_views.view_ids
- new_view = RepoView(view_name, view_type, view_data, exist_view_ids)
+ navigation = view_details.get('navigation', [])
+ view_name = get_no_duplicate_obj_name(view_name, metadata_views.views_names)
+ exist_folders_views_ids = metadata_views.folders_views_ids
+ new_view = RepoView(view_name, view_type, view_data, exist_folders_views_ids)
view_json = new_view.view_json
view_id = view_json.get('_id')
view_details['views'].append(view_json)
- view_details['navigation'].append({'_id': view_id, 'type': 'view'})
+ new_view_nav = { '_id': view_id, 'type': 'view' }
+ if folder_id:
+ folder = next((folder for folder in navigation if folder.get('_id') == folder_id), None)
+ if not folder:
+ return None
+ folderChildren = folder.get('children', [])
+ folderChildren.append(new_view_nav)
+ else:
+ navigation.append(new_view_nav)
metadata_views.details = json.dumps(view_details)
metadata_views.save()
return new_view.view_json
@@ -156,7 +233,7 @@ def update_view(self, repo_id, view_id, view_dict):
metadata_views = self.filter(repo_id=repo_id).first()
view_dict.pop('_id', '')
if 'name' in view_dict:
- exist_obj_names = metadata_views.view_names
+ exist_obj_names = metadata_views.views_names
view_dict['name'] = get_no_duplicate_obj_name(view_dict['name'], exist_obj_names)
view_details = json.loads(metadata_views.details)
for v in view_details['views']:
@@ -167,56 +244,125 @@ def update_view(self, repo_id, view_id, view_dict):
metadata_views.save()
return json.loads(metadata_views.details)
- def duplicate_view(self, repo_id, view_id):
+ def duplicate_view(self, repo_id, view_id, folder_id=None):
metadata_views = self.filter(repo_id=repo_id).first()
view_details = json.loads(metadata_views.details)
- exist_view_ids = metadata_views.view_ids
- new_view_id = generate_view_id(4, exist_view_ids)
+ exist_folders_views_ids = metadata_views.folders_views_ids
+ new_view_id = generate_views_unique_id(4, exist_folders_views_ids)
duplicate_view = next((copy.deepcopy(view) for view in view_details['views'] if view.get('_id') == view_id), None)
+ if not duplicate_view:
+ return None
+
duplicate_view['_id'] = new_view_id
- view_name = get_no_duplicate_obj_name(duplicate_view['name'], metadata_views.view_names)
+ view_name = get_no_duplicate_obj_name(duplicate_view['name'], metadata_views.views_names)
duplicate_view['name'] = view_name
view_details['views'].append(duplicate_view)
- view_details['navigation'].append({'_id': new_view_id, 'type': 'view'})
+ navigation = view_details.get('navigation', [])
+ new_view_nav = {'_id': new_view_id, 'type': 'view'}
+ if folder_id:
+ # add duplicate_view into folder
+ folder = next((folder for folder in navigation if folder.get('_id') == folder_id), None)
+ if not folder:
+ return None
+ folderChildren = folder.get('children', [])
+ folderChildren.append(new_view_nav)
+ else:
+ navigation.append(new_view_nav)
+
metadata_views.details = json.dumps(view_details)
metadata_views.save()
return duplicate_view
- def delete_view(self, repo_id, view_id):
+ def delete_view(self, repo_id, view_id, folder_id=None):
metadata_views = self.filter(repo_id=repo_id).first()
view_details = json.loads(metadata_views.details)
- for v in view_details['views']:
- if v.get('_id') == view_id:
- view_details['views'].remove(v)
+ navigation = view_details.get('navigation', [])
+ views = view_details.get('views', [])
+
+ for view in views:
+ if view.get('_id') == view_id:
+ views.remove(view)
break
- for v in view_details['navigation']:
- if v.get('_id') == view_id:
- view_details['navigation'].remove(v)
+ for nav_item in navigation:
+ # delete view from folder
+ if folder_id and nav_item.get('_id') == folder_id and nav_item.get('type') == 'folder' and nav_item.get('children'):
+ for child in nav_item.get('children'):
+ if child.get('_id') == view_id:
+ nav_item.get('children').remove(child)
+ break
break
+
+ # delete view not in folders
+ if nav_item.get('_id') == view_id:
+ navigation.remove(nav_item)
+ break
+
metadata_views.details = json.dumps(view_details)
metadata_views.save()
return json.loads(metadata_views.details)
- def move_view(self, repo_id, view_id, target_view_id):
+ def move_view(self, repo_id, source_view_id, source_folder_id, target_view_id, target_folder_id):
metadata_views = self.filter(repo_id=repo_id).first()
view_details = json.loads(metadata_views.details)
- view_index = None
- target_index = None
- for i, view in enumerate(view_details['navigation']):
- if view['_id'] == view_id:
- view_index = i
- if view['_id'] == target_view_id:
- target_index = i
-
- if view_index is not None and target_index is not None:
- if view_index < target_index:
- view_to_move = view_details['navigation'][view_index]
- view_details['navigation'].insert(target_index, view_to_move)
- view_details['navigation'].pop(view_index)
+ navigation = view_details.get('navigation', [])
+
+ # find drag source
+ if source_folder_id:
+ if source_view_id:
+ # drag view from folder
+ dragged_id = source_view_id
+ source_folder = next((folder for folder in navigation if folder.get('_id') == source_folder_id), None)
+ if source_folder:
+ updated_source_nav_list = source_folder.get('children', [])
else:
- view_to_move = view_details['navigation'].pop(view_index)
- view_details['navigation'].insert(target_index, view_to_move)
+ # drag folder
+ dragged_id = source_folder_id
+ updated_source_nav_list = navigation
+ elif source_view_id:
+ # drag view not in folders
+ dragged_id = source_view_id
+ updated_source_nav_list = navigation
+
+ # invalid drag source
+ if not dragged_id or not updated_source_nav_list:
+ return None
+ drag_source = next((nav for nav in updated_source_nav_list if nav.get('_id') == dragged_id), None)
+ if not drag_source:
+ return None
+
+ # remove drag source from navigation
+ updated_source_nav_list.remove(drag_source)
+
+ # find drop target
+ updated_target_nav_list = navigation
+ if target_folder_id and source_view_id:
+ target_folder = next((folder for folder in navigation if folder.get('_id') == target_folder_id), None)
+ if target_folder:
+ updated_target_nav_list = target_folder.get('children', [])
+
+ # drag source already exist
+ exist_drag_source = next((nav for nav in updated_target_nav_list if nav.get('_id') == drag_source.get('_id')), None)
+ if exist_drag_source:
+ return None
+
+ # drop drag source to the target position
+ target_nav = None
+ if target_view_id:
+ # move folder/view above to view
+ target_nav = next((nav for nav in updated_target_nav_list if nav.get('_id') == target_view_id), None)
+ elif not source_view_id and target_folder_id:
+ # move folder above to folder
+ target_nav = next((nav for nav in updated_target_nav_list if nav.get('_id') == target_folder_id), None)
+
+ insert_index = -1
+ if target_nav:
+ insert_index = updated_target_nav_list.index(target_nav)
+
+ if insert_index > -1:
+ updated_target_nav_list.insert(insert_index, drag_source)
+ else:
+ updated_target_nav_list.append(drag_source)
metadata_views.details = json.dumps(view_details)
metadata_views.save()
@@ -233,11 +379,27 @@ class Meta:
db_table = 'repo_metadata_view'
@property
- def view_ids(self):
+ def folders_ids(self):
+ metadata_views = json.loads(self.details)
+ navigation = metadata_views.get('navigation', [])
+ return [folder.get('_id') for folder in navigation if folder.get('type', None) == 'folder']
+
+ @property
+ def folders_names(self):
+ metadata_views = json.loads(self.details)
+ navigation = metadata_views.get('navigation', [])
+ return [folder.get('name') for folder in navigation if folder.get('type', None) == 'folder']
+
+ @property
+ def views_ids(self):
views = json.loads(self.details)['views']
return [v.get('_id') for v in views]
@property
- def view_names(self):
+ def views_names(self):
views = json.loads(self.details)['views']
return [v.get('name') for v in views]
+
+ @property
+ def folders_views_ids(self):
+ return self.folders_ids + self.views_ids
diff --git a/seahub/repo_metadata/urls.py b/seahub/repo_metadata/urls.py
index 62d8f88e2ed..8c607a3f04f 100644
--- a/seahub/repo_metadata/urls.py
+++ b/seahub/repo_metadata/urls.py
@@ -1,6 +1,6 @@
from django.urls import re_path
from .apis import MetadataRecords, MetadataManage, MetadataColumns, MetadataRecordInfo, \
- MetadataViews, MetadataViewsMoveView, MetadataViewsDetailView, MetadataViewsDuplicateView, FacesRecords, \
+ MetadataFolders, MetadataViews, MetadataViewsMoveView, MetadataViewsDetailView, MetadataViewsDuplicateView, FacesRecords, \
FaceRecognitionManage, FacesRecord, MetadataExtractFileDetails, PeoplePhotos, MetadataTagsStatusManage, MetadataTags, \
MetadataFileTags, MetadataTagFiles, MetadataDetailsSettingsView
@@ -11,6 +11,7 @@
re_path(r'^columns/$', MetadataColumns.as_view(), name='api-v2.1-metadata-columns'),
# view
+ re_path(r'^folders/$', MetadataFolders.as_view(), name='api-v2.1-metadata-folders'),
re_path(r'^views/$', MetadataViews.as_view(), name='api-v2.1-metadata-views'),
re_path(r'^views/(?P.+)/$', MetadataViewsDetailView.as_view(), name='api-v2.1-metadata-views-detail'),
re_path(r'^move-views/$', MetadataViewsMoveView.as_view(), name='api-v2.1-metadata-views-move'),