Merge pull request #9 from tracim/fix/better_app_content_type_list

backend/tracim_backend/models/applications.py

@@ -59,6 +59,16 @@ thread = Application(
 
 )
 
+folder = Application(
+    label='Folder',
+    slug='contents/folder',
+    fa_icon='folder-open-o',
+    hexcolor='#252525',
+    is_active=True,
+    config={},
+    main_route='',
+)
+
 _file = Application(
     label='Files',
     slug='contents/file',
@@ -92,8 +102,10 @@ html_documents = Application(
 # List of applications
 applications = [
     html_documents,
-    markdownpluspage,
+    # TODO - G.M - 2018-08-02 - Restore markdownpage app
+    # markdownpluspage,
     _file,
     thread,
-    calendar,
+    folder,
+    # calendar,
 ]

backend/tracim_backend/models/contents.py

@@ -6,6 +6,7 @@ from tracim_backend.exceptions import ContentTypeNotExist
 from tracim_backend.exceptions import ContentStatusNotExist
 from tracim_backend.models.applications import html_documents
 from tracim_backend.models.applications import _file
+from tracim_backend.models.applications import folder
 from tracim_backend.models.applications import thread
 from tracim_backend.models.applications import markdownpluspage
 
@@ -171,10 +172,10 @@ html_documents_type = ContentType(
 # TODO - G.M - 31-05-2018 - Set Better folder params
 folder_type = ContentType(
     slug='folder',
-    fa_icon=thread.fa_icon,
-    hexcolor=thread.hexcolor,
+    fa_icon=folder.fa_icon,
+    hexcolor=folder.hexcolor,
     label='Folder',
-    creation_label='Create collection of any documents',
+    creation_label='Create a folder',
     available_statuses=CONTENT_STATUS.get_all(),
 )
 
@@ -261,7 +262,8 @@ CONTENT_TYPES = ContentTypeList(
     [
         thread_type,
         file_type,
-        markdownpluspage_type,
+        # TODO - G.M - 2018-08-02 - Restore markdown page content
+        #    markdownpluspage_type,
         html_documents_type,
     ]
 )

backend/tracim_backend/tests/functional/test_system.py

@@ -1,5 +1,7 @@
 # coding=utf-8
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import FunctionalTest
+from tracim_backend.models.applications import applications
 
 """
 Tests for /api/v2/system subpath endpoints.
@@ -24,41 +26,14 @@ class TestApplicationEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/system/applications', status=200)
         res = res.json_body
-        application = res[0]
-        assert application['label'] == "Text Documents"
-        assert application['slug'] == 'contents/html-document'
-        assert application['fa_icon'] == 'file-text-o'
-        assert application['hexcolor'] == '#3f52e3'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[1]
-        assert application['label'] == "Markdown Plus Documents"
-        assert application['slug'] == 'contents/markdownpluspage'
-        assert application['fa_icon'] == 'file-code-o'
-        assert application['hexcolor'] == '#f12d2d'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[2]
-        assert application['label'] == "Files"
-        assert application['slug'] == 'contents/file'
-        assert application['fa_icon'] == 'paperclip'
-        assert application['hexcolor'] == '#FF9900'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[3]
-        assert application['label'] == "Threads"
-        assert application['slug'] == 'contents/thread'
-        assert application['fa_icon'] == 'comments-o'
-        assert application['hexcolor'] == '#ad4cf9'
-        assert application['is_active'] is True
-        assert 'config' in application
-        application = res[4]
-        assert application['label'] == "Calendar"
-        assert application['slug'] == 'calendar'
-        assert application['fa_icon'] == 'calendar'
-        assert application['hexcolor'] == '#757575'
-        assert application['is_active'] is True
-        assert 'config' in application
+        assert len(res) == len(applications)
+        for counter, application in enumerate(applications):
+            assert res[counter]['label'] == application.label
+            assert res[counter]['slug'] == application.slug
+            assert res[counter]['fa_icon'] == application.fa_icon
+            assert res[counter]['hexcolor'] == application.hexcolor
+            assert res[counter]['is_active'] == application.is_active
+            assert res[counter]['config'] == application.config
 
     def test_api__get_applications__err_401__unregistered_user(self):
         """
@@ -96,44 +71,21 @@ class TestContentsTypesEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/system/content_types', status=200)
         res = res.json_body
+        assert len(res) == len(CONTENT_TYPES.endpoint_allowed_types_slug())
+        content_types = CONTENT_TYPES.endpoint_allowed_types_slug()
 
-        content_type = res[1]
-        assert content_type['slug'] == 'thread'
-        assert content_type['fa_icon'] == 'comments-o'
-        assert content_type['hexcolor'] == '#ad4cf9'
-        assert content_type['label'] == 'Thread'
-        assert content_type['creation_label'] == 'Discuss about a topic'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[2]
-        assert content_type['slug'] == 'file'
-        assert content_type['fa_icon'] == 'paperclip'
-        assert content_type['hexcolor'] == '#FF9900'
-        assert content_type['label'] == 'File'
-        assert content_type['creation_label'] == 'Upload a file'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[3]
-        assert content_type['slug'] == 'markdownpage'
-        assert content_type['fa_icon'] == 'file-code-o'
-        assert content_type['hexcolor'] == '#f12d2d'
-        assert content_type['label'] == 'Rich Markdown File'
-        assert content_type['creation_label'] == 'Create a Markdown document'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-
-        content_type = res[4]
-        assert content_type['slug'] == 'html-document'
-        assert content_type['fa_icon'] == 'file-text-o'
-        assert content_type['hexcolor'] == '#3f52e3'
-        assert content_type['label'] == 'Text Document'
-        assert content_type['creation_label'] == 'Write a document'
-        assert 'available_statuses' in content_type
-        assert len(content_type['available_statuses']) == 4
-        # TODO - G.M - 31-05-2018 - Check Folder type
-        # TODO - G.M - 29-05-2018 - Better check for available_statuses
+        for counter, content_type_slug in enumerate(content_types):
+            content_type = CONTENT_TYPES.get_one_by_slug(content_type_slug)
+            assert res[counter]['slug'] == content_type.slug
+            assert res[counter]['fa_icon'] == content_type.fa_icon
+            assert res[counter]['hexcolor'] == content_type.hexcolor
+            assert res[counter]['label'] == content_type.label
+            assert res[counter]['creation_label'] == content_type.creation_label
+            for status_counter, status in enumerate(content_type.available_statuses):
+                assert res[counter]['available_statuses'][status_counter]['fa_icon'] == status.fa_icon  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['global_status'] == status.global_status  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['slug'] == status.slug  # nopep8
+                assert res[counter]['available_statuses'][status_counter]['hexcolor'] == status.hexcolor  # nopep8
 
     def test_api__get_content_types__err_401__unregistered_user(self):
         """

backend/tracim_backend/tests/functional/test_user.py

@@ -2382,8 +2382,10 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert workspace['workspace_id'] == 1
         assert workspace['label'] == 'Business'
         assert workspace['slug'] == 'business'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -2406,32 +2408,19 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
 
     def test_api__get_user_workspaces__err_403__unallowed_user(self):
         """

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -41,8 +41,10 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -65,33 +67,19 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
-
     def test_api__update_workspace__ok_200__nominal_case(self) -> None:
         """
         Test update workspace
@@ -118,7 +106,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # modify workspace
         res = self.testapp.put_json(
@@ -132,7 +120,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # after
         res = self.testapp.get(
@@ -145,7 +133,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
     def test_api__update_workspace__err_400__empty_label(self) -> None:
         """
@@ -1438,7 +1426,7 @@ class TestWorkspaceContents(FunctionalTest):
         params = {
             'parent_id': None,
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1449,7 +1437,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1480,7 +1468,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1491,7 +1479,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1544,7 +1532,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
             'parent_id': 10,
         }
         res = self.testapp.post_json(
@@ -1556,7 +1544,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1587,7 +1575,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': '',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',