Merge branch 'develop' into feature/612_get_known_user

README_traduction.md

@@ -0,0 +1,74 @@
+# Tracim internationalization
+
+## How to for Frontend part
+
+In each frontend repo (frontend, frontend_app_..., frontend_lib), there is a folder i18next.scanner that holds every translation files in JSON.
+
+___
+
+### I have found a translation error, how do I fix it ?
+
+**If the error is in any language other than english:**
+
+a) you can edit the values of the json files.
+
+b) Then commit/push your changes
+
+**If the error is in en.json:**
+
+1) You must find the key in the according .jsx file of that same repo.
+
+2) Fix the error
+ 
+3) Rebuild the translation files with:
+
+`npm run build-translation`
+
+This will add your new key in the translation files and remove the old one.
+
+4) Add translations for your new key in other .json files.
+
+5) commit/push your changes
+
+___
+
+### I have found an untranslated key in a language, how do I fix it ?
+
+It means you have found an english text even though you have selected another language. 
+
+Do task a) and b) in the according .json file, in folder i18next.scanner.
+
+___
+
+### I have found an untranslated key in a language but the key does not appear in the .json file.
+
+Do step 3).
+
+If the key still isn't in the .json file, it means the text in the .jsx file does not implement the translation process.
+
+So you must:
+
+I) Find the according .jsx file that have your untranslated key
+
+II) wrap your untranslated key in the translation function `t`:
+
+Exemple: `<div>My untranslated key</div>` will become `<div>{this.props.t('My untranslated key')}</div>`
+
+III) Check that `t` in available in your component, meanings your component must be wraped in the `translate()` higher order function
+
+``` javascript
+import React from 'react'
+import { translate } from 'react-i18next'
+
+class MyComponent extends React.Component {
+  render () {
+    return (<div>{this.props.t('My untranslated key')}</div>)
+  }
+}
+
+export default translate()(MyComponent)
+```
+
+IV) You can destruct `t` from `this.props` in the `render()` like it is done in most components.
+
+V) Do steps 3), 4), 5)

backend/doc/roles.md

@@ -7,6 +7,11 @@ The other is workspace related and is called "workspace role".
 
 ## Global profile
 
+|                               | Normal User | Managers    | Admin          |
+|-------------------------------|-------------|-------------|----------------|
+| slug                            | users       | managers    | administrators |
+|-------------------------------|-------------|-------------|---------|
+
 
 |                               | Normal User | Managers    | Admin   |
 |-------------------------------|-------------|-------------|---------|
@@ -22,11 +27,18 @@ The other is workspace related and is called "workspace role".
 | access to all user data (/users/{user_id} endpoints) |personal-only|personal-only| yes     |
 
 
+
+
 ## Workspace Roles
 
 
 |                              | Reader | Contributor | Content Manager | Workspace Manager |
 |------------------------------|--------|-------------|-----------------|-------------------|
+| slug                         | reader | contributor | content-manager |  workspace-manager|
+|------------------------------|--------|-------------|-----------------|-------------------|
+
+|                              | Reader | Contributor | Content Manager | Workspace Manager |
+|------------------------------|--------|-------------|-----------------|-------------------|
 | read content                 |  yes   | yes         | yes             | yes               |
 |------------------------------|--------|-------------|-----------------|-------------------|
 | create content               |  no    | yes         | yes             | yes               |

backend/tracim_backend/config.py

@@ -3,8 +3,9 @@ from urllib.parse import urlparse
 from paste.deploy.converters import asbool
 from tracim_backend.lib.utils.logger import logger
 from depot.manager import DepotManager
+from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.models.data import ActionDescription
 
-from tracim_backend.models.data import ActionDescription, ContentType
 
 
 class CFG(object):
@@ -145,11 +146,11 @@ class CFG(object):
         ]
 
         self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [
-            ContentType.Page,
-            ContentType.Thread,
-            ContentType.File,
-            ContentType.Comment,
-            # ContentType.Folder -- Folder is skipped
+            CONTENT_TYPES.Page.slug,
+            CONTENT_TYPES.Thread.slug,
+            CONTENT_TYPES.File.slug,
+            CONTENT_TYPES.Comment.slug,
+            # CONTENT_TYPES.Folder.slug -- Folder is skipped
         ]
         if settings.get('email.notification.from'):
             raise Exception(

backend/tracim_backend/fixtures/content.py

@@ -8,7 +8,7 @@ from tracim_backend.fixtures.users_and_groups import Test
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.revision_protection import new_revision
 
@@ -91,14 +91,14 @@ class Content(Fixture):
         # Folders
 
         tool_workspace = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=business_workspace,
             label='Tools',
             do_save=True,
             do_notify=False,
         )
         menu_workspace = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=business_workspace,
             label='Menus',
             do_save=True,
@@ -106,21 +106,21 @@ class Content(Fixture):
         )
 
         dessert_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Desserts',
             do_save=True,
             do_notify=False,
         )
         salads_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Salads',
             do_save=True,
             do_notify=False,
         )
         other_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=other_workspace,
             label='Infos',
             do_save=True,
@@ -129,7 +129,7 @@ class Content(Fixture):
 
         # Pages, threads, ..
         tiramisu_page = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Tiramisu Recipes!!!',
@@ -149,7 +149,7 @@ class Content(Fixture):
             content_api.save(tiramisu_page)
 
         best_cake_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Best Cake',
@@ -159,7 +159,7 @@ class Content(Fixture):
         best_cake_thread.description = 'Which is the best cake?'
         self._session.add(best_cake_thread)
         apple_pie_recipe = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Apple_Pie',
@@ -174,7 +174,7 @@ class Content(Fixture):
         )
         self._session.add(apple_pie_recipe)
         Brownie_recipe = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=recipe_workspace,
             parent=dessert_folder,
             label='Brownie Recipe',
@@ -189,7 +189,7 @@ class Content(Fixture):
         )
         self._session.add(Brownie_recipe)
         fruits_desserts_folder = content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=recipe_workspace,
             label='Fruits Desserts',
             parent=dessert_folder,
@@ -197,7 +197,7 @@ class Content(Fixture):
         )
 
         menu_page = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=menu_workspace,
             label='Current Menu',
@@ -205,14 +205,14 @@ class Content(Fixture):
         )
 
         new_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='New Fruit Salad',
             do_save=True,
         )
         old_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='Fruit Salad',
@@ -228,7 +228,7 @@ class Content(Fixture):
         content_api.save(old_fruit_salad)
 
         bad_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=recipe_workspace,
             parent=fruits_desserts_folder,
             label='Bad Fruit Salad',
@@ -245,13 +245,13 @@ class Content(Fixture):
 
         # File at the root for test
         new_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='New Fruit Salad',
             do_save=True,
         )
         old_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='Fruit Salad',
             do_save=True,
@@ -265,7 +265,7 @@ class Content(Fixture):
         content_api.save(old_fruit_salad)
 
         bad_fruit_salad = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=other_workspace,
             label='Bad Fruit Salad',
             do_save=True,

backend/tracim_backend/lib/core/content.py

@@ -34,13 +34,15 @@ from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.exceptions import ContentNotFound
 from tracim_backend.exceptions import WorkspacesDoNotMatch
 from tracim_backend.lib.utils.utils import current_date_for_filename
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.data import ActionDescription
-from tracim_backend.models.data import ContentStatus
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
+
 from tracim_backend.models.data import NodeTreeItem
 from tracim_backend.models.data import RevisionReadStatus
 from tracim_backend.models.data import UserRoleInWorkspace
@@ -75,10 +77,10 @@ def compare_content_for_sorting_by_type_and_name(
     else:
         # TODO - D.A. - 2014-12-02 - Manage Content Types Dynamically
         content_type_order = [
-            ContentType.Folder,
-            ContentType.Page,
-            ContentType.Thread,
-            ContentType.File,
+            CONTENT_TYPES.Folder.slug,
+            CONTENT_TYPES.Page.slug,
+            CONTENT_TYPES.Thread.slug,
+            CONTENT_TYPES.File.slug,
         ]
 
         content_1_type_index = content_type_order.index(content1.type)
@@ -105,15 +107,15 @@ class ContentApi(object):
     SEARCH_SEPARATORS = ',| '
     SEARCH_DEFAULT_RESULT_NB = 50
 
-    DISPLAYABLE_CONTENTS = (
-        ContentType.Folder,
-        ContentType.File,
-        ContentType.Comment,
-        ContentType.Thread,
-        ContentType.Page,
-        ContentType.PageLegacy,
-        ContentType.MarkdownPage,
-    )
+    # DISPLAYABLE_CONTENTS = (
+    #     CONTENT_TYPES.Folder.slug,
+    #     CONTENT_TYPES.File.slug,
+    #     CONTENT_TYPES.Comment.slug,
+    #     CONTENT_TYPES.Thread.slug,
+    #     CONTENT_TYPES.Page.slug,
+    #     CONTENT_TYPES.Page.slugLegacy,
+    #     ContentType.MarkdownPage,
+    # )
 
     def __init__(
             self,
@@ -230,7 +232,7 @@ class ContentApi(object):
 
         # Exclude non displayable types
         if not self._force_show_all_types:
-            result = result.filter(Content.type.in_(self.DISPLAYABLE_CONTENTS))
+            result = result.filter(Content.type.in_(CONTENT_TYPES.query_allowed_types_slugs()))
 
         if workspace:
             result = result.filter(Content.workspace_id == workspace.workspace_id)
@@ -369,8 +371,8 @@ class ContentApi(object):
     #     removed_item_ids = removed_item_ids or []  # FDV
     # 
     #     if not allowed_node_types:
-    #         allowed_node_types = [ContentType.Folder]
-    #     elif allowed_node_types==ContentType.Any:
+    #         allowed_node_types = [CONTENT_TYPES.Folder.slug]
+    #     elif allowed_node_types==CONTENT_TYPES.Any_SLUG:
     #         allowed_node_types = ContentType.all()
     # 
     #     parent_id = parent.content_id if parent else None
@@ -395,7 +397,7 @@ class ContentApi(object):
     #     for folder in folders:
     #         for allowed_content_type in filter_by_allowed_content_types:
     # 
-    #             is_folder = folder.type == ContentType.Folder
+    #             is_folder = folder.type == CONTENT_TYPES.Folder.slug
     #             content_type__allowed = folder.properties['allowed_content'][allowed_content_type] == True
     # 
     #             if is_folder and content_type__allowed:
@@ -404,12 +406,13 @@ class ContentApi(object):
     # 
     #     return result
 
-    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label: str ='', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
+    def create(self, content_type_slug: str, workspace: Workspace, parent: Content=None, label: str = '', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
         # TODO - G.M - 2018-07-16 - raise Exception instead of assert
-        assert content_type in ContentType.allowed_types()
+        assert content_type_slug in CONTENT_TYPES.query_allowed_types_slugs()
+        assert content_type_slug != CONTENT_TYPES.Any_SLUG
         assert not (label and filename)
 
-        if content_type == ContentType.Folder and not label:
+        if content_type_slug == CONTENT_TYPES.Folder.slug and not label:
             label = self.generate_folder_label(workspace, parent)
 
         content = Content()
@@ -421,7 +424,7 @@ class ContentApi(object):
         elif label:
             content.label = label
         else:
-            if content_type == ContentType.Comment:
+            if content_type_slug == CONTENT_TYPES.Comment.slug:
                 # INFO - G.M - 2018-07-16 - Default label for comments is
                 # empty string.
                 content.label = ''
@@ -431,13 +434,13 @@ class ContentApi(object):
         content.owner = self._user
         content.parent = parent
         content.workspace = workspace
-        content.type = content_type
+        content.type = content_type_slug
         content.is_temporary = is_temporary
         content.revision_type = ActionDescription.CREATION
 
         if content.type in (
-                ContentType.Page,
-                ContentType.Thread,
+                CONTENT_TYPES.Page.slug,
+                CONTENT_TYPES.Thread.slug,
         ):
             content.file_extension = '.html'
 
@@ -447,7 +450,7 @@ class ContentApi(object):
         return content
 
     def create_comment(self, workspace: Workspace=None, parent: Content=None, content:str ='', do_save=False) -> Content:
-        assert parent and parent.type != ContentType.Folder
+        assert parent and parent.type != CONTENT_TYPES.Folder.slug
         if not content:
             raise EmptyCommentContentNotAllowed()
         item = Content()
@@ -456,7 +459,7 @@ class ContentApi(object):
         if not workspace:
             workspace = item.parent.workspace
         item.workspace = workspace
-        item.type = ContentType.Comment
+        item.type = CONTENT_TYPES.Comment.slug
         item.description = content
         item.label = ''
         item.revision_type = ActionDescription.COMMENT
@@ -492,7 +495,7 @@ class ContentApi(object):
 
         base_request = self._base_query(workspace).filter(Content.content_id==content_id)
 
-        if content_type!=ContentType.Any:
+        if content_type!=CONTENT_TYPES.Any_SLUG:
             base_request = base_request.filter(Content.type==content_type)
 
         if parent:
@@ -577,20 +580,20 @@ class ContentApi(object):
         return query.filter(
             or_(
                 and_(
-                    Content.type == ContentType.File,
+                    Content.type == CONTENT_TYPES.File.slug,
                     Content.label == file_name,
                     Content.file_extension == file_extension,
                 ),
                 and_(
-                    Content.type == ContentType.Thread,
+                    Content.type == CONTENT_TYPES.Thread.slug,
                     Content.label == file_name,
                 ),
                 and_(
-                    Content.type == ContentType.Page,
+                    Content.type == CONTENT_TYPES.Page.slug,
                     Content.label == file_name,
                 ),
                 and_(
-                    Content.type == ContentType.Folder,
+                    Content.type == CONTENT_TYPES.Folder.slug,
                     Content.label == content_label,
                 ),
             )
@@ -671,7 +674,7 @@ class ContentApi(object):
             # Filter query on label
             folder_query = query \
                 .filter(
-                    Content.type == ContentType.Folder,
+                    Content.type == CONTENT_TYPES.Folder.slug,
                     Content.label == label,
                     Content.workspace_id == workspace.workspace_id,
                 )
@@ -723,22 +726,22 @@ class ContentApi(object):
 
         return query.filter(or_(
             and_(
-                Content.type == ContentType.File,
+                Content.type == CONTENT_TYPES.File.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Thread,
+                Content.type == CONTENT_TYPES.Thread.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Page,
+                Content.type == CONTENT_TYPES.Page.slug,
                 file_name_filter,
                 file_extension_filter,
             ),
             and_(
-                Content.type == ContentType.Folder,
+                Content.type == CONTENT_TYPES.Folder.slug,
                 label_filter,
             ),
         ))
@@ -844,25 +847,28 @@ class ContentApi(object):
     def _get_all_query(
         self,
         parent_id: int = None,
-        content_type: str = ContentType.Any,
+        content_type_slug: str = CONTENT_TYPES.Any_SLUG,
         workspace: Workspace = None
     ) -> Query:
         """
         Extended filter for better "get all data" query
         :param parent_id: filter by parent_id
-        :param content_type: filter by content_type slug
+        :param content_type_slug: filter by content_type slug
         :param workspace: filter by workspace
         :return:
         """
         assert parent_id is None or isinstance(parent_id, int)
-        assert content_type is not None
+        assert content_type_slug is not None
         resultset = self._base_query(workspace)
 
-        if content_type!=ContentType.Any:
+        if content_type_slug != CONTENT_TYPES.Any_SLUG:
             # INFO - G.M - 2018-07-05 - convert with
             #  content type object to support legacy slug
-            content_type_object = ContentType(content_type)
-            resultset = resultset.filter(Content.type.in_(content_type_object.get_slug_aliases()))
+            content_type_object = CONTENT_TYPES.get_one_by_slug(content_type_slug)
+            all_slug_alias = [content_type_object.slug]
+            if content_type_object.slug_alias:
+                all_slug_alias.extend(content_type_object.slug_alias)
+            resultset = resultset.filter(Content.type.in_(all_slug_alias))
 
         if parent_id:
             resultset = resultset.filter(Content.parent_id==parent_id)
@@ -871,7 +877,7 @@ class ContentApi(object):
 
         return resultset
 
-    def get_all(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> typing.List[Content]:
+    def get_all(self, parent_id: int=None, content_type: str=CONTENT_TYPES.Any_SLUG, workspace: Workspace=None) -> typing.List[Content]:
         return self._get_all_query(parent_id, content_type, workspace).all()
 
     # TODO - G.M - 2018-07-17 - [Cleanup] Drop this method if unneeded
@@ -895,14 +901,14 @@ class ContentApi(object):
 
     # TODO - G.M - 2018-07-17 - [Cleanup] Drop this method if unneeded
     # TODO find an other name to filter on is_deleted / is_archived
-    def get_all_with_filter(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> typing.List[Content]:
+    def get_all_with_filter(self, parent_id: int=None, content_type: str=CONTENT_TYPES.Any_SLUG, workspace: Workspace=None) -> typing.List[Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
 
         resultset = self._base_query(workspace)
 
-        if content_type != ContentType.Any:
+        if content_type != CONTENT_TYPES.Any_SLUG:
             resultset = resultset.filter(Content.type==content_type)
 
         resultset = resultset.filter(Content.is_deleted == self._show_deleted)
@@ -919,46 +925,11 @@ class ContentApi(object):
 
         resultset = self._base_query(workspace)
 
-        if content_type != ContentType.Any:
+        if content_type != CONTENT_TYPES.Any_SLUG:
             resultset = resultset.filter(Content.type==content_type)
 
         return resultset.all()
 
-    def get_last_active(self, parent_id: int, content_type: str, workspace: Workspace=None, limit=10) -> typing.List[Content]:
-        assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
-        assert content_type is not None# DYN_REMOVE
-        assert isinstance(content_type, str) # DYN_REMOVE
-
-        resultset = self._base_query(workspace) \
-            .filter(Content.workspace_id == Workspace.workspace_id) \
-            .filter(Workspace.is_deleted.is_(False)) \
-            .order_by(desc(Content.updated))
-
-        if content_type!=ContentType.Any:
-            resultset = resultset.filter(Content.type==content_type)
-
-        if parent_id:
-            resultset = resultset.filter(Content.parent_id==parent_id)
-
-        result = []
-        for item in resultset:
-            new_item = None
-            if ContentType.Comment == item.type:
-                new_item = item.parent
-            else:
-                new_item = item
-
-            # INFO - D.A. - 2015-05-20
-            # We do not want to show only one item if the last 10 items are
-            # comments about one thread for example
-            if new_item not in result:
-                result.append(new_item)
-
-            if len(result) >= limit:
-                break
-
-        return result
-
     def get_last_unread(self, parent_id: int, content_type: str,
                         workspace: Workspace=None, limit=10) -> typing.List[Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE
@@ -980,7 +951,7 @@ class ContentApi(object):
     #
     #     resultset = self._base_query(workspace)
     #
-    #     if content_type != ContentType.Any:
+    #     if content_type != CONTENT_TYPES.Any_SLUG:
     #         resultset = resultset.filter(Content.type==content_type)
     #
     #     return resultset.all()
@@ -989,7 +960,7 @@ class ContentApi(object):
             self,
             workspace: Workspace=None,
             limit: typing.Optional[int]=None,
-            before_datetime: typing.Optional[datetime.datetime]= None,
+            before_content: typing.Optional[Content]= None,
             content_ids: typing.Optional[typing.List[int]] = None,
     ) -> typing.List[Content]:
         """
@@ -997,7 +968,8 @@ class ContentApi(object):
         (last modification of content itself or one of this comment)
         :param workspace: Workspace to check
         :param limit: maximum number of elements to return
-        :param before_datetime: date from where we check older content.
+        :param before_content: last_active content are only those updated
+         before this content given.
         :param content_ids: restrict selection to some content ids and
         related Comments
         :return: list of content
@@ -1012,7 +984,7 @@ class ContentApi(object):
                     Content.content_id.in_(content_ids),
                     and_(
                         Content.parent_id.in_(content_ids),
-                        Content.type == ContentType.Comment
+                        Content.type == CONTENT_TYPES.Comment.slug
                     )
                 )
             )
@@ -1021,25 +993,24 @@ class ContentApi(object):
 
         active_contents = []
         too_recent_content = []
+        before_content_find = False
         for content in resultset:
             related_active_content = None
-            if ContentType.Comment == content.type:
+            if CONTENT_TYPES.Comment.slug == content.type:
                 related_active_content = content.parent
             else:
                 related_active_content = content
 
-            if not before_datetime:
-                before_datetime = datetime.datetime.now()
-            # INFO - D.A. - 2015-05-20
-            # We do not want to show only one item if the last 10 items are
-            # comments about one thread for example
             if related_active_content not in active_contents and related_active_content not in too_recent_content:  # nopep8
-                # we verify that content is old enough
-                if content.updated < before_datetime:
+
+                if not before_content or before_content_find:
                     active_contents.append(related_active_content)
                 else:
                     too_recent_content.append(related_active_content)
 
+                if before_content and related_active_content == before_content:
+                    before_content_find = True
+
             if limit and len(active_contents) >= limit:
                 break
 
@@ -1075,12 +1046,12 @@ class ContentApi(object):
     #         .filter(Content.content_id.in_(not_read_content_ids)) \
     #         .order_by(desc(Content.updated))
     #
-    #     if content_type != ContentType.Any:
+    #     if content_type != CONTENT_TYPES.Any_SLUG:
     #         not_read_contents = not_read_contents.filter(
     #             Content.type==content_type)
     #     else:
     #         not_read_contents = not_read_contents.filter(
-    #             Content.type!=ContentType.Folder)
+    #             Content.type!=CONTENT_TYPES.Folder.slug)
     #
     #     if parent_id:
     #         not_read_contents = not_read_contents.filter(
@@ -1089,7 +1060,7 @@ class ContentApi(object):
     #     result = []
     #     for item in not_read_contents:
     #         new_item = None
-    #         if ContentType.Comment == item.type:
+    #         if CONTENT_TYPES.Comment.slug == item.type:
     #             new_item = item.parent
     #         else:
     #             new_item = item
@@ -1121,7 +1092,7 @@ class ContentApi(object):
         folder.properties = properties
 
     def set_status(self, content: Content, new_status: str):
-        if new_status in ContentStatus.allowed_values():
+        if new_status in CONTENT_STATUS.get_all_slugs_values():
             content.status = new_status
             content.revision_type = ActionDescription.STATUS_UPDATE
         else:
@@ -1331,7 +1302,7 @@ class ContentApi(object):
                 self.mark_read(child, read_datetime=read_datetime,
                                do_flush=False)
 
-            if ContentType.Comment == content.type:
+            if CONTENT_TYPES.Comment.slug == content.type:
                 self.mark_read(content.parent, read_datetime=read_datetime,
                                do_flush=False, recursive=False)
                 for comment in content.parent.get_comments():
@@ -1451,12 +1422,12 @@ class ContentApi(object):
         return title_keyworded_items
 
     def get_all_types(self) -> typing.List[ContentType]:
-        labels = ContentType.all()
+        labels = CONTENT_TYPES.endpoint_allowed_types_slug()
         content_types = []
         for label in labels:
-            content_types.append(ContentType(label))
+            content_types.append(CONTENT_TYPES.get_one_by_slug(label))
 
-        return ContentType.sorted(content_types)
+        return content_types
 
     # TODO - G.M - 2018-07-24 - [Cleanup] Is this method already needed ?
     def exclude_unavailable(

backend/tracim_backend/lib/core/workspace.py

@@ -3,9 +3,11 @@ import typing
 
 from sqlalchemy.orm import Query
 from sqlalchemy.orm import Session
+from sqlalchemy.orm.exc import NoResultFound
 
 from tracim_backend import CFG
 from tracim_backend.exceptions import EmptyLabelNotAllowed
+from tracim_backend.exceptions import WorkspaceNotFound
 from tracim_backend.lib.utils.translation import fake_translator as _
 
 from tracim_backend.lib.core.userworkspace import RoleApi
@@ -132,10 +134,16 @@ class WorkspaceApi(object):
         return workspace
 
     def get_one(self, id):
-        return self._base_query().filter(Workspace.workspace_id == id).one()
+        try:
+            return self._base_query().filter(Workspace.workspace_id == id).one()
+        except NoResultFound as exc:
+            raise WorkspaceNotFound('workspace {} does not exist or not visible for user'.format(id)) from exc  # nopep8
 
     def get_one_by_label(self, label: str) -> Workspace:
-        return self._base_query().filter(Workspace.label == label).one()
+        try:
+            return self._base_query().filter(Workspace.label == label).one()
+        except NoResultFound as exc:
+            raise WorkspaceNotFound('workspace {} does not exist or not visible for user'.format(id)) from exc  # nopep8
 
     """
     def get_one_for_current_user(self, id):

backend/tracim_backend/lib/mail_notifier/notifier.py

@@ -19,9 +19,9 @@ from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.utils.logger import logger
 from tracim_backend.models import User
 from tracim_backend.models.auth import User
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.lib.utils.translation import fake_translator as l_, \
     fake_translator as _
@@ -233,8 +233,8 @@ class EmailManager(object):
             config=self.config,
             show_archived=True,
             show_deleted=True,
-        ).get_one(event_content_id, ContentType.Any)
-        main_content = content.parent if content.type == ContentType.Comment else content
+        ).get_one(event_content_id, CONTENT_TYPES.Any_SLUG)
+        main_content = content.parent if content.type == CONTENT_TYPES.Comment.slug else content
         notifiable_roles = WorkspaceApi(
             current_user=user,
             session=self.session,
@@ -455,20 +455,20 @@ class EmailManager(object):
             content_text = content.description
             call_to_action_text = l_('View online')
 
-            if ContentType.Thread == content.type:
+            if CONTENT_TYPES.Thread.slug == content.type:
                 call_to_action_text = l_('Answer')
                 content_intro = l_('<span id="content-intro-username">{}</span> started a thread entitled:').format(actor.display_name)
                 content_text = '<p id="content-body-intro">{}</p>'.format(content.label) + \
                                content.get_last_comment_from(actor).description
 
-            elif ContentType.File == content.type:
+            elif CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> added a file entitled:').format(actor.display_name)
                 if content.description:
                     content_text = content.description
                 else:
                     content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
 
-            elif ContentType.Page == content.type:
+            elif CONTENT_TYPES.Page.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> added a page entitled:').format(actor.display_name)
                 content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
 
@@ -476,11 +476,11 @@ class EmailManager(object):
             content_text = content.description
             call_to_action_text = l_('View online')
 
-            if ContentType.File == content.type:
+            if CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> uploaded a new revision.').format(actor.display_name)
                 content_text = ''
 
-            elif ContentType.Page == content.type:
+            elif CONTENT_TYPES.Page.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated this page.').format(actor.display_name)
                 previous_revision = content.get_previous_revision()
                 title_diff = ''
@@ -490,7 +490,7 @@ class EmailManager(object):
                     title_diff + \
                     htmldiff(previous_revision.description, content.description)
 
-            elif ContentType.Thread == content.type:
+            elif CONTENT_TYPES.Thread.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated the thread description.').format(actor.display_name)
                 previous_revision = content.get_previous_revision()
                 title_diff = ''
@@ -503,7 +503,7 @@ class EmailManager(object):
         elif ActionDescription.EDITION == action:
             call_to_action_text = l_('View online')
 
-            if ContentType.File == content.type:
+            if CONTENT_TYPES.File.slug == content.type:
                 content_intro = l_('<span id="content-intro-username">{}</span> updated the file description.').format(actor.display_name)
                 content_text = '<p id="content-body-intro">{}</p>'.format(content.get_label()) + \
                     content.description

backend/tracim_backend/lib/utils/authorization.py

@@ -5,15 +5,15 @@ import functools
 from pyramid.interfaces import IAuthorizationPolicy
 from zope.interface import implementer
 
-from tracim_backend.models.contents import NewContentType
-from tracim_backend.models.context_models import ContentInContext
+from tracim_backend.models.contents import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 try:
     from json.decoder import JSONDecodeError
 except ImportError:  # python3.4
     JSONDecodeError = ValueError
 
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import ContentType
 from tracim_backend.exceptions import InsufficientUserRoleInWorkspace
 from tracim_backend.exceptions import ContentTypeNotAllowed
 from tracim_backend.exceptions import InsufficientUserProfile
@@ -133,18 +133,18 @@ def require_candidate_workspace_role(minimal_required_role: int) -> typing.Calla
     return decorator
 
 
-def require_content_types(content_types: typing.List['NewContentType']) -> typing.Callable:  # nopep8
+def require_content_types(content_types: typing.List['ContentType']) -> typing.Callable:  # nopep8
     """
     Restricts access to specific file type or raise an exception.
     Check role for candidate_workspace.
-    :param content_types: list of NewContentType object
+    :param content_types: list of ContentType object
     :return: decorator
     """
     def decorator(func: typing.Callable) -> typing.Callable:
         @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest') -> typing.Callable:
             content = request.current_content
-            current_content_type_slug = ContentType(content.type).slug
+            current_content_type_slug = CONTENT_TYPES.get_one_by_slug(content.type).slug
             content_types_slug = [content_type.slug for content_type in content_types]  # nopep8
             if current_content_type_slug in content_types_slug:
                 return func(self, context, request)

backend/tracim_backend/lib/utils/request.py

@@ -15,7 +15,7 @@ from tracim_backend.exceptions import UserNotFoundInTracimRequest
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.exceptions import WorkspaceNotFound
 from tracim_backend.exceptions import ImmutableAttribute
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
@@ -233,7 +233,7 @@ class TracimRequest(Request):
             )
             comment = api.get_one(
                 comment_id,
-                content_type=ContentType.Comment,
+                content_type=CONTENT_TYPES.Comment.slug,
                 workspace=workspace,
                 parent=content,
             )
@@ -271,7 +271,7 @@ class TracimRequest(Request):
                 session=request.dbsession,
                 config=request.registry.settings['CFG']
             )
-            content = api.get_one(content_id=content_id, workspace=workspace, content_type=ContentType.Any)  # nopep8
+            content = api.get_one(content_id=content_id, workspace=workspace, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
         except NoResultFound as exc:
             raise ContentNotFound(
                 'Content {} does not exist '

backend/tracim_backend/lib/webdav/dav_provider.py

@@ -8,6 +8,7 @@ from sqlalchemy.orm.exc import NoResultFound
 from tracim_backend import CFG
 from tracim_backend.lib.webdav.utils import transform_to_bdd, HistoryType, \
     SpecialFolderExtension
+from tracim_backend.models.contents import CONTENT_TYPES
 
 from wsgidav.dav_provider import DAVProvider
 from wsgidav.lock_manager import LockManager
@@ -19,7 +20,8 @@ from tracim_backend.lib.core.content import ContentRevisionRO
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.webdav import resources
 from tracim_backend.lib.webdav.utils import normpath
-from tracim_backend.models.data import ContentType, Content, Workspace
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import Workspace
 
 
 class Provider(DAVProvider):
@@ -174,7 +176,7 @@ class Provider(DAVProvider):
             content_revision = content_api.get_one_revision(revision_id)
             content = self.get_content_from_revision(content_revision, content_api)
 
-            if content.type == ContentType.File:
+            if content.type == CONTENT_TYPES.File.slug:
                 return resources.HistoryFileResource(
                     path=path,
                     environ=environ,
@@ -198,7 +200,7 @@ class Provider(DAVProvider):
 
         if content is None:
             return None
-        if content.type == ContentType.Folder:
+        if content.type == CONTENT_TYPES.Folder.slug:
             return resources.FolderResource(
                 path=path,
                 environ=environ,
@@ -207,7 +209,7 @@ class Provider(DAVProvider):
                 session=session,
                 user=user,
             )
-        elif content.type == ContentType.File:
+        elif content.type == CONTENT_TYPES.File.slug:
             return resources.FileResource(
                 path=path,
                 environ=environ,
@@ -356,7 +358,7 @@ class Provider(DAVProvider):
 
     def get_content_from_revision(self, revision: ContentRevisionRO, api: ContentApi) -> Content:
         try:
-            return api.get_one(revision.content_id, ContentType.Any)
+            return api.get_one(revision.content_id, CONTENT_TYPES.Any_SLUG)
         except NoResultFound:
             return None
 

backend/tracim_backend/lib/webdav/design.py

@@ -1,8 +1,8 @@
 #coding: utf8
 from datetime import datetime
 
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import VirtualEvent
-from tracim_backend.models.data import ContentType
 from tracim_backend.models import data
 
 # FIXME: fix temporaire ...
@@ -237,6 +237,7 @@ def designPage(content: data.Content, content_revision: data.ContentRevisionRO)
 
     return page
 
+
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
         hist = content.get_history(drop_empty_revision=False)
 
@@ -248,7 +249,7 @@ def designThread(content: data.Content, content_revision: data.ContentRevisionRO
         disc = ''
         participants = {}
         for t in allT:
-            if t.type == ContentType.Comment:
+            if t.type == CONTENT_TYPES.Comment.slug:
                 disc += '''
                     <div class="row comment comment-row">
                         <i class="fa fa-comment-o comment-icon"></i>

backend/tracim_backend/lib/webdav/resources.py

@@ -19,10 +19,11 @@ from tracim_backend.lib.webdav.utils import transform_to_display, HistoryType, \
     FakeFileStream
 from tracim_backend.lib.webdav.utils import transform_to_bdd
 from tracim_backend.lib.core.workspace import WorkspaceApi
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import User, ContentRevisionRO
 from tracim_backend.models.data import Workspace
-from tracim_backend.models.data import Content, ActionDescription
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import ActionDescription
 from tracim_backend.lib.webdav.design import designThread, designPage
 
 from wsgidav import compat
@@ -236,7 +237,7 @@ class WorkspaceResource(DAVCollection):
 
         for content in children:
             # the purpose is to display .history only if there's at least one content's type that has a history
-            if content.type != ContentType.Folder:
+            if content.type != CONTENT_TYPES.Folder.slug:
                 self._file_count += 1
             retlist.append(content.get_label_as_file())
 
@@ -288,7 +289,7 @@ class WorkspaceResource(DAVCollection):
             raise DAVError(HTTP_FORBIDDEN)
 
         folder = self.content_api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=self.workspace,
             label=label,
             parent=self.content
@@ -331,12 +332,12 @@ class WorkspaceResource(DAVCollection):
     def getMemberList(self) -> [_DAVResource]:
         members = []
 
-        children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+        children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-            if content.type == ContentType.Folder:
+            if content.type == CONTENT_TYPES.Folder.slug:
                 members.append(
                     FolderResource(
                         path=content_path,
@@ -347,7 +348,7 @@ class WorkspaceResource(DAVCollection):
                         session=self.session,
                     )
                 )
-            elif content.type == ContentType.File:
+            elif content.type == CONTENT_TYPES.File.slug:
                 self._file_count += 1
                 members.append(
                     FileResource(
@@ -553,7 +554,7 @@ class FolderResource(WorkspaceResource):
         )
         visible_children = content_api.get_all(
             self.content.content_id,
-            ContentType.Any,
+            CONTENT_TYPES.Any_SLUG,
             self.workspace,
         )
 
@@ -561,7 +562,7 @@ class FolderResource(WorkspaceResource):
             content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
             try:
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             path=content_path,
@@ -572,7 +573,7 @@ class FolderResource(WorkspaceResource):
                             session=self.session,
                         )
                     )
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -592,13 +593,15 @@ class FolderResource(WorkspaceResource):
                             user=self.user,
                             session=self.session,
                         ))
-            except Exception as exc:
-                logger.exception(
-                    'Unable to construct member {}'.format(
-                        content_path,
-                    ),
-                    exc_info=True,
-                )
+            except NotImplementedError as exc:
+                pass
+            # except Exception as exc:
+            #     logger.exception(
+            #         'Unable to construct member {}'.format(
+            #             content_path,
+            #         ),
+            #         exc_info=True,
+            #     )
 
         if self._file_count > 0 and self.provider.show_history():
             members.append(
@@ -708,11 +711,11 @@ class HistoryFolderResource(FolderResource):
         ret = []
 
         content_id = None if self.content is None else self.content.id
-        for content in self.content_api.get_all(content_id, ContentType.Any, self.workspace):
+        for content in self.content_api.get_all(content_id, CONTENT_TYPES.Any_SLUG, self.workspace):
             if (self._is_archived and content.is_archived or
                 self._is_deleted and content.is_deleted or
                 not (content.is_archived or self._is_archived or content.is_deleted or self._is_deleted))\
-                    and content.type != ContentType.Folder:
+                    and content.type != CONTENT_TYPES.Folder.slug:
                 ret.append(content.get_label_as_file())
 
         return ret
@@ -741,7 +744,7 @@ class HistoryFolderResource(FolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
         
         for content in children:
             if content.is_archived == self._is_archived and content.is_deleted == self._is_deleted:
@@ -812,13 +815,13 @@ class DeletedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_deleted:
                 retlist.append(content.get_label_as_file())
 
-                if content.type != ContentType.Folder:
+                if content.type != CONTENT_TYPES.Folder.slug:
                     self._file_count += 1
 
         return retlist
@@ -829,13 +832,13 @@ class DeletedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_deleted:
                 content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             content_path,
@@ -845,7 +848,7 @@ class DeletedFolderResource(HistoryFolderResource):
                             user=self.user,
                             session=self.session,
                         ))
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -936,10 +939,10 @@ class ArchivedFolderResource(HistoryFolderResource):
         retlist = []
 
         for content in self.content_api.get_all_with_filter(
-                self.content if self.content is None else self.content.id, ContentType.Any):
+                self.content if self.content is None else self.content.id, CONTENT_TYPES.Any_SLUG):
             retlist.append(content.get_label_as_file())
 
-            if content.type != ContentType.Folder:
+            if content.type != CONTENT_TYPES.Folder.slug:
                 self._file_count += 1
 
         return retlist
@@ -950,13 +953,13 @@ class ArchivedFolderResource(HistoryFolderResource):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, CONTENT_TYPES.Any_SLUG, self.workspace)
 
         for content in children:
             if content.is_archived:
                 content_path = '%s/%s' % (self.path, transform_to_display(content.get_label_as_file()))
 
-                if content.type == ContentType.Folder:
+                if content.type == CONTENT_TYPES.Folder.slug:
                     members.append(
                         FolderResource(
                             content_path,
@@ -966,7 +969,7 @@ class ArchivedFolderResource(HistoryFolderResource):
                             user=self.user,
                             session=self.session,
                         ))
-                elif content.type == ContentType.File:
+                elif content.type == CONTENT_TYPES.File.slug:
                     self._file_count += 1
                     members.append(
                         FileResource(
@@ -1053,7 +1056,7 @@ class HistoryFileFolderResource(HistoryFolderResource):
 
         left_side = '%s/(%d - %s) ' % (self.path, revision.revision_id, revision.revision_type)
 
-        if self.content.type == ContentType.File:
+        if self.content.type == CONTENT_TYPES.File.slug:
             return HistoryFileResource(
                 path='%s%s' % (left_side, transform_to_display(revision.file_name)),
                 environ=self.environ,
@@ -1079,7 +1082,7 @@ class HistoryFileFolderResource(HistoryFolderResource):
 
             left_side = '%s/(%d - %s) ' % (self.path, content.revision_id, content.revision_type)
 
-            if self.content.type == ContentType.File:
+            if self.content.type == CONTENT_TYPES.File.slug:
                 members.append(HistoryFileResource(
                     path='%s%s' % (left_side, transform_to_display(content.file_name)),
                     environ=self.environ,
@@ -1425,13 +1428,13 @@ class OtherFileResource(FileResource):
         return filestream
 
     def design(self):
-        if self.content.type == ContentType.Page:
+        if self.content.type == CONTENT_TYPES.Page.slug:
             return designPage(self.content, self.content_revision)
         else:
             return designThread(
                 self.content,
                 self.content_revision,
-                self.content_api.get_all(self.content.content_id, ContentType.Comment)
+                self.content_api.get_all(self.content.content_id, CONTENT_TYPES.Comment.slug)
             )
 
 

backend/tracim_backend/lib/webdav/utils.py

@@ -4,12 +4,14 @@ import transaction
 from os.path import normpath as base_normpath
 
 from sqlalchemy.orm import Session
+from tracim_backend.models.contents import CONTENT_TYPES
 from wsgidav import util
 from wsgidav import compat
 
 from tracim_backend.lib.core.content import ContentApi
-from tracim_backend.models.data import Workspace, Content, ContentType, \
-    ActionDescription
+from tracim_backend.models.data import Workspace
+from tracim_backend.models.data import Content
+from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.revision_protection import new_revision
 
 
@@ -177,7 +179,7 @@ class FakeFileStream(object):
 
         file = self._api.create(
             filename=self._file_name,
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=self._workspace,
             parent=self._parent,
             is_temporary=is_temporary

backend/tracim_backend/models/applications.py

@@ -50,7 +50,7 @@ calendar = Application(
 
 thread = Application(
     label='Threads',
-    slug='contents/threads',
+    slug='contents/thread',
     fa_icon='comments-o',
     hexcolor='#ad4cf9',
     is_active=True,
@@ -61,7 +61,7 @@ thread = Application(
 
 _file = Application(
     label='Files',
-    slug='contents/files',
+    slug='contents/file',
     fa_icon='paperclip',
     hexcolor='#FF9900',
     is_active=True,
@@ -81,12 +81,12 @@ markdownpluspage = Application(
 
 html_documents = Application(
     label='Text Documents',  # TODO - G.M - 24-05-2018 - Check label
-    slug='contents/html-documents',
+    slug='contents/html-document',
     fa_icon='file-text-o',
     hexcolor='#3f52e3',
     is_active=True,
     config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=html-documents',
+    main_route='/#/workspaces/{workspace_id}/contents?type=html-document',
 )
 # TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
 # List of applications

backend/tracim_backend/models/contents.py

@@ -19,9 +19,9 @@ class GlobalStatus(Enum):
     CLOSED = 'closed'
 
 
-class NewContentStatus(object):
+class ContentStatus(object):
     """
-    Future ContentStatus object class
+    ContentStatus object class
     """
     def __init__(
             self,
@@ -38,7 +38,7 @@ class NewContentStatus(object):
         self.hexcolor = hexcolor
 
 
-open_status = NewContentStatus(
+open_status = ContentStatus(
     slug='open',
     global_status=GlobalStatus.OPEN.value,
     label='Open',
@@ -46,7 +46,7 @@ open_status = NewContentStatus(
     hexcolor='#3f52e3',
 )
 
-closed_validated_status = NewContentStatus(
+closed_validated_status = ContentStatus(
     slug='closed-validated',
     global_status=GlobalStatus.CLOSED.value,
     label='Validated',
@@ -54,7 +54,7 @@ closed_validated_status = NewContentStatus(
     hexcolor='#008000',
 )
 
-closed_unvalidated_status = NewContentStatus(
+closed_unvalidated_status = ContentStatus(
     slug='closed-unvalidated',
     global_status=GlobalStatus.CLOSED.value,
     label='Cancelled',
@@ -62,7 +62,7 @@ closed_unvalidated_status = NewContentStatus(
     hexcolor='#f63434',
 )
 
-closed_deprecated_status = NewContentStatus(
+closed_deprecated_status = ContentStatus(
     slug='closed-deprecated',
     global_status=GlobalStatus.CLOSED.value,
     label='Deprecated',
@@ -71,50 +71,44 @@ closed_deprecated_status = NewContentStatus(
 )
 
 
-CONTENT_DEFAULT_STATUS = [
-    open_status,
-    closed_validated_status,
-    closed_unvalidated_status,
-    closed_deprecated_status,
-]
+class ContentStatusList(object):
 
+    OPEN = open_status
 
-class ContentStatusLegacy(NewContentStatus):
-    """
-    Temporary remplacement object for Legacy ContentStatus Object
-    """
-    OPEN = open_status.slug
-    CLOSED_VALIDATED = closed_validated_status.slug
-    CLOSED_UNVALIDATED = closed_unvalidated_status.slug
-    CLOSED_DEPRECATED = closed_deprecated_status.slug
-
-    def __init__(self, slug: str):
-        for status in CONTENT_DEFAULT_STATUS:
-            if slug == status.slug:
-                super(ContentStatusLegacy, self).__init__(
-                    slug=status.slug,
-                    global_status=status.global_status,
-                    label=status.label,
-                    fa_icon=status.fa_icon,
-                    hexcolor=status.hexcolor,
-                )
-                return
+    def __init__(self, extend_content_status: typing.List[ContentStatus]):
+        self._content_status = [self.OPEN]
+        self._content_status.extend(extend_content_status)
+
+    def get_one_by_slug(self, slug: str) -> ContentStatus:
+        for item in self._content_status:
+            if item.slug == slug:
+                return item
         raise ContentStatusNotExist()
 
-    @classmethod
-    def all(cls, type='') -> ['NewContentStatus']:
-        return CONTENT_DEFAULT_STATUS
+    def get_all_slugs_values(self) -> typing.List[str]:
+        """ Get alls slugs"""
+        return [item.slug for item in self._content_status]
+
+    def get_all(self) -> typing.List[ContentStatus]:
+        """ Get all status"""
+        return [item for item in self._content_status]
 
-    @classmethod
-    def allowed_values(cls):
-        return [status.slug for status in CONTENT_DEFAULT_STATUS]
+    def get_default_status(self) -> ContentStatus:
+        return self.OPEN
 
 
+CONTENT_STATUS = ContentStatusList(
+    [
+        closed_validated_status,
+        closed_unvalidated_status,
+        closed_deprecated_status,
+    ]
+)
 ####
 # ContentType
 
 
-class NewContentType(object):
+class ContentType(object):
     """
     Future ContentType object class
     """
@@ -125,8 +119,8 @@ class NewContentType(object):
             hexcolor: str,
             label: str,
             creation_label: str,
-            available_statuses: typing.List[NewContentStatus],
-
+            available_statuses: typing.List[ContentStatus],
+            slug_alias: typing.List[str] = None,
     ):
         self.slug = slug
         self.fa_icon = fa_icon
@@ -134,169 +128,140 @@ class NewContentType(object):
         self.label = label
         self.creation_label = creation_label
         self.available_statuses = available_statuses
+        self.slug_alias = slug_alias
 
 
-thread_type = NewContentType(
+thread_type = ContentType(
     slug='thread',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Thread',
     creation_label='Discuss about a topic',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-file_type = NewContentType(
+file_type = ContentType(
     slug='file',
     fa_icon=_file.fa_icon,
     hexcolor=_file.hexcolor,
     label='File',
     creation_label='Upload a file',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-markdownpluspage_type = NewContentType(
+markdownpluspage_type = ContentType(
     slug='markdownpage',
     fa_icon=markdownpluspage.fa_icon,
     hexcolor=markdownpluspage.hexcolor,
     label='Rich Markdown File',
     creation_label='Create a Markdown document',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-html_documents_type = NewContentType(
-    slug='html-documents',
+html_documents_type = ContentType(
+    slug='html-document',
     fa_icon=html_documents.fa_icon,
     hexcolor=html_documents.hexcolor,
     label='Text Document',
     creation_label='Write a document',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
+    slug_alias=['page']
 )
 
 # TODO - G.M - 31-05-2018 - Set Better folder params
-folder_type = NewContentType(
+folder_type = ContentType(
     slug='folder',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Folder',
     creation_label='Create collection of any documents',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-CONTENT_DEFAULT_TYPE = [
-    thread_type,
-    file_type,
-    markdownpluspage_type,
-    html_documents_type,
-    folder_type,
-]
 
 # TODO - G.M - 31-05-2018 - Set Better Event params
-event_type = NewContentType(
+event_type = ContentType(
     slug='event',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Event',
     creation_label='Event',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
 # TODO - G.M - 31-05-2018 - Set Better Event params
-comment_type = NewContentType(
+comment_type = ContentType(
     slug='comment',
     fa_icon=thread.fa_icon,
     hexcolor=thread.hexcolor,
     label='Comment',
     creation_label='Comment',
-    available_statuses=CONTENT_DEFAULT_STATUS,
+    available_statuses=CONTENT_STATUS.get_all(),
 )
 
-CONTENT_DEFAULT_TYPE_SPECIAL = [
-    event_type,
-    comment_type,
-]
-
-ALL_CONTENTS_DEFAULT_TYPES = CONTENT_DEFAULT_TYPE + CONTENT_DEFAULT_TYPE_SPECIAL
 
-
-class ContentTypeLegacy(NewContentType):
+class ContentTypeList(object):
     """
-    Temporary remplacement object for Legacy ContentType Object
+    ContentType List
     """
-
-    # special type
-    Any = 'any'
-    Folder = 'folder'
-    Event = 'event'
-    Comment = 'comment'
-
-    File = file_type.slug
-    Thread = thread_type.slug
-    Page = html_documents_type.slug
-    PageLegacy = 'page'
-    MarkdownPage = markdownpluspage_type.slug
-
-    def __init__(self, slug: str):
-        if slug == 'page':
-            slug = ContentTypeLegacy.Page
-        for content_type in ALL_CONTENTS_DEFAULT_TYPES:
-            if slug == content_type.slug:
-                super(ContentTypeLegacy, self).__init__(
-                    slug=content_type.slug,
-                    fa_icon=content_type.fa_icon,
-                    hexcolor=content_type.hexcolor,
-                    label=content_type.label,
-                    creation_label=content_type.creation_label,
-                    available_statuses=content_type.available_statuses
-                )
-                return
+    Any_SLUG = 'any'
+    Folder = folder_type
+    Comment = comment_type
+    Event = event_type
+    File = file_type
+    Page = html_documents_type
+    Thread = thread_type
+
+    def __init__(self, extend_content_status: typing.List[ContentType]):
+        self._content_types = [self.Folder]
+        self._content_types.extend(extend_content_status)
+        self._special_contents_types = [self.Comment]
+        self._extra_slugs = [self.Any_SLUG]
+
+    def get_one_by_slug(self, slug: str) -> ContentType:
+        """
+        Get ContentType object according to slug
+        match for both slug and slug_alias
+        """
+        content_types = self._content_types.copy()
+        content_types.extend(self._special_contents_types)
+        for item in content_types:
+            if item.slug == slug or (item.slug_alias and slug in item.slug_alias):  # nopep8
+                return item
         raise ContentTypeNotExist()
 
-    def get_slug_aliases(self) -> typing.List[str]:
+    def endpoint_allowed_types_slug(self) -> typing.List[str]:
         """
-        Get all slug aliases of a content,
-        useful for legacy code convertion
+        Return restricted list of content_type:
+        dont return special content_type like  comment, don't return
+        "any" slug, dont return content type slug alias , don't return event.
+        Useful to restrict slug param in schema.
         """
-        # TODO - G.M - 2018-07-05 - Remove this legacy compat code
-        # when possible.
-        page_alias = [self.Page, self.PageLegacy]
-        if self.slug in page_alias:
-            return page_alias
-        else:
-            return [self.slug]
-
-    @classmethod
-    def all(cls) -> typing.List[str]:
-        return cls.allowed_types()
-
-    @classmethod
-    def allowed_types(cls) -> typing.List[str]:
-        contents_types = [status.slug for status in ALL_CONTENTS_DEFAULT_TYPES]
-        return contents_types
-
-    @classmethod
-    def allowed_type_values(cls) -> typing.List[str]:
+        allowed_type_slug = [contents_type.slug for contents_type in self._content_types]  # nopep8
+        return allowed_type_slug
+
+    def query_allowed_types_slugs(self) -> typing.List[str]:
         """
-        All content type slug + special values like any
+        Return alls allowed types slug : content_type slug + all alias, any
+        and special content_type like comment. Do not return event.
+        Usefull allowed value to perform query to database.
         """
-        content_types = cls.allowed_types()
-        content_types.append(ContentTypeLegacy.Any)
-        return content_types
-
-    @classmethod
-    def allowed_types_for_folding(cls):
-        # This method is used for showing only "main"
-        # types in the left-side treeview
-        contents_types = [status.slug for status in CONTENT_DEFAULT_TYPE]
-        return contents_types
-
-    # TODO - G.M - 30-05-2018 - This method don't do anything.
-    @classmethod
-    def sorted(cls, types: ['ContentType']) -> ['ContentType']:
-        return types
-
-    @property
-    def id(self):
-        return self.slug
-
-    def toDict(self):
-        raise NotImplementedError()
+        allowed_types_slug = []
+        for content_type in self._content_types:
+            allowed_types_slug.append(content_type.slug)
+            if content_type.slug_alias:
+                allowed_types_slug.extend(content_type.slug_alias)
+        for content_type in self._special_contents_types:
+            allowed_types_slug.append(content_type.slug)
+        allowed_types_slug.extend(self._extra_slugs)
+        return allowed_types_slug
+
+
+CONTENT_TYPES = ContentTypeList(
+    [
+        thread_type,
+        file_type,
+        markdownpluspage_type,
+        html_documents_type,
+    ]
+)

backend/tracim_backend/models/context_models.py

@@ -16,7 +16,7 @@ from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.roles import WorkspaceRoles
 from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry
 from tracim_backend.models.workspace_menu_entries import WorkspaceMenuEntry
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 
 class PreviewAllowedDim(object):
@@ -234,10 +234,10 @@ class ActiveContentFilter(object):
     def __init__(
             self,
             limit: int = None,
-            before_datetime: datetime = None,
+            before_content_id: datetime = None,
     ):
         self.limit = limit
-        self.before_datetime = before_datetime
+        self.before_content_id = before_content_id
 
 
 class ContentIdsQuery(object):
@@ -299,7 +299,7 @@ class ContentCreation(object):
     ) -> None:
         self.label = label
         self.content_type = content_type
-        self.parent_id = parent_id
+        self.parent_id = parent_id or None
 
 
 class CommentCreation(object):
@@ -586,7 +586,7 @@ class ContentInContext(object):
 
     @property
     def content_type(self) -> str:
-        content_type = ContentType(self.content.type)
+        content_type = CONTENT_TYPES.get_one_by_slug(self.content.type)
         return content_type.slug
 
     @property
@@ -698,11 +698,7 @@ class RevisionInContext(object):
 
     @property
     def content_type(self) -> str:
-        content_type = ContentType(self.revision.type)
-        if content_type:
-            return content_type.slug
-        else:
-            return None
+        return CONTENT_TYPES.get_one_by_slug(self.revision.type).slug
 
     @property
     def sub_content_types(self) -> typing.List[str]:

backend/tracim_backend/models/data.py

@@ -96,7 +96,7 @@ class Workspace(DeclarativeBase):
 
     def get_allowed_content_types(self):
         # @see Content.get_allowed_content_types()
-        return [ContentType('folder')]
+        return CONTENT_TYPES.endpoint_allowed_types_slug()
 
     def get_valid_children(
             self,
@@ -291,8 +291,9 @@ class ActionDescription(object):
                 ]
 
 
-from tracim_backend.models.contents import ContentStatusLegacy as ContentStatus
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import ContentStatus
+from tracim_backend.models.contents import CONTENT_TYPES
 # TODO - G.M - 30-05-2018 - Drop this old code when whe are sure nothing
 # is lost .
 
@@ -351,9 +352,9 @@ from tracim_backend.models.contents import ContentTypeLegacy as ContentType
 #         # self.icon = ContentStatus._ICONS[id]
 #         # self.css = ContentStatus._CSS[id]
 #         #
-#         # if type==ContentType.Thread:
+#         # if type==CONTENT_TYPES.Thread.slug:
 #         #     self.label = ContentStatus._LABELS_THREAD[id]
-#         # elif type==ContentType.File:
+#         # elif type==CONTENT_TYPES.File.slug:
 #         #     self.label = ContentStatus._LABELS_FILE[id]
 #         # else:
 #         #     self.label = ContentStatus._LABELS[id]
@@ -499,13 +500,13 @@ from tracim_backend.models.contents import ContentTypeLegacy as ContentType
 #     #     # TODO - DYNDATATYPE - D.A. - 2014-12-02
 #     #     # Make this code dynamic loading data types
 #     #
-#     #     if content.type==ContentType.Folder:
+#     #     if content.type==CONTENT_TYPES.Folder.slug:
 #     #         return '/workspaces/{}/folders/{}'.format(content.workspace_id, content.content_id)
-#     #     elif content.type==ContentType.File:
+#     #     elif content.type==CONTENT_TYPES.File.slug:
 #     #         return '/workspaces/{}/folders/{}/files/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-#     #     elif content.type==ContentType.Thread:
+#     #     elif content.type==CONTENT_TYPES.Thread.slug:
 #     #         return '/workspaces/{}/folders/{}/threads/{}'.format(content.workspace_id, content.parent_id, content.content_id)
-#     #     elif content.type==ContentType.Page:
+#     #     elif content.type==CONTENT_TYPES.Page.slug:
 #     #         return '/workspaces/{}/folders/{}/pages/{}'.format(content.workspace_id, content.parent_id, content.content_id)
 #     #
 #     # @classmethod
@@ -544,7 +545,7 @@ class ContentChecker(object):
 
     @classmethod
     def check_properties(cls, item):
-        if item.type == ContentType.Folder:
+        if item.type == CONTENT_TYPES.Folder.slug:
             properties = item.properties
             if 'allowed_content' not in properties.keys():
                 return False
@@ -558,7 +559,7 @@ class ContentChecker(object):
                 return False
             return True
 
-        if item.type == ContentType.Event:
+        if item.type == CONTENT_TYPES.Event.slug:
             properties = item.properties
             if 'name' not in properties.keys():
                 return False
@@ -572,7 +573,7 @@ class ContentChecker(object):
 
         # TODO - G.M - 15-03-2018 - Choose only correct Content-type for origin
         # Only content who can be copied need this
-        if item.type == ContentType.Any:
+        if item.type == CONTENT_TYPES.Any_SLUG:
             properties = item.properties
             if 'origin' in properties.keys():
                 return True
@@ -580,7 +581,7 @@ class ContentChecker(object):
 
     @classmethod
     def reset_properties(cls, item):
-        if item.type == ContentType.Folder:
+        if item.type == CONTENT_TYPES.Folder.slug:
             item.properties = DEFAULT_PROPERTIES
             return
 
@@ -616,7 +617,7 @@ class ContentRevisionRO(DeclarativeBase):
     properties = Column('properties', Text(), unique=False, nullable=False, default='')
 
     type = Column(Unicode(32), unique=False, nullable=False)
-    status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
+    status = Column(Unicode(32), unique=False, nullable=False, default=str(CONTENT_STATUS.get_default_status().slug))
     created = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
     updated = Column(DateTime, unique=False, nullable=False, default=datetime.utcnow)
     is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
@@ -754,7 +755,7 @@ class ContentRevisionRO(DeclarativeBase):
         super().__setattr__(key, value)
 
     def get_status(self) -> ContentStatus:
-        return ContentStatus(self.status)
+        return CONTENT_STATUS.get_one_by_slug(self.status)
 
     def get_label(self) -> str:
         return self.label or self.file_name or ''
@@ -779,9 +780,9 @@ class ContentRevisionRO(DeclarativeBase):
     def get_label_as_file(self):
         file_extension = self.file_extension or ''
 
-        if self.type == ContentType.Thread:
+        if self.type == CONTENT_TYPES.Thread.slug:
             file_extension = '.html'
-        elif self.type == ContentType.Page:
+        elif self.type == CONTENT_TYPES.Page.slug:
             file_extension = '.html'
 
         return '{0}{1}'.format(
@@ -1227,10 +1228,10 @@ class Content(DeclarativeBase):
         return format_timedelta(delta_from_datetime - datetime_object,
                                 locale=get_locale())
 
-    def get_child_nb(self, content_type: ContentType, content_status = ''):
+    def get_child_nb(self, content_type: str, content_status = ''):
         child_nb = 0
         for child in self.get_valid_children():
-            if child.type == content_type or content_type == ContentType.Any:
+            if child.type == content_type or content_type.slug == CONTENT_TYPES.Any_SLUG:
                 if not content_status:
                     child_nb = child_nb+1
                 elif content_status==child.status:
@@ -1247,10 +1248,8 @@ class Content(DeclarativeBase):
         return self.revision.get_label_as_file()
 
     def get_status(self) -> ContentStatus:
-        return ContentStatus(
+        return CONTENT_STATUS.get_one_by_slug(
             self.status,
-            # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
-            # self.type.__str__()
         )
 
     def get_last_action(self) -> ActionDescription:
@@ -1307,7 +1306,7 @@ class Content(DeclarativeBase):
     def get_comments(self):
         children = []
         for child in self.children:
-            if ContentType.Comment==child.type and not child.is_deleted and not child.is_archived:
+            if CONTENT_TYPES.Comment.slug == child.type and not child.is_deleted and not child.is_archived:
                 children.append(child.node)
         return children
 
@@ -1348,13 +1347,13 @@ class Content(DeclarativeBase):
             allowed_types = self.properties['allowed_content']
             for type_label, is_allowed in allowed_types.items():
                 if is_allowed:
-                    types.append(ContentType(type_label))
+                    types.append(CONTENT_TYPES.get_one_by_slug(type_label))
         except Exception as e:
             print(e.__str__())
             print('----- /*\ *****')
             raise ValueError('Not allowed content property')
 
-        return ContentType.sorted(types)
+        return types
 
     def get_history(self, drop_empty_revision=False) -> '[VirtualEvent]':
         events = []
@@ -1447,10 +1446,9 @@ class VirtualEvent(object):
 
     @classmethod
     def create_from_content(cls, content: Content):
-        content_type = ContentType(content.type)
 
         label = content.get_label()
-        if content.type == ContentType.Comment:
+        if content.type == CONTENT_TYPES.Comment.slug:
             # TODO - G.M  - 10-04-2018 - [Cleanup] Remove label param
             # from this object ?
             label = l_('<strong>{}</strong> wrote:').format(content.owner.get_display_name())
@@ -1458,7 +1456,7 @@ class VirtualEvent(object):
         return VirtualEvent(id=content.content_id,
                             created=content.created,
                             owner=content.owner,
-                            type=content_type,
+                            type=ActionDescription(content.revision_type),
                             label=label,
                             content=content.description,
                             ref_object=content)

backend/tracim_backend/tests/__init__.py

@@ -14,8 +14,8 @@ from tracim_backend.models import get_engine
 from tracim_backend.models import DeclarativeBase
 from tracim_backend.models import get_session_factory
 from tracim_backend.models import get_tm_session
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Content
 from tracim_backend.lib.utils.logger import logger
@@ -50,7 +50,7 @@ def set_html_document_slug_to_legacy(session_factory) -> None:
     )
     content_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'page').filter(ContentRevisionRO.content_id == 6)  # nopep8
     assert content_query.count() == 0
-    html_documents_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'html-documents')  # nopep8
+    html_documents_query = dbsession.query(ContentRevisionRO).filter(ContentRevisionRO.type == 'html-document')  # nopep8
     html_documents_query.update({ContentRevisionRO.type: 'page'})
     transaction.commit()
     assert content_query.count() > 0
@@ -268,13 +268,13 @@ class DefaultTest(StandardTest):
         workspace = self._create_workspace_and_test(workspace_name, user)
         folder = self._create_content_and_test(
             folder_name, workspace,
-            type=ContentType.Folder,
+            type=CONTENT_TYPES.Folder.slug,
             owner=user
         )
         thread = self._create_content_and_test(
             thread_name,
             workspace,
-            type=ContentType.Thread,
+            type=CONTENT_TYPES.Thread.slug,
             parent=folder,
             owner=user
         )

backend/tracim_backend/tests/functional/test_contents.py

@@ -5,7 +5,7 @@ from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 import io
 
@@ -16,7 +16,6 @@ from depot.io.utils import FileIntent
 from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.data import ContentType
 from tracim_backend.models import get_tm_session
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.tests import FunctionalTest
@@ -51,7 +50,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -92,7 +91,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -255,7 +254,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -282,7 +281,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -324,7 +323,7 @@ class TestHtmlDocuments(FunctionalTest):
         revisions = res.json_body
         assert len(revisions) == 3
         revision = revisions[0]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -346,7 +345,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[1]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -368,7 +367,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[2]
-        assert revision['content_type'] == 'html-documents'
+        assert revision['content_type'] == 'html-document'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -411,7 +410,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['status'] == 'open'
 
@@ -428,7 +427,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 6
         assert content['status'] == 'closed-deprecated'
 
@@ -480,9 +479,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -648,9 +647,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -703,9 +702,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -809,9 +808,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -882,9 +881,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -978,9 +977,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1031,9 +1030,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1082,9 +1081,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1137,9 +1136,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1196,9 +1195,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1251,9 +1250,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1302,9 +1301,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1375,9 +1374,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1438,9 +1437,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1489,9 +1488,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1554,9 +1553,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1618,9 +1617,9 @@ class TestFiles(FunctionalTest):
             config=self.app_config
         )
         business_workspace = workspace_api.get_one(1)
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1989,9 +1988,9 @@ class TestThreads(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',

backend/tracim_backend/tests/functional/test_mail_notification.py

@@ -11,7 +11,7 @@ from tracim_backend.fixtures.users_and_groups import Base as BaseFixture
 from tracim_backend.fixtures.content import Content as ContentFixture
 from tracim_backend.lib.utils.utils import get_redis_connection
 from tracim_backend.lib.utils.utils import get_rq_queue
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
@@ -139,7 +139,7 @@ class TestNotificationsSync(MailHogTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
@@ -147,7 +147,7 @@ class TestNotificationsSync(MailHogTest):
             do_notify=False,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',
@@ -231,7 +231,7 @@ class TestNotificationsAsync(MailHogTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
@@ -239,7 +239,7 @@ class TestNotificationsAsync(MailHogTest):
             do_notify=False,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',

backend/tracim_backend/tests/functional/test_system.py

@@ -5,6 +5,7 @@ from tracim_backend.tests import FunctionalTest
 Tests for /api/v2/system subpath endpoints.
 """
 
+
 class TestApplicationEndpoint(FunctionalTest):
     """
     Tests for /api/v2/system/applications
@@ -25,7 +26,7 @@ class TestApplicationEndpoint(FunctionalTest):
         res = res.json_body
         application = res[0]
         assert application['label'] == "Text Documents"
-        assert application['slug'] == 'contents/html-documents'
+        assert application['slug'] == 'contents/html-document'
         assert application['fa_icon'] == 'file-text-o'
         assert application['hexcolor'] == '#3f52e3'
         assert application['is_active'] is True
@@ -39,14 +40,14 @@ class TestApplicationEndpoint(FunctionalTest):
         assert 'config' in application
         application = res[2]
         assert application['label'] == "Files"
-        assert application['slug'] == 'contents/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/threads'
+        assert application['slug'] == 'contents/thread'
         assert application['fa_icon'] == 'comments-o'
         assert application['hexcolor'] == '#ad4cf9'
         assert application['is_active'] is True
@@ -96,7 +97,7 @@ class TestContentsTypesEndpoint(FunctionalTest):
         res = self.testapp.get('/api/v2/system/content_types', status=200)
         res = res.json_body
 
-        content_type = res[0]
+        content_type = res[1]
         assert content_type['slug'] == 'thread'
         assert content_type['fa_icon'] == 'comments-o'
         assert content_type['hexcolor'] == '#ad4cf9'
@@ -105,7 +106,7 @@ class TestContentsTypesEndpoint(FunctionalTest):
         assert 'available_statuses' in content_type
         assert len(content_type['available_statuses']) == 4
 
-        content_type = res[1]
+        content_type = res[2]
         assert content_type['slug'] == 'file'
         assert content_type['fa_icon'] == 'paperclip'
         assert content_type['hexcolor'] == '#FF9900'
@@ -114,7 +115,7 @@ class TestContentsTypesEndpoint(FunctionalTest):
         assert 'available_statuses' in content_type
         assert len(content_type['available_statuses']) == 4
 
-        content_type = res[2]
+        content_type = res[3]
         assert content_type['slug'] == 'markdownpage'
         assert content_type['fa_icon'] == 'file-code-o'
         assert content_type['hexcolor'] == '#f12d2d'
@@ -123,8 +124,8 @@ class TestContentsTypesEndpoint(FunctionalTest):
         assert 'available_statuses' in content_type
         assert len(content_type['available_statuses']) == 4
 
-        content_type = res[3]
-        assert content_type['slug'] == 'html-documents'
+        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'

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -10,7 +10,7 @@ from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import FunctionalTest
 from tracim_backend.tests import set_html_document_slug_to_legacy
 from tracim_backend.fixtures.content import Content as ContentFixtures
@@ -58,9 +58,9 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "th"
 
         sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/html-documents'
+        assert sidebar_entry['slug'] == 'contents/html-document'
         assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-document'  # nopep8
         assert sidebar_entry['hexcolor'] == "#3f52e3"
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
@@ -72,14 +72,14 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-code-o"
 
         sidebar_entry = workspace['sidebar_entries'][4]
-        assert sidebar_entry['slug'] == 'contents/files'
+        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]
-        assert sidebar_entry['slug'] == 'contents/threads'
+        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"
@@ -643,7 +643,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'tools'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
         assert content['content_id'] == 2
@@ -655,11 +655,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'menus'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[2]
         assert content['content_id'] == 11
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Current Menu'
@@ -667,7 +667,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     def test_api__get_workspace_content__ok_200__get_default_html_documents(self):
@@ -682,14 +682,14 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         params = {
-            'content_type': 'html-documents',
+            'content_type': 'html-document',
         }
         res = self.testapp.get('/api/v2/workspaces/1/contents', status=200, params=params).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
         assert content
         assert content['content_id'] == 11
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['label'] == 'Current Menu'
@@ -697,7 +697,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     # Root related
@@ -727,7 +727,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -736,11 +736,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -749,11 +749,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -762,7 +762,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_all_root_content(self):
@@ -790,7 +790,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -799,11 +799,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -812,11 +812,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -825,7 +825,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
@@ -853,7 +853,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 2
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -862,7 +862,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
@@ -889,7 +889,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -898,7 +898,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
@@ -927,7 +927,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -936,7 +936,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
@@ -983,9 +983,9 @@ class TestWorkspaceContents(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',
@@ -995,7 +995,7 @@ class TestWorkspaceContents(FunctionalTest):
         test_thread.description = 'Thread description'
         dbsession.add(test_thread)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1009,16 +1009,16 @@ class TestWorkspaceContents(FunctionalTest):
             'text/plain',
         )
         test_page_legacy = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             label='test_page',
             do_save=False,
             do_notify=False,
         )
-        test_page_legacy.type = ContentType.PageLegacy
+        test_page_legacy.type = 'page'
         content_api.update_content(test_page_legacy, 'test_page', '<p>PAGE</p>')
         test_html_document = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             label='test_html_page',
             do_save=False,
@@ -1058,7 +1058,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-thread'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     def test_api__get_workspace_content__ok_200__get_all_filter_content_html_and_legacy_page(self):  # nopep8
@@ -1078,9 +1078,9 @@ class TestWorkspaceContents(FunctionalTest):
             session=dbsession,
             config=self.app_config
         )
-        tool_folder = content_api.get_one(1, content_type=ContentType.Any)
+        tool_folder = content_api.get_one(1, content_type=CONTENT_TYPES.Any_SLUG)
         test_thread = content_api.create(
-            content_type=ContentType.Thread,
+            content_type_slug=CONTENT_TYPES.Thread.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test Thread',
@@ -1090,7 +1090,7 @@ class TestWorkspaceContents(FunctionalTest):
         test_thread.description = 'Thread description'
         dbsession.add(test_thread)
         test_file = content_api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='Test file',
@@ -1104,17 +1104,17 @@ class TestWorkspaceContents(FunctionalTest):
             'text/plain',
         )
         test_page_legacy = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='test_page',
             do_save=False,
             do_notify=False,
         )
-        test_page_legacy.type = ContentType.PageLegacy
+        test_page_legacy.type = 'page'
         content_api.update_content(test_page_legacy, 'test_page', '<p>PAGE</p>')
         test_html_document = content_api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=business_workspace,
             parent=tool_folder,
             label='test_html_page',
@@ -1130,7 +1130,7 @@ class TestWorkspaceContents(FunctionalTest):
             'show_archived': 1,
             'show_deleted': 1,
             'show_active': 1,
-            'content_type': 'html-documents',
+            'content_type': 'html-document',
         }
         self.testapp.authorization = (
             'Basic',
@@ -1146,7 +1146,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body
         assert len(res) == 2
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id']
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1155,10 +1155,10 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-page'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id']
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1167,7 +1167,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'test-html-page'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         assert res[0]['content_id'] != res[1]['content_id']
 
@@ -1180,7 +1180,7 @@ class TestWorkspaceContents(FunctionalTest):
             'show_archived': 1,
             'show_deleted': 1,
             'show_active': 1,
-            'content_type': 'any'
+         #   'content_type': 'any'
         }
         self.testapp.authorization = (
             'Basic',
@@ -1196,7 +1196,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 3
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -1205,11 +1205,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[1]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -1218,11 +1218,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[2]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -1231,7 +1231,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
@@ -1267,7 +1267,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
@@ -1294,7 +1294,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -1303,7 +1303,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
@@ -1331,7 +1331,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'html-documents'
+        assert content['content_type'] == 'html-document'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -1340,7 +1340,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-document', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8
@@ -1436,6 +1436,7 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         params = {
+            'parent_id': None,
             'label': 'GenericCreatedContent',
             'content_type': 'markdownpage',
         }
@@ -1466,6 +1467,70 @@ class TestWorkspaceContents(FunctionalTest):
         active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
         assert res.json_body in active_contents
 
+    def test_api__post_content_create_generic_content__ok_200__no_parent_id_param(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=200
+        )
+        assert res
+        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['is_archived'] is False
+        assert res.json_body['is_deleted'] is False
+        assert res.json_body['workspace_id'] == 1
+        assert res.json_body['slug'] == 'genericcreatedcontent'
+        assert res.json_body['parent_id'] is None
+        assert res.json_body['show_in_ui'] is True
+        assert res.json_body['sub_content_types']
+        params_active = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        # INFO - G.M - 2018-06-165 - Verify if new content is correctly created
+        active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
+        assert res.json_body in active_contents
+
+    def test_api__post_content_create_generic_content__err_400__parent_id_0(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'parent_id': 0,
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=400
+        )
+
     def test_api__post_content_create_generic_content__ok_200__in_folder(self) -> None:  # nopep8
         """
         Create generic content in folder

backend/tracim_backend/tests/library/test_content_api.py

@@ -14,6 +14,7 @@ from tracim_backend.exceptions import SameValueError
 from tracim_backend.lib.core.workspace import RoleApi
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.auth import Group
@@ -22,7 +23,6 @@ from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import Content
-from tracim_backend.models.data import ContentType
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.fixtures.users_and_groups import Test as FixtureTest
 from tracim_backend.tests import DefaultTest
@@ -129,14 +129,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='not_deleted',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='to_delete',
@@ -159,10 +159,10 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -184,7 +184,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(1, len(items))
         transaction.commit()
 
@@ -202,7 +202,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_deleted=True,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
     def test_archive(self):
@@ -240,14 +240,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='not_archived',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='to_archive',
@@ -269,10 +269,10 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -295,7 +295,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(1, len(items))
         transaction.commit()
 
@@ -320,7 +320,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_archived=True,
         )
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
     def test_get_all_with_filter(self):
@@ -358,14 +358,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='thefolder',
             do_save=True
         )
         item2 = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='thefile',
@@ -389,14 +389,14 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(2, len(items))
 
-        items2 = api.get_all(None, ContentType.File, workspace)
+        items2 = api.get_all(None, CONTENT_TYPES.File.slug, workspace)
         eq_(1, len(items2))
         eq_('thefile', items2[0].label)
 
-        items3 = api.get_all(None, ContentType.Folder, workspace)
+        items3 = api.get_all(None, CONTENT_TYPES.Folder.slug, workspace)
         eq_(1, len(items3))
         eq_('thefolder', items3[0].label)
 
@@ -428,21 +428,21 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         item = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'parent',
             do_save=True,
         )
         item2 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             item,
             'file1',
             do_save=True,
         )
         item3 = api.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             None,
             'file2',
@@ -468,10 +468,10 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        items = api.get_all(None, ContentType.Any, workspace)
+        items = api.get_all(None, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(3, len(items))
 
-        items2 = api.get_all(parent_id, ContentType.File, workspace)
+        items2 = api.get_all(parent_id, CONTENT_TYPES.File.slug, workspace)
         eq_(1, len(items2))
         eq_(child_id, items2[0].content_id)
 
@@ -506,7 +506,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        c = api.create(ContentType.Folder, workspace, None, 'parent', '', True)
+        c = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'parent', '', True)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -546,7 +546,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        c = api.create(ContentType.Folder, workspace, None, 'parent', '', True)
+        c = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'parent', '', True)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -591,14 +591,14 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        p = api.create(ContentType.Page, workspace, None, 'this_is_a_page')
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, None, 'this_is_a_page')
         c = api.create_comment(workspace, p, 'this is the comment', True)
 
         eq_(Content, c.__class__)
         eq_(p.content_id, c.parent_id)
         eq_(user, c.owner)
         eq_(workspace, c.workspace)
-        eq_(ContentType.Comment, c.type)
+        eq_(CONTENT_TYPES.Comment.slug, c.type)
         eq_('this is the comment', c.description)
         eq_('', c.label)
         eq_(ActionDescription.COMMENT, c.revision_type)
@@ -652,7 +652,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -661,7 +661,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -689,7 +689,7 @@ class TestContentApi(DefaultTest):
             save_now=True
         )
         folderb = api2.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace2,
             None,
             'folder b',
@@ -773,7 +773,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -782,7 +782,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -810,7 +810,7 @@ class TestContentApi(DefaultTest):
             save_now=True
         )
         folderb = api2.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace2,
             None,
             'folder b',
@@ -891,7 +891,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         foldera = api.create(
-            ContentType.Folder,
+            CONTENT_TYPES.Folder.slug,
             workspace,
             None,
             'folder a',
@@ -900,7 +900,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             text_file = api.create(
-                content_type=ContentType.File,
+                content_type_slug=CONTENT_TYPES.File.slug,
                 workspace=workspace,
                 parent=foldera,
                 label='test_file',
@@ -1014,13 +1014,13 @@ class TestContentApi(DefaultTest):
 
         # Creates page_1 & page_2 in workspace 1
         #     and page_3 & page_4 in workspace 2
-        page_1 = cont_api_a.create(ContentType.Page, workspace1, None,
+        page_1 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace1, None,
                                    'this is a page', do_save=True)
-        page_2 = cont_api_a.create(ContentType.Page, workspace1, None,
+        page_2 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace1, None,
                                    'this is page1', do_save=True)
-        page_3 = cont_api_a.create(ContentType.Thread, workspace2, None,
+        page_3 = cont_api_a.create(CONTENT_TYPES.Thread.slug, workspace2, None,
                                    'this is page2', do_save=True)
-        page_4 = cont_api_a.create(ContentType.File, workspace2, None,
+        page_4 = cont_api_a.create(CONTENT_TYPES.File.slug, workspace2, None,
                                    'this is page3', do_save=True)
 
         for rev in page_1.revisions:
@@ -1118,7 +1118,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        page_1 = cont_api_a.create(ContentType.Page, workspace, None,
+        page_1 = cont_api_a.create(CONTENT_TYPES.Page.slug, workspace, None,
                                    'this is a page', do_save=True)
 
         for rev in page_1.revisions:
@@ -1187,21 +1187,21 @@ class TestContentApi(DefaultTest):
         )
 
         page_2 = cont_api_a.create(
-            ContentType.Page,
+            CONTENT_TYPES.Page.slug,
             workspace,
             None,
             'this is page1',
             do_save=True
         )
         page_3 = cont_api_a.create(
-            ContentType.Thread,
+            CONTENT_TYPES.Thread.slug,
             workspace,
             None,
             'this is page2',
             do_save=True
         )
         page_4 = cont_api_a.create(
-            ContentType.File,
+            CONTENT_TYPES.File.slug,
             workspace,
             None,
             'this is page3',
@@ -1285,7 +1285,7 @@ class TestContentApi(DefaultTest):
         )
 
         p = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1312,7 +1312,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1326,7 +1326,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
            session=self.session,
            tm=transaction.manager,
@@ -1353,7 +1353,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        updated = api.get_one(pcid, ContentType.Any, workspace)
+        updated = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1412,7 +1412,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             page = api.create(
-                content_type=ContentType.Page,
+                content_type_slug=CONTENT_TYPES.Page.slug,
                 workspace=workspace,
                 label="same_content",
                 do_save=False
@@ -1426,7 +1426,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(page.content_id, ContentType.Any, workspace)
+        content2 = api2.get_one(page.content_id, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
            session=self.session,
            tm=transaction.manager,
@@ -1495,7 +1495,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1524,7 +1524,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1538,7 +1538,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1561,7 +1561,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        updated = api.get_one(pcid, ContentType.Any, workspace)
+        updated = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1622,7 +1622,7 @@ class TestContentApi(DefaultTest):
         )
         with self.session.no_autoflush:
             page = api.create(
-                content_type=ContentType.Page,
+                content_type_slug=CONTENT_TYPES.Page.slug,
                 workspace=workspace,
                 label="same_content",
                 do_save=False
@@ -1641,7 +1641,7 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        content2 = api2.get_one(page.content_id, ContentType.Any, workspace)
+        content2 = api2.get_one(page.content_id, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1713,7 +1713,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1741,7 +1741,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1757,7 +1757,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_archived=True,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -1796,7 +1796,7 @@ class TestContentApi(DefaultTest):
             show_archived=True,
         )
 
-        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        updated = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1805,7 +1805,7 @@ class TestContentApi(DefaultTest):
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, workspace)
+        updated2 = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -1874,7 +1874,7 @@ class TestContentApi(DefaultTest):
             show_deleted=True,
         )
         p = api.create(
-            content_type=ContentType.File,
+            content_type_slug=CONTENT_TYPES.File.slug,
             workspace=workspace,
             parent=None,
             label='this_is_a_page',
@@ -1900,7 +1900,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         ).get_one(wid)
 
-        content = api.get_one(pcid, ContentType.Any, workspace)
+        content = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u1id, content.owner_id)
         eq_(poid, content.owner_id)
 
@@ -1915,7 +1915,7 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
             show_deleted=True,
         )
-        content2 = api2.get_one(pcid, ContentType.Any, workspace)
+        content2 = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
                 session=self.session,
                 tm=transaction.manager,
@@ -1956,7 +1956,7 @@ class TestContentApi(DefaultTest):
             show_deleted=True
         )
 
-        updated = api2.get_one(pcid, ContentType.Any, workspace)
+        updated = api2.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         eq_(u2id, updated.owner_id,
             'the owner id should be {} (found {})'.format(u2id,
                                                           updated.owner_id))
@@ -1965,7 +1965,7 @@ class TestContentApi(DefaultTest):
 
         ####
 
-        updated2 = api.get_one(pcid, ContentType.Any, workspace)
+        updated2 = api.get_one(pcid, CONTENT_TYPES.Any_SLUG, workspace)
         with new_revision(
             tm=transaction.manager,
             session=self.session,
@@ -2016,14 +2016,14 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder_workspace2 = api.create(ContentType.Folder, workspace2, None, 'Hepla', '', True)  # nopep8
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder_workspace2 = api.create(CONTENT_TYPES.Folder.slug, workspace2, None, 'Hepla', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2032,11 +2032,11 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
-        content_workspace_2 = api.create(ContentType.Page, workspace2 ,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
+        content_workspace_2 = api.create(CONTENT_TYPES.Page.slug, workspace2 ,main_folder_workspace2, 'content_workspace_2', '',True)  # nopep8
         last_actives = api.get_last_active()
         assert len(last_actives) == 9
         # workspace_2 content
@@ -2088,13 +2088,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2103,8 +2103,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         last_actives = api.get_last_active(workspace=workspace)
@@ -2153,13 +2153,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2168,8 +2168,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         selected_contents = [
@@ -2228,13 +2228,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2243,30 +2243,30 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
-        last_actives = api.get_last_active(workspace=workspace, limit=2, before_datetime=datetime.datetime.now())  # nopep8
+        last_actives = api.get_last_active(workspace=workspace, limit=2)  # nopep8
         assert len(last_actives) == 2
         # comment is newest than page2
         assert last_actives[0] == firstly_created_but_recently_commented
         assert last_actives[1] == secondly_created_but_not_commented
 
-        last_actives = api.get_last_active(workspace=workspace, limit=2, before_datetime=last_actives[1].get_simple_last_activity_date())  # nopep8
+        last_actives = api.get_last_active(workspace=workspace, limit=2, before_content=last_actives[1])  # nopep8
         assert len(last_actives) == 2
         # last updated content is newer than other one despite creation
         # of the other is more recent
         assert last_actives[0] == firstly_created_but_recently_updated
         assert last_actives[1] == secondly_created_but_not_updated
 
-        last_actives = api.get_last_active(workspace=workspace, limit=2, before_datetime=last_actives[1].get_simple_last_activity_date())  # nopep8
+        last_actives = api.get_last_active(workspace=workspace, limit=2, before_content=last_actives[1])  # nopep8
         assert len(last_actives) == 2
         # creation order is inverted here as last created is last active
         assert last_actives[0] == secondly_created
         assert last_actives[1] == firstly_created
 
-        last_actives = api.get_last_active(workspace=workspace, limit=2, before_datetime=last_actives[1].get_simple_last_activity_date())  # nopep8
+        last_actives = api.get_last_active(workspace=workspace, limit=2, before_content=last_actives[1])  # nopep8
         assert len(last_actives) == 1
         # folder subcontent modification does not change folder order
         assert last_actives[0] == main_folder
@@ -2309,13 +2309,13 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        main_folder = api.create(ContentType.Folder, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
         # creation order test
-        firstly_created = api.create(ContentType.Page, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
-        secondly_created = api.create(ContentType.Page, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
+        firstly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'creation_order_test', '', True)  # nopep8
+        secondly_created = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another creation_order_test', '', True)  # nopep8
         # update order test
-        firstly_created_but_recently_updated = api.create(ContentType.Page, workspace, main_folder, 'update_order_test', '', True)  # nopep8
-        secondly_created_but_not_updated = api.create(ContentType.Page, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
+        firstly_created_but_recently_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'update_order_test', '', True)  # nopep8
+        secondly_created_but_not_updated = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'another update_order_test', '', True)  # nopep8
         with new_revision(
             session=self.session,
             tm=transaction.manager,
@@ -2324,8 +2324,8 @@ class TestContentApi(DefaultTest):
             firstly_created_but_recently_updated.description = 'Just an update'
         api.save(firstly_created_but_recently_updated)
         # comment change order
-        firstly_created_but_recently_commented = api.create(ContentType.Page, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
-        secondly_created_but_not_commented = api.create(ContentType.Page, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
+        firstly_created_but_recently_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is randomized label content', '', True)  # nopep8
+        secondly_created_but_not_commented = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'this is another randomized label content', '', True)  # nopep8
         comments = api.create_comment(workspace, firstly_created_but_recently_commented, 'juste a super comment', True)  # nopep8
 
         last_actives = api.get_last_active(workspace=workspace2)
@@ -2366,9 +2366,9 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        a = api.create(ContentType.Folder, workspace, None,
+        a = api.create(CONTENT_TYPES.Folder.slug, workspace, None,
                        'this is randomized folder', '', True)
-        p = api.create(ContentType.Page, workspace, a,
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, a,
                        'this is randomized label content', '', True)
 
         with new_revision(
@@ -2422,9 +2422,9 @@ class TestContentApi(DefaultTest):
             session=self.session,
             config=self.app_config,
         )
-        a = api.create(ContentType.Folder, workspace, None,
+        a = api.create(CONTENT_TYPES.Folder.slug, workspace, None,
                        'this is randomized folder', '', True)
-        p = api.create(ContentType.Page, workspace, a,
+        p = api.create(CONTENT_TYPES.Page.slug, workspace, a,
                        'this is dummy label content', '', True)
 
         with new_revision(
@@ -2476,21 +2476,21 @@ class TestContentApi(DefaultTest):
             config=self.app_config,
         )
         a = api.create(
-            content_type=ContentType.Folder,
+            content_type_slug=CONTENT_TYPES.Folder.slug,
             workspace=workspace,
             parent=None,
             label='this is randomized folder',
             do_save=True
         )
         p1 = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=a,
             label='this is dummy label content',
             do_save=True
         )
         p2 = api.create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=workspace,
             parent=a,
             label='Hey ! Jon !',
@@ -2540,22 +2540,22 @@ class TestContentApi(DefaultTest):
         folder_1 = self._create_content_and_test(
             'folder_1',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         folder_2 = self._create_content_and_test(
             'folder_2',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         page_1 = self._create_content_and_test(
             'foo', workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             parent=folder_1
         )
         page_2 = self._create_content_and_test(
             'bar',
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             parent=folder_2
         )
 
@@ -2636,7 +2636,7 @@ class TestContentApiSecurity(DefaultTest):
             session=self.session,
             config=self.app_config,
         ).create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=bob_workspace,
             label='bob_page',
             do_save=True,
@@ -2647,7 +2647,7 @@ class TestContentApiSecurity(DefaultTest):
             session=self.session,
             config=self.app_config,
         ).create(
-            content_type=ContentType.Page,
+            content_type_slug=CONTENT_TYPES.Page.slug,
             workspace=admin_workspace,
             label='admin_page',
             do_save=True,

backend/tracim_backend/tests/models/test_content.py

@@ -15,7 +15,7 @@ from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models import User
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import ContentRevisionRO
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
 from tracim_backend.tests import StandardTest
 
@@ -95,7 +95,7 @@ class TestContent(StandardTest):
 
         content1_from_api = api.get_one(
             content1.id,
-            ContentType.Page,
+            CONTENT_TYPES.Page.slug,
             workspace1
         )
 
@@ -196,7 +196,7 @@ class TestContent(StandardTest):
         first_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_1',
             description='TEST_CONTENT_DESCRIPTION_1',
             revision_type=ActionDescription.CREATION,
@@ -221,7 +221,7 @@ class TestContent(StandardTest):
         second_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_2',
             description='TEST_CONTENT_DESCRIPTION_2',
             revision_type=ActionDescription.CREATION
@@ -268,7 +268,7 @@ class TestContent(StandardTest):
         created_content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             label='TEST_CONTENT_%s' % key,
             description='TEST_CONTENT_DESCRIPTION_%s' % key,
             revision_type=ActionDescription.CREATION
@@ -308,7 +308,7 @@ class TestContent(StandardTest):
         content = self._create_content(
             owner=user_admin,
             workspace=workspace,
-            type=ContentType.File,
+            type=CONTENT_TYPES.File.slug,
             label='TEST_CONTENT_1',
             description='TEST_CONTENT_DESCRIPTION_1',
             revision_type=ActionDescription.CREATION,

backend/tracim_backend/tests/models/test_content_revision.py

@@ -5,10 +5,11 @@ from sqlalchemy import inspect
 
 from tracim_backend.models import ContentRevisionRO
 from tracim_backend.models import User
-from tracim_backend.models.data import ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.tests import DefaultTest
 from tracim_backend.tests import eq_
 
+
 class TestContentRevision(DefaultTest):
 
     def _new_from(self, revision):
@@ -47,14 +48,14 @@ class TestContentRevision(DefaultTest):
         folder = self._create_content_and_test(
             name='folder_1',
             workspace=workspace,
-            type=ContentType.Folder
+            type=CONTENT_TYPES.Folder.slug
         )
         page = self._create_content_and_test(
             workspace=workspace,
             parent=folder,
             name='file_1',
             description='content of file_1',
-            type=ContentType.Page,
+            type=CONTENT_TYPES.Page.slug,
             owner=admin
         )
 

backend/tracim_backend/views/contents_api/comment_controller.py

@@ -20,7 +20,7 @@ from tracim_backend.views.core_api.schemas import SetCommentSchema
 from tracim_backend.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim_backend.views.core_api.schemas import NoContentSchema
 from tracim_backend.exceptions import EmptyCommentContentNotAllowed
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.data import UserRoleInWorkspace
 
@@ -47,7 +47,7 @@ class CommentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         comments = content.get_comments()
         comments.sort(key=lambda comment: comment.created)
@@ -74,7 +74,7 @@ class CommentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         comment = api.create_comment(
             content.workspace,
@@ -109,12 +109,12 @@ class CommentController(Controller):
         workspace = wapi.get_one(hapic_data.path.workspace_id)
         parent = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any,
+            content_type=CONTENT_TYPES.Any_SLUG,
             workspace=workspace
         )
         comment = api.get_one(
             hapic_data.path.comment_id,
-            content_type=ContentType.Comment,
+            content_type=CONTENT_TYPES.Comment.slug,
             workspace=workspace,
             parent=parent,
         )

backend/tracim_backend/views/contents_api/file_controller.py

@@ -32,7 +32,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import file_type
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.exceptions import EmptyLabelNotAllowed
@@ -67,7 +67,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         file = request.POST['files']
         with new_revision(
@@ -101,7 +101,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         file = DepotManager.get().get(content.depot_file)
         response = request.response
@@ -126,7 +126,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -160,7 +160,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         pdf_preview_path = api.get_pdf_preview_path(
             content.content_id,
@@ -187,7 +187,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         pdf_preview_path = api.get_full_pdf_preview_path(content.revision_id)
         return FileResponse(pdf_preview_path)
@@ -211,7 +211,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -244,7 +244,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         allowed_dim = api.get_jpg_preview_allowed_dim()
         jpg_preview_path = api.get_jpg_preview_path(
@@ -276,7 +276,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         jpg_preview_path = api.get_jpg_preview_path(
             content_id=content.content_id,
@@ -307,7 +307,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revision = api.get_one_revision(
             revision_id=hapic_data.path.revision_id,
@@ -358,7 +358,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -381,7 +381,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -419,7 +419,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -446,7 +446,7 @@ class FileController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/contents_api/html_document_controller.py

@@ -26,7 +26,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import html_documents_type
 from tracim_backend.models.revision_protection import new_revision
 
@@ -52,7 +52,7 @@ class HTMLDocumentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -75,7 +75,7 @@ class HTMLDocumentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -113,7 +113,7 @@ class HTMLDocumentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -144,7 +144,7 @@ class HTMLDocumentController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/contents_api/threads_controller.py

@@ -25,7 +25,7 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import thread_type
 from tracim_backend.models.revision_protection import new_revision
 
@@ -51,7 +51,7 @@ class ThreadController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(content)
 
@@ -74,7 +74,7 @@ class ThreadController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -112,7 +112,7 @@ class ThreadController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         revisions = content.revisions
         return [
@@ -138,7 +138,7 @@ class ThreadController(Controller):
         )
         content = api.get_one(
             hapic_data.path.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

backend/tracim_backend/views/core_api/schemas.py

@@ -8,9 +8,9 @@ from marshmallow.validate import Range
 from tracim_backend.lib.utils.utils import DATETIME_FORMAT
 from tracim_backend.models.auth import Profile
 from tracim_backend.models.contents import GlobalStatus
+from tracim_backend.models.contents import CONTENT_STATUS
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import open_status
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
-from tracim_backend.models.contents import ContentStatusLegacy as ContentStatus
 from tracim_backend.models.context_models import ActiveContentFilter
 from tracim_backend.models.context_models import AutocompleteQuery
 from tracim_backend.models.context_models import ContentIdsQuery
@@ -355,9 +355,9 @@ class FilterContentQuerySchema(marshmallow.Schema):
         validate=Range(min=0, max=1, error="Value must be 0 or 1"),
     )
     content_type = marshmallow.fields.String(
-        example=ContentType.Any,
-        default=ContentType.Any,
-        validate=OneOf(ContentType.allowed_type_values())
+        example=CONTENT_TYPES.Any_SLUG,
+        default=CONTENT_TYPES.Any_SLUG,
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
     )
 
     @post_load
@@ -373,9 +373,11 @@ class ActiveContentFilterQuerySchema(marshmallow.Schema):
                     'the first limit elem (according to offset)',
         validate=Range(min=0, error="Value must be positive or 0"),
     )
-    before_datetime = marshmallow.fields.DateTime(
-        format=DATETIME_FORMAT,
-        description='return only content lastly updated before this date',
+    before_content_id = marshmallow.fields.Int(
+        example=41,
+        default=None,
+        allow_none=True,
+        description='return only content updated before this content',
     )
     @post_load
     def make_content_filter(self, data):
@@ -605,7 +607,7 @@ class StatusSchema(marshmallow.Schema):
 class ContentTypeSchema(marshmallow.Schema):
     slug = marshmallow.fields.String(
         example='pagehtml',
-        validate=OneOf(ContentType.allowed_types()),
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     fa_icon = marshmallow.fields.String(
         example='fa-file-text-o',
@@ -658,17 +660,20 @@ class ContentCreationSchema(marshmallow.Schema):
         description='Title of the content to create'
     )
     content_type = marshmallow.fields.String(
-        example='html-documents',
-        validate=OneOf(ContentType.allowed_types_for_folding()),  # nopep8
+        example='html-document',
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     parent_id = marshmallow.fields.Integer(
         example=35,
-        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.'
+        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.', # nopep8
+        allow_none=True,
+        default=None,
+        validate=Range(min=1, error="Value must be positive"),
     )
 
 
     @post_load
-    def make_content_filter(self, data):
+    def make_content_creation(self, data):
         return ContentCreation(**data)
 
 
@@ -690,13 +695,13 @@ class ContentDigestSchema(marshmallow.Schema):
     )
     label = marshmallow.fields.Str(example='Intervention Report 12')
     content_type = marshmallow.fields.Str(
-        example='html-documents',
-        validate=OneOf(ContentType.allowed_types()),
+        example='html-document',
+        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
     )
     sub_content_types = marshmallow.fields.List(
         marshmallow.fields.String(
             example='html-content',
-            validate=OneOf(ContentType.allowed_types())
+            validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
         ),
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '
@@ -704,7 +709,7 @@ class ContentDigestSchema(marshmallow.Schema):
     )
     status = marshmallow.fields.Str(
         example='closed-deprecated',
-        validate=OneOf(ContentStatus.allowed_values()),
+        validate=OneOf(CONTENT_STATUS.get_all_slugs_values()),
         description='this slug is found in content_type available statuses',
         default=open_status
     )
@@ -729,6 +734,7 @@ class ReadStatusSchema(marshmallow.Schema):
 # Content
 #####
 
+
 class ContentSchema(ContentDigestSchema):
     current_revision_id = marshmallow.fields.Int(example=12)
     created = marshmallow.fields.DateTime(
@@ -848,7 +854,7 @@ class FileContentModifySchema(TextBasedContentModifySchema):
 class SetContentStatusSchema(marshmallow.Schema):
     status = marshmallow.fields.Str(
         example='closed-deprecated',
-        validate=OneOf(ContentStatus.allowed_values()),
+        validate=OneOf(CONTENT_STATUS.get_all_slugs_values()),
         description='this slug is found in content_type available statuses',
         default=open_status,
         required=True,

backend/tracim_backend/views/core_api/system_controller.py

@@ -5,7 +5,7 @@ from tracim_backend.exceptions import InsufficientUserProfile
 from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.models import Group
 from tracim_backend.models.applications import applications
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 
 try:  # Python 3.5+
     from http import HTTPStatus
@@ -39,8 +39,8 @@ class SystemController(Controller):
         """
         Get list of alls content types availables in this tracim instance.
         """
-        content_types_slugs = ContentType.allowed_types_for_folding()
-        content_types = [ContentType(slug) for slug in content_types_slugs]
+        content_types_slugs = CONTENT_TYPES.endpoint_allowed_types_slug()
+        content_types = [CONTENT_TYPES.get_one_by_slug(slug) for slug in content_types_slugs]
         return content_types
 
     def bind(self, configurator: Configurator) -> None:

backend/tracim_backend/views/core_api/user_controller.py

@@ -1,4 +1,5 @@
 from pyramid.config import Configurator
+
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
@@ -33,6 +34,7 @@ from tracim_backend.views.core_api.schemas import UserWorkspaceAndContentIdPathS
 from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import ActiveContentFilterQuerySchema
 from tracim_backend.views.core_api.schemas import WorkspaceDigestSchema
+from tracim_backend.models.contents import CONTENT_TYPES
 
 SWAGGER_TAG__USER_ENDPOINTS = 'Users'
 
@@ -308,10 +310,17 @@ class UserController(Controller):
         workspace = None
         if hapic_data.path.workspace_id:
             workspace = wapi.get_one(hapic_data.path.workspace_id)
+        before_content = None
+        if content_filter.before_content_id:
+            before_content = api.get_one(
+                content_id=content_filter.before_content_id,
+                workspace=workspace,
+                content_type=CONTENT_TYPES.Any_SLUG
+            )
         last_actives = api.get_last_active(
             workspace=workspace,
             limit=content_filter.limit or None,
-            before_datetime=content_filter.before_datetime or None,
+            before_content=before_content,
         )
         return [
             api.get_content_in_context(content)
@@ -345,7 +354,7 @@ class UserController(Controller):
         last_actives = api.get_last_active(
             workspace=workspace,
             limit=None,
-            before_datetime=None,
+            before_content=None,
             content_ids=hapic_data.query.contents_ids or None
         )
         return [

backend/tracim_backend/views/core_api/workspace_controller.py

@@ -46,7 +46,7 @@ from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import WorkspaceSchema
 from tracim_backend.views.core_api.schemas import WorkspaceIdPathSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberSchema
-from tracim_backend.models.contents import ContentTypeLegacy as ContentType
+from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG_WORKSPACE_ENDPOINTS = 'Workspaces'
@@ -259,7 +259,7 @@ class WorkspaceController(Controller):
         contents = api.get_all(
             parent_id=content_filter.parent_id,
             workspace=request.current_workspace,
-            content_type=content_filter.content_type or ContentType.Any,
+            content_type=content_filter.content_type or CONTENT_TYPES.Any_SLUG,
         )
         contents = [
             api.get_content_in_context(content) for content in contents
@@ -291,14 +291,14 @@ class WorkspaceController(Controller):
         parent = None
         if creation_data.parent_id:
             try:
-                parent = api.get_one(content_id=creation_data.parent_id, content_type=ContentType.Any)  # nopep8
+                parent = api.get_one(content_id=creation_data.parent_id, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
             except ContentNotFound as exc:
                 raise ParentNotFound(
                     'Parent with content_id {} not found'.format(creation_data.parent_id)
                 ) from exc
         content = api.create(
             label=creation_data.label,
-            content_type=creation_data.content_type,
+            content_type_slug=creation_data.content_type,
             workspace=request.current_workspace,
             parent=parent,
         )
@@ -333,10 +333,10 @@ class WorkspaceController(Controller):
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         new_parent = api.get_one(
-            move_data.new_parent_id, content_type=ContentType.Any
+            move_data.new_parent_id, content_type=CONTENT_TYPES.Any_SLUG
         )
 
         new_workspace = request.candidate_workspace
@@ -354,7 +354,7 @@ class WorkspaceController(Controller):
             )
         updated_content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         return api.get_content_in_context(updated_content)
 
@@ -380,7 +380,7 @@ class WorkspaceController(Controller):
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -413,7 +413,7 @@ class WorkspaceController(Controller):
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,
@@ -443,7 +443,7 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
         )
-        content = api.get_one(path_data.content_id, content_type=ContentType.Any)  # nopep8
+        content = api.get_one(path_data.content_id, content_type=CONTENT_TYPES.Any_SLUG)  # nopep8
         with new_revision(
                 session=request.dbsession,
                 tm=transaction.manager,
@@ -475,7 +475,7 @@ class WorkspaceController(Controller):
         )
         content = api.get_one(
             path_data.content_id,
-            content_type=ContentType.Any
+            content_type=CONTENT_TYPES.Any_SLUG
         )
         with new_revision(
                 session=request.dbsession,

build_full_frontend.sh

@@ -9,23 +9,82 @@ fi
 
 echo -e "\n${BROWN}/!\ ${NC}this script does not run 'npm install'\n${BROWN}/!\ ${NC}it also assumes your webpack dev server of frontend is running"
 
+# Tracim Lib
+
 log "cd frontend_lib"
 cd frontend_lib
 log "npm run buildtracimlib$windoz"
 npm run buildtracimlib$windoz
 cd -
 
+# app Html Document
+
 log "cd frontend_app_html-document"
 cd frontend_app_html-document
+
 log "npm run build$windoz # for frontend_app_html-document"
 npm run build$windoz
+
 log "cp dist/html-document.app.js"
 cp dist/html-document.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/tml-document_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/html-document_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/html-document_fr_translation.json
 cd -
 
+# app Thread
+
 log "cd frontend_app_thread"
 cd frontend_app_thread
+
 log "npm run build$windoz # for frontend_app_thread"
 npm run build$windoz
+
 log "cp dist/thread.app.js"
 cp dist/thread.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/thread_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/thread_fr_translation.json
+cd -
+
+# app Workspace
+
+log "cd frontend_app_workspace"
+cd frontend_app_workspace
+
+log "npm run build$windoz # for frontend_app_workspace"
+npm run build$windoz
+
+log "cp dist/workspace.app.js"
+cp dist/workspace.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/workspace_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/workspace_fr_translation.json
+cd -
+
+# app Admin Workspace User
+
+log "cd frontend_app_admin_workspace_user"
+cd frontend_app_admin_workspace_user
+
+log "npm run build$windoz # for frontend_app_thread"
+npm run build$windoz
+
+log "cp dist/admin_workspace_user.app.js"
+cp dist/admin_workspace_user.app.js ../frontend/dist/app
+
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json
+
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json
+cd -

frontend/README.md

@@ -58,7 +58,7 @@ To test them inside Tracim, you need to build them and copast them to tracim_fro
 You also need to make the mock api able to tell tracim_frontend that it handle you app :
 - add an entry for you App in tracim_frontend/jsonserver/static_db.json in the `app_config` property
 - reload your mock api server
-- add the source of your app in tracim_frontend/dist/index.html and an entry to the switch case of the function `GLOBAL_renderAppFull`. All of this will be handled by backend later on, this is all work in progress stuffs.
+- add the source of your app in tracim_frontend/dist/index.html and an entry to the switch case of the function `GLOBAL_renderAppFeature`. All of this will be handled by backend later on, this is all work in progress stuffs.
 
 
 #### Urls list

frontend/dist/appInterface.js

@@ -3,12 +3,16 @@
 
   getSelectedApp = name => {
     switch (name) {
-      case 'html-documents':
+      case 'workspace':
+        return appWorkspace
+      case 'html-document':
         return appHtmlDocument
       case 'thread':
         return appThread
       case 'file':
         return appFile
+      case 'admin_workspace_user':
+        return appAdminWorkspaceUser
       default:
         return null
     }
@@ -19,15 +23,30 @@
   // use module.export and require
   // doesn't work, cant resolve a file outside of the build dir
 
-  GLOBAL_renderAppFull = app => {
-    console.log('%cGLOBAL_renderAppFull', 'color: #5cebeb', app)
+  GLOBAL_renderAppFeature = app => {
+    console.log('%cGLOBAL_renderAppFeature', 'color: #5cebeb', app)
 
     const selectedApp = getSelectedApp(app.config.slug)
 
     if (selectedApp.isRendered) {
-      GLOBAL_dispatchEvent({type: `${app.config.slug}_showApp`, data: app}) // handled by html-documents:src/container/HtmlDocument.jsx
+      GLOBAL_dispatchEvent({type: `${app.config.slug}_showApp`, data: app}) // handled by html-documents:src/container/AdminWorkspaceUser.jsx
     } else {
-      selectedApp.renderAppFull(app)
+      selectedApp.renderAppFeature(app)
+      selectedApp.isRendered = true
+      prevSelectedApp.isRendered = false
+      prevSelectedApp = selectedApp
+    }
+  }
+
+  GLOBAL_renderAppFullscreen = app => {
+    console.log('%cGLOBAL_renderAppFullscreen', 'color: #5cebeb', app)
+
+    const selectedApp = getSelectedApp(app.config.slug)
+
+    if (selectedApp.isRendered) {
+      GLOBAL_dispatchEvent({type: `${app.config.slug}_showApp`, data: app}) // handled by html-documents:src/container/AdminWorkspaceUser.jsx
+    } else {
+      selectedApp.renderAppFullscreen(app)
       selectedApp.isRendered = true
       prevSelectedApp.isRendered = false
       prevSelectedApp = selectedApp
@@ -64,7 +83,7 @@
         console.log('%cGLOBAL_eventReducer Custom Event', 'color: #28a745', type, data)
         if (prevSelectedApp.name === '') return
 
-        prevSelectedApp.unmountApp('appContainer')
+        prevSelectedApp.unmountApp('appFeatureContainer')
         prevSelectedApp.unmountApp('popupCreateContentContainer')
         prevSelectedApp.isRendered = false
         break

frontend/dist/index.html

@@ -51,9 +51,11 @@
     <script src='/tracim.vendor.bundle.js'></script>
     <script src='/tracim.app.entry.js'></script>
 
+    <script src='/app/workspace.app.js'></script>
     <script src='/app/html-document.app.js'></script>
     <script src='/app/thread.app.js'></script>
     <!-- <script src='/app/file.app.js'></script> -->
+    <script src='/app/admin_workspace_user.app.js'></script>
 
     <script src="/dev/jquery-3.2.1.js"></script>
     <script src="/dev/popper-1.12.3.js"></script>

frontend/i18next.scanner.js

@@ -0,0 +1,16 @@
+const scanner = require('i18next-scanner')
+const vfs = require('vinyl-fs')
+
+const option = require('../i18next.option.js')
+
+// this script is run by npm run build-translation and generate i18next.scanner/**/*.json
+
+// --------------------
+// 2018/07/27 - currently, last version is 2.6.5 but a bug is spaming log with errors. So I'm using 2.6.1
+// this issue seems related : https://github.com/i18next/i18next-scanner/issues/88
+// --------------------
+
+vfs.src(['./src/**/*.jsx'])
+  // .pipe(sort()) // Sort files in stream by path
+  .pipe(scanner(option))
+  .pipe(vfs.dest('./i18next.scanner'))

frontend/i18next.scanner/en/translation.json

@@ -0,0 +1,68 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Create your own collaborative workspaces on trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Disconnection error",
+  "Error": "Error",
+  "Email or password invalid": "Email or password invalid",
+  "Type": "Type",
+  "Status": "Status",
+  "Create in folder...": "Create in folder...",
+  "Search...": "Search...",
+  "Create a workspace": "Create a workspace",
+  "Title": "Title",
+  "Change": "Change",
+  "Move": "Move",
+  "Download": "Download",
+  "Archive": "Archive",
+  "Delete": "Delete",
+  "My Account": "My Account",
+  "Logout": "Logout",
+  "Notification": "Notification",
+  "Archive Topic": "Archive Topic",
+  "Deleted File": "Deleted File",
+  "Send": "Send",
+  "Workspace and notifications": "Workspace and notifications",
+  "Workspace": "Workspace",
+  "Role": "Role",
+  "Account information": "Account information",
+  "Change your password": "Change your password",
+  "Password": "Password",
+  "Change your name": "Change your name",
+  "Change your email": "Change your email",
+  "Change your Timezone": "Change your Timezone",
+  "Calendar": "Calendar",
+  "Access your personal calendar": "Access your personal calendar",
+  "Dashboard": "Dashboard",
+  "Active advanced Dashboard": "Active advanced Dashboard",
+  "Change your status": "Change your status",
+  "subscriber": "subscriber",
+  "unsubscribed": "unsubscribed",
+  "Start a new Thread": "Start a new Thread",
+  "Writing a document": "Writing a document",
+  "Upload a file": "Upload a file",
+  "Start a videoconference": "Start a videoconference",
+  "View the Calendar": "View the Calendar",
+  "Recent activity": "Recent activity",
+  "Mark everything as read": "Mark everything as read",
+  "See more": "See more",
+  "Member List": "Member List",
+  "Add a member": "Add a member",
+  "Enter the name or email of the member": "Enter the name or email of the member",
+  "Create an account": "Create an account",
+  "Choose the role of the member": "Choose the role of the member",
+  "Supervisor": "Supervisor",
+  "Content Manager": "Content Manager",
+  "Contributor": "Contributor",
+  "Reader": "Reader",
+  "Validate": "Validate",
+  "Implement Tracim in your explorer": "Implement Tracim in your explorer",
+  "Find all your documents deposited online directly on your computer via the workstation, without going through the software.": "Find all your documents deposited online directly on your computer via the workstation, without going through the software.",
+  "Workspace Calendar": "Workspace Calendar",
+  "Each workspace has its own calendar.": "Each workspace has its own calendar.",
+  "Email Adress": "Email Adress",
+  "Explore the workspace": "Explore the workspace",
+  "Old password": "Old password",
+  "New password": "New password",
+  "Name:": "Name:",
+  "Email Adress:": "Email Adress:"
+}

frontend/i18next.scanner/fr/translation.json

@@ -0,0 +1,68 @@
+{
+  "Create your own collaborative workspaces on trac.im": "Créer votre propre espace de travail sur trac.im",
+  "Copyright 2013 - 2017": "Copyright 2013 - 2017",
+  "Disconnection error": "Erreur de déconnexion",
+  "Error": "Erreur",
+  "Email or password invalid": "Email ou mot de passe invalid",
+  "Type": "Type",
+  "Status": "Statut",
+  "Create in folder...": "Créer dans le dossier ...",
+  "Search...": "Rechercher ...",
+  "Create a workspace": "Créer un espace de travail",
+  "Title": "Titre",
+  "Change": "Modifier",
+  "Move": "Déplacer",
+  "Download": "Télécharger",
+  "Archive": "Archiver",
+  "Delete": "Supprimer",
+  "My Account": "Mon Compte",
+  "Logout": "Se Déconnecter",
+  "Notification": "Notification",
+  "Archive Topic": "Conversation archivée",
+  "Deleted File": "Fichier supprimé",
+  "Send": "Envoyer",
+  "Workspace and notifications": "Espace de travail & Notifications",
+  "Workspace": "Espace de travail",
+  "Role": "Rôle",
+  "Account information": "Information du compte",
+  "Change your password": "Changer votre mot de passe",
+  "Password": "Mot de passe",
+  "Change your name": "Modifier votre nom",
+  "Change your email": "Modifier votre email",
+  "Change your Timezone": "Modifier votre fuseau horaire",
+  "Calendar": "Calendrier",
+  "Access your personal calendar": "Accéder à votre calendrier personnel",
+  "Dashboard": "Tableau de bord",
+  "Active advanced Dashboard": "Activer le mode avancé ",
+  "Change your status": "Changer de status",
+  "subscriber": "Abonné(e)",
+  "unsubscribed": "Non Abonné(e)",
+  "Start a new Thread": "Débuter une nouvelle discussion",
+  "Writing a document": "Rédiger un document",
+  "Upload a file": "Importer un fichier",
+  "Start a videoconference": "Débuter une visioconférence",
+  "View the Calendar": "Voir le Calendrier",
+  "Explore the workspace": "Explorer l'espace de travail",
+  "Recent activity": "Activité récente",
+  "Mark everything as read": "Tout marquer comme lu",
+  "See more": "Voir plus",
+  "Member List": "Liste des membres",
+  "Add a member": "Ajouter un membre",
+  "Enter the name or email of the member": "Renseigner le nom ou l'email de l'utilisateur",
+  "Create an account": "Créer un compte",
+  "Supervisor": "Responsable",
+  "Content Manager": "Gestionnaire de contenu",
+  "Contributor": "Contributeur",
+  "Reader": "Lecteur",
+  "Validate": "Validé",
+  "Implement Tracim in your explorer": "Implémenter Tracim dans votre explorateur",
+  "Find all your documents deposited online directly on your computer via the workstation, without going through the software.": "Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur via le poste de travail, sans passer par le logiciel.",
+  "Workspace Calendar": "Calendrier de l'espace de travail",
+  "Each workspace has its own calendar.": "Chaque espace de travail à son propre calendrier",
+  "Choose the role of the member": "Choisissez le rôle du membre",
+  "Email Adress": "Adresse email",
+  "Old password": "Ancien mot de passe",
+  "New password": "Nouveau mot de passe",
+  "Name:": "Nom :",
+  "Email Adress:": "Adresse mail :"
+}

frontend/jsonserver/static_db.json

@@ -35,7 +35,7 @@
     "customClass": "wsContentPageHtml",
     "icon": "fa fa-fw fa-file-text-o",
     "color": "#3f52e3",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }, {
     "name": "PageMarkdown",
     "label": {
@@ -47,7 +47,7 @@
     "customClass": "wsContentPageMarkdown",
     "icon": "fa fa-fw fa-file-code-o",
     "color": "#e0082b",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }, {
     "name": "File",
     "label": {
@@ -59,7 +59,7 @@
     "customClass": "wsContentFile",
     "icon": "fa fa-fw fa-file-image-o",
     "color": "#263462",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }, {
     "name": "Thread",
     "label": {
@@ -71,7 +71,7 @@
     "customClass": "wsContentThread",
     "icon": "fa fa-fw fa-comments-o",
     "color": "#2674d3",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }, {
     "name": "Task",
     "label": {
@@ -83,7 +83,7 @@
     "customClass": "wsContentTask",
     "icon": "fa fa-fw fa-list-ul",
     "color": "#2d5a88",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }, {
     "name": "Issue",
     "label": {
@@ -95,7 +95,7 @@
     "customClass": "wsContentIssue",
     "icon": "fa fa-fw fa-ticket",
     "color": "#a4835e",
-    "domContainer": "appContainer"
+    "domContainer": "appFeatureContainer"
   }],
   "workspace_detail": {
     "id": 1,

frontend/package.json

@@ -10,6 +10,7 @@
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -- webpack-dev-server --watch --colors --inline --hot --progress",
     "buildwindoz": "set NODE_ENV=production&& webpack -p",
     "build": "NODE_ENV=production webpack -p",
+    "build-translation": "node i18next.scanner.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -31,6 +32,7 @@
     "js-cookie": "^2.2.0",
     "prop-types": "^15.6.0",
     "query-string": "^6.1.0",
+    "radium": "^0.24.1",
     "react": "^16.0.0",
     "react-animate-height": "^0.10.10",
     "react-dom": "^16.0.0",
@@ -52,6 +54,7 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "i18next-scanner": "^2.6.1",
     "json-server": "^0.12.0",
     "webpack-dashboard": "^1.0.2",
     "webpack-dev-server": "^2.9.2"
@@ -61,7 +64,8 @@
       "fetch",
       "btoa",
       "history",
-      "GLOBAL_renderAppFull",
+      "GLOBAL_renderAppFeature",
+      "GLOBAL_renderAppFullscreen",
       "GLOBAL_renderAppPopupCreation",
       "GLOBAL_dispatchEvent",
       "GLOBAL_hideApp"

frontend/src/action-creator.async.js

@@ -11,6 +11,8 @@ import {
   setUserRole,
   WORKSPACE,
   WORKSPACE_LIST,
+  WORKSPACE_DETAIL,
+  WORKSPACE_MEMBER_LIST,
   FOLDER,
   setFolderData,
   APP_LIST,
@@ -57,8 +59,20 @@ const fetchWrapper = async ({url, param, actionName, dispatch, debug = false}) =
   })()
   if (debug) console.log(`fetch ${param.method}/${actionName} result: `, fetchResult)
 
-  if ([200, 204, 304].includes(fetchResult.status)) dispatch({type: `${param.method}/${actionName}/SUCCESS`, data: fetchResult.json})
-  else if ([400, 404, 500].includes(fetchResult.status)) dispatch({type: `${param.method}/${actionName}/FAILED`, data: fetchResult.json})
+  // if ([200, 204, 304].includes(fetchResult.status)) dispatch({type: `${param.method}/${actionName}/SUCCESS`, data: fetchResult.json})
+  // else if ([400, 404, 500].includes(fetchResult.status)) dispatch({type: `${param.method}/${actionName}/FAILED`, data: fetchResult.json})
+  switch (fetchResult.status) {
+    case 200:
+    case 204:
+    case 304:
+      dispatch({type: `${param.method}/${actionName}/SUCCESS`, data: fetchResult.json})
+      break
+    case 400:
+    case 404:
+    case 500:
+      dispatch({type: `${param.method}/${actionName}/FAILED`, data: fetchResult.json})
+      break
+  }
 
   return fetchResult
 }
@@ -161,9 +175,9 @@ export const getWorkspaceList = user => dispatch => {
   })
 }
 
-export const getWorkspaceContentList = (user, idWorkspace, idParent) => dispatch => {
+export const getWorkspaceDetail = (user, idWorkspace) => dispatch => {
   return fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents?parent_id=${idParent}`,
+    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}`,
     param: {
       headers: {
         ...FETCH_CONFIG.headers,
@@ -171,16 +185,34 @@ export const getWorkspaceContentList = (user, idWorkspace, idParent) => dispatch
       },
       method: 'GET'
     },
-    actionName: WORKSPACE,
+    actionName: WORKSPACE_DETAIL,
     dispatch
   })
 }
 
-export const getWorkspaceContent = (idWorkspace, idContent) => dispatch => {
+export const getWorkspaceMemberList = (user, idWorkspace) => dispatch => {
   return fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents/${idContent}`,
+    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/members`,
     param: {
-      headers: {...FETCH_CONFIG.headers},
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
+      method: 'GET'
+    },
+    actionName: WORKSPACE_MEMBER_LIST,
+    dispatch
+  })
+}
+
+export const getWorkspaceContentList = (user, idWorkspace, idParent) => dispatch => {
+  return fetchWrapper({
+    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents?parent_id=${idParent}`,
+    param: {
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
       method: 'GET'
     },
     actionName: WORKSPACE,

frontend/src/action-creator.sync.js

@@ -1,44 +1,61 @@
+export const SET = 'Set'
+export const UPDATE = 'Update'
+export const ADD = 'Add'
+export const REMOVE = 'Remove'
+
 export const TIMEZONE = 'Timezone'
-export const setTimezone = timezone => ({ type: `Set/${TIMEZONE}`, timezone })
+export const setTimezone = timezone => ({ type: `${SET}/${TIMEZONE}`, timezone })
 
 export const FLASH_MESSAGE = 'FlashMessage'
 export const newFlashMessage = (msgText = '', msgType = 'info', msgDelay = 5000) => dispatch => {
   msgDelay !== 0 && window.setTimeout(() => dispatch(removeFlashMessage(msgText)), msgDelay)
   return dispatch(addFlashMessage({message: msgText, type: msgType}))
 }
-export const addFlashMessage = msg => ({ type: `Add/${FLASH_MESSAGE}`, msg })
-export const removeFlashMessage = msg => ({ type: `Remove/${FLASH_MESSAGE}`, msg })
-
-export const USER_LOGIN = 'User/Login'
-export const USER_LOGOUT = 'User/Logout'
-export const USER_DATA = 'User/Data'
-export const USER_ROLE = 'User/Role'
-export const USER_CONNECTED = 'User/Connected'
-export const USER_DISCONNECTED = 'User/Disconnected'
-export const setUserConnected = user => ({ type: `Set/${USER_CONNECTED}`, user })
-export const setUserDisconnected = () => ({ type: `Set/${USER_DISCONNECTED}` })
-export const updateUserData = userData => ({ type: `Update/${USER_DATA}`, data: userData })
-export const setUserRole = userRole => ({ type: `Set/${USER_ROLE}`, userRole }) // this actually update workspaceList state
+export const addFlashMessage = msg => ({ type: `${ADD}/${FLASH_MESSAGE}`, msg })
+export const removeFlashMessage = msg => ({ type: `${REMOVE}/${FLASH_MESSAGE}`, msg })
+
+export const USER = 'User'
+export const USER_LOGIN = `${USER}/Login`
+export const USER_LOGOUT = `${USER}/Logout`
+export const USER_DATA = `${USER}/Data`
+export const USER_ROLE = `${USER}/Role`
+export const USER_CONNECTED = `${USER}/Connected`
+export const USER_DISCONNECTED = `${USER}/Disconnected`
+export const USER_LANG = `${USER}/Lang`
+export const setUserConnected = user => ({ type: `${SET}/${USER}/Connected`, user })
+export const setUserDisconnected = () => ({ type: `${SET}/${USER}/Disconnected` })
+export const updateUserData = userData => ({ type: `${UPDATE}/${USER}/Data`, data: userData })
+export const setUserRole = userRole => ({ type: `${SET}/${USER}/Role`, userRole }) // this actually update workspaceList state
+export const setUserLang = lang => ({ type: `${SET}/${USER}/Lang`, lang })
 export const updateUserWorkspaceSubscriptionNotif = (workspaceId, subscriptionNotif) =>
-  ({ type: `Update/${USER_ROLE}/SubscriptionNotif`, workspaceId, subscriptionNotif })
+  ({ type: `${UPDATE}/${USER_ROLE}/SubscriptionNotif`, workspaceId, subscriptionNotif })
 
 export const WORKSPACE = 'Workspace'
-export const setWorkspaceContent = (workspaceContent, filterStr = '') => ({ type: `Set/${WORKSPACE}/Content`, workspaceContent, filterStr })
-export const updateWorkspaceFilter = filterList => ({ type: `Update/${WORKSPACE}/Filter`, filterList })
+export const WORKSPACE_CONTENT = `${WORKSPACE}/Content`
+export const setWorkspaceContentList = (workspaceContentList, filterStr = '') => ({ type: `${SET}/${WORKSPACE_CONTENT}`, workspaceContentList, filterStr })
+export const updateWorkspaceFilter = filterList => ({ type: `${UPDATE}/${WORKSPACE}/Filter`, filterList })
 
-export const FOLDER = 'Folder'
-export const setFolderData = (folderId, content) => ({ type: `Set/${WORKSPACE}/${FOLDER}/Content`, folderId, content })
+export const WORKSPACE_LIST = `${WORKSPACE}/List`
+export const updateWorkspaceListData = workspaceList => ({ type: `${UPDATE}/${WORKSPACE_LIST}`, workspaceList })
+export const setWorkspaceListIsOpenInSidebar = (workspaceId, isOpenInSidebar) => ({ type: `${SET}/${WORKSPACE_LIST}/isOpenInSidebar`, workspaceId, isOpenInSidebar })
+
+export const WORKSPACE_DETAIL = `${WORKSPACE}/Detail`
+export const setWorkspaceDetail = workspaceDetail => ({ type: `${SET}/${WORKSPACE_DETAIL}`, workspaceDetail })
 
-export const WORKSPACE_LIST = 'WorkspaceList'
-export const updateWorkspaceListData = workspaceList => ({ type: `Update/${WORKSPACE_LIST}`, workspaceList })
-export const setWorkspaceListIsOpenInSidebar = (workspaceId, isOpenInSidebar) => ({ type: `Set/${WORKSPACE_LIST}/isOpenInSidebar`, workspaceId, isOpenInSidebar })
+export const WORKSPACE_MEMBER = `${WORKSPACE}/Member`
+export const WORKSPACE_MEMBER_LIST = `${WORKSPACE_MEMBER}/List`
+export const setWorkspaceMemberList = workspaceMemberList => ({ type: `${SET}/${WORKSPACE_MEMBER_LIST}`, workspaceMemberList })
+
+export const FOLDER = 'Folder'
+export const setFolderData = (folderId, content) => ({ type: `${SET}/${WORKSPACE}/${FOLDER}/Content`, folderId, content })
 
-export const APP_LIST = 'App/List'
-export const setAppList = appList => ({ type: `Set/${APP_LIST}`, appList })
+export const APP = 'App'
+export const APP_LIST = `${APP}/List`
+export const setAppList = appList => ({ type: `${SET}/${APP_LIST}`, appList })
 
-export const CONTENT_TYPE_LIST = 'ContentType/List'
-export const setContentTypeList = contentTypeList => ({ type: `Set/${CONTENT_TYPE_LIST}`, contentTypeList })
+export const CONTENT_TYPE = 'ContentType'
+export const CONTENT_TYPE_LIST = `${CONTENT_TYPE}/List`
+export const setContentTypeList = contentTypeList => ({ type: `${SET}/${CONTENT_TYPE_LIST}`, contentTypeList })
 
 export const LANG = 'Lang'
-export const updateLangList = langList => ({ type: `Update/${LANG}`, langList })
-export const setLangActive = langId => ({ type: `Set/${LANG}/Active`, langId })
+export const updateLangList = langList => ({ type: `${UPDATE}/${LANG}`, langList })

frontend/src/appFactory.js

@@ -1,16 +1,30 @@
 import React from 'react'
 import { FETCH_CONFIG } from './helper.js'
+import i18n from './i18n.js'
 
 export function appFactory (WrappedComponent) {
   return class AppFactory extends React.Component {
-    renderAppFull = (appConfig, user, content) => GLOBAL_renderAppFull({
+    renderAppFeature = (appConfig, user, content) => GLOBAL_renderAppFeature({
       loggedUser: user.logged ? user : {},
       config: {
         ...appConfig,
-        domContainer: 'appContainer',
+        domContainer: 'appFeatureContainer',
         apiUrl: FETCH_CONFIG.apiUrl,
-        mockApiUrl: FETCH_CONFIG.mockApiUrl,
-        apiHeader: FETCH_CONFIG.headers
+        mockApiUrl: FETCH_CONFIG.mockApiUrl, // Côme - 2018/07/31 - this should not be used, I deprecate it
+        apiHeader: FETCH_CONFIG.headers,
+        translation: i18n.store.data
+      },
+      content
+    })
+
+    renderAppFullscreen = (appConfig, user, content) => GLOBAL_renderAppFullscreen({
+      loggedUser: user.logged ? user : {},
+      config: {
+        ...appConfig,
+        domContainer: 'appFullscreenContainer',
+        apiUrl: FETCH_CONFIG.apiUrl,
+        apiHeader: FETCH_CONFIG.headers,
+        translation: i18n.store.data
       },
       content
     })
@@ -22,21 +36,23 @@ export function appFactory (WrappedComponent) {
         domContainer: 'popupCreateContentContainer',
         apiUrl: FETCH_CONFIG.apiUrl,
         mockApiUrl: FETCH_CONFIG.mockApiUrl,
-        apiHeader: FETCH_CONFIG.headers // should this be used by app ? right now, apps have their own headers
+        apiHeader: FETCH_CONFIG.headers, // should this be used by app ? right now, apps have their own headers
+        translation: i18n.store.data
       },
       idWorkspace,
       idFolder: idFolder === 'null' ? null : idFolder
     })
 
-    emitEventApp = (type, data) => GLOBAL_dispatchEvent({ type, data })
+    dispatchCustomEvent = (type, data) => GLOBAL_dispatchEvent({ type, data })
 
     render () {
       return (
         <WrappedComponent
           {...this.props}
-          renderAppFull={this.renderAppFull}
+          renderAppFeature={this.renderAppFeature}
+          renderAppFullscreen={this.renderAppFullscreen}
           renderAppPopupCreation={this.renderAppPopupCreation}
-          emitEventApp={this.emitEventApp}
+          dispatchCustomEvent={this.dispatchCustomEvent}
           // hideApp={this.hideApp}
         />
       )

frontend/src/component/Account/Calendar.jsx

@@ -5,7 +5,7 @@ export const Calendar = props => {
     <div className='account__userpreference__setting__calendar'>
 
       <div className='calendar__title subTitle ml-2 ml-sm-0'>
-        Calendrier
+        {props.t('Calendar')}
       </div>
 
       <div className='calendar__text ml-2 ml-sm-0'>
@@ -13,7 +13,7 @@ export const Calendar = props => {
       </div>
 
       <div className='calendar__title ml-2 ml-sm-0'>
-        Accèder à votre Calendrier personnel
+        {props.t('Access your personal calendar')}
       </div>
       <div className='calendar__link ml-2 ml-sm-0'>
         {props.user.caldavUrl}

frontend/src/component/Account/Notification.jsx

@@ -9,7 +9,7 @@ export const Notification = props => {
   return (
     <div className='account__userpreference__setting__notification'>
       <div className='notification__sectiontitle subTitle ml-2 ml-sm-0'>
-        Espace de Travail & Notification
+        {props.t('Workspace and notifications')}
       </div>
 
       <div className='notification__text ml-2 ml-sm-0'>
@@ -20,9 +20,9 @@ export const Notification = props => {
         <table className='table'>
           <thead>
             <tr>
-              <th>Espace de travail</th>
-              <th>Role</th>
-              <th>Notification</th>
+              <th>{props.t('Workspace')}</th>
+              <th>{props.t('Role')}</th>
+              <th>{props.t('Notification')}</th>
             </tr>
           </thead>
           <tbody>

frontend/src/component/Account/Password.jsx

@@ -1,10 +1,11 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 
 export const Password = props => {
   return (
     <div className='account__userpreference__setting__personaldata'>
       <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
-        Changer de mot de passe
+        {props.t('Change your password')}
       </div>
 
       <div className='personaldata__text ml-2 ml-sm-0'>
@@ -13,12 +14,20 @@ export const Password = props => {
 
       <form className='personaldata__form mr-5'>
         <div className='personaldata__form__title'>
-          Mot de passe :
+          {props.t('Password')}
         </div>
-        <input className='personaldata__form__txtinput form-control' type='password' placeholder='Ancien mot de passe' />
-        <input className='personaldata__form__txtinput form-control mt-4' type='password' placeholder='Nouveau mot de passe' />
+        <input
+          className='personaldata__form__txtinput form-control'
+          type='password'
+          placeholder={props.t('Old password')}
+        />
+        <input
+          className='personaldata__form__txtinput form-control mt-4'
+          type='password'
+          placeholder={props.t('New password')}
+        />
         <button type='submit' className='personaldata__form__button btn btn-outline-primary mt-4'>
-          Envoyer
+          {props.t('Send')}
         </button>
       </form>
 
@@ -26,4 +35,4 @@ export const Password = props => {
   )
 }
 
-export default Password
+export default translate()(Password)

frontend/src/component/Account/PersonalData.jsx

@@ -1,10 +1,12 @@
 import React from 'react'
+import PropTypes from 'prop-types'
+import { translate } from 'react-i18next'
 
 export const PersonalData = props => {
   return (
     <div className='account__userpreference__setting__personaldata'>
       <div className='personaldata__sectiontitle subTitle ml-2 ml-sm-0'>
-        Information du compte
+        {props.t('Account information')}
       </div>
 
       <div className='personaldata__text ml-2 ml-sm-0'>
@@ -13,23 +15,36 @@ export const PersonalData = props => {
 
       <form className='personaldata__form'>
         <div className='personaldata__form__title'>
-          Nom :
+          {props.t('Name:')}
         </div>
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
-          <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='text' placeholder='Nom' />
+          <input
+            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
+            type='text'
+            placeholder={props.t('Change your name')}
+          />
         </div>
         <div className='personaldata__form__title'>
-          Adresse mail :
+          {props.t('Email Adress:')}
         </div>
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
-          <input className='personaldata__form__txtinput form-control mt-3 mt-sm-0' type='email' placeholder='Nouvelle adresse mail' />
+          <input
+            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
+            type='email'
+            placeholder={props.t('Change your email')}
+          />
         </div>
         <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
-          Envoyer
+          {props.t('Send')}
         </button>
       </form>
     </div>
   )
 }
 
-export default PersonalData
+PersonalData.propTypes = {
+  inputPlaceholderNameUser: PropTypes.string,
+  inputPlaceholderEmailUser: PropTypes.string
+}
+
+export default translate()(PersonalData)

frontend/src/component/Account/Timezone.jsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import Select from 'react-select'
 import 'react-select/dist/react-select.css'
+import { translate } from 'react-i18next'
 
 export const Timezone = props => {
   const handleChangeTimezone = selectedTimezone => props.onChangeTimezone(props.timezone.find(t => t.place === selectedTimezone.place))
@@ -9,7 +10,7 @@ export const Timezone = props => {
     <div className='account__userpreference__setting__timezone'>
 
       <div className='timezone__title subTitle ml-2 ml-sm-0'>
-        Changer de Fuseau Horaire
+        {props.t('Change your Timezone')}
       </div>
 
       <div className='timezone__text ml-2 ml-sm-0'>
@@ -32,4 +33,4 @@ export const Timezone = props => {
   )
 }
 
-export default Timezone
+export default translate()(Timezone)

frontend/src/component/FlashMessage.jsx

@@ -22,7 +22,7 @@ const FlashMessage = props => {
 
               <div className='flashmessage__container__content__text'>
                 <div className='flashmessage__container__content__text__title'>
-                  {props.t('FlashMessage.error')}
+                  {props.t('Error')}
                 </div>
                 <div className='flashmessage__container__content__text__paragraph'>
                   {props.flashMessage[0].message}

frontend/src/component/Footer.jsx

@@ -7,7 +7,7 @@ const Footer = ({ t }) => {
   return (
     <footer className='footer text-right'>
       <div className='footer__text'>
-        {t('Footer.marketing_msg')} - {t('Footer.copyright')}
+        {t('Create your own collaborative workspaces on trac.im')} - {t('Copyright 2013 - 2017')}
       </div>
       <img className='footer__logo' src={logoFooter} />
     </footer>

frontend/src/component/Header/MenuActionListItem/DropdownLang.jsx

@@ -2,7 +2,6 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 const DropdownLang = props => {
-  const activeLang = props.langList.find(l => l.active) || {id: 'fr', name: 'Français', src: '', active: true}
   return (
     <li className='header__menu__rightside__itemlanguage'>
       <div className='header__menu__rightside__itemlanguage__languagedropdown dropdown'>
@@ -14,12 +13,12 @@ const DropdownLang = props => {
           aria-haspopup='true'
           aria-expanded='false'
         >
-          <img className='languagedropdown__btnlanguage__imgselected' src={activeLang.src} />
+          <img className='languagedropdown__btnlanguage__imgselected' src={props.langList.find(l => l.id === props.idLangActive).icon} />
         </button>
         <div className='languagedropdown__subdropdown dropdown-menu' aria-labelledby='headerDropdownMenuButton'>
-          { props.langList.map((l, i) => l.active === false &&
+          { props.langList.filter(l => l.id !== props.idLangActive).map((l, i) =>
             <div className='subdropdown__link dropdown-item' onClick={() => props.onChangeLang(l.id)} key={i}>
-              <img className='subdropdown__flag' src={l.src} />
+              <img className='subdropdown__flag' src={l.icon} />
             </div>
           )}
         </div>
@@ -31,5 +30,6 @@ export default DropdownLang
 
 DropdownLang.propTypes = {
   langList: PropTypes.array.isRequired,
+  idLangActive: PropTypes.string.isRequired,
   onChangeLang: PropTypes.func.isRequired
 }

frontend/src/component/Header/MenuActionListItem/MenuProfil.jsx

@@ -2,6 +2,7 @@ import React from 'react'
 import { Link } from 'react-router-dom'
 import PropTypes from 'prop-types'
 import { PAGE } from '../../../helper.js'
+import { translate } from 'react-i18next'
 
 const MenuProfil = props => {
   return props.user.logged
@@ -17,12 +18,12 @@ const MenuProfil = props => {
           <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
             <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
               <i className='fa fa-fw fa-user-o mr-2' />
-              Mon compte
+              {props.t('My Account')}
             </Link>
             {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
             <div className='setting__link dropdown-item' onClick={props.onClickLogout}>
               <i className='fa fa-fw fa-sign-out mr-2' />
-              Se déconnecter
+              {props.t('Logout')}
             </div>
           </div>
         </div>
@@ -30,7 +31,7 @@ const MenuProfil = props => {
     )
     : ''
 }
-export default MenuProfil
+export default translate()(MenuProfil)
 
 MenuProfil.propTypes = {
   user: PropTypes.object.isRequired,

frontend/src/component/Header/MenuActionListItem/Notification.jsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import { translate } from 'react-i18next'
 // import PropTypes from 'prop-types'
 
 const Notification = props => {
@@ -13,18 +14,18 @@ const Notification = props => {
           aria-haspopup='true'
           aria-expanded='false'
         >
-          Notification
+          {props.t('Notification')}
         </button>
         <div className='timeline__subdropdown dropdown-menu' aria-labelledby='headerDropdownMenuButton'>
           <div className='timeline__subdropdown__text dropdown-item' >
-            Conversation archivé
+            {props.t('Archive Topic')}
           </div>
           <div className='timeline__subdropdown__text dropdown-item' >
-            Fichier supprimé
+            {props.t('Deleted File')}
           </div>
         </div>
       </div>
     </li>
   )
 }
-export default Notification
+export default translate()(Notification)

frontend/src/component/Header/MenuActionListItem/Search.jsx

@@ -9,7 +9,7 @@ const Search = props => {
         <input
           type='text'
           className='search__input form-control'
-          placeholder={`${props.t('Header.Search')}...`}
+          placeholder={`${props.t('Search...')}`}
           aria-describedby='headerInputSearch'
           onChange={props.onChangeInput}
         />

frontend/src/component/Workspace/BtnExtandedAction.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { translate } from 'react-i18next'
 
 const ExtandedAction = props => {
   return (
@@ -22,7 +23,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-pencil' />
           </div>
           <div className='subdropdown__item__text'>
-            Modifier
+            {props.t('Change')}
           </div>
         </div>
 
@@ -31,7 +32,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-arrows-alt' />
           </div>
           <div className='subdropdown__item__text'>
-            Déplacer
+            {props.t('Move')}
           </div>
         </div>
 
@@ -40,7 +41,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-download' />
           </div>
           <div className='subdropdown__item__text'>
-            Télécharger
+            {props.t('Download')}
           </div>
         </div> */ }
 
@@ -49,7 +50,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-archive' />
           </div>
           <div className='subdropdown__item__text'>
-            Archiver
+            {props.t('Archive')}
           </div>
         </div>
 
@@ -58,7 +59,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-trash-o' />
           </div>
           <div className='subdropdown__item__text'>
-            Supprimer
+            {props.t('Delete')}
           </div>
         </div>
 
@@ -67,7 +68,7 @@ const ExtandedAction = props => {
   )
 }
 
-export default ExtandedAction
+export default translate()(ExtandedAction)
 
 ExtandedAction.propTypes = {
   onClickExtendedAction: PropTypes.object.isRequired

frontend/src/component/Workspace/ContentItem.jsx

@@ -4,6 +4,8 @@ import classnames from 'classnames'
 import BtnExtandedAction from './BtnExtandedAction.jsx'
 
 const ContentItem = props => {
+  if (props.contentType === null) return null // this means the endpoint system/content_type hasn't responded yet
+
   const status = props.contentType.availableStatuses.find(s => s.slug === props.statusSlug)
   return (
     <div className={classnames('content', 'align-items-center', {'item-last': props.isLast}, props.customClass)} onClick={props.onClickItem}>

frontend/src/component/Workspace/ContentItemHeader.jsx

@@ -5,13 +5,13 @@ const FileItemHeader = props => {
   return (
     <div className='content__header'>
       <div className='content__header__type'>
-        {props.t('FileItemHeader.type')}
+        {props.t('Type')}
       </div>
       <div className='content__header__name'>
-        {props.t('FileItemHeader.document_name')}
+        {props.t('Title')}
       </div>
       <div className='content__header__status'>
-        {props.t('FileItemHeader.status')}
+        {props.t('Status')}
       </div>
     </div>
   )

frontend/src/component/Workspace/Folder.jsx

@@ -65,7 +65,7 @@ class Folder extends React.Component {
                 aria-expanded='false'
                 onClick={e => e.stopPropagation()}
               >
-                {t('Folder.create')} ...
+                {t('Create in folder...')}
               </button>
 
               <div className='addbtn__subdropdown dropdown-menu' aria-labelledby='dropdownMenuButton'>

frontend/src/component/Workspace/OpenContentApp.jsx

@@ -3,13 +3,14 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router'
 import appFactory from '../../appFactory.js'
 
+// @FIXME Côme - 2018/07/31 - should this be in a component like AppFeatureManager ?
 export class OpenContentApp extends React.Component {
   openContentApp = () => {
-    const { idWorkspace, appOpenedType, user, workspaceContent, contentType, renderAppFull, match } = this.props
+    const { idWorkspace, appOpenedType, user, workspaceContentList, contentType, renderAppFeature, dispatchCustomEvent, match } = this.props
 
     if (isNaN(idWorkspace) || idWorkspace === -1) return
 
-    if (['type', 'idcts'].every(p => p in match.params) && match.params.type !== 'contents' && workspaceContent.length) {
+    if (['type', 'idcts'].every(p => p in match.params) && match.params.type !== 'contents' && workspaceContentList.length) {
       if (isNaN(match.params.idcts) || !contentType.map(c => c.slug).includes(match.params.type)) return
 
       const contentToOpen = {
@@ -21,15 +22,15 @@ export class OpenContentApp extends React.Component {
       console.log('%c<OpenContentApp> contentToOpen', 'color: #dcae84', contentToOpen)
 
       if (appOpenedType === contentToOpen.type) { // app already open
-        GLOBAL_dispatchEvent({
-          type: `${contentToOpen.type}_reloadContent`, // handled by html-documents:src/container/HtmlDocument.jsx
+        dispatchCustomEvent({
+          type: `${contentToOpen.type}_reloadContent`, // handled by html-document:src/container/AdminWorkspaceUser.jsx
           data: contentToOpen
         })
       } else { // open another app
         // if another app is already visible, hide it
-        if (appOpenedType !== false) GLOBAL_dispatchEvent({type: `${appOpenedType}_hideApp`})
+        if (appOpenedType !== false) dispatchCustomEvent({type: `${appOpenedType}_hideApp`})
         // open app
-        renderAppFull(
+        renderAppFeature(
           contentType.find(ct => ct.slug === contentToOpen.type),
           user,
           contentToOpen
@@ -56,5 +57,5 @@ export class OpenContentApp extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, workspaceContent, contentType }) => ({ user, workspaceContent, contentType })
+const mapStateToProps = ({ user, workspaceContentList, contentType }) => ({ user, workspaceContentList, contentType })
 export default withRouter(connect(mapStateToProps)(appFactory(OpenContentApp)))

frontend/src/component/Workspace/OpenCreateContentApp.jsx

@@ -5,6 +5,7 @@ import appFactory from '../../appFactory.js'
 
 const qs = require('query-string')
 
+// @FIXME Côme - 2018/07/31 - should this be in a component like AppFeatureManager ? (or AppCreateContentManager)
 export class OpenCreateContentApp extends React.Component {
   openCreateContentApp = () => {
     const { idWorkspace, user, contentType, renderAppPopupCreation, match, location } = this.props
@@ -38,5 +39,5 @@ export class OpenCreateContentApp extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, workspaceContent, contentType }) => ({ user, workspaceContent, contentType })
+const mapStateToProps = ({ user, contentType }) => ({ user, contentType })
 export default withRouter(connect(mapStateToProps)(appFactory(OpenCreateContentApp)))

frontend/src/component/common/Input/SubDropdownCreateButton.jsx

@@ -10,7 +10,10 @@ const SubDropdownCreateButton = props => {
         <div className='subdropdown__link dropdown-item' onClick={e => props.onClickCreateContent(e, props.idFolder, app.slug)} key={app.slug}>
           <div className={`subdropdown__link__${app.slug} d-flex align-items-center`}>
             <div className={`subdropdown__link__${app.slug}__icon mr-3`}>
-              <i className={`fa fa-fw fa-${app.faIcon}`} />
+              <i
+                className={`fa fa-fw fa-${app.faIcon}`}
+                style={{color: app.hexcolor}}
+              />
             </div>
             <div className='subdropdown__link__folder__text'>
               {app.creationLabel}

frontend/src/container/Account.jsx

@@ -1,9 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import Sidebar from './Sidebar.jsx'
-import PageWrapper from '../component/common/layout/PageWrapper.jsx'
-import PageTitle from '../component/common/layout/PageTitle.jsx'
-import PageContent from '../component/common/layout/PageContent.jsx'
 import UserInfo from '../component/Account/UserInfo.jsx'
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
 import PersonalData from '../component/Account/PersonalData.jsx'
@@ -11,12 +8,18 @@ import PersonalData from '../component/Account/PersonalData.jsx'
 import Notification from '../component/Account/Notification.jsx'
 import Password from '../component/Account/Password.jsx'
 import Timezone from '../component/Account/Timezone.jsx'
-import { Delimiter } from 'tracim_frontend_lib'
+import {
+  Delimiter,
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
 import { updateUserWorkspaceSubscriptionNotif } from '../action-creator.sync.js'
 import {
   getTimezone,
   getUserRole
 } from '../action-creator.async.js'
+import { translate } from 'react-i18next'
 
 class Account extends React.Component {
   constructor (props) {
@@ -77,7 +80,8 @@ class Account extends React.Component {
     const subComponent = (() => {
       switch (this.state.subComponentMenu.find(({active}) => active).name) {
         case 'personalData':
-          return <PersonalData />
+          return <PersonalData
+          />
 
         // case 'calendar':
         //   return <Calendar user={this.props.user} />
@@ -88,11 +92,12 @@ class Account extends React.Component {
             onChangeSubscriptionNotif={this.handleChangeSubscriptionNotif}
           />
 
+        case 'password':
+          return <Password
+          />
+
         case 'timezone':
           return <Timezone timezone={this.props.timezone} onChangeTimezone={this.handleChangeTimezone} />
-
-        case 'password':
-          return <Password />
       }
     })()
 
@@ -127,4 +132,4 @@ class Account extends React.Component {
 }
 
 const mapStateToProps = ({ user, workspaceList, timezone }) => ({ user, workspaceList, timezone })
-export default connect(mapStateToProps)(Account)
+export default connect(mapStateToProps)(translate()(Account))

frontend/src/container/AppFullscreenManager.jsx

@@ -0,0 +1,47 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
+import { Route } from 'react-router-dom'
+import { PAGE } from '../helper.js'
+import appFactory from '../appFactory.js'
+import Sidebar from './Sidebar.jsx'
+
+class AppFullscreenManager extends React.Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      AmIMounted: false
+    }
+  }
+
+  componentDidMount = () => this.setState({AmIMounted: true})
+
+  render () {
+    const { props } = this
+
+    return (
+      <div className='sidebarpagecontainer'>
+        <Sidebar />
+
+        <div id='appFullscreenContainer' />
+
+        {this.state.AmIMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
+          <div className='emptyDiForRoute'>
+            <Route path={PAGE.ADMIN.WORKSPACE} render={() => {
+              props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'workspace'}, props.user, {})
+              return null
+            }} />
+
+            <Route path={PAGE.ADMIN.USER} render={() => {
+              props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'user'}, props.user, {})
+              return null
+            }} />
+          </div>
+        )}
+      </div>
+    )
+  }
+}
+
+const mapStateToProps = ({ user }) => ({ user })
+export default connect(mapStateToProps)(withRouter(appFactory(AppFullscreenManager)))

frontend/src/container/Dashboard.jsx

@@ -2,13 +2,22 @@ import React from 'react'
 import { connect } from 'react-redux'
 import Sidebar from './Sidebar.jsx'
 import imgProfil from '../img/imgProfil.png'
+import { translate } from 'react-i18next'
+import Radium from 'radium'
+import color from 'color'
 import {
-  getAppList,
-  getContentTypeList, getWorkspaceList
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
+import {
+  getWorkspaceDetail,
+  getWorkspaceMemberList
 } from '../action-creator.async.js'
 import {
-  setAppList,
-  setContentTypeList, setWorkspaceListIsOpenInSidebar, updateWorkspaceListData
+  addFlashMessage,
+  setWorkspaceDetail,
+  setWorkspaceMemberList
 } from '../action-creator.sync.js'
 
 class Dashboard extends React.Component {
@@ -24,28 +33,28 @@ class Dashboard extends React.Component {
   }
 
   async componentDidMount () {
-    const { workspaceIdInUrl } = this.state
-    const { user, workspaceList, app, contentType, dispatch } = this.props
-
-    console.log('<Dashboard> componentDidMount')
-
-    if (app.length === 0) {
-      const fetchGetAppList = await dispatch(getAppList(user))
-      if (fetchGetAppList.status === 200) dispatch(setAppList(fetchGetAppList.json))
-    }
-
-    if (contentType.length === 0) {
-      const fetchGetContentTypeList = await dispatch(getContentTypeList(user))
-      if (fetchGetContentTypeList.status === 200) dispatch(setContentTypeList(fetchGetContentTypeList.json))
+    const { props, state } = this
+
+    const fetchWorkspaceDetail = await props.dispatch(getWorkspaceDetail(props.user, state.workspaceIdInUrl))
+    switch (fetchWorkspaceDetail.status) {
+      case 200:
+        props.dispatch(setWorkspaceDetail(fetchWorkspaceDetail.json))
+        break
+      case 400:
+      case 500:
+        props.dispatch(addFlashMessage(props.t('An error has happened'), 'warning'))
+        break
     }
 
-    if (user.user_id !== -1 && workspaceList.length === 0) {
-      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
-
-      if (fetchGetWorkspaceList.status === 200) {
-        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
-        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].workspace_id, true))
-      }
+    const fetchWorkspaceMemberList = await props.dispatch(getWorkspaceMemberList(props.user, state.workspaceIdInUrl))
+    switch (fetchWorkspaceMemberList.status) {
+      case 200:
+        props.dispatch(setWorkspaceMemberList(fetchWorkspaceMemberList.json))
+        break
+      case 400:
+      case 500:
+        props.dispatch(addFlashMessage(props.t('An error has happened'), 'warning'))
+        break
     }
   }
 
@@ -66,219 +75,145 @@ class Dashboard extends React.Component {
   }))
 
   render () {
+    const { props, state } = this
+
     return (
       <div className='sidebarpagecontainer'>
         <Sidebar />
 
-        <div className='dashboard'>
-          <div className='container-fluid nopadding'>
-            <div className='dashboard__header mb-5'>
-              <div className='pageTitleGeneric dashboard__header__title d-flex align-items-center'>
-                <div className='pageTitleGeneric__title dashboard__header__title__text mr-3'>
-                  Dashboard
-                </div>
-                <div className='dashboard__header__acces' />
-              </div>
-              <div className='dashboard__header__advancedmode mr-3'>
-                <button type='button' className='btn btn-primary'>Activer édition avancé</button>
-              </div>
+        <PageWrapper customeClass='dashboard'>
+          <PageTitle
+            parentClass='dashboard__header'
+            title={props.t('Dashboard')}
+            subtitle={''}
+          >
+            <div className='dashboard__header__advancedmode mr-3'>
+              <button type='button' className='btn btn-primary'>
+                {props.t('Active advanced Dashboard')}
+              </button>
             </div>
+          </PageTitle>
 
-            <div className='dashboard__wkswrapper'>
+          <PageContent>
+            <div className='dashboard__workspace-wrapper'>
               <div className='dashboard__workspace'>
                 <div className='dashboard__workspace__title'>
-                  Développement tracim
+                  {props.curWs.label}
                 </div>
 
                 <div className='dashboard__workspace__detail'>
-                  Ligne directive pour le prochain design de Tracim et des futurs fonctionnalités.
+                  {props.curWs.description}
                 </div>
               </div>
-              <div className='dashboard__userstatut'>
 
+              <div className='dashboard__userstatut'>
                 <div className='dashboard__userstatut__role'>
-                  <div className='dashboard__userstatut__role__text'>
-                    Hi ! Alexi, vous êtes actuellement
+                  <div className='dashboard__userstatut__role__msg'>
+                    {props.t(`Hi ! ${props.user.public_name}, vous êtes actuellement`)}
                   </div>
-                  <div className='dashboard__userstatut__role__rank'>
-                    <div className='dashboard__userstatut__role__rank__icon'>
+
+                  <div className='dashboard__userstatut__role__definition'>
+                    <div className='dashboard__userstatut__role__definition__icon'>
                       <i className='fa fa-graduation-cap' />
                     </div>
-                    <div className='dashboard__userstatut__role__rank__rolename'>
-                      Gestionnaire de projet
+
+                    <div className='dashboard__userstatut__role__definition__text'>
+                      {(member => member ? member.role : '')(props.curWs.member.find(m => m.id === props.user.user_id))}
                     </div>
                   </div>
                 </div>
 
                 <div className='dashboard__userstatut__notification'>
                   <div className='dashboard__userstatut__notification__text'>
-                    Vous êtes abonné(e) aux notifications de ce workspace
+                    {props.t("You have subscribed to this workspace's notifications")} (nyi)
                   </div>
-                  {this.state.displayNotifBtn === false &&
-                    <div
-                      className='dashboard__userstatut__notification__btn btn btn-outline-primary'
-                      onClick={this.handleToggleNotifBtn}
-                    >
-                      Changer de statut
-                    </div>
-                  }
 
-                  {this.state.displayNotifBtn === true &&
-                    <div className='dashboard__userstatut__notification__subscribe dropdown'>
-                      <button className='dashboard__userstatut__notification__subscribe__btn btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
-                        Abonné(e)
-                      </button>
-                      <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>Abonné(e)
-                        </div>
-                        <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>Non Abonné(e)
+                  {state.displayNotifBtn
+                    ? (
+                      <div className='dashboard__userstatut__notification__subscribe dropdown'>
+                        <button
+                          className='dashboard__userstatut__notification__subscribe__btn btn btn-outline-primary dropdown-toggle'
+                          type='button'
+                          id='dropdownMenuButton'
+                          data-toggle='dropdown'
+                          aria-haspopup='true'
+                          aria-expanded='false'
+                        >
+                          Abonné(e)
+                        </button>
+
+                        <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
+                          <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>
+                            {props.t('subscriber')}
+                          </div>
+                          <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>
+                            {props.t('unsubscribed')}
+                          </div>
                         </div>
                       </div>
-                    </div>
+                    )
+                    : (
+                      <div
+                        className='dashboard__userstatut__notification__btn btn btn-outline-primary'
+                        onClick={this.handleToggleNotifBtn}
+                      >
+                        {props.t('Change your status')}
+                      </div>
+                    )
                   }
                 </div>
               </div>
             </div>
 
             <div className='dashboard__calltoaction justify-content-xl-center'>
-              <div className='dashboard__calltoaction__button btnaction btnthread'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-comments-o' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Débuter une nouvelle discussion
-                  </div>
-                </div>
-              </div>
-
-              <div className='dashboard__calltoaction__button btnaction writefile'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-file-text-o' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Rédiger un document
-                  </div>
-                </div>
-              </div>
-
-              <div className='dashboard__calltoaction__button btnaction importfile'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-paperclip' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Importer un fichier
-                  </div>
-                </div>
-              </div>
-
-              {/*
-                <div className='dashboard__calltoaction__button btnaction visioconf'>
-                  <div className='dashboard__calltoaction__button__text'>
-                    <div className='dashboard__calltoaction__button__text__icon'>
-                      <i className='fa fa-video-camera' />
-                    </div>
-                    <div className='dashboard__calltoaction__button__text__title'>
-                      Débuter une visioconférence
-                    </div>
-                  </div>
-                </div>
-
-                <div className='dashboard__calltoaction__button btnaction calendar'>
+              {props.contentType.map(ct =>
+                <div
+                  className='dashboard__calltoaction__button btnaction'
+                  style={{
+                    backgroundColor: ct.hexcolor,
+                    ':hover': {
+                      backgroundColor: color(ct.hexcolor).darken(0.15).hexString()
+                    }
+                  }}
+                  key={ct.label}
+                >
                   <div className='dashboard__calltoaction__button__text'>
                     <div className='dashboard__calltoaction__button__text__icon'>
-                      <i className='fa fa-calendar' />
+                      <i className={`fa fa-${ct.faIcon}`} />
                     </div>
                     <div className='dashboard__calltoaction__button__text__title'>
-                      Voir le Calendrier
+                      {ct.creationLabel}
                     </div>
                   </div>
                 </div>
-              */ }
-
-              <div className='dashboard__calltoaction__button btnaction explore'>
-                <div className='dashboard__calltoaction__button__text'>
-                  <div className='dashboard__calltoaction__button__text__icon'>
-                    <i className='fa fa-folder-open-o' />
-                  </div>
-                  <div className='dashboard__calltoaction__button__text__title'>
-                    Explorer le Workspace
-                  </div>
-                </div>
-              </div>
+              )}
             </div>
 
             <div className='dashboard__wksinfo'>
               <div className='dashboard__activity'>
                 <div className='dashboard__activity__header'>
                   <div className='dashboard__activity__header__title subTitle'>
-                    Activité récente
+                    {this.props.t('Recent activity')}
                   </div>
 
                   <div className='dashboard__activity__header__allread btn btn-outline-primary'>
-                    Tout marquer comme lu
+                    {this.props.t('Mark everything as read')}
                   </div>
                 </div>
                 <div className='dashboard__activity__wrapper'>
-                  <div className='dashboard__activity__workspace'>
-                    <div className='dashboard__activity__workspace__icon'>
-                      <i className='fa fa-comments-o' />
-                    </div>
-                    <div className='dashboard__activity__workspace__name'>
-                      <span>Développement Tracim</span>
-                    </div>
-                  </div>
-
-                  <div className='dashboard__activity__workspace'>
-                    <div className='dashboard__activity__workspace__icon'>
-                      <i className='fa fa-list-ul' />
-                    </div>
-                    <div className='dashboard__activity__workspace__name'>
-                      Mission externe
-                    </div>
-                  </div>
-
-                  <div className='dashboard__activity__workspace'>
-                    <div className='dashboard__activity__workspace__icon'>
-                      <i className='fa fa-list-ul' />
-                    </div>
-                    <div className='dashboard__activity__workspace__name'>
-                      Recherche et developpement
-                    </div>
-                  </div>
-
-                  <div className='dashboard__activity__workspace'>
-                    <div className='dashboard__activity__workspace__icon'>
-                      <i className='fa fa-file-text-o' />
-                    </div>
-                    <div className='dashboard__activity__workspace__name'>
-                      <span>Marketing</span>
-                    </div>
-                  </div>
 
                   <div className='dashboard__activity__workspace'>
                     <div className='dashboard__activity__workspace__icon'>
                       <i className='fa fa-comments-o' />
                     </div>
                     <div className='dashboard__activity__workspace__name'>
-                      <span>Évolution</span>
-                    </div>
-                  </div>
-
-                  <div className='dashboard__activity__workspace'>
-                    <div className='dashboard__activity__workspace__icon'>
-                      <i className='fa fa-file-text-o' />
-                    </div>
-                    <div className='dashboard__activity__workspace__name'>
-                      Commercialisation
+                      <span>Développement Tracim</span>
                     </div>
                   </div>
 
                   <div className='dashboard__activity__more d-flex flex-row-reverse'>
                     <div className='dashboard__activity__more__btn btn btn-outline-primary'>
-                      Voir plus
+                      {this.props.t('See more')}
                     </div>
                   </div>
                 </div>
@@ -287,13 +222,14 @@ class Dashboard extends React.Component {
               <div className='dashboard__memberlist'>
 
                 <div className='dashboard__memberlist__title subTitle'>
-                  Liste des membres
+                  {this.props.t('Member List')}
                 </div>
 
                 <div className='dashboard__memberlist__wrapper'>
                   {this.state.displayNewMemberDashboard === false &&
                     <div>
                       <ul className='dashboard__memberlist__list'>
+
                         <li className='dashboard__memberlist__list__item'>
                           <div className='dashboard__memberlist__list__item__avatar'>
                             <img src={imgProfil} alt='avatar' />
@@ -311,110 +247,12 @@ class Dashboard extends React.Component {
                           </div>
                         </li>
 
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              Aldwin Vinel
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Lecteur
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
-
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              William Himme
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Contributeur
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
-
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              Yacine Lite
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Contributeur
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
-
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              Alexi Falcin
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Gestionnaire
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
-
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              Mickaël Fonati
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Gestionnaire
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
-
-                        <li className='dashboard__memberlist__list__item'>
-                          <div className='dashboard__memberlist__list__item__avatar'>
-                            <img src={imgProfil} alt='avatar' />
-                          </div>
-                          <div className='dashboard__memberlist__list__item__info mr-auto'>
-                            <div className='dashboard__memberlist__list__item__info__name'>
-                              Eva Lonbard
-                            </div>
-                            <div className='dashboard__memberlist__list__item__info__role'>
-                              Gestionnaire
-                            </div>
-                          </div>
-                          <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
-                            <i className='fa fa-trash-o' />
-                          </div>
-                        </li>
                       </ul>
 
-                      <div className='dashboard__memberlist__btnadd'>
+                      <div
+                        className='dashboard__memberlist__btnadd'
+                        onClick={this.handleToggleNewMemberDashboard}
+                      >
                         <div className='dashboard__memberlist__btnadd__button'>
                           <div className='dashboard__memberlist__btnadd__button__avatar'>
                             <div className='dashboard__memberlist__btnadd__button__avatar__icon'>
@@ -423,9 +261,8 @@ class Dashboard extends React.Component {
                           </div>
                           <div
                             className='dashboard__memberlist__btnadd__button__text'
-                            onClick={this.handleToggleNewMemberDashboard}
                           >
-                             Ajouter un membre
+                            {this.props.t('Add a member')}
                           </div>
                         </div>
                       </div>
@@ -433,89 +270,64 @@ class Dashboard extends React.Component {
                   }
 
                   {this.state.displayNewMemberDashboard === true &&
-                    <form className='dashboard__memberlist__form'>
-                      <div
-                        className='dashboard__memberlist__form__close d-flex justify-content-end'
-                      >
-                        <i className='fa fa-times' onClick={this.handleToggleNewMemberDashboard} />
+                  <form className='dashboard__memberlist__form'>
+                    <div
+                      className='dashboard__memberlist__form__close d-flex justify-content-end'
+                    >
+                      <i className='fa fa-times' onClick={this.handleToggleNewMemberDashboard} />
+                    </div>
+
+                    <div className='dashboard__memberlist__form__member'>
+                      <div className='dashboard__memberlist__form__member__name'>
+                        <label className='name__label' htmlFor='addmember'>
+                          {this.props.t('Enter the name or email of the member')}
+                        </label>
+                        <input type='text' id='addmember' className='name__input form-control' placeholder='Nom ou Email' />
                       </div>
-                      <div className='dashboard__memberlist__form__member'>
-                        <div className='dashboard__memberlist__form__member__name'>
-                          <label className='name__label' htmlFor='addmember'>Indiquer le nom ou l'email du membre</label>
-                          <input type='text' id='addmember' className='name__input form-control' placeholder='Nom ou Email' />
+
+                      <div className='dashboard__memberlist__form__member__create'>
+                        <div className='create__radiobtn mr-3'>
+                          <input type='radio' />
                         </div>
-                        <div className='dashboard__memberlist__form__member__create'>
-                          <div className='create__radiobtn mr-3'>
-                            <input type='radio' />
-                          </div>
-                          <div className='create__text'>
-                            Créer un compte
-                          </div>
+
+                        <div className='create__text'>
+                          {this.props.t('Create an account')}
                         </div>
                       </div>
-                      <div className='dashboard__memberlist__form__role'>
-                        <div className='dashboard__memberlist__form__role__text'>
-                          Choisissez le rôle du membre
-                        </div>
-                        <ul className='dashboard__memberlist__form__role__list'>
-                          <li className='dashboard__memberlist__form__role__list__item'>
-                            <div className='item__radiobtn mr-3'>
-                              <input type='radio' name='role' value='responsable' />
-                            </div>
-                            <div className='item__text'>
-                              <div className='item_text_icon mr-2'>
-                                <i className='fa fa-gavel' />
-                              </div>
-                              <div className='item__text__name'>
-                                Responsable
-                              </div>
-                            </div>
-                          </li>
-                          <li className='dashboard__memberlist__form__role__list__item'>
-                            <div className='item__radiobtn mr-3'>
-                              <input type='radio' name='role' value='gestionnaire' />
-                            </div>
-                            <div className='item__text'>
-                              <div className='item_text_icon mr-2'>
-                                <i className='fa fa-graduation-cap' />
-                              </div>
-                              <div className='item__text__name'>
-                                Gestionnaire de contenu
-                              </div>
-                            </div>
-                          </li>
-                          <li className='dashboard__memberlist__form__role__list__item'>
-                            <div className='item__radiobtn mr-3'>
-                              <input type='radio' name='role' value='contributeur' />
-                            </div>
-                            <div className='item__text'>
-                              <div className='item_text_icon mr-2'>
-                                <i className='fa fa-pencil' />
-                              </div>
-                              <div className='item__text__name'>
-                                Contributeur
-                              </div>
-                            </div>
-                          </li>
-                          <li className='dashboard__memberlist__form__role__list__item'>
-                            <div className='item__radiobtn mr-3'>
-                              <input type='radio' name='role' value='lecteur' />
+                    </div>
+
+                    <div className='dashboard__memberlist__form__role'>
+                      <div className='dashboard__memberlist__form__role__text'>
+                        {this.props.t('Choose the role of the member')}
+                      </div>
+
+                      <ul className='dashboard__memberlist__form__role__list'>
+
+                        <li className='dashboard__memberlist__form__role__list__item'>
+                          <div className='item__radiobtn mr-3'>
+                            <input type='radio' name='role' value='responsable' />
+                          </div>
+
+                          <div className='item__text'>
+                            <div className='item_text_icon mr-2'>
+                              <i className='fa fa-gavel' />
                             </div>
-                            <div className='item__text'>
-                              <div className='item_text_icon mr-2'>
-                                <i className='fa fa-eye' />
-                              </div>
-                              <div className='item__text__name'>
-                                Lecteur
-                              </div>
+
+                            <div className='item__text__name'>
+                              {this.props.t('Supervisor')}
                             </div>
-                          </li>
-                        </ul>
-                      </div>
-                      <div className='dashboard__memberlist__form__submitbtn'>
-                        <button className='btn btn-outline-primary'>Valider</button>
-                      </div>
-                    </form>
+                          </div>
+                        </li>
+
+                      </ul>
+                    </div>
+
+                    <div className='dashboard__memberlist__form__submitbtn'>
+                      <button className='btn btn-outline-primary'>
+                        {this.props.t('Validate')}
+                      </button>
+                    </div>
+                  </form>
                   }
                 </div>
               </div>
@@ -532,21 +344,21 @@ class Dashboard extends React.Component {
                   </div>
 
                   <div className='dashboard__moreinfo__webdav__btn__text genericBtnInfoDashboard__btn__text'>
-                    Implémenter Tracim dans votre explorateur
+                    {this.props.t('Implement Tracim in your explorer')}
                   </div>
                 </div>
                 {this.state.displayWebdavBtn === true &&
-                  <div>
-                    <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
-                      <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
-                        Retrouvez tous vos documents déposés en ligne directement sur votre ordinateur via le poste de travail, sans passer par le logiciel.
-                      </div>
+                <div>
+                  <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
+                    <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
+                      {this.props.t('Find all your documents deposited online directly on your computer via the workstation, without going through the software.')}'
+                    </div>
 
-                      <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
-                        http://algoo.trac.im/webdav/
-                      </div>
+                    <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
+                      http://algoo.trac.im/webdav/
                     </div>
                   </div>
+                </div>
                 }
               </div>
               <div className='dashboard__moreinfo__calendar genericBtnInfoDashboard'>
@@ -560,33 +372,33 @@ class Dashboard extends React.Component {
                     </div>
 
                     <div className='dashboard__moreinfo__calendar__btn__text genericBtnInfoDashboard__btn__text'>
-                      Calendrier de l'espace de travail
+                      {this.props.t('Workspace Calendar')}
                     </div>
                   </div>
                 </div>
                 <div className='dashboard__moreinfo__calendar__wrapperText'>
                   {this.state.displayCalendarBtn === true &&
-                    <div>
-                      <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
-                        <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
-                          Chaque espace de travail possède son propre calendrier.
-                        </div>
+                  <div>
+                    <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
+                      <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
+                        {this.props.t('Each workspace has its own calendar.')}
+                      </div>
 
-                        <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>
-                          http://algoo.trac.im/calendar/
-                        </div>
+                      <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>
+                        http://algoo.trac.im/calendar/
                       </div>
                     </div>
+                  </div>
                   }
                 </div>
               </div>
             </div>
-          </div>
-        </div>
+          </PageContent>
+        </PageWrapper>
       </div>
     )
   }
 }
 
-const mapStateToProps = ({ user, app, contentType, workspaceList }) => ({ user, app, contentType, workspaceList })
-export default connect(mapStateToProps)(Dashboard)
+const mapStateToProps = ({ user, contentType, currentWorkspace }) => ({ user, contentType, curWs: currentWorkspace })
+export default connect(mapStateToProps)(translate()(Radium(Dashboard)))

frontend/src/container/Dashboard_old.jsx

@@ -0,0 +1,571 @@
+import React from 'react'
+import { connect } from 'react-redux'
+import Sidebar from './Sidebar.jsx'
+import imgProfil from '../img/imgProfil.png'
+import { translate } from 'react-i18next'
+
+class Dashboard extends React.Component {
+  constructor (props) {
+    super(props)
+    this.state = {
+      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null, // this is used to avoid handling the parseInt everytime
+      displayNewMemberDashboard: false,
+      displayNotifBtn: false,
+      displayWebdavBtn: false,
+      displayCalendarBtn: false
+    }
+  }
+
+  handleToggleNewMemberDashboard = () => this.setState(prevState => ({
+    displayNewMemberDashboard: !prevState.displayNewMemberDashboard
+  }))
+
+  handleToggleNotifBtn = () => this.setState(prevState => ({
+    displayNotifBtn: !prevState.displayNotifBtn
+  }))
+
+  handleToggleWebdavBtn = () => this.setState(prevState => ({
+    displayWebdavBtn: !prevState.displayWebdavBtn
+  }))
+
+  handleToggleCalendarBtn = () => this.setState(prevState => ({
+    displayCalendarBtn: !prevState.displayCalendarBtn
+  }))
+
+  render () {
+    return (
+      <div className='sidebarpagecontainer'>
+        <Sidebar />
+
+        <div className='dashboard'>
+          <div className='container-fluid nopadding'>
+            <div className='dashboard__header mb-5'>
+              <div className='pageTitleGeneric dashboard__header__title d-flex align-items-center'>
+                <div className='pageTitleGeneric__title dashboard__header__title__text mr-3'>
+                  {this.props.t('Dashboard')}
+                </div>
+                <div className='dashboard__header__acces' />
+              </div>
+
+              <div className='dashboard__header__advancedmode mr-3'>
+                <button type='button' className='btn btn-primary'>
+                  {this.props.t('Active advanced Dashboard')}
+                </button>
+              </div>
+            </div>
+
+            <div className='dashboard__workspace-wrapper'>
+              <div className='dashboard__workspace'>
+                <div className='dashboard__workspace__title'>
+                  Développement tracim
+                </div>
+
+                <div className='dashboard__workspace__detail'>
+                  Ligne directive pour le prochain design de Tracim et des futurs fonctionnalités.
+                </div>
+              </div>
+
+              <div className='dashboard__userstatut'>
+
+                <div className='dashboard__userstatut__role'>
+                  <div className='dashboard__userstatut__role__text'>
+                    Hi ! Alexi, vous êtes actuellement
+                  </div>
+                  <div className='dashboard__userstatut__role__rank'>
+                    <div className='dashboard__userstatut__role__rank__icon'>
+                      <i className='fa fa-graduation-cap' />
+                    </div>
+                    <div className='dashboard__userstatut__role__rank__rolename'>
+                      Gestionnaire de projet
+                    </div>
+                  </div>
+                </div>
+
+                <div className='dashboard__userstatut__notification'>
+                  <div className='dashboard__userstatut__notification__text'>
+                    Vous êtes abonné(e) aux notifications de ce workspace
+                  </div>
+                  {this.state.displayNotifBtn === false &&
+                  <div
+                    className='dashboard__userstatut__notification__btn btn btn-outline-primary'
+                    onClick={this.handleToggleNotifBtn}
+                  >
+                    {this.props.t('Change your status')}
+                  </div>
+                  }
+
+                  {this.state.displayNotifBtn === true &&
+                  <div className='dashboard__userstatut__notification__subscribe dropdown'>
+                    <button className='dashboard__userstatut__notification__subscribe__btn btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
+                      Abonné(e)
+                    </button>
+                    <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
+                      <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item'>
+                        {this.props.t('subscriber')}
+                      </div>
+                      <div className='dashboard__userstatut__notification__subscribe__submenu__item dropdown-item dropdown-item'>
+                        {this.props.t('unsubscribed')}
+                      </div>
+                    </div>
+                  </div>
+                  }
+                </div>
+              </div>
+            </div>
+
+            <div className='dashboard__calltoaction justify-content-xl-center'>
+              <div className='dashboard__calltoaction__button btnaction btnthread'>
+                <div className='dashboard__calltoaction__button__text'>
+                  <div className='dashboard__calltoaction__button__text__icon'>
+                    <i className='fa fa-comments-o' />
+                  </div>
+                  <div className='dashboard__calltoaction__button__text__title'>
+                    {this.props.t('Start a new Thread')}
+                  </div>
+                </div>
+              </div>
+
+              <div className='dashboard__calltoaction__button btnaction writefile'>
+                <div className='dashboard__calltoaction__button__text'>
+                  <div className='dashboard__calltoaction__button__text__icon'>
+                    <i className='fa fa-file-text-o' />
+                  </div>
+                  <div className='dashboard__calltoaction__button__text__title'>
+                    {this.props.t('Writing a document')}
+                  </div>
+                </div>
+              </div>
+
+              <div className='dashboard__calltoaction__button btnaction importfile'>
+                <div className='dashboard__calltoaction__button__text'>
+                  <div className='dashboard__calltoaction__button__text__icon'>
+                    <i className='fa fa-paperclip' />
+                  </div>
+                  <div className='dashboard__calltoaction__button__text__title'>
+                    {this.props.t('Upload a file')}
+                  </div>
+                </div>
+              </div>
+
+              {/*
+                <div className='dashboard__calltoaction__button btnaction visioconf'>
+                  <div className='dashboard__calltoaction__button__text'>
+                    <div className='dashboard__calltoaction__button__text__icon'>
+                      <i className='fa fa-video-camera' />
+                    </div>
+                    <div className='dashboard__calltoaction__button__text__title'>
+                      {this.props.t('Start a videoconference')}
+                    </div>
+                  </div>
+                </div>
+
+                <div className='dashboard__calltoaction__button btnaction calendar'>
+                  <div className='dashboard__calltoaction__button__text'>
+                    <div className='dashboard__calltoaction__button__text__icon'>
+                      <i className='fa fa-calendar' />
+                    </div>
+                    <div className='dashboard__calltoaction__button__text__title'>
+                      {this.props.t('View the Calendar')}
+                    </div>
+                  </div>
+                </div>
+              */ }
+
+              <div className='dashboard__calltoaction__button btnaction explore'>
+                <div className='dashboard__calltoaction__button__text'>
+                  <div className='dashboard__calltoaction__button__text__icon'>
+                    <i className='fa fa-folder-open-o' />
+                  </div>
+                  <div className='dashboard__calltoaction__button__text__title'>
+                    {this.props.t('Explore the workspace')}
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div className='dashboard__wksinfo'>
+              <div className='dashboard__activity'>
+                <div className='dashboard__activity__header'>
+                  <div className='dashboard__activity__header__title subTitle'>
+                    {this.props.t('Recent activity')}
+                  </div>
+
+                  <div className='dashboard__activity__header__allread btn btn-outline-primary'>
+                    {this.props.t('Mark everything as read')}
+                  </div>
+                </div>
+                <div className='dashboard__activity__wrapper'>
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-comments-o' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      <span>Développement Tracim</span>
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-list-ul' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      Mission externe
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-list-ul' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      Recherche et developpement
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-file-text-o' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      <span>Marketing</span>
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-comments-o' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      <span>Évolution</span>
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__workspace'>
+                    <div className='dashboard__activity__workspace__icon'>
+                      <i className='fa fa-file-text-o' />
+                    </div>
+                    <div className='dashboard__activity__workspace__name'>
+                      Commercialisation
+                    </div>
+                  </div>
+
+                  <div className='dashboard__activity__more d-flex flex-row-reverse'>
+                    <div className='dashboard__activity__more__btn btn btn-outline-primary'>
+                      {this.props.t('See more')}
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <div className='dashboard__memberlist'>
+
+                <div className='dashboard__memberlist__title subTitle'>
+                  {this.props.t('Member List')}
+                </div>
+
+                <div className='dashboard__memberlist__wrapper'>
+                  {this.state.displayNewMemberDashboard === false &&
+                  <div>
+                    <ul className='dashboard__memberlist__list'>
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Jean Dupont
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Responsable
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Aldwin Vinel
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Lecteur
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            William Himme
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Contributeur
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Yacine Lite
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Contributeur
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Alexi Falcin
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Gestionnaire
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Mickaël Fonati
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Gestionnaire
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+
+                      <li className='dashboard__memberlist__list__item'>
+                        <div className='dashboard__memberlist__list__item__avatar'>
+                          <img src={imgProfil} alt='avatar' />
+                        </div>
+                        <div className='dashboard__memberlist__list__item__info mr-auto'>
+                          <div className='dashboard__memberlist__list__item__info__name'>
+                            Eva Lonbard
+                          </div>
+                          <div className='dashboard__memberlist__list__item__info__role'>
+                            Gestionnaire
+                          </div>
+                        </div>
+                        <div className='dashboard__memberlist__list__item__delete d-flex justify-content-end'>
+                          <i className='fa fa-trash-o' />
+                        </div>
+                      </li>
+                    </ul>
+
+                    <div
+                      className='dashboard__memberlist__btnadd'
+                      onClick={this.handleToggleNewMemberDashboard}
+                    >
+                      <div className='dashboard__memberlist__btnadd__button'>
+                        <div className='dashboard__memberlist__btnadd__button__avatar'>
+                          <div className='dashboard__memberlist__btnadd__button__avatar__icon'>
+                            <i className='fa fa-plus' />
+                          </div>
+                        </div>
+                        <div
+                          className='dashboard__memberlist__btnadd__button__text'
+                        >
+                          {this.props.t('Add a member')}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  }
+
+                  {this.state.displayNewMemberDashboard === true &&
+                  <form className='dashboard__memberlist__form'>
+                    <div
+                      className='dashboard__memberlist__form__close d-flex justify-content-end'
+                    >
+                      <i className='fa fa-times' onClick={this.handleToggleNewMemberDashboard} />
+                    </div>
+                    <div className='dashboard__memberlist__form__member'>
+                      <div className='dashboard__memberlist__form__member__name'>
+                        <label className='name__label' htmlFor='addmember'>
+                          {this.props.t('Enter the name or email of the member')}
+                        </label>
+                        <input type='text' id='addmember' className='name__input form-control' placeholder='Nom ou Email' />
+                      </div>
+                      <div className='dashboard__memberlist__form__member__create'>
+                        <div className='create__radiobtn mr-3'>
+                          <input type='radio' />
+                        </div>
+                        <div className='create__text'>
+                          {this.props.t('Create an account')}
+                        </div>
+                      </div>
+                    </div>
+                    <div className='dashboard__memberlist__form__role'>
+                      <div className='dashboard__memberlist__form__role__text'>
+                        {this.props.t('Choose the role of the member')}
+                      </div>
+                      <ul className='dashboard__memberlist__form__role__list'>
+                        <li className='dashboard__memberlist__form__role__list__item'>
+                          <div className='item__radiobtn mr-3'>
+                            <input type='radio' name='role' value='responsable' />
+                          </div>
+                          <div className='item__text'>
+                            <div className='item_text_icon mr-2'>
+                              <i className='fa fa-gavel' />
+                            </div>
+                            <div className='item__text__name'>
+                              {this.props.t('Supervisor')}
+                            </div>
+                          </div>
+                        </li>
+                        <li className='dashboard__memberlist__form__role__list__item'>
+                          <div className='item__radiobtn mr-3'>
+                            <input type='radio' name='role' value='gestionnaire' />
+                          </div>
+                          <div className='item__text'>
+                            <div className='item_text_icon mr-2'>
+                              <i className='fa fa-graduation-cap' />
+                            </div>
+                            <div className='item__text__name'>
+                              {this.props.t('Content Manager')}
+                            </div>
+                          </div>
+                        </li>
+                        <li className='dashboard__memberlist__form__role__list__item'>
+                          <div className='item__radiobtn mr-3'>
+                            <input type='radio' name='role' value='contributeur' />
+                          </div>
+                          <div className='item__text'>
+                            <div className='item_text_icon mr-2'>
+                              <i className='fa fa-pencil' />
+                            </div>
+                            <div className='item__text__name'>
+                              {this.props.t('Contributor')}
+                            </div>
+                          </div>
+                        </li>
+                        <li className='dashboard__memberlist__form__role__list__item'>
+                          <div className='item__radiobtn mr-3'>
+                            <input type='radio' name='role' value='lecteur' />
+                          </div>
+                          <div className='item__text'>
+                            <div className='item_text_icon mr-2'>
+                              <i className='fa fa-eye' />
+                            </div>
+                            <div className='item__text__name'>
+                              {this.props.t('Reader')}
+                            </div>
+                          </div>
+                        </li>
+                      </ul>
+                    </div>
+                    <div className='dashboard__memberlist__form__submitbtn'>
+                      <button className='btn btn-outline-primary'>
+                        {this.props.t('Validate')}
+                      </button>
+                    </div>
+                  </form>
+                  }
+                </div>
+              </div>
+            </div>
+
+            <div className='dashboard__moreinfo'>
+              <div className='dashboard__moreinfo__webdav genericBtnInfoDashboard'>
+                <div
+                  className='dashboard__moreinfo__webdav__btn genericBtnInfoDashboard__btn'
+                  onClick={this.handleToggleWebdavBtn}
+                >
+                  <div className='dashboard__moreinfo__webdav__btn__icon genericBtnInfoDashboard__btn__icon'>
+                    <i className='fa fa-windows' />
+                  </div>
+
+                  <div className='dashboard__moreinfo__webdav__btn__text genericBtnInfoDashboard__btn__text'>
+                    {this.props.t('Implement Tracim in your explorer')}
+                  </div>
+                </div>
+                {this.state.displayWebdavBtn === true &&
+                <div>
+                  <div className='dashboard__moreinfo__webdav__information genericBtnInfoDashboard__info'>
+                    <div className='dashboard__moreinfo__webdav__information__text genericBtnInfoDashboard__info__text'>
+                      {this.props.t('Find all your documents deposited online directly on your computer via the workstation, without going through the software.')}'
+                    </div>
+
+                    <div className='dashboard__moreinfo__webdav__information__link genericBtnInfoDashboard__info__link'>
+                      http://algoo.trac.im/webdav/
+                    </div>
+                  </div>
+                </div>
+                }
+              </div>
+              <div className='dashboard__moreinfo__calendar genericBtnInfoDashboard'>
+                <div className='dashboard__moreinfo__calendar__wrapperBtn'>
+                  <div
+                    className='dashboard__moreinfo__calendar__btn genericBtnInfoDashboard__btn'
+                    onClick={this.handleToggleCalendarBtn}
+                  >
+                    <div className='dashboard__moreinfo__calendar__btn__icon genericBtnInfoDashboard__btn__icon'>
+                      <i className='fa fa-calendar' />
+                    </div>
+
+                    <div className='dashboard__moreinfo__calendar__btn__text genericBtnInfoDashboard__btn__text'>
+                      {this.props.t('Workspace Calendar')}
+                    </div>
+                  </div>
+                </div>
+                <div className='dashboard__moreinfo__calendar__wrapperText'>
+                  {this.state.displayCalendarBtn === true &&
+                  <div>
+                    <div className='dashboard__moreinfo__calendar__information genericBtnInfoDashboard__info'>
+                      <div className='dashboard__moreinfo__calendar__information__text genericBtnInfoDashboard__info__text'>
+                        {this.props.t('Each workspace has its own calendar.')}
+                      </div>
+
+                      <div className='dashboard__moreinfo__calendar__information__link genericBtnInfoDashboard__info__link'>
+                        http://algoo.trac.im/calendar/
+                      </div>
+                    </div>
+                  </div>
+                  }
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
+
+const mapStateToProps = ({ user, app, contentType, workspaceList }) => ({ user, app, contentType, workspaceList })
+export default connect(mapStateToProps)(translate()(Dashboard))

frontend/src/container/Header.jsx

@@ -1,6 +1,8 @@
 import React from 'react'
 import { connect } from 'react-redux'
+import { withRouter } from 'react-router'
 import i18n from '../i18n.js'
+import appFactory from '../appFactory.js'
 import { translate } from 'react-i18next'
 import Cookies from 'js-cookie'
 import Logo from '../component/Header/Logo.jsx'
@@ -14,13 +16,13 @@ import MenuActionListItemNotification from '../component/Header/MenuActionListIt
 import logoHeader from '../img/logo-tracim.png'
 import {
   newFlashMessage,
-  setLangActive,
+  setUserLang,
   setUserDisconnected
 } from '../action-creator.sync.js'
 import {
   postUserLogout
 } from '../action-creator.async.js'
-import { COOKIE } from '../helper.js'
+import { COOKIE, PAGE } from '../helper.js'
 
 class Header extends React.Component {
   handleClickLogo = () => {}
@@ -32,15 +34,16 @@ class Header extends React.Component {
   handleChangeInput = e => this.setState({inputSearchValue: e.target.value})
   handleClickSubmit = () => {}
 
-  handleChangeLang = langId => {
-    this.props.dispatch(setLangActive(langId))
-    i18n.changeLanguage(langId)
+  handleChangeLang = idLang => {
+    this.props.dispatch(setUserLang(idLang))
+    i18n.changeLanguage(idLang)
+    this.props.dispatchCustomEvent('allApp_changeLang', idLang)
   }
 
   handleClickHelp = () => {}
 
   handleClickLogout = async () => {
-    const { dispatch, t } = this.props
+    const { history, dispatch, t } = this.props
 
     const fetchPostUserLogout = await dispatch(postUserLogout())
     if (fetchPostUserLogout.status === 204) {
@@ -48,8 +51,9 @@ class Header extends React.Component {
       Cookies.remove(COOKIE.USER_AUTH)
 
       dispatch(setUserDisconnected())
+      history.push(PAGE.LOGIN)
     } else {
-      dispatch(newFlashMessage(t('Login.logout_error', 'danger')))
+      dispatch(newFlashMessage(t('Disconnection error', 'danger')))
     }
   }
 
@@ -82,6 +86,7 @@ class Header extends React.Component {
 
               <MenuActionListItemDropdownLang
                 langList={lang}
+                idLangActive={user.lang}
                 onChangeLang={this.handleChangeLang}
               />
 
@@ -104,4 +109,4 @@ class Header extends React.Component {
 }
 
 const mapStateToProps = ({ lang, user }) => ({ lang, user })
-export default connect(mapStateToProps)(translate()(Header))
+export default withRouter(connect(mapStateToProps)(translate()(appFactory(Header))))

frontend/src/container/Login.jsx

@@ -57,7 +57,7 @@ class Login extends React.Component {
 
       history.push(PAGE.HOME)
     } else if (fetchPostUserLogin.status === 400) {
-      dispatch(newFlashMessage(t('Login.fail'), 'danger'))
+      dispatch(newFlashMessage(t('Email or password invalid'), 'danger'))
     }
   }
 
@@ -83,7 +83,7 @@ class Login extends React.Component {
                         customClass='mb-3 mt-4'
                         icon='fa-envelope-open-o'
                         type='email'
-                        placeHolder='Adresse Email'
+                        placeHolder={this.props.t('Email Adress')}
                         invalidMsg='Email invalide.'
                         isInvalid={this.state.inputLogin.isInvalid}
                         value={this.state.inputLogin.value}
@@ -95,7 +95,7 @@ class Login extends React.Component {
                         customClass=''
                         icon='fa-lock'
                         type='password'
-                        placeHolder='Mot de passe'
+                        placeHolder={this.props.t('Password')}
                         invalidMsg='Mot de passe invalide.'
                         isInvalid={this.state.inputPassword.isInvalid}
                         value={this.state.inputPassword.value}

frontend/src/container/Sidebar.jsx

@@ -3,12 +3,17 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router'
 import classnames from 'classnames'
 import { translate } from 'react-i18next'
+import appFactory from '../appFactory.js'
 import WorkspaceListItem from '../component/Sidebar/WorkspaceListItem.jsx'
 import {
   setWorkspaceListIsOpenInSidebar,
-  updateWorkspaceFilter
+  updateWorkspaceFilter,
+  updateWorkspaceListData
 } from '../action-creator.sync.js'
-import { PAGE } from '../helper.js'
+import {
+  getWorkspaceList
+} from '../action-creator.async.js'
+import { PAGE, workspaceConfig } from '../helper.js'
 
 const qs = require('query-string')
 
@@ -19,6 +24,21 @@ class Sidebar extends React.Component {
       sidebarClose: false,
       workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
     }
+
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
+
+  customEventReducer = async ({ detail: { type, data } }) => {
+    switch (type) {
+      case 'refreshWorkspaceList':
+        console.log('%c<Sidebar> Custom event', 'color: #28a745', type, data)
+        this.loadWorkspaceList()
+        break
+    }
+  }
+
+  componentDidMount () {
+    this.loadWorkspaceList()
   }
 
   componentDidUpdate (prevProps, prevState) {
@@ -29,6 +49,20 @@ class Sidebar extends React.Component {
     if (prevState.workspaceIdInUrl !== newWorkspaceId) this.setState({workspaceIdInUrl: newWorkspaceId})
   }
 
+  loadWorkspaceList = async () => {
+    const { workspaceIdInUrl } = this.state
+    const { user, dispatch } = this.props
+
+    if (user.user_id !== -1) {
+      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
+
+      if (fetchGetWorkspaceList.status === 200) {
+        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
+        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].workspace_id, true))
+      }
+    }
+  }
+
   handleClickWorkspace = (idWs, newIsOpenInSidebar) => this.props.dispatch(setWorkspaceListIsOpenInSidebar(idWs, newIsOpenInSidebar))
 
   handleClickAllContent = idWs => {
@@ -45,13 +79,15 @@ class Sidebar extends React.Component {
 
     history.push(`${PAGE.WORKSPACE.CONTENT_LIST(idWs)}?type=${newFilter.join(';')}`) // workspace.filter gets updated on react redraw from match.params
 
-    // obviously, it's ugly to use custom event to tell WorkspaceContent to refresh, but since WorkspaceContent
+    // obviously, it's ugly to use custom event to tell WorkspaceContentList to refresh, but since WorkspaceContentList
     // will end up being an App, it'll have to be that way. So it's fine
     GLOBAL_dispatchEvent({ type: 'refreshContentList', data: {} })
   }
 
   handleClickToggleSidebar = () => this.setState(prev => ({sidebarClose: !prev.sidebarClose}))
 
+  handleClickNewWorkspace = () => this.props.renderAppPopupCreation(workspaceConfig, this.props.user, null, null)
+
   render () {
     const { sidebarClose, workspaceIdInUrl } = this.state
     const { activeLang, workspaceList, t } = this.props
@@ -85,8 +121,11 @@ class Sidebar extends React.Component {
             </nav>
 
             <div className='sidebar__btnnewworkspace'>
-              <button className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'>
-                {t('Sidebar.create_new_workspace')}
+              <button
+                className='sidebar__btnnewworkspace__btn btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover mb-5'
+                onClick={this.handleClickNewWorkspace}
+              >
+                {t('Create a workspace')}
               </button>
             </div>
 
@@ -106,11 +145,10 @@ class Sidebar extends React.Component {
   }
 }
 
-const mapStateToProps = ({ lang, user, workspace, workspaceList, app }) => ({
+const mapStateToProps = ({ lang, user, workspace, workspaceList }) => ({
   activeLang: lang.find(l => l.active) || {id: 'en'},
   user,
   workspace,
-  workspaceList,
-  app
+  workspaceList
 })
-export default withRouter(connect(mapStateToProps)(translate()(Sidebar)))
+export default withRouter(connect(mapStateToProps)(appFactory(translate()(Sidebar))))

frontend/src/container/Tracim.jsx

@@ -5,6 +5,7 @@ import Header from './Header.jsx'
 import Login from './Login.jsx'
 import Dashboard from './Dashboard.jsx'
 import Account from './Account.jsx'
+import AppFullscreenManager from './AppFullscreenManager.jsx'
 import FlashMessage from '../component/FlashMessage.jsx'
 import WorkspaceContent from './WorkspaceContent.jsx'
 import WIPcomponent from './WIPcomponent.jsx'
@@ -14,15 +15,34 @@ import {
 import PrivateRoute from './PrivateRoute.jsx'
 import { COOKIE, PAGE } from '../helper.js'
 import {
-  getUserIsConnected
+  getAppList,
+  getUserIsConnected,
+  getContentTypeList
 } from '../action-creator.async.js'
 import {
   removeFlashMessage,
-  setUserConnected
+  setAppList,
+  setUserConnected,
+  setContentTypeList
 } from '../action-creator.sync.js'
 import Cookies from 'js-cookie'
 
 class Tracim extends React.Component {
+  constructor (props) {
+    super(props)
+
+    document.addEventListener('appCustomEvent', this.customEventReducer)
+  }
+
+  customEventReducer = async ({ detail: { type, data } }) => {
+    switch (type) {
+      case 'redirect':
+        console.log('%c<Tracim> Custom event', 'color: #28a745', type, data)
+        this.props.history.push(data.url)
+        break
+    }
+  }
+
   async componentDidMount () {
     const { dispatch } = this.props
 
@@ -34,14 +54,24 @@ class Tracim extends React.Component {
     const fetchGetUserIsConnected = await dispatch(getUserIsConnected(userFromCookies))
     switch (fetchGetUserIsConnected.status) {
       case 200:
-        dispatch(setUserConnected({
+        const userLogged = {
           ...fetchGetUserIsConnected.json,
           auth: userFromCookies.auth,
           logged: true
-        }))
+        }
+
+        dispatch(setUserConnected(userLogged))
+
+        const fetchGetAppList = await dispatch(getAppList(userLogged))
+        if (fetchGetAppList.status === 200) dispatch(setAppList(fetchGetAppList.json))
+
+        const fetchGetContentTypeList = await dispatch(getContentTypeList(userLogged))
+        if (fetchGetContentTypeList.status === 200) dispatch(setContentTypeList(fetchGetContentTypeList.json))
         break
+
       case 401:
         dispatch(setUserConnected({logged: false})); break
+
       default:
         dispatch(setUserConnected({logged: null})); break
     }
@@ -69,7 +99,10 @@ class Tracim extends React.Component {
           </Switch>
 
           <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
+          <PrivateRoute path={PAGE.ADMIN.ROOT} component={AppFullscreenManager} />
           <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
+
+          <div id='appFeatureContainer' />
         </div>
 
       </div>
@@ -77,5 +110,5 @@ class Tracim extends React.Component {
   }
 }
 
-const mapStateToProps = ({ flashMessage, user }) => ({ flashMessage, user })
+const mapStateToProps = ({ flashMessage }) => ({ flashMessage })
 export default withRouter(connect(mapStateToProps)(translate()(Tracim)))

frontend/src/container/WorkspaceContent.jsx

@@ -7,26 +7,21 @@ import Sidebar from './Sidebar.jsx'
 import Folder from '../component/Workspace/Folder.jsx'
 import ContentItem from '../component/Workspace/ContentItem.jsx'
 import ContentItemHeader from '../component/Workspace/ContentItemHeader.jsx'
-import PageWrapper from '../component/common/layout/PageWrapper.jsx'
-import PageTitle from '../component/common/layout/PageTitle.jsx'
-import PageContent from '../component/common/layout/PageContent.jsx'
 import DropdownCreateButton from '../component/common/Input/DropdownCreateButton.jsx'
 import OpenContentApp from '../component/Workspace/OpenContentApp.jsx'
 import OpenCreateContentApp from '../component/Workspace/OpenCreateContentApp.jsx'
 import {
-  getAppList,
-  getContentTypeList,
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
+import {
   getWorkspaceContentList,
-  getFolderContent,
-  getWorkspaceList
+  getFolderContent
 } from '../action-creator.async.js'
 import {
   newFlashMessage,
-  setAppList,
-  setContentTypeList,
-  setWorkspaceContent,
-  setWorkspaceListIsOpenInSidebar,
-  updateWorkspaceListData
+  setWorkspaceContentList
 } from '../action-creator.sync.js'
 
 const qs = require('query-string')
@@ -35,11 +30,6 @@ class WorkspaceContent extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
-      popupCreateContent: {
-        display: false,
-        type: undefined,
-        folder: undefined
-      },
       workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null, // this is used to avoid handling the parseInt every time
       appOpenedType: false
     }
@@ -69,38 +59,16 @@ class WorkspaceContent extends React.Component {
   }
 
   async componentDidMount () {
-    const { workspaceIdInUrl } = this.state
-    const { user, workspaceList, app, contentType, match, dispatch } = this.props
+    const { workspaceList, match } = this.props
 
     console.log('%c<WorkspaceContent> componentDidMount', 'color: #c17838')
 
-    if (app.length === 0) { // @fixme shouldn't this be done by <Sidebar> ?
-      const fetchGetAppList = await dispatch(getAppList(user))
-      if (fetchGetAppList.status === 200) dispatch(setAppList(fetchGetAppList.json))
-    }
-
-    if (contentType.length === 0) {
-      const fetchGetContentTypeList = await dispatch(getContentTypeList(user))
-      if (fetchGetContentTypeList.status === 200) dispatch(setContentTypeList(fetchGetContentTypeList.json))
-    }
-
     let wsToLoad = null
-    if (match.params.idws !== undefined) wsToLoad = match.params.idws
-
-    if (user.user_id !== -1 && workspaceList.length === 0) {
-      const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
 
-      if (fetchGetWorkspaceList.status === 200) {
-        dispatch(updateWorkspaceListData(fetchGetWorkspaceList.json))
-        dispatch(setWorkspaceListIsOpenInSidebar(workspaceIdInUrl || fetchGetWorkspaceList.json[0].workspace_id, true))
-
-        if (match.params.idws === undefined && fetchGetWorkspaceList.json.length > 0) {
-          wsToLoad = fetchGetWorkspaceList.json[0].workspace_id // load first ws if none specified
-        }
-      }
-    }
-
-    if (wsToLoad === null) return // ws already loaded
+    if (match.params.idws === undefined) {
+      if (workspaceList.length > 0) wsToLoad = workspaceList[0].id
+      else return
+    } else wsToLoad = match.params.idws
 
     this.loadContentList(wsToLoad)
   }
@@ -111,7 +79,6 @@ class WorkspaceContent extends React.Component {
     if (this.state.workspaceIdInUrl === null) return
 
     const idWorkspace = parseInt(this.props.match.params.idws)
-
     if (isNaN(idWorkspace)) return
 
     const prevFilter = qs.parse(prevProps.location.search).type
@@ -126,7 +93,7 @@ class WorkspaceContent extends React.Component {
   }
 
   componentWillUnmount () {
-    this.props.emitEventApp('unmount_app')
+    this.props.dispatchCustomEvent('unmount_app')
     document.removeEventListener('appCustomEvent', this.customEventReducer)
   }
 
@@ -135,7 +102,7 @@ class WorkspaceContent extends React.Component {
 
     const wsContent = await dispatch(getWorkspaceContentList(user, idWorkspace, 0))
 
-    if (wsContent.status === 200) dispatch(setWorkspaceContent(wsContent.json, qs.parse(location.search).type))
+    if (wsContent.status === 200) dispatch(setWorkspaceContentList(wsContent.json, qs.parse(location.search).type))
     else dispatch(newFlashMessage('Error while loading workspace', 'danger'))
   }
 
@@ -181,7 +148,7 @@ class WorkspaceContent extends React.Component {
   handleUpdateAppOpenedType = openedAppType => this.setState({appOpenedType: openedAppType})
 
   render () {
-    const { workspaceContent, contentType } = this.props
+    const { workspaceContentList, contentType } = this.props
 
     const filterWorkspaceContent = (contentList, filter) => {
       return filter.length === 0
@@ -194,8 +161,8 @@ class WorkspaceContent extends React.Component {
 
     const urlFilter = qs.parse(this.props.location.search).type
 
-    const filteredWorkspaceContent = workspaceContent.length > 0
-      ? filterWorkspaceContent(workspaceContent, urlFilter ? [urlFilter] : [])
+    const filteredWorkspaceContentList = workspaceContentList.length > 0
+      ? filterWorkspaceContent(workspaceContentList, urlFilter ? [urlFilter] : [])
       : []
 
     return (
@@ -221,7 +188,8 @@ class WorkspaceContent extends React.Component {
           <PageTitle
             parentClass='workspace__header'
             customClass='justify-content-between'
-            title={workspaceContent.label ? workspaceContent.label : ''}
+            title='Liste des Contenus'
+            subtitle={workspaceContentList.label ? workspaceContentList.label : ''}
           >
             <DropdownCreateButton
               parentClass='workspace__header__btnaddworkspace'
@@ -237,7 +205,7 @@ class WorkspaceContent extends React.Component {
             <div className='workspace__content__fileandfolder folder__content active'>
               <ContentItemHeader />
 
-              { filteredWorkspaceContent.map((c, i) => c.type === 'folder'
+              { filteredWorkspaceContentList.map((c, i) => c.type === 'folder'
                 ? (
                   <Folder
                     availableApp={contentType}
@@ -252,7 +220,7 @@ class WorkspaceContent extends React.Component {
                     }}
                     onClickFolder={this.handleClickFolder}
                     onClickCreateContent={this.handleClickCreateContent}
-                    isLast={i === filteredWorkspaceContent.length - 1}
+                    isLast={i === filteredWorkspaceContentList.length - 1}
                     key={c.id}
                   />
                 )
@@ -262,7 +230,7 @@ class WorkspaceContent extends React.Component {
                     type={c.type}
                     faIcon={contentType.length ? contentType.find(a => a.slug === c.type).faIcon : ''}
                     statusSlug={c.statusSlug}
-                    contentType={contentType.find(ct => ct.slug === c.type)}
+                    contentType={contentType.length ? contentType.find(ct => ct.slug === c.type) : null}
                     onClickItem={() => this.handleClickContentItem(c)}
                     onClickExtendedAction={{
                       edit: e => this.handleClickEditContentItem(e, c),
@@ -272,7 +240,7 @@ class WorkspaceContent extends React.Component {
                       delete: e => this.handleClickDeleteContentItem(e, c)
                     }}
                     onClickCreateContent={this.handleClickCreateContent}
-                    isLast={i === filteredWorkspaceContent.length - 1}
+                    isLast={i === filteredWorkspaceContentList.length - 1}
                     key={c.id}
                   />
                 )
@@ -285,8 +253,6 @@ class WorkspaceContent extends React.Component {
               onClickCreateContent={this.handleClickCreateContent}
               availableApp={contentType}
             />
-
-            <div id='appContainer' />
           </PageContent>
 
         </PageWrapper>
@@ -295,5 +261,5 @@ class WorkspaceContent extends React.Component {
   }
 }
 
-const mapStateToProps = ({ user, workspaceContent, workspaceList, app, contentType }) => ({ user, workspaceContent, workspaceList, app, contentType })
+const mapStateToProps = ({ user, workspaceContentList, workspaceList, contentType }) => ({ user, workspaceContentList, workspaceList, contentType })
 export default withRouter(connect(mapStateToProps)(appFactory(WorkspaceContent)))

frontend/src/css/Dashboard.styl

@@ -43,7 +43,7 @@ coloricon()
         margin 0
     &__advancedmode
       cursor pointer
-  &__wkswrapper
+  &__workspace-wrapper
     flexwrap()
   &__workspace
     margin-right 20px
@@ -62,9 +62,9 @@ coloricon()
       flexwrap()
       margin 20px 0
       font-size 18px
-      &__text
+      &__msg
         margin-right 15px
-      &__rank
+      &__definition
         display flex
         &__icon
           margin-right 15px
@@ -88,25 +88,11 @@ coloricon()
       &:active
         box-shadow inset 0px 0px 5px 2px #656565
       &__text
+        color white
         &__icon
           font-size 30px
-          .fa-comments-o, .fa-paperclip, .fa-calendar, .fa-file-text-o, .fa-folder-open-o, .fa-video-camera
-              color white
         &__title
           font-size 18px
-          color white
-    .btnthread
-      background-color threadColor
-    .writefile
-      background-color writefile
-    .importfile
-      background-color importfile
-    .visioconf
-      background-color grey-hover
-    .calendar
-      background-color calendar
-    .explore
-      background-color explore
   &__wksinfo
     flexwrap()
     margin-top 150px
@@ -270,19 +256,19 @@ coloricon()
     justify-content space-between
     flexwrap wrap
     &__webdav
-      margin-bottom 40px
+      margin 0 15px 40px 0
       &__btn
         width 300px
       &__information
-        width 550px
+        width 300px
     &__calendar
       margin-bottom 100px
       &__wrapperBtn
-        margin-right 300px
+        margin-right 290px
       &__btn
         width 300px
       &__information
-        width 550px
+        width 300px
 
 /**** MEDIAQUERIES *****/
 

frontend/src/css/Generic.styl

@@ -202,7 +202,7 @@ a
   display flex
   flex-direction column
   justify-content center
-  margin 20px 30px 20px 0
+  margin 0 15px
   border-radius 10px
   padding 15px
   width 230px
@@ -210,6 +210,10 @@ a
   box-shadow shadow-all
   text-align center
   cursor pointer
+  &:nth-child(1)
+    margin-left 0
+  &:nth-last-child
+    margin-right 0
 
 .genericBtnInfoDashboard
   &__btn
@@ -237,4 +241,4 @@ a
       margin-bottom 15px
       border 1px solid grey
       border-radius 10px
-      padding 15px 25px
+      padding 15px

frontend/src/css/Header.styl

@@ -40,7 +40,6 @@
         background-color transparent
         cursor pointer
       &__itemlanguage
-        display none
         &__languagedropdown
           .languagedropdown
             &__btnlanguage

frontend/src/css/Login.styl

@@ -65,10 +65,10 @@
         width 130px
   &__footer
     position fixed
-    top 95%
-    left calc(50% - 152px) // 152px => width of the text / 2
+    bottom 2%
+    left calc(50% - 155px) // 155px => width of the text / 2
     &__text
-      width 305px
+      width 310px
       font-size 17px
 
 @media (min-width: min-lg) and (max-width: max-lg)

frontend/src/css/Workspace.styl

@@ -8,7 +8,7 @@
     &__button
       display flex
       justify-content flex-end
-      margin 50px 15px 0 0
+      margin 45px 15px 45px 0
       width 100%
       &__btnaddworkspace
         margin-bottom 50px

frontend/src/helper.js

@@ -12,6 +12,15 @@ export const COOKIE = {
   USER_AUTH: 'user_auth'
 }
 
+// Côme - 2018/08/02 - shouldn't this come from api ?
+export const workspaceConfig = {
+  slug: 'workspace',
+  faIcon: 'space-shuttle',
+  hexcolor: '#7d4e24',
+  creationLabel: 'Create a workspace',
+  domContainer: 'appFeatureContainer'
+}
+
 export const PAGE = {
   HOME: '/',
   WORKSPACE: {
@@ -26,7 +35,12 @@ export const PAGE = {
     ADMIN: (idws = ':idws') => `/workspaces/${idws}/admin`
   },
   LOGIN: '/login',
-  ACCOUNT: '/account'
+  ACCOUNT: '/account',
+  ADMIN: {
+    ROOT: '/admin',
+    WORKSPACE: '/admin/workspace',
+    USEr: '/admin/user'
+  }
 }
 
 export const ROLE = [{
@@ -50,3 +64,5 @@ export const ROLE = [{
   icon: 'fa-gavel',
   translationKey: 'role.manager'
 }]
+
+export const handleRouteFromApi = route => route.startsWith('/#') ? route.slice(2) : route

frontend/src/i18n.js

@@ -1,29 +1,39 @@
 import i18n from 'i18next'
 import { reactI18nextModule } from 'react-i18next'
-import { langFr, langEn } from 'tracim_frontend_lib'
-import fr from './translate/fr.js'
-import en from './translate/en.js'
+import { frLib, enLib } from 'tracim_frontend_lib'
+import en from '../i18next.scanner/en/translation.json'
+import fr from '../i18next.scanner/fr/translation.json'
+
+// get translation files of apps
+// theses files are generated by build_appname.sh
+const htmlDocEnTranslation = require('../dist/app/html-document_en_translation.json')
+const htmlDocFrTranslation = require('../dist/app/html-document_fr_translation.json')
 
 i18n
   .use(reactI18nextModule)
   .init({
-    fallbackLng: 'fr',
+    fallbackLng: 'en',
     // have a common namespace used around the full app
     ns: ['translation'], // namespace
     defaultNS: 'translation',
     debug: true,
-    // interpolation: {
-    //   escapeValue: false, // not needed for react!!
-    // },
     react: {
       wait: true
     },
     resources: {
       en: {
-        translation: {...langEn.translation, ...en.translation}
+        translation: {
+          ...enLib, // fronted_lib
+          ...en, // frontend
+          ...htmlDocEnTranslation // html-document
+        }
       },
       fr: {
-        translation: {...langFr.translation, ...fr.translation}
+        translation: {
+          ...frLib, // fronted_lib
+          ...fr, // frontend
+          ...htmlDocFrTranslation // html-document
+        }
       }
     }
   })

frontend/src/reducer/app.js → frontend/src/reducer/appList.js

@@ -1,8 +1,8 @@
-import { APP_LIST } from '../action-creator.sync.js'
+import { SET, APP_LIST } from '../action-creator.sync.js'
 
 export default function app (state = [], action) {
   switch (action.type) {
-    case `Set/${APP_LIST}`:
+    case `${SET}/${APP_LIST}`:
       return action.appList.map(a => ({
         label: a.label,
         slug: a.slug,

frontend/src/reducer/contentType.js

@@ -1,8 +1,8 @@
-import { CONTENT_TYPE_LIST } from '../action-creator.sync.js'
+import { SET, CONTENT_TYPE_LIST } from '../action-creator.sync.js'
 
 export function contentType (state = [], action) {
   switch (action.type) {
-    case `Set/${CONTENT_TYPE_LIST}`:
+    case `${SET}/${CONTENT_TYPE_LIST}`:
       return action.contentTypeList.map(ct => ({
         label: ct.label,
         slug: ct.slug,

frontend/src/reducer/currentWorkspace.js

@@ -0,0 +1,46 @@
+import {SET, WORKSPACE_DETAIL, WORKSPACE_MEMBER_LIST} from '../action-creator.sync.js'
+import { handleRouteFromApi } from '../helper.js'
+
+const defaultWorkspace = {
+  id: 0,
+  slug: '',
+  label: '',
+  description: '',
+  sidebarEntries: [],
+  member: []
+}
+
+export default function currentWorkspace (state = defaultWorkspace, action) {
+  switch (action.type) {
+    case `${SET}/${WORKSPACE_DETAIL}`:
+      return {
+        ...state,
+        id: action.workspaceDetail.workspace_id,
+        slug: action.workspaceDetail.slug,
+        label: action.workspaceDetail.label,
+        description: action.workspaceDetail.description,
+        sidebarEntries: action.workspaceDetail.sidebar_entries.map(sbe => ({
+          slug: sbe.slug,
+          route: handleRouteFromApi(sbe.route),
+          faIcon: sbe.fa_icon,
+          hexcolor: sbe.hexcolor,
+          label: sbe.label
+        }))
+      }
+
+    case `${SET}/${WORKSPACE_MEMBER_LIST}`:
+      return {
+        ...state,
+        member: action.workspaceMemberList.map(m => ({
+          id: m.user_id,
+          publicName: m.user.public_name,
+          avatarUrl: m.user.avatar_url,
+          role: m.role,
+          isActive: m.is_active,
+        }))
+      }
+
+    default:
+      return state
+  }
+}

frontend/src/reducer/flashMessage.js

@@ -1,16 +1,14 @@
-import {
-  FLASH_MESSAGE
-} from '../action-creator.sync.js'
+import { ADD, REMOVE, FLASH_MESSAGE } from '../action-creator.sync.js'
 
 export default function flashMessage (state = [], action) {
   switch (action.type) {
-    case `Add/${FLASH_MESSAGE}`:
+    case `${ADD}/${FLASH_MESSAGE}`:
       return [...state, {
         message: action.msg.message,
         type: action.msg.type || 'info' // may be info, success, danger
       }]
 
-    case `Remove/${FLASH_MESSAGE}`:
+    case `${REMOVE}/${FLASH_MESSAGE}`:
       return state.filter(fm => fm.message === action.message)
 
     default:

frontend/src/reducer/lang.js

@@ -1,12 +1,23 @@
-import { LANG } from '../action-creator.sync.js'
+import { UPDATE, LANG } from '../action-creator.sync.js'
+import flagEn from '../img/flag_en.png'
+import flagFr from '../img/flag_fr.png'
 
-export function lang (state = [], action) {
+const defaultLang = [{
+  id: 'en',
+  icon: flagEn
+}, {
+  id: 'fr',
+  icon: flagFr
+}]
+
+export function lang (state = defaultLang, action) {
   switch (action.type) {
-    case `Update/${LANG}`:
+    case `${UPDATE}/${LANG}`:
       return action.langList
 
-    case `Set/${LANG}/Active`:
-      return state.map(l => ({...l, active: l.id === action.langId}))
+    // Côme - 2018/07/30 - deprecated, lang active is saved in user reducer
+    // case `Set/${LANG}/Active`:
+    //   return state.map(l => ({...l, active: l.id === action.langId}))
 
     default:
       return state

frontend/src/reducer/root.js

@@ -2,12 +2,13 @@ import { combineReducers } from 'redux'
 import lang from './lang.js'
 import flashMessage from './flashMessage.js'
 import user from './user.js'
-import workspaceContent from './workspaceContent.js'
+import currentWorkspace from './currentWorkspace.js'
+import workspaceContentList from './workspaceContentList.js'
 import workspaceList from './workspaceList.js'
-import app from './app.js'
+import appList from './appList.js'
 import contentType from './contentType.js'
 import timezone from './timezone.js'
 
-const rootReducer = combineReducers({ lang, flashMessage, user, workspaceContent, workspaceList, app, contentType, timezone })
+const rootReducer = combineReducers({ lang, flashMessage, user, currentWorkspace, workspaceContentList, workspaceList, appList, contentType, timezone })
 
 export default rootReducer

frontend/src/reducer/timezone.js

@@ -1,8 +1,8 @@
-import { TIMEZONE } from '../action-creator.sync.js'
+import { SET, TIMEZONE } from '../action-creator.sync.js'
 
 export function timezone (state = [], action) {
   switch (action.type) {
-    case `Set/${TIMEZONE}`:
+    case `${SET}/${TIMEZONE}`:
       return action.timezone
 
     default:

frontend/src/reducer/user.js

@@ -1,12 +1,16 @@
 import {
+  SET,
+  UPDATE,
   USER_CONNECTED,
   USER_DISCONNECTED,
-  USER_DATA
+  USER_DATA,
+  USER_LANG
 } from '../action-creator.sync.js'
 
 const defaultUser = {
   user_id: -1,
   logged: null, // null avoid to be redirected to /login while whoami ep has not responded yet
+  auth: '',
   timezone: '',
   profile: {
     id: 1,
@@ -17,23 +21,28 @@ const defaultUser = {
   caldav_url: null,
   avatar_url: null,
   created: '',
-  display_name: ''
+  public_name: '',
+  lang: 'en' // @FIXME Côme - 2018/07/30 - remove this line when api returns the lang (https://github.com/tracim/tracim/issues/734)
 }
 
 export default function user (state = defaultUser, action) {
   switch (action.type) {
-    case `Set/${USER_CONNECTED}`:
+    case `${SET}/${USER_CONNECTED}`:
       return {
+        ...state,
         ...action.user,
         avatar_url: 'https://www.algoo.fr/static/images/people_images/PERSO_SEUL.png' // @FIXME use avatar from api when db handles it
       }
 
-    case `Set/${USER_DISCONNECTED}`:
+    case `${SET}/${USER_DISCONNECTED}`:
       return defaultUser
 
-    case `Update/${USER_DATA}`:
+    case `${UPDATE}/${USER_DATA}`:
       return {...state, ...action.data}
 
+    case `${SET}/${USER_LANG}`:
+      return {...state, lang: action.lang}
+
     default:
       return state
   }

frontend/src/reducer/workspaceContent.js → frontend/src/reducer/workspaceContentList.js

@@ -1,12 +1,15 @@
 import {
+  SET,
+  UPDATE,
   WORKSPACE,
+  WORKSPACE_CONTENT,
   FOLDER
 } from '../action-creator.sync.js'
 
-export default function workspace (state = [], action) {
+export default function workspaceContentList (state = [], action) {
   switch (action.type) {
-    case `Set/${WORKSPACE}/Content`:
-      return action.workspaceContent.map(wsc => ({
+    case `${SET}/${WORKSPACE_CONTENT}`:
+      return action.workspaceContentList.map(wsc => ({
         id: wsc.content_id,
         label: wsc.label,
         slug: wsc.slug,
@@ -20,10 +23,10 @@ export default function workspace (state = [], action) {
         subContentTypeSlug: wsc.sub_content_type_slug
       }))
 
-    case `Update/${WORKSPACE}/Filter`: // not used anymore ?
+    case `${UPDATE}/${WORKSPACE}/Filter`: // not used anymore ?
       return {...state, filter: action.filterList}
 
-    case `Set/${WORKSPACE}/${FOLDER}/Content`:
+    case `${SET}/${WORKSPACE}/${FOLDER}/Content`:
       const setFolderContent = (contentItem, action) => {
         if (contentItem.id === action.folderId) return {...contentItem, content: action.content}
 

frontend/src/reducer/workspaceList.js

@@ -1,18 +1,19 @@
 import {
+  SET,
+  UPDATE,
   WORKSPACE_LIST,
   USER_ROLE
 } from '../action-creator.sync.js'
-
-const handleRouteFromApi = route => route.startsWith('/#') ? route.slice(2) : route
+import { handleRouteFromApi } from '../helper.js'
 
 export function workspaceList (state = [], action) {
   switch (action.type) {
-    case `Update/${WORKSPACE_LIST}`:
+    case `${UPDATE}/${WORKSPACE_LIST}`:
       return action.workspaceList.map(ws => ({
         id: ws.workspace_id,
         label: ws.label,
         slug: ws.slug,
-        description: ws.description,
+        // description: ws.description, // not returned by /api/v2/users/:idUser/workspaces
         sidebarEntry: ws.sidebar_entries.map(sbe => ({
           slug: sbe.slug,
           route: handleRouteFromApi(sbe.route),
@@ -23,13 +24,13 @@ export function workspaceList (state = [], action) {
         isOpenInSidebar: false
       }))
 
-    case `Set/${WORKSPACE_LIST}/isOpenInSidebar`:
+    case `${SET}/${WORKSPACE_LIST}/isOpenInSidebar`:
       return state.map(ws => ws.id === action.workspaceId
         ? {...ws, isOpenInSidebar: action.isOpenInSidebar}
         : ws
       )
 
-    case `Set/${USER_ROLE}`: // not used yet
+    case `${SET}/${USER_ROLE}`: // not used yet
       return state.map(ws => {
         const foundWorkspace = action.userRole.find(r => ws.id === r.workspace.id) || {role: '', subscribed_to_notif: ''}
         return {
@@ -39,7 +40,7 @@ export function workspaceList (state = [], action) {
         }
       })
 
-    case `Update/${USER_ROLE}/SubscriptionNotif`: // not used yet
+    case `${UPDATE}/${USER_ROLE}/SubscriptionNotif`: // not used yet
       return state.map(ws => ws.id === action.workspaceId
         ? {...ws, notif: action.subscriptionNotif}
         : ws

frontend/src/translate/en.js

@@ -1,41 +0,0 @@
-const en = {
-  translation: { // 'en' in the namespace 'translation'
-    Header: {
-      Search: 'Search'
-    },
-    Footer: {
-      marketing_msg: 'Create your own collaborative workspaces on trac.im',
-      copyright: 'Copyright 2013 - 2017'
-    },
-    FlashMessage: {
-      error: 'Error'
-    },
-    Login: {
-      fail: 'Unknown email or password',
-      logout_error: 'Disconnection error'
-    },
-    FileItemHeader: {
-      type: 'Type',
-      document_name: "Document's name",
-      status: 'Status'
-    },
-    Folder: {
-      create: 'Create in this folder',
-      content_type: 'Content type'
-    },
-    Sidebar: {
-      create_new_workspace: 'Create new workspace'
-    },
-    Account: {
-      title: 'My account'
-    },
-    role: {
-      reader: 'Reader',
-      contributor: 'Contributor',
-      content_manager: 'Content manager',
-      manager: 'Manager'
-    }
-  }
-}
-
-export default en

frontend/src/translate/fr.js

@@ -1,41 +0,0 @@
-const fr = {
-  translation: { // 'fr' in the namespace 'translation'
-    Header: {
-      Search: 'Rechercher'
-    },
-    Footer: {
-      marketing_msg: 'Créer votre propre espace de travail collaboratif sur trac.im',
-      copyright: 'Copyright 2013 - 2017'
-    },
-    FlashMessage: {
-      error: 'Erreur'
-    },
-    Login: {
-      fail: 'Email ou mot de passe inconnu.',
-      logout_error: 'Erreur de déconnexion.'
-    },
-    FileItemHeader: {
-      type: 'Type',
-      document_name: 'Nom du document',
-      status: 'Statut'
-    },
-    Folder: {
-      create: 'Créer dans ce dossier',
-      content_type: 'Type de contenu'
-    },
-    Sidebar: {
-      create_new_workspace: 'Créer un workspace'
-    },
-    Account: {
-      title: 'Mon compte'
-    },
-    role: {
-      reader: 'Lecteur',
-      contributor: 'Contributeur',
-      content_manager: 'Gestionnaire de contenu',
-      manager: 'Responsable'
-    }
-  }
-}
-
-export default fr

frontend_app_admin_workspace_user/.editorconfig

@@ -0,0 +1,13 @@
+# doc here : https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.py]
+indent_size = 4

frontend_app_admin_workspace_user/.gitignore

@@ -0,0 +1,5 @@
+# Created by .ignore support plugin (hsz.mobi)
+.idea/
+.git/
+dist/admin_workspace_user.app.js
+node_modules/

frontend_app_admin_workspace_user/README.md

@@ -0,0 +1 @@
+# app Admin Workspace User

frontend_app_admin_workspace_user/build_admin_workspace_user.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. ../bash_library.sh # source bash_library.sh
+
+windoz=""
+if [[ $1 = "-w" ]]; then
+    windoz="windoz"
+fi
+
+log "npm run build$windoz"
+npm run build$windoz
+log "cp dist/admin_workspace_user.app.js ../frontend/dist/app"
+cp dist/admin_workspace_user.app.js ../frontend/dist/app
+log "cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json"
+cp i18next.scanner/en/translation.json ../frontend/dist/app/admin_workspace_user_en_translation.json
+log "cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json"
+cp i18next.scanner/fr/translation.json ../frontend/dist/app/admin_workspace_user_fr_translation.json

frontend_app_admin_workspace_user/dist/asset

@@ -0,0 +1 @@
+../../frontend/dist/asset/