Merge branch 'develop' into feature/650_folder_missing_endpoint_about_edit

.travis.yml

@@ -3,7 +3,6 @@ matrix:
     - sudo: false
       language: python
       python:
-        - "3.4"
         - "3.5"
         - "3.6"
 

backend/tests_configs.ini

@@ -63,3 +63,70 @@ email.notification.smtp.server = 127.0.0.1
 email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
+
+[functional_test]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = false
+
+[functional_test_no_db]
+sqlalchemy.url = sqlite://
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = false
+
+[functional_test_with_mail_test_sync]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = true
+email.notification.from.email = test_user_from+{user_id}@localhost
+email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = test_user_reply+{content_id}@localhost
+email.notification.references.email = test_user_refs+{content_id}@localhost
+email.notification.content_update.template.html = %(here)s/tracim_backend/templates/mail/content_update_body_html.mak
+email.notification.content_update.template.text = %(here)s/tracim_backend/templates/mail/content_update_body_text.mak
+email.notification.created_account.template.html = %(here)s/tracim_backend/templates/mail/created_account_body_html.mak
+email.notification.created_account.template.text = %(here)s/tracim_backend/templates/mail/created_account_body_text.mak
+email.notification.content_update.subject = [{website_title}] [{workspace_label}] {content_label} ({content_status_label})
+email.notification.created_account.subject = [{website_title}] Created account
+email.notification.processing_mode = sync
+email.notification.smtp.server = 127.0.0.1
+email.notification.smtp.port = 1025
+email.notification.smtp.user = test_user
+email.notification.smtp.password = just_a_password
+
+
+[functional_test_with_mail_test_async]
+sqlalchemy.url = sqlite:///tracim_test.sqlite
+depot_storage_name = test
+depot_storage_dir = /tmp/test/depot
+user.auth_token.validity = 604800
+preview_cache_dir = /tmp/test/preview_cache
+preview.jpg.restricted_dims = True
+email.notification.activated = true
+email.notification.from.email = test_user_from+{user_id}@localhost
+email.notification.from.default_label = Tracim Notifications
+email.notification.reply_to.email = test_user_reply+{content_id}@localhost
+email.notification.references.email = test_user_refs+{content_id}@localhost
+email.notification.content_update.template.html = %(here)s/tracim_backend/templates/mail/content_update_body_html.mak
+email.notification.content_update.template.text = %(here)s/tracim_backend/templates/mail/content_update_body_text.mak
+email.notification.created_account.template.html = %(here)s/tracim_backend/templates/mail/created_account_body_html.mak
+email.notification.created_account.template.text = %(here)s/tracim_backend/templates/mail/created_account_body_text.mak
+email.notification.content_update.subject = [{website_title}] [{workspace_label}] {content_label} ({content_status_label})
+email.notification.created_account.subject = [{website_title}] Created account
+email.notification.processing_mode = async
+email.notification.smtp.server = 127.0.0.1
+email.notification.smtp.port = 1025
+email.notification.smtp.user = test_user
+email.notification.smtp.password = just_a_password

backend/tracim_backend/config.py

@@ -161,9 +161,11 @@ class CFG(object):
 
         self.EMAIL_NOTIFICATION_FROM_EMAIL = settings.get(
             'email.notification.from.email',
+            'noreply+{user_id}@trac.im'
         )
         self.EMAIL_NOTIFICATION_FROM_DEFAULT_LABEL = settings.get(
-            'email.notification.from.default_label'
+            'email.notification.from.default_label',
+            'Tracim Notifications'
         )
         self.EMAIL_NOTIFICATION_REPLY_TO_EMAIL = settings.get(
             'email.notification.reply_to.email',

backend/tracim_backend/exceptions.py

@@ -204,6 +204,8 @@ class PageOfPreviewNotFound(NotFound):
 class PreviewDimNotAllowed(TracimException):
     pass
 
-
 class UnallowedSubContent(TracimException):
     pass
+
+class TooShortAutocompleteString(TracimException):
+    pass

backend/tracim_backend/lib/core/user.py

@@ -3,13 +3,17 @@ from smtplib import SMTPException
 
 import transaction
 import typing as typing
+
+from sqlalchemy import or_
 from sqlalchemy.orm import Session
+from sqlalchemy.orm import Query
 from sqlalchemy.orm.exc import NoResultFound
 
 from tracim_backend import CFG
 from tracim_backend.models.auth import User
 from tracim_backend.models.auth import Group
 from tracim_backend.exceptions import NoUserSetted
+from tracim_backend.exceptions import TooShortAutocompleteString
 from tracim_backend.exceptions import PasswordDoNotMatch
 from tracim_backend.exceptions import EmailValidationFailed
 from tracim_backend.exceptions import UserDoesNotExist
@@ -20,6 +24,7 @@ from tracim_backend.exceptions import UserNotActive
 from tracim_backend.models.context_models import UserInContext
 from tracim_backend.lib.mail_notifier.notifier import get_email_manager
 from tracim_backend.models.context_models import TypeUser
+from tracim_backend.models.data import UserRoleInWorkspace
 
 
 class UserApi(object):
@@ -94,8 +99,41 @@ class UserApi(object):
             raise UserDoesNotExist('There is no current user')
         return self._user
 
+    def _get_all_query(self) -> Query:
+        return self._session.query(User).order_by(User.display_name)
+
     def get_all(self) -> typing.Iterable[User]:
-        return self._session.query(User).order_by(User.display_name).all()
+        return self._get_all_query().all()
+
+    def get_known_user(
+            self,
+            acp: str,
+    ) -> typing.Iterable[User]:
+        """
+        Return list of know user by current UserApi user.
+        :param acp: autocomplete filter by name/email
+        :return: List of found users
+        """
+        if len(acp) < 2:
+            raise TooShortAutocompleteString(
+                '"{acp}" is a too short string, acp string need to have more than one character'.format(acp=acp)  # nopep8
+            )
+        query = self._get_all_query()
+        query = query.filter(or_(User.display_name.ilike('%{}%'.format(acp)), User.email.ilike('%{}%'.format(acp))))  # nopep8
+
+        # INFO - G.M - 2018-07-27 - if user is set and is simple user, we
+        # should show only user in same workspace as user
+        if self._user and self._user.profile.id <= Group.TIM_USER:
+            user_workspaces_id_query = self._session.\
+                query(UserRoleInWorkspace.workspace_id).\
+                distinct(UserRoleInWorkspace.workspace_id).\
+                filter(UserRoleInWorkspace.user_id == self._user.user_id)
+            users_in_workspaces = self._session.\
+                query(UserRoleInWorkspace.user_id).\
+                distinct(UserRoleInWorkspace.user_id).\
+                filter(UserRoleInWorkspace.workspace_id.in_(user_workspaces_id_query.subquery())).subquery()  # nopep8
+            query = query.filter(User.user_id.in_(users_in_workspaces))
+        return query.all()
 
     def find(
             self,
@@ -196,7 +234,7 @@ class UserApi(object):
         )
         if do_save:
             # TODO - G.M - 2018-07-24 - Check why commit is needed here
-            transaction.commit()
+            self.save(user)
         return user
 
     def set_email(

backend/tracim_backend/lib/utils/utils.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 import datetime
+import random
+import string
 from redis import Redis
 from rq import Queue
 
@@ -72,3 +74,25 @@ def current_date_for_filename() -> str:
     # webdav utils, it may cause trouble. So, it should be replaced to
     # a character which will not change in bdd.
     return datetime.datetime.now().isoformat().replace(':', '.')
+
+# INFO - G.M - 2018-08-02 - Simple password generator, inspired by
+# https://gist.github.com/23maverick23/4131896
+
+
+ALLOWED_AUTOGEN_PASSWORD_CHAR = string.ascii_letters + \
+                                string.digits + \
+                                string.punctuation
+
+DEFAULT_PASSWORD_GEN_CHAR_LENGTH = 12
+
+
+def password_generator(
+        length: int=DEFAULT_PASSWORD_GEN_CHAR_LENGTH,
+        chars: str=ALLOWED_AUTOGEN_PASSWORD_CHAR
+) -> str:
+    """
+    :param length: length of the new password
+    :param chars: characters allowed
+    :return: password as string
+    """
+    return ''.join(random.choice(chars) for char_number in range(length))

backend/tracim_backend/models/applications.py

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

backend/tracim_backend/models/contents.py

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

backend/tracim_backend/models/context_models.py

@@ -186,6 +186,14 @@ class CommentPath(object):
         self.comment_id = comment_id
 
 
+class AutocompleteQuery(object):
+    """
+    Autocomplete query model
+    """
+    def __init__(self, acp: str):
+        self.acp = acp
+
+
 class PageQuery(object):
     """
     Page query model

backend/tracim_backend/tests/__init__.py

@@ -68,20 +68,17 @@ def create_1000px_png_test_image():
 class FunctionalTest(unittest.TestCase):
 
     fixtures = [BaseFixture]
-    sqlalchemy_url = 'sqlite:///tracim_test.sqlite'
+    config_uri = 'tests_configs.ini'
+    config_section = 'functional_test'
 
     def setUp(self):
         logger._logger.setLevel('WARNING')
+
         DepotManager._clear()
-        self.settings = {
-            'sqlalchemy.url': self.sqlalchemy_url,
-            'user.auth_token.validity': '604800',
-            'depot_storage_dir': '/tmp/test/depot',
-            'depot_storage_name': 'test',
-            'preview_cache_dir': '/tmp/test/preview_cache',
-            'preview.jpg.restricted_dims': True,
-            'email.notification.activated': 'false',
-        }
+        self.settings = plaster.get_settings(
+            self.config_uri,
+            self.config_section
+        )
         hapic.reset_context()
         self.engine = get_engine(self.settings)
         DeclarativeBase.metadata.create_all(self.engine)
@@ -127,7 +124,7 @@ class FunctionalTestEmptyDB(FunctionalTest):
 
 
 class FunctionalTestNoDB(FunctionalTest):
-    sqlalchemy_url = 'sqlite://'
+    config_section = 'functional_test_no_db'
 
     def init_database(self, settings):
         self.engine = get_engine(settings)

backend/tracim_backend/tests/functional/test_system.py

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

backend/tracim_backend/tests/functional/test_user.py

@@ -2382,8 +2382,10 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert workspace['workspace_id'] == 1
         assert workspace['label'] == 'Business'
         assert workspace['slug'] == 'business'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -2406,32 +2408,19 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
 
     def test_api__get_user_workspaces__err_403__unallowed_user(self):
         """
@@ -2646,6 +2635,390 @@ class TestUserEndpoint(FunctionalTest):
         )
 
 
+class TestUsersEndpoint(FunctionalTest):
+    # -*- coding: utf-8 -*-
+    """
+    Tests for GET /api/v2/users/{user_id}
+    """
+    fixtures = [BaseFixture]
+
+    def test_api__get_user__ok_200__admin(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/users',
+            status=200
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == admin.user_id
+        assert res[0]['public_name'] == admin.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user.user_id
+        assert res[1]['public_name'] == test_user.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__err_403__normal_user(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'test@test.test',
+                'pass'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/users',
+            status=403
+        )
+
+
+class TestKnownMembersEndpoint(FunctionalTest):
+    # -*- coding: utf-8 -*-
+    """
+    Tests for GET /api/v2/users/{user_id}
+    """
+    fixtures = [BaseFixture]
+
+    def test_api__get_user__ok_200__admin__by_name(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 'bob',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params,
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__ok_200__admin__by_email(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 'test',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params,
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+    def test_api__get_user__err_403__admin__too_small_acp(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        transaction.commit()
+        user_id = int(admin.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'acp': 't',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=400,
+            params=params
+        )
+
+    def test_api__get_user__ok_200__normal_user_by_email(self):
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        gapi = GroupApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        groups = [gapi.get_one_with_name('users')]
+        test_user = uapi.create_user(
+            email='test@test.test',
+            password='pass',
+            name='bob',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user2 = uapi.create_user(
+            email='test2@test2.test2',
+            password='pass',
+            name='bob2',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        test_user3 = uapi.create_user(
+            email='test3@test3.test3',
+            password='pass',
+            name='bob3',
+            groups=groups,
+            timezone='Europe/Paris',
+            do_save=True,
+            do_notify=False,
+        )
+        uapi.save(test_user)
+        uapi.save(test_user2)
+        uapi.save(test_user3)
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+
+        )
+        workspace = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace',
+            save_now=True
+        )
+        role_api = RoleApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
+        role_api.create_one(test_user, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(test_user2, workspace, UserRoleInWorkspace.READER, False)
+        transaction.commit()
+        user_id = int(test_user.user_id)
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'test@test.test',
+                'pass'
+            )
+        )
+        params = {
+            'acp': 'test',
+        }
+        res = self.testapp.get(
+            '/api/v2/users/{user_id}/known_members'.format(user_id=user_id),
+            status=200,
+            params=params
+        )
+        res = res.json_body
+        assert len(res) == 2
+        assert res[0]['user_id'] == test_user.user_id
+        assert res[0]['public_name'] == test_user.display_name
+        assert res[0]['avatar_url'] is None
+
+        assert res[1]['user_id'] == test_user2.user_id
+        assert res[1]['public_name'] == test_user2.display_name
+        assert res[1]['avatar_url'] is None
+
+
 class TestSetEmailEndpoint(FunctionalTest):
     # -*- coding: utf-8 -*-
     """
@@ -3025,6 +3398,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=204,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert not user.validate_password('pass')
         assert user.validate_password('mynewpassword')
@@ -3080,6 +3459,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             params=params,
             status=403,
         )
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         # Check After
         user = uapi.get_one(user_id)
         assert user.validate_password('pass')
@@ -3138,6 +3523,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=400,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert user.validate_password('pass')
         assert not user.validate_password('mynewpassword')
@@ -3195,6 +3586,12 @@ class TestSetPasswordEndpoint(FunctionalTest):
             status=204,
         )
         # Check After
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        uapi = UserApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config,
+        )
         user = uapi.get_one(user_id)
         assert not user.validate_password('pass')
         assert user.validate_password('mynewpassword')

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -2,7 +2,7 @@
 """
 Tests for /api/v2/workspaces subpath endpoints.
 """
-
+import requests
 import transaction
 from depot.io.utils import FileIntent
 
@@ -41,8 +41,10 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
+        # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
+        # not fixed on active application/content-file
         sidebar_entry = workspace['sidebar_entries'][0]
         assert sidebar_entry['slug'] == 'dashboard'
         assert sidebar_entry['label'] == 'Dashboard'
@@ -65,33 +67,19 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == "file-text-o"
 
         sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/markdownpluspage'
-        assert sidebar_entry['label'] == 'Markdown Plus Documents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
-        assert sidebar_entry['hexcolor'] == "#f12d2d"
-        assert sidebar_entry['fa_icon'] == "file-code-o"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/file'
         assert sidebar_entry['label'] == 'Files'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
         assert sidebar_entry['hexcolor'] == "#FF9900"
         assert sidebar_entry['fa_icon'] == "paperclip"
 
-        sidebar_entry = workspace['sidebar_entries'][5]
+        sidebar_entry = workspace['sidebar_entries'][4]
         assert sidebar_entry['slug'] == 'contents/thread'
         assert sidebar_entry['label'] == 'Threads'
         assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
         assert sidebar_entry['fa_icon'] == "comments-o"
 
-        sidebar_entry = workspace['sidebar_entries'][6]
-        assert sidebar_entry['slug'] == 'calendar'
-        assert sidebar_entry['label'] == 'Calendar'
-        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#757575"
-        assert sidebar_entry['fa_icon'] == "calendar"
-
     def test_api__update_workspace__ok_200__nominal_case(self) -> None:
         """
         Test update workspace
@@ -118,7 +106,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # modify workspace
         res = self.testapp.put_json(
@@ -132,7 +120,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
         # after
         res = self.testapp.get(
@@ -145,7 +133,7 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
-        assert len(workspace['sidebar_entries']) == 7
+        assert len(workspace['sidebar_entries']) == 5
 
     def test_api__update_workspace__err_400__empty_label(self) -> None:
         """
@@ -612,6 +600,89 @@ class TestWorkspaceMembersEndpoint(FunctionalTest):
         assert user_role['workspace_id'] == 1
 
 
+class TestUserInvitationWithMailActivatedSync(FunctionalTest):
+
+    fixtures = [BaseFixture, ContentFixtures]
+    config_section = 'functional_test_with_mail_test_sync'
+
+    def test_api__create_workspace_member_role__ok_200__new_user(self):  # nopep8
+        """
+        Create workspace member role
+        :return:
+        """
+        requests.delete('http://127.0.0.1:8025/api/v1/messages')
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        # create workspace role
+        params = {
+            'user_id': None,
+            'user_email_or_public_name': 'bob@bob.bob',
+            'role': 'content-manager',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/members',
+            status=200,
+            params=params,
+        )
+        user_role_found = res.json_body
+        assert user_role_found['role'] == 'content-manager'
+        assert user_role_found['user_id']
+        user_id = user_role_found['user_id']
+        assert user_role_found['workspace_id'] == 1
+        assert user_role_found['newly_created'] is True
+        assert user_role_found['email_sent'] is True
+
+        # check mail received
+        response = requests.get('http://127.0.0.1:8025/api/v1/messages')
+        response = response.json()
+        assert len(response) == 1
+        headers = response[0]['Content']['Headers']
+        assert headers['From'][0] == 'Tracim Notifications <test_user_from+0@localhost>'  # nopep8
+        assert headers['To'][0] == 'bob <bob@bob.bob>'
+        assert headers['Subject'][0] == '[TRACIM] Created account'
+
+        # TODO - G.M - 2018-08-02 - Place cleanup outside of the test
+        requests.delete('http://127.0.0.1:8025/api/v1/messages')
+
+
+class TestUserInvitationWithMailActivatedASync(FunctionalTest):
+
+    fixtures = [BaseFixture, ContentFixtures]
+    config_section = 'functional_test_with_mail_test_async'
+
+    def test_api__create_workspace_member_role__ok_200__new_user(self):  # nopep8
+        """
+        Create workspace member role
+        :return:
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        # create workspace role
+        params = {
+            'user_id': None,
+            'user_email_or_public_name': 'bob@bob.bob',
+            'role': 'content-manager',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/members',
+            status=200,
+            params=params,
+        )
+        user_role_found = res.json_body
+        assert user_role_found['newly_created'] is True
+        assert user_role_found['email_sent'] is False
+
+
 class TestWorkspaceContents(FunctionalTest):
     """
     Tests for /api/v2/workspaces/{workspace_id}/contents endpoint
@@ -1442,7 +1513,7 @@ class TestWorkspaceContents(FunctionalTest):
         params = {
             'parent_id': None,
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1453,7 +1524,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1484,7 +1555,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
@@ -1495,7 +1566,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1548,7 +1619,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
             'parent_id': 10,
         }
         res = self.testapp.post_json(
@@ -1560,7 +1631,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert res.json_body
         assert res.json_body['status'] == 'open'
         assert res.json_body['content_id']
-        assert res.json_body['content_type'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'html-document'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
@@ -1591,7 +1662,7 @@ class TestWorkspaceContents(FunctionalTest):
         )
         params = {
             'label': '',
-            'content_type': 'markdownpage',
+            'content_type': 'html-document',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',

backend/tracim_backend/tests/library/test_user_api.py

@@ -1,14 +1,19 @@
 # -*- coding: utf-8 -*-
 import pytest
 import transaction
+from tracim_backend import models
 
 from tracim_backend.exceptions import AuthenticationFailed
+from tracim_backend.exceptions import TooShortAutocompleteString
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.exceptions import UserNotActive
 from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.user import UserApi
+from tracim_backend.lib.core.userworkspace import RoleApi
+from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import User
 from tracim_backend.models.context_models import UserInContext
+from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.tests import DefaultTest
 from tracim_backend.tests import eq_
 
@@ -107,6 +112,184 @@ class TestUserApi(DefaultTest):
         # u1 + Admin user from BaseFixture
         assert 2 == len(users)
 
+    def test_unit__get_known__user__admin__too_short_acp_str(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        with pytest.raises(TooShortAutocompleteString):
+            api.get_known_user('e')
+
+    def test_unit__get_known__user__admin__by_email(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+
+        users = api.get_known_user('email')
+        assert len(users) == 1
+        assert users[0] == u1
+
+    def test_unit__get_known__user__user__no_workspace_empty_known_user(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=admin,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('email')
+        assert len(users) == 0
+
+    def test_unit__get_known__user__same_workspaces_users_by_name(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        u2 = api.create_user(
+            email='email2@email2',
+            name='name2',
+            do_notify=False,
+            do_save=True,
+        )
+        u3 = api.create_user(
+            email='notfound@notfound',
+            name='notfound',
+            do_notify=False,
+            do_save=True,
+        )
+        wapi = WorkspaceApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        workspace = wapi.create_workspace(
+            'test workspace n°1',
+            save_now=True)
+        role_api = RoleApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        role_api.create_one(u1, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u2, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u3, workspace, UserRoleInWorkspace.READER, False)
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('name')
+        assert len(users) == 2
+        assert users[0] == u1
+        assert users[1] == u2
+
+    def test_unit__get_known__user__same_workspaces_users_by_email(self):
+        admin = self.session.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+        u2 = api.create_user(
+            email='email2@email2',
+            name='name2',
+            do_notify=False,
+            do_save=True,
+        )
+        u3 = api.create_user(
+            email='notfound@notfound',
+            name='notfound',
+            do_notify=False,
+            do_save=True,
+        )
+        wapi = WorkspaceApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        workspace = wapi.create_workspace(
+            'test workspace n°1',
+            save_now=True)
+        role_api = RoleApi(
+            current_user=admin,
+            session=self.session,
+            config=self.app_config,
+        )
+        role_api.create_one(u1, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u2, workspace, UserRoleInWorkspace.READER, False)
+        role_api.create_one(u3, workspace, UserRoleInWorkspace.READER, False)
+        api2 = UserApi(
+            current_user=u1,
+            session=self.session,
+            config=self.config,
+        )
+        users = api2.get_known_user('email')
+        assert len(users) == 2
+        assert users[0] == u1
+        assert users[1] == u2
+
+    def test_unit__get_known__user__admin__by_name(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        u1 = api.create_user(
+            email='email@email',
+            name='name',
+            do_notify=False,
+            do_save=True,
+        )
+
+        users = api.get_known_user('nam')
+        assert len(users) == 1
+        assert users[0] == u1
+
     def test_unit__get_one__ok__nominal_case(self):
         api = UserApi(
             current_user=None,

backend/tracim_backend/tests/library/tests_utils.py

@@ -0,0 +1,14 @@
+import string
+
+from tracim_backend.lib.utils.utils import password_generator
+from tracim_backend.lib.utils.utils import ALLOWED_AUTOGEN_PASSWORD_CHAR
+from tracim_backend.lib.utils.utils import DEFAULT_PASSWORD_GEN_CHAR_LENGTH
+
+
+class TestPasswordGenerator(object):
+
+    def test_password_generator_ok_nominal_case(self):
+        password = password_generator()
+        assert len(password) == DEFAULT_PASSWORD_GEN_CHAR_LENGTH
+        for char in password:
+            assert char in ALLOWED_AUTOGEN_PASSWORD_CHAR

backend/tracim_backend/views/contents_api/comment_controller.py

@@ -41,6 +41,8 @@ class CommentController(Controller):
         # login = hapic_data.body
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -68,6 +70,8 @@ class CommentController(Controller):
         # login = hapic_data.body
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -97,6 +101,8 @@ class CommentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,

backend/tracim_backend/views/contents_api/file_controller.py

@@ -61,6 +61,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -95,6 +97,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -120,6 +124,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -154,6 +160,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -181,6 +189,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -205,6 +215,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -238,6 +250,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -270,6 +284,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -301,6 +317,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -334,6 +352,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -352,6 +372,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -375,6 +397,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -413,6 +437,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -440,6 +466,8 @@ class FileController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,

backend/tracim_backend/views/contents_api/html_document_controller.py

@@ -46,6 +46,8 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -69,6 +71,8 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -107,6 +111,8 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -138,6 +144,8 @@ class HTMLDocumentController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,

backend/tracim_backend/views/contents_api/threads_controller.py

@@ -45,6 +45,8 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -68,6 +70,8 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -106,6 +110,8 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -132,6 +138,8 @@ class ThreadController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,

backend/tracim_backend/views/core_api/schemas.py

@@ -2,6 +2,7 @@
 import marshmallow
 from marshmallow import post_load
 from marshmallow.validate import OneOf
+from marshmallow.validate import Length
 from marshmallow.validate import Range
 
 from tracim_backend.lib.utils.utils import DATETIME_FORMAT
@@ -12,6 +13,7 @@ from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import open_status
 from tracim_backend.models.context_models import ActiveContentFilter
 from tracim_backend.models.context_models import FolderContentUpdate
+from tracim_backend.models.context_models import AutocompleteQuery
 from tracim_backend.models.context_models import ContentIdsQuery
 from tracim_backend.models.context_models import UserWorkspaceAndContentPath
 from tracim_backend.models.context_models import ContentCreation
@@ -293,6 +295,17 @@ class CommentsPathSchema(WorkspaceAndContentIdPathSchema):
         return CommentPath(**data)
 
 
+class AutocompleteQuerySchema(marshmallow.Schema):
+    acp = marshmallow.fields.Str(
+        example='test',
+        description='search text to query',
+        validate=Length(min=2),
+    )
+    @post_load
+    def make_autocomplete(self, data):
+        return AutocompleteQuery(**data)
+
+
 class PageQuerySchema(marshmallow.Schema):
     page = marshmallow.fields.Int(
         example=2,

backend/tracim_backend/views/core_api/user_controller.py

@@ -18,6 +18,8 @@ from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.exceptions import WrongUserPassword
 from tracim_backend.exceptions import PasswordDoNotMatch
 from tracim_backend.views.core_api.schemas import UserSchema
+from tracim_backend.views.core_api.schemas import AutocompleteQuerySchema
+from tracim_backend.views.core_api.schemas import UserDigestSchema
 from tracim_backend.views.core_api.schemas import SetEmailSchema
 from tracim_backend.views.core_api.schemas import SetPasswordSchema
 from tracim_backend.views.core_api.schemas import UserInfosSchema
@@ -37,6 +39,7 @@ from tracim_backend.models.contents import CONTENT_TYPES
 SWAGGER_TAG__USER_ENDPOINTS = 'Users'
 
 
+
 class UserController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
@@ -77,6 +80,46 @@ class UserController(Controller):
         return uapi.get_user_with_context(request.candidate_user)
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_profile(Group.TIM_ADMIN)
+    @hapic.output_body(UserDigestSchema(many=True))
+    def users(self, context, request: TracimRequest, hapic_data=None):
+        """
+        Get all users
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        users = uapi.get_all()
+        context_users = [
+            uapi.get_user_with_context(user) for user in users
+        ]
+        return context_users
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_same_user_or_profile(Group.TIM_MANAGER)
+    @hapic.input_path(UserIdPathSchema())
+    @hapic.input_query(AutocompleteQuerySchema())
+    @hapic.output_body(UserDigestSchema(many=True))
+    def known_members(self, context, request: TracimRequest, hapic_data=None):
+        """
+        Get known users list
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.candidate_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        users = uapi.get_known_user(acp=hapic_data.query.acp)
+        context_users = [
+            uapi.get_user_with_context(user) for user in users
+        ]
+        return context_users
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
     @hapic.handle_exception(WrongUserPassword, HTTPStatus.FORBIDDEN)
     @require_same_user_or_profile(Group.TIM_ADMIN)
     @hapic.input_body(SetEmailSchema())
@@ -329,6 +372,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -346,6 +391,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -363,6 +410,8 @@ class UserController(Controller):
         """
         app_config = request.registry.settings['CFG']
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.candidate_user,
             session=request.dbsession,
             config=app_config,
@@ -384,6 +433,14 @@ class UserController(Controller):
         configurator.add_route('user', '/users/{user_id}', request_method='GET')  # nopep8
         configurator.add_view(self.user, route_name='user')
 
+        # users lists
+        configurator.add_route('users', '/users', request_method='GET')  # nopep8
+        configurator.add_view(self.users, route_name='users')
+
+        # known members lists
+        configurator.add_route('known_members', '/users/{user_id}/known_members', request_method='GET')  # nopep8
+        configurator.add_view(self.known_members, route_name='known_members')
+
         # set user email
         configurator.add_route('set_user_email', '/users/{user_id}/email', request_method='PUT')  # nopep8
         configurator.add_view(self.set_user_email, route_name='set_user_email')

backend/tracim_backend/views/core_api/workspace_controller.py

@@ -31,6 +31,7 @@ from tracim_backend.exceptions import ContentNotFound
 from tracim_backend.exceptions import WorkspacesDoNotMatch
 from tracim_backend.exceptions import ParentNotFound
 from tracim_backend.views.controllers import Controller
+from tracim_backend.lib.utils.utils import password_generator
 from tracim_backend.views.core_api.schemas import FilterContentQuerySchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberCreationSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberInviteSchema
@@ -213,12 +214,18 @@ class WorkspaceController(Controller):
                 # TODO - G.M - 2018-07-05 - [UserCreation] Reenable email
                 # notification for creation
                 user = uapi.create_user(
-                    hapic_data.body.user_email_or_public_name,
-                    do_notify=False
+                    email=hapic_data.body.user_email_or_public_name,
+                    password= password_generator(),
+                    do_notify=True
                 )  # nopep8
                 newly_created = True
+                if app_config.EMAIL_NOTIFICATION_ACTIVATED and \
+                        app_config.EMAIL_NOTIFICATION_PROCESSING_MODE.lower() == 'sync':
+                    email_sent = True
+
             except EmailValidationFailed:
                 raise UserCreationFailed('no valid mail given')
+
         role = rapi.create_one(
             user=user,
             workspace=request.current_workspace,
@@ -328,6 +335,8 @@ class WorkspaceController(Controller):
         move_data = hapic_data.body
 
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -375,6 +384,8 @@ class WorkspaceController(Controller):
         app_config = request.registry.settings['CFG']
         path_data = hapic_data.path
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -411,6 +422,7 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_deleted=True,
+            show_archived=True,
         )
         content = api.get_one(
             path_data.content_id,
@@ -440,6 +452,8 @@ class WorkspaceController(Controller):
         app_config = request.registry.settings['CFG']
         path_data = hapic_data.path
         api = ContentApi(
+            show_archived=True,
+            show_deleted=True,
             current_user=request.current_user,
             session=request.dbsession,
             config=app_config,
@@ -473,6 +487,7 @@ class WorkspaceController(Controller):
             session=request.dbsession,
             config=app_config,
             show_archived=True,
+            show_deleted=True,
         )
         content = api.get_one(
             path_data.content_id,

bash_library.sh

@@ -5,5 +5,5 @@ BROWN='\033[0;33m'
 NC='\033[0m' # No Color
 
 function log {
-    echo -e "\n${YELLOW}[$(date +'%H:%M:%S')]${BROWN} $ $1${NC}\n"
+    echo -e "\n${YELLOW}[$(date +'%H:%M:%S')]${BROWN} $ $1${NC}"
 }

build_full_frontend.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . bash_library.sh # source bash_library.sh
 
 windoz=""
@@ -10,81 +11,77 @@ 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 "build frontend_lib"
+(
+  cd frontend_lib || exit
+  npm run buildtracimlib$windoz
+)
 
-log "cd frontend_lib"
-cd frontend_lib
-log "npm run buildtracimlib$windoz"
-npm run buildtracimlib$windoz
-cd -
 
 # app Html Document
+log "build frontend_app_html-document"
+(
+  cd frontend_app_html-document || exit
+  npm run build$windoz
+)
 
-log "cd frontend_app_html-document"
-cd frontend_app_html-document
+log "copying built file to frontend/"
+cp frontend_app_html-document/dist/html-document.app.js frontend/dist/app/
 
-log "npm run build$windoz # for frontend_app_html-document"
-npm run build$windoz
+log "copying en translation.json"
+cp frontend_app_html-document/i18next.scanner/en/translation.json frontend/dist/app/html-document_en_translation.json
 
-log "cp dist/html-document.app.js"
-cp dist/html-document.app.js ../frontend/dist/app
+log "copying fr translation.json"
+cp frontend_app_html-document/i18next.scanner/fr/translation.json frontend/dist/app/html-document_fr_translation.json
 
-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 "build frontend_app_thread"
+(
+  cd frontend_app_thread || exit
+  npm run build$windoz
+)
 
-log "cd frontend_app_thread"
-cd frontend_app_thread
-
-log "npm run build$windoz # for frontend_app_thread"
-npm run build$windoz
+log "copying built file to frontend/"
+cp frontend_app_thread/dist/thread.app.js frontend/dist/app/
 
-log "cp dist/thread.app.js"
-cp dist/thread.app.js ../frontend/dist/app
+log "copying Thread en translation.json"
+cp frontend_app_thread/i18next.scanner/en/translation.json frontend/dist/app/thread_en_translation.json
 
-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 "copying Thread fr translation.json"
+cp frontend_app_thread/i18next.scanner/fr/translation.json frontend/dist/app/thread_fr_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 "build frontend_app_workspace"
+(
+  cd frontend_app_workspace || exit
+  npm run build$windoz
+)
 
-log "cd frontend_app_workspace"
-cd frontend_app_workspace
-
-log "npm run build$windoz # for frontend_app_workspace"
-npm run build$windoz
+log "copying built file to frontend/"
+cp frontend_app_workspace/dist/workspace.app.js frontend/dist/app/
 
-log "cp dist/workspace.app.js"
-cp dist/workspace.app.js ../frontend/dist/app
+log "copying Thread en translation.json"
+cp frontend_app_workspace/i18next.scanner/en/translation.json frontend/dist/app/workspace_en_translation.json
 
-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 -
+log "copying Thread fr translation.json"
+cp frontend_app_workspace/i18next.scanner/fr/translation.json frontend/dist/app/workspace_fr_translation.json
 
 # app Admin Workspace User
+log "build frontend_app_admin_workspace_user"
+(
+  cd frontend_app_admin_workspace_user || exit
+  npm run build$windoz
+)
 
-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 "copying built file to frontend/"
+cp frontend_app_admin_workspace_user/dist/admin_workspace_user.app.js frontend/dist/app/
 
-log "cp dist/admin_workspace_user.app.js"
-cp dist/admin_workspace_user.app.js ../frontend/dist/app
+log "copying Thread en translation.json"
+cp frontend_app_admin_workspace_user/i18next.scanner/en/translation.json frontend/dist/app/admin_workspace_user_en_translation.json
 
-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 "copying Thread fr translation.json"
+cp frontend_app_admin_workspace_user/i18next.scanner/fr/translation.json frontend/dist/app/admin_workspace_user_fr_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 -
+log "frontend fully built"

frontend/dist/appInterface.js

@@ -76,6 +76,7 @@
   GLOBAL_eventReducer = ({detail: {type, data}}) => {
     switch (type) {
       case 'hide_popupCreateContent':
+      case 'hide_popupCreateWorkspace':
         console.log('%cGLOBAL_eventReducer Custom Event', 'color: #28a745', type, data)
         getSelectedApp(data.name).unmountApp('popupCreateContentContainer')
         break

frontend/dist/index.html

@@ -36,7 +36,6 @@
       .primaryColorBorder { border-color: #7d4e24; }
       .primaryColorBorderDarken { border-color: #572800; }
       .primaryColorBorderLighten { border-color: #a3744a; }
-      .whiteColorBorder { border-color: #fdfdfd; }
 
       .primaryColorBorderHover:hover { border-color: #7d4e24; }
       .primaryColorBorderDarkenHover:hover { border-color: #572800; }

frontend/dist/tinymceInit.js

@@ -32,6 +32,7 @@
     });
 
     tinymce.init({
+      forced_root_block : "",
       selector: selector,
       menubar: false,
       resize: false,

frontend/i18next.scanner/en/translation.json

@@ -64,5 +64,10 @@
   "Old password": "Old password",
   "New password": "New password",
   "Name:": "Name:",
-  "Email Adress:": "Email Adress:"
+  "Email Adress:": "Email Adress:",
+  "An error has happened": "An error has happened",
+  "You have subscribed to this workspace's notifications": "You have subscribed to this workspace's notifications",
+  "Connection": "Connection",
+  "Forgotten password ?": "Forgotten password ?",
+  "currently, you are ": "currently, you are "
 }

frontend/i18next.scanner/fr/translation.json

@@ -64,5 +64,10 @@
   "Old password": "Ancien mot de passe",
   "New password": "Nouveau mot de passe",
   "Name:": "Nom :",
-  "Email Adress:": "Adresse mail :"
+  "Email Adress:": "Adresse mail :",
+  "An error has happened": "__NOT_TRANSLATED__",
+  "You have subscribed to this workspace's notifications": "Vous êtes abonné aux notifications de cet espace de travail.",
+  "Connection": "Connexion",
+  "Forgotten password ?": "Mot de passe oublié ?",
+  "currently, you are ": "actuellement, vous êtes "
 }

frontend/src/action-creator.async.js

@@ -2,8 +2,6 @@ import { FETCH_CONFIG } from './helper.js'
 import {
   TIMEZONE,
   setTimezone,
-  LANG,
-  updateLangList,
   USER_LOGIN,
   USER_LOGOUT,
   USER_ROLE,
@@ -16,7 +14,9 @@ import {
   FOLDER,
   setFolderData,
   APP_LIST,
-  CONTENT_TYPE_LIST
+  CONTENT_TYPE_LIST,
+  WORKSPACE_RECENT_ACTIVITY,
+  WORKSPACE_READ_STATUS
 } from './action-creator.sync.js'
 
 /*
@@ -36,6 +36,7 @@ import {
  * This function create a http async request using whatwg-fetch while dispatching a PENDING and a SUCCESS redux action.
  * It also adds, to the Response of the fetch request, the json value so that the redux action have access to the status and the data
  */
+// Côme - 2018/08/02 - fetchWrapper should come from tracim_lib so that all apps uses the same
 const fetchWrapper = async ({url, param, actionName, dispatch, debug = false}) => {
   dispatch({type: `${param.method}/${actionName}/PENDING`})
 
@@ -77,19 +78,6 @@ const fetchWrapper = async ({url, param, actionName, dispatch, debug = false}) =
   return fetchResult
 }
 
-export const getLangList = () => async dispatch => {
-  const fetchGetLangList = await fetchWrapper({
-    url: `${FETCH_CONFIG.apiUrl}/lang`,
-    param: {
-      headers: {...FETCH_CONFIG.headers},
-      method: 'GET'
-    },
-    actionName: LANG,
-    dispatch
-  })
-  if (fetchGetLangList.status === 200) dispatch(updateLangList(fetchGetLangList.json))
-}
-
 export const getTimezone = () => async dispatch => {
   const fetchGetTimezone = await fetchWrapper({
     url: `${FETCH_CONFIG.apiUrl}/timezone`,
@@ -220,6 +208,36 @@ export const getWorkspaceContentList = (user, idWorkspace, idParent) => dispatch
   })
 }
 
+export const getWorkspaceRecentActivityList = (user, idWorkspace) => dispatch => {
+  return fetchWrapper({
+    url: `${FETCH_CONFIG.apiUrl}/users/${user.user_id}/workspaces/${idWorkspace}/contents/recently_active?limit=10`,
+    param: {
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
+      method: 'GET'
+    },
+    actionName: WORKSPACE_RECENT_ACTIVITY,
+    dispatch
+  })
+}
+
+export const getWorkspaceReadStatusList = (user, idWorkspace) => dispatch => {
+  return fetchWrapper({
+    url: `${FETCH_CONFIG.apiUrl}/users/${user.user_id}/workspaces/${idWorkspace}/contents/read_status`,
+    param: {
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
+      method: 'GET'
+    },
+    actionName: WORKSPACE_READ_STATUS,
+    dispatch
+  })
+}
+
 export const getFolderContent = (idWorkspace, idFolder) => async dispatch => {
   const fetchGetFolderContent = await fetchWrapper({
     url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents/?parent_id=${idFolder}`,

frontend/src/action-creator.sync.js

@@ -32,7 +32,7 @@ export const updateUserWorkspaceSubscriptionNotif = (workspaceId, subscriptionNo
 
 export const WORKSPACE = 'Workspace'
 export const WORKSPACE_CONTENT = `${WORKSPACE}/Content`
-export const setWorkspaceContentList = (workspaceContentList, filterStr = '') => ({ type: `${SET}/${WORKSPACE_CONTENT}`, workspaceContentList, filterStr })
+export const setWorkspaceContentList = workspaceContentList => ({ type: `${SET}/${WORKSPACE_CONTENT}`, workspaceContentList })
 export const updateWorkspaceFilter = filterList => ({ type: `${UPDATE}/${WORKSPACE}/Filter`, filterList })
 
 export const WORKSPACE_LIST = `${WORKSPACE}/List`
@@ -46,6 +46,14 @@ 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 WORKSPACE_RECENT_ACTIVITY = `${WORKSPACE}/RecentActivity/List`
+export const WORKSPACE_RECENT_ACTIVITY_LIST = `${WORKSPACE_RECENT_ACTIVITY}/List`
+export const setWorkspaceRecentActivityList = workspaceRecentActivityList => ({ type: `${SET}/${WORKSPACE_RECENT_ACTIVITY_LIST}`, workspaceRecentActivityList })
+
+export const WORKSPACE_READ_STATUS = `${WORKSPACE}/ReadStatus`
+export const WORKSPACE_READ_STATUS_LIST = `${WORKSPACE_READ_STATUS}/List`
+export const setWorkspaceReadStatusList = workspaceReadStatusList => ({ type: `${SET}/${WORKSPACE_READ_STATUS_LIST}`, workspaceReadStatusList })
+
 export const FOLDER = 'Folder'
 export const setFolderData = (folderId, content) => ({ type: `${SET}/${WORKSPACE}/${FOLDER}/Content`, folderId, content })
 

frontend/src/component/Account/Notification.jsx

@@ -4,7 +4,7 @@ import { BtnSwitch } from 'tracim_frontend_lib'
 import { ROLE } from '../../helper.js'
 
 export const Notification = props => {
-  const getRole = role => ROLE.find(r => r.name === role)
+  const getRole = role => ROLE.find(r => r.slug === role)
 
   return (
     <div className='account__userpreference__setting__notification'>

frontend/src/component/Dashboard/ContentTypeBtn.jsx

@@ -0,0 +1,41 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import Radium from 'radium'
+import color from 'color'
+import classnames from 'classnames'
+
+require('./ContentTypeBtn.styl')
+
+export const ContentTypeBtn = props =>
+  <div
+    className={classnames(`${props.customClass}`, 'contentTypeBtn')}
+    style={{
+      backgroundColor: props.hexcolor,
+      ':hover': {
+        backgroundColor: color(props.hexcolor).darken(0.15).hexString()
+      }
+    }}
+  >
+    <div className={classnames(`${props.customClass}__text`)}>
+      <div className={classnames(`${props.customClass}__text__icon`)}>
+        <i className={`fa fa-${props.faIcon}`} />
+      </div>
+      <div className={classnames(`${props.customClass}__text__title`)}>
+        {props.creationLabel}
+      </div>
+    </div>
+  </div>
+
+export default Radium(ContentTypeBtn)
+
+ContentTypeBtn.propTypes = {
+  hexcolor: PropTypes.string.isRequired,
+  label: PropTypes.string.isRequired,
+  faIcon: PropTypes.string.isRequired,
+  creationLabel: PropTypes.string.isRequired,
+  customClass: PropTypes.string
+}
+
+ContentTypeBtn.defaultProps = {
+  customClass: ''
+}

frontend/src/component/Dashboard/ContentTypeBtn.styl

@@ -0,0 +1,16 @@
+.contentTypeBtn
+  display flex
+  flex-direction column
+  justify-content center
+  margin 0 15px
+  border-radius 10px
+  padding 15px
+  width 230px
+  height 200px
+  box-shadow shadow-all
+  text-align center
+  cursor pointer
+  &:nth-child(1)
+    margin-left 0
+  &:nth-last-child
+    margin-right 0

frontend/src/component/Dashboard/MemberList.jsx

@@ -0,0 +1,162 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Checkbox } from 'tracim_frontend_lib'
+
+require('./MemberList.styl')
+
+export class MemberList extends React.Component {
+  constructor (props) {
+    super(props)
+
+    this.state = {
+      displayNewMemberList: true,
+      createAccountCheckbox: false
+    }
+  }
+
+  handleClickAddMemberBtn = () => this.setState({displayNewMemberList: false})
+
+  handleClickCloseAddMemberBtn = () => this.setState({displayNewMemberList: true})
+
+  handleClickCheckboxCreateAccount = e => {
+    e.preventDefault()
+    e.stopPropagation()
+    this.setState(prev => ({createAccountCheckbox: !prev.createAccountCheckbox}))
+  }
+
+  render () {
+    const { props, state } = this
+
+    return (
+      <div className='memberlist'>
+
+        <div className='memberlist__title subTitle'>
+          {props.t('Member List')}
+        </div>
+
+        <div className='memberlist__wrapper'>
+          {state.displayNewMemberList
+            ? (
+              <div>
+                <ul className='memberlist__list'>
+                  {props.memberList.map(m =>
+                    <li className='memberlist__list__item primaryColorBgLightenHover' key={m.id}>
+                      <div className='memberlist__list__item__avatar'>
+                        {m.avatarUrl ? <img src={m.avatarUrl} /> : <img src='NYI' />}
+                      </div>
+
+                      <div className='memberlist__list__item__info mr-auto'>
+                        <div className='memberlist__list__item__info__name'>
+                          {m.publicName}
+                        </div>
+
+                        <div className='memberlist__list__item__info__role'>
+                          {props.roleList.find(r => r.slug === m.role).label}
+                        </div>
+                      </div>
+
+                      <div className='memberlist__list__item__delete'>
+                        <i className='fa fa-trash-o' />
+                      </div>
+                    </li>
+                  )}
+                </ul>
+
+                <div className='memberlist__btnadd' onClick={this.handleClickAddMemberBtn}>
+                  <div className='memberlist__btnadd__button'>
+                    <div className='memberlist__btnadd__button__avatar'>
+                      <div className='memberlist__btnadd__button__avatar__icon'>
+                        <i className='fa fa-plus' />
+                      </div>
+                    </div>
+
+                    <div className='memberlist__btnadd__button__text'>
+                      {props.t('Add a member')}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            )
+            : (
+              <form className='memberlist__form'>
+                <div className='memberlist__form__close d-flex justify-content-end'>
+                  <i className='fa fa-times' onClick={this.handleClickCloseAddMemberBtn} />
+                </div>
+
+                <div className='memberlist__form__member'>
+                  <div className='memberlist__form__member__name'>
+                    <label className='name__label' htmlFor='addmember'>
+                      {props.t('Enter the name or email of the member')}
+                    </label>
+
+                    <input
+                      type='text'
+                      className='name__input form-control'
+                      id='addmember'
+                      placeholder='Nom ou Email'
+                      onChange={props.onChangeName}
+                    />
+                  </div>
+
+                  <div className='memberlist__form__member__create'>
+                    <div className='memberlist__form__member__create__checkbox mr-3'>
+                      <Checkbox
+                        name='createAccountCheckbox'
+                        onClickCheckbox={e => this.handleClickCheckboxCreateAccount(e)}
+                        checked={state.createAccountCheckbox}
+                      />
+                    </div>
+
+                    <div className='create__text'>
+                      {props.t('Create an account')}
+                    </div>
+                  </div>
+                </div>
+
+                <div className='memberlist__form__role'>
+                  <div className='memberlist__form__role__text'>
+                    {props.t('Choose the role of the member')}
+                  </div>
+
+                  <ul className='memberlist__form__role__list'>
+                    {props.roleList.map(r =>
+                      <li className='memberlist__form__role__list__item' key={r.slug}>
+                        <div className='item__radiobtn mr-3'>
+                          <input type='radio' name='role' value={r.slug} />
+                        </div>
+
+                        <div className='item__text'>
+                          <div className='item_text_icon mr-2' style={{color: r.hexcolor}}>
+                            <i className={`fa fa-${r.faIcon}`} />
+                          </div>
+
+                          <div className='item__text__name'>
+                            {r.label}
+                          </div>
+                        </div>
+                      </li>
+                    )}
+
+                  </ul>
+                </div>
+
+                <div className='memberlist__form__submitbtn'>
+                  <button className='btn btn-outline-primary'>
+                    {props.t('Validate')}
+                  </button>
+                </div>
+              </form>
+            )
+          }
+        </div>
+      </div>
+    )
+  }
+}
+
+export default MemberList
+
+MemberList.propTypes = {
+  memberList: PropTypes.array.isRequired,
+  onChangeName: PropTypes.func
+}

frontend/src/component/Dashboard/MemberList.styl

@@ -0,0 +1,117 @@
+.memberlist
+  margin 0 0 50px 0
+  width 35%
+  &__title
+    margin-bottom 20px
+    padding 6px
+    height 45px
+  &__wrapper
+    position relative
+    border 1px solid grey
+    height 480px
+  &__list
+    margin 0
+    padding 0
+    list-style none
+    height 400px
+    overflow-Y scroll
+    &__item
+      display flex
+      border-bottom 1px solid grey
+      padding 10px 15px
+      &:hover
+        background-color fourthColor
+      &:nth-last-child(1)
+        border-bottom 0
+      &:nth-child(even)
+        background-color grey-hover
+        &:hover
+          background-color fourthColor
+      &__avatar
+        margin-right 20px
+        & > img
+          width 50px
+          height 50px
+      &__info
+        &__name
+          font-size 20px
+        &__role
+          font-size 18px
+      &__delete
+        font-size 20px
+        color darkGrey
+        cursor pointer
+  &__btnadd
+    border-top 1px solid grey
+    padding 15px
+    &__button
+      display flex
+      align-items center
+      &__avatar
+        display flex
+        justify-content center
+        align-items center
+        margin-right 20px
+        border 2px dashed grey
+        border-radius 50%
+        width 50px
+        height 50px
+        cursor pointer
+        &__icon
+          color grey
+          font-size 25px
+      &__text
+        font-size 18px
+        color fontColor
+        cursor pointer
+  &__form
+    padding 15px
+    flex-direction column
+    height 100%
+    width 100%
+    background-color off-white
+    &__close
+      font-size 20px
+      & > i
+        cursor pointer
+    &__member
+      &__name
+        .name__label
+          margin 30px 0 20px 0
+          label()
+      .name__input
+        margin-bottom 20px
+        border 1px solid grey
+        border-radius 10px
+        padding 10px
+        width 300px
+      &__create
+        display flex
+        align-items center
+        margin 15px 0
+        line-height 23px
+        &__checkbox
+          padding-top 6px
+    &__role
+      margin-bottom 15px
+      coloricon()
+      &__text
+        margin 15px 0
+        label()
+      &__list
+        margin 0
+        padding 0
+        list-style none
+        &__item
+          display flex
+          align-items center
+          margin 10px 25px 10px 0
+          .item
+            &__text
+              display flex
+    &__submitbtn
+      display flex
+      justify-content flex-end
+      & > button
+        padding 8px 30px
+        cursor pointer

frontend/src/component/Dashboard/RecentActivity.jsx

@@ -0,0 +1,50 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import classnames from 'classnames'
+
+export const RecentActivity = props =>
+  <div className={props.customClass}>
+    <div className={`${props.customClass}__header`}>
+      <div className={classnames(`${props.customClass}__header__title`, 'subTitle')}>
+        {props.t('Recent activity')}
+      </div>
+
+      <div className={classnames(`${props.customClass}__header__allread`, 'btn btn-outline-primary')}>
+        {props.t('Mark everything as read')}
+      </div>
+    </div>
+
+    <div className={`${props.customClass}__wrapper`}>
+      {props.recentActivityFilteredForUser.map(content => {
+        const contentType = props.contentTypeList.find(ct => ct.slug === content.type)
+        return (
+          <div className={`${props.customClass}__workspace`} key={content.id}>
+            <div className={`${props.customClass}__workspace__icon`} style={{color: contentType.hexcolor}}>
+              <i className={`fa fa-${contentType.faIcon}`} />
+            </div>
+            <div className={`${props.customClass}__workspace__name`}>
+              {content.label}
+            </div>
+          </div>
+        )
+      })}
+
+      <div className={classnames(`${props.customClass}__more`, 'd-flex flex-row-reverse')}>
+        <div
+          className={classnames(`${props.customClass}__more__btn`, 'btn btn-outline-primary')}
+          onClick={props.onClickSeeMore}
+        >
+          {props.t('See more')}
+        </div>
+      </div>
+    </div>
+  </div>
+
+export default RecentActivity
+
+RecentActivity.propTypes = {
+  t: PropTypes.func.isRequired,
+  recentActivityFilteredForUser: PropTypes.array.isRequired,
+  contentTypeList: PropTypes.array.isRequired,
+  onClickSeeMore: PropTypes.func.isRequired
+}

frontend/src/component/Workspace/OpenContentApp.jsx

@@ -22,13 +22,10 @@ export class OpenContentApp extends React.Component {
       console.log('%c<OpenContentApp> contentToOpen', 'color: #dcae84', contentToOpen)
 
       if (appOpenedType === contentToOpen.type) { // app already open
-        dispatchCustomEvent({
-          type: `${contentToOpen.type}_reloadContent`, // handled by html-document:src/container/AdminWorkspaceUser.jsx
-          data: contentToOpen
-        })
+        dispatchCustomEvent(`${contentToOpen.type}_reloadContent`, contentToOpen)
       } else { // open another app
         // if another app is already visible, hide it
-        if (appOpenedType !== false) dispatchCustomEvent({type: `${appOpenedType}_hideApp`})
+        if (appOpenedType !== false) dispatchCustomEvent(`${appOpenedType}_hideApp`, {})
         // open app
         renderAppFeature(
           contentType.find(ct => ct.slug === contentToOpen.type),

frontend/src/container/Account.jsx

@@ -1,6 +1,5 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import Sidebar from './Sidebar.jsx'
 import UserInfo from '../component/Account/UserInfo.jsx'
 import MenuSubComponent from '../component/Account/MenuSubComponent.jsx'
 import PersonalData from '../component/Account/PersonalData.jsx'
@@ -102,9 +101,7 @@ class Account extends React.Component {
     })()
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='Account'>
         <PageWrapper customClass='account'>
           <PageTitle
             parentClass={'account'}

frontend/src/container/AdminWorkspacePage.jsx

@@ -0,0 +1,138 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import Sidebar from './Sidebar.jsx'
+import {
+  Delimiter,
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
+import { translate } from 'react-i18next'
+
+class AdminWorkspacePage extends React.Component {
+  render () {
+    return (
+      <div className='sidebarpagecontainer'>
+        <Sidebar />
+
+        <PageWrapper customClass='adminWorkspacePage'>
+          <PageTitle
+            parentClass={'adminWorkspacePage'}
+            title={'Workspace management'}
+          />
+
+          <PageContent parentClass='adminWorkspacePage'>
+
+            <div className='adminWorkspacePage__description'>
+              This page informs all workspaces of the instances
+            </div>
+
+            <div className='adminWorkspacePage__createworkspace'>
+              <button className='adminWorkspacePage__createworkspace__btncreate btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover'>
+                {this.props.t('Create a workspace')}
+              </button>
+            </div>
+
+            <Delimiter customClass={'adminWorkspacePage__delimiter'} />
+
+            <div className='adminWorkspacePage__workspaceTable'>
+
+              <table class='table'>
+                <thead>
+                  <tr>
+                    <th scope='col'># ID</th>
+                    <th scope='col'>Workspace</th>
+                    <th scope='col'>Description</th>
+                    <th scope='col'>Users</th>
+                    <th scope='col'>Calendar</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <th>#1</th>
+                    <td>Design v_2</td>
+                    <td>Workspace about tracim v2 design</td>
+                    <td>8 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#2</th>
+                    <td>New features</td>
+                    <td>Add a new features : Annotated files</td>
+                    <td>5 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#3</th>
+                    <td>Fix Backend</td>
+                    <td>workspace referring to multiple issues on the backend </td>
+                    <td>3 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#4</th>
+                    <td>Design v_2</td>
+                    <td>Workspace about tracim v2 design</td>
+                    <td>8 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#5</th>
+                    <td>New features</td>
+                    <td>Add a new features : Annotated files</td>
+                    <td>5 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-square-o' />
+                      </div>
+                      Disable
+                    </td>
+                  </tr>
+                  <tr>
+                    <th>#6</th>
+                    <td>Fix Backend</td>
+                    <td>workspace referring to multiple issues on the backend </td>
+                    <td>3 users</td>
+                    <td className='d-flex align-items-center flex-wrap'>
+                      <div className='adminWorkspacePage__workspaceTable__calendaricon mr-2'>
+                        <i className='fa fa-fw fa-check-square-o' />
+                      </div>
+                      Enable
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+
+          </PageContent>
+        </PageWrapper>
+      </div>
+    )
+  }
+}
+
+AdminWorkspacePage.propTypes = {
+  availableApp: PropTypes.array.isRequired
+}
+
+export default translate()(AdminWorkspacePage)

frontend/src/container/AppFullscreenManager.jsx

@@ -4,7 +4,6 @@ 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) {
@@ -20,9 +19,7 @@ class AppFullscreenManager extends React.Component {
     const { props } = this
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='AppFullScreenManager'>
         <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

frontend/src/container/Dashboard.jsx

@@ -1,10 +1,6 @@
 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 {
   PageWrapper,
   PageTitle,
@@ -12,13 +8,21 @@ import {
 } from 'tracim_frontend_lib'
 import {
   getWorkspaceDetail,
-  getWorkspaceMemberList
+  getWorkspaceMemberList,
+  getWorkspaceRecentActivityList,
+  getWorkspaceReadStatusList
 } from '../action-creator.async.js'
 import {
-  addFlashMessage,
+  newFlashMessage,
   setWorkspaceDetail,
-  setWorkspaceMemberList
+  setWorkspaceMemberList,
+  setWorkspaceRecentActivityList,
+  setWorkspaceReadStatusList
 } from '../action-creator.sync.js'
+import { ROLE } from '../helper.js'
+import ContentTypeBtn from '../component/Dashboard/ContentTypeBtn.jsx'
+import RecentActivity from '../component/Dashboard/RecentActivity.jsx'
+import MemberList from '../component/Dashboard/MemberList.jsx'
 
 class Dashboard extends React.Component {
   constructor (props) {
@@ -38,23 +42,33 @@ class Dashboard extends React.Component {
     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
+        props.dispatch(setWorkspaceDetail(fetchWorkspaceDetail.json)); break
+      default:
+        props.dispatch(newFlashMessage(props.t('An error has happened when fetching workspace detail'), 'warning')); break
     }
 
     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
+        props.dispatch(setWorkspaceMemberList(fetchWorkspaceMemberList.json)); break
+      default:
+        props.dispatch(newFlashMessage(props.t('An error has happened while fetching member list'), 'warning')); break
+    }
+
+    const fetchWorkspaceRecentActivityList = await props.dispatch(getWorkspaceRecentActivityList(props.user, state.workspaceIdInUrl))
+    switch (fetchWorkspaceRecentActivityList.status) {
+      case 200:
+        props.dispatch(setWorkspaceRecentActivityList(fetchWorkspaceRecentActivityList.json)); break
+      default:
+        props.dispatch(newFlashMessage(props.t('An error has happened while fetching recent activity list'), 'warning')); break
+    }
+
+    const fetchWorkspaceReadStatusList = await props.dispatch(getWorkspaceReadStatusList(props.user, state.workspaceIdInUrl))
+    switch (fetchWorkspaceReadStatusList.status) {
+      case 200:
+        props.dispatch(setWorkspaceReadStatusList(fetchWorkspaceReadStatusList.json)); break
+      default:
+        props.dispatch(newFlashMessage(props.t('An error has happened while fetching read status list'), 'warning')); break
     }
   }
 
@@ -78,9 +92,7 @@ class Dashboard extends React.Component {
     const { props, state } = this
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='Dashboard' style={{width: '100%'}}>
         <PageWrapper customeClass='dashboard'>
           <PageTitle
             parentClass='dashboard__header'
@@ -109,18 +121,27 @@ class Dashboard extends React.Component {
               <div className='dashboard__userstatut'>
                 <div className='dashboard__userstatut__role'>
                   <div className='dashboard__userstatut__role__msg'>
-                    {props.t(`Hi ! ${props.user.public_name}, vous êtes actuellement`)}
+                    {props.t(`Hi ! ${props.user.public_name} `)}{props.t('currently, you are ')}
                   </div>
 
-                  <div className='dashboard__userstatut__role__definition'>
-                    <div className='dashboard__userstatut__role__definition__icon'>
-                      <i className='fa fa-graduation-cap' />
-                    </div>
+                  {(() => {
+                    const myself = props.curWs.memberList.find(m => m.id === props.user.user_id)
+                    if (myself === undefined) return
 
-                    <div className='dashboard__userstatut__role__definition__text'>
-                      {(member => member ? member.role : '')(props.curWs.member.find(m => m.id === props.user.user_id))}
-                    </div>
-                  </div>
+                    const myRole = ROLE.find(r => r.slug === myself.role)
+
+                    return (
+                      <div className='dashboard__userstatut__role__definition'>
+                        <div className='dashboard__userstatut__role__definition__icon'>
+                          <i className={`fa fa-${myRole.faIcon}`} />
+                        </div>
+
+                        <div className='dashboard__userstatut__role__definition__text'>
+                          {myRole.label}
+                        </div>
+                      </div>
+                    )
+                  })()}
                 </div>
 
                 <div className='dashboard__userstatut__notification'>
@@ -139,7 +160,7 @@ class Dashboard extends React.Component {
                           aria-haspopup='true'
                           aria-expanded='false'
                         >
-                          Abonné(e)
+                          {props.t('subscriber')}
                         </button>
 
                         <div className='dashboard__userstatut__notification__subscribe__submenu dropdown-menu'>
@@ -167,170 +188,32 @@ class Dashboard extends React.Component {
 
             <div className='dashboard__calltoaction justify-content-xl-center'>
               {props.contentType.map(ct =>
-                <div
-                  className='dashboard__calltoaction__button btnaction'
-                  style={{
-                    backgroundColor: ct.hexcolor,
-                    ':hover': {
-                      backgroundColor: color(ct.hexcolor).darken(0.15).hexString()
-                    }
-                  }}
+                <ContentTypeBtn
+                  customClass='dashboard__calltoaction__button'
+                  hexcolor={ct.hexcolor}
+                  label={ct.label}
+                  faIcon={ct.faIcon}
+                  creationLabel={ct.creationLabel}
                   key={ct.label}
-                >
-                  <div className='dashboard__calltoaction__button__text'>
-                    <div className='dashboard__calltoaction__button__text__icon'>
-                      <i className={`fa fa-${ct.faIcon}`} />
-                    </div>
-                    <div className='dashboard__calltoaction__button__text__title'>
-                      {ct.creationLabel}
-                    </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__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>
-
-                      </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>
-
-                      </ul>
-                    </div>
-
-                    <div className='dashboard__memberlist__form__submitbtn'>
-                      <button className='btn btn-outline-primary'>
-                        {this.props.t('Validate')}
-                      </button>
-                    </div>
-                  </form>
-                  }
-                </div>
-              </div>
+            <div className='dashboard__workspaceInfo'>
+              <RecentActivity
+                customClass='dashboard__activity'
+                recentActivityFilteredForUser={props.curWs.recentActivityList.filter(content => !props.curWs.contentReadStatusList.includes(content.id))}
+                contentTypeList={props.contentType}
+                onClickSeeMore={() => {}}
+                t={props.t}
+              />
+
+              <MemberList
+                customClass='dashboard__memberlist'
+                memberList={props.curWs.memberList}
+                roleList={ROLE}
+                t={props.t}
+              />
             </div>
 
             <div className='dashboard__moreinfo'>
@@ -401,4 +284,4 @@ class Dashboard extends React.Component {
 }
 
 const mapStateToProps = ({ user, contentType, currentWorkspace }) => ({ user, contentType, curWs: currentWorkspace })
-export default connect(mapStateToProps)(translate()(Radium(Dashboard)))
+export default connect(mapStateToProps)(translate()(Dashboard))

frontend/src/container/Dashboard_old.jsx

@@ -1,571 +0,0 @@
-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/Login.jsx

@@ -55,8 +55,8 @@ class Login extends React.Component {
       Cookies.set(COOKIE.USER_LOGIN, inputLogin.value)
       Cookies.set(COOKIE.USER_AUTH, userAuth)
 
-      history.push(PAGE.HOME)
-    } else if (fetchPostUserLogin.status === 400) {
+      history.push(PAGE.WORKSPACE.ROOT)
+    } else if (fetchPostUserLogin.status === 403) {
       dispatch(newFlashMessage(t('Email or password invalid'), 'danger'))
     }
   }
@@ -74,7 +74,7 @@ class Login extends React.Component {
               <div className='col-12 col-sm-11 col-md-8 col-lg-6 col-xl-4'>
 
                 <Card customClass='loginpage__connection'>
-                  <CardHeader customClass='connection__header text-center'>{'Connexion'}</CardHeader>
+                  <CardHeader customClass='connection__header text-center'>{this.props.t('Connection')}</CardHeader>
 
                   <CardBody formClass='connection__form'>
                     <div>
@@ -118,7 +118,7 @@ class Login extends React.Component {
                         <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6 text-sm-right'>
                           <LoginBtnForgotPw
                             customClass='connection__form__pwforgot'
-                            label='Mot de passe oublié ?'
+                            label={this.props.t('Forgotten password ?')}
                           />
                         </div>
                       </div>
@@ -127,7 +127,7 @@ class Login extends React.Component {
                         htmlType='button'
                         bootstrapType='primary'
                         customClass='connection__form__btnsubmit ml-auto'
-                        label='Connexion'
+                        label={this.props.t('Connection')}
                         onClick={this.handleClickSubmit}
                       />
                     </div>

frontend/src/container/Sidebar.jsx

@@ -6,11 +6,14 @@ import { translate } from 'react-i18next'
 import appFactory from '../appFactory.js'
 import WorkspaceListItem from '../component/Sidebar/WorkspaceListItem.jsx'
 import {
+  setAppList,
+  setContentTypeList,
   setWorkspaceListIsOpenInSidebar,
   updateWorkspaceFilter,
   updateWorkspaceListData
 } from '../action-creator.sync.js'
 import {
+  getAppList, getContentTypeList,
   getWorkspaceList
 } from '../action-creator.async.js'
 import { PAGE, workspaceConfig } from '../helper.js'
@@ -22,7 +25,7 @@ class Sidebar extends React.Component {
     super(props)
     this.state = {
       sidebarClose: false,
-      workspaceIdInUrl: props.match.params.idws ? parseInt(props.match.params.idws) : null
+      workspaceIdInUrl: props.match && props.match.params.idws ? parseInt(props.match.params.idws) : null
     }
 
     document.addEventListener('appCustomEvent', this.customEventReducer)
@@ -32,28 +35,37 @@ class Sidebar extends React.Component {
     switch (type) {
       case 'refreshWorkspaceList':
         console.log('%c<Sidebar> Custom event', 'color: #28a745', type, data)
-        this.loadWorkspaceList()
+        this.loadAppConfigAndWorkspaceList()
         break
     }
   }
 
   componentDidMount () {
-    this.loadWorkspaceList()
+    // console.log('Sidebar Did Mount', this.props)
+    this.loadAppConfigAndWorkspaceList()
   }
 
   componentDidUpdate (prevProps, prevState) {
+    const { props } = this
+
     // console.log('%c<Sidebar> Did Update', 'color: #c17838')
-    if (this.props.match.params.idws === undefined || isNaN(this.props.match.params.idws)) return
+    if (!props.match || props.match.params.idws === undefined || isNaN(props.match.params.idws)) return
 
-    const newWorkspaceId = parseInt(this.props.match.params.idws)
+    const newWorkspaceId = parseInt(props.match.params.idws)
     if (prevState.workspaceIdInUrl !== newWorkspaceId) this.setState({workspaceIdInUrl: newWorkspaceId})
   }
 
-  loadWorkspaceList = async () => {
+  loadAppConfigAndWorkspaceList = async () => {
     const { workspaceIdInUrl } = this.state
     const { user, dispatch } = this.props
 
     if (user.user_id !== -1) {
+      const fetchGetAppList = await dispatch(getAppList(user))
+      if (fetchGetAppList.status === 200) dispatch(setAppList(fetchGetAppList.json))
+
+      const fetchGetContentTypeList = await dispatch(getContentTypeList(user))
+      if (fetchGetContentTypeList.status === 200) dispatch(setContentTypeList(fetchGetContentTypeList.json))
+
       const fetchGetWorkspaceList = await dispatch(getWorkspaceList(user))
 
       if (fetchGetWorkspaceList.status === 200) {

frontend/src/container/Tracim.jsx

@@ -1,31 +1,28 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { translate } from 'react-i18next'
+import Sidebar from './Sidebar.jsx'
 import Header from './Header.jsx'
 import Login from './Login.jsx'
-import Dashboard from './Dashboard.jsx'
 import Account from './Account.jsx'
+import AdminWorkspacePage from './AdminWorkspacePage.jsx'
 import AppFullscreenManager from './AppFullscreenManager.jsx'
 import FlashMessage from '../component/FlashMessage.jsx'
 import WorkspaceContent from './WorkspaceContent.jsx'
 import WIPcomponent from './WIPcomponent.jsx'
 import {
-  Route, withRouter, Switch
+  Route, withRouter, Redirect
 } from 'react-router-dom'
-import PrivateRoute from './PrivateRoute.jsx'
 import { COOKIE, PAGE } from '../helper.js'
 import {
-  getAppList,
-  getUserIsConnected,
-  getContentTypeList
+  getUserIsConnected
 } from '../action-creator.async.js'
 import {
   removeFlashMessage,
-  setAppList,
-  setUserConnected,
-  setContentTypeList
+  setUserConnected
 } from '../action-creator.sync.js'
 import Cookies from 'js-cookie'
+import Dashboard from './Dashboard.jsx'
 
 class Tracim extends React.Component {
   constructor (props) {
@@ -44,6 +41,7 @@ class Tracim extends React.Component {
   }
 
   async componentDidMount () {
+    // console.log('<Tracim> did Mount')
     const { dispatch } = this.props
 
     const userFromCookies = {
@@ -54,24 +52,14 @@ class Tracim extends React.Component {
     const fetchGetUserIsConnected = await dispatch(getUserIsConnected(userFromCookies))
     switch (fetchGetUserIsConnected.status) {
       case 200:
-        const userLogged = {
+        dispatch(setUserConnected({
           ...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
     }
@@ -80,27 +68,57 @@ class Tracim extends React.Component {
   handleRemoveFlashMessage = msg => this.props.dispatch(removeFlashMessage(msg))
 
   render () {
-    const { flashMessage, t } = this.props
+    const { props } = this
 
     return (
       <div className='tracim'>
         <Header />
-        <FlashMessage flashMessage={flashMessage} removeFlashMessage={this.handleRemoveFlashMessage} t={t} />
+        <FlashMessage flashMessage={props.flashMessage} removeFlashMessage={this.handleRemoveFlashMessage} t={props.t} />
 
         <div className='tracim__content'>
           <Route path={PAGE.LOGIN} component={Login} />
 
-          <PrivateRoute exact path='/' component={WorkspaceContent} />
-
-          <Switch>
-            <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
-            <PrivateRoute path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />
-            <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':type?', ':idcts?')} component={WorkspaceContent} />
-          </Switch>
-
-          <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
-          <PrivateRoute path={PAGE.ADMIN.ROOT} component={AppFullscreenManager} />
-          <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
+          <Route exact path='/' component={() => {
+            switch (props.user.logged) {
+              case true:
+                return <Redirect to={{pathname: PAGE.WORKSPACE.ROOT, state: {from: props.location}}} />
+              case false:
+                return <Redirect to={{pathname: '/login', state: {from: props.location}}} />
+              case null:
+                return null
+            }
+          }} />
+
+          { props.user.logged
+            ? (
+              <Route path='/workspaces/:idws?' render={() => // Workspace Router
+                <div className='sidebarpagecontainer'>
+                  <Sidebar />
+
+                  <Route exact path={PAGE.WORKSPACE.ROOT} render={() => props.workspaceList.length === 0 // handle '/' and redirect to first workspace
+                    ? null
+
+          <PrivateRoute path='/admin_temp/workspace' component={AdminWorkspacePage} />
+
+                  <Route exact path={`${PAGE.WORKSPACE.ROOT}/:idws`} render={props2 => // handle '/workspaces/:id' and add '/contents'
+                    <Redirect to={{pathname: `/workspaces/${props2.match.params.idws}/contents`, state: {from: props.location}}} />
+                  } />
+
+                  <Route path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
+                  <Route path={PAGE.WORKSPACE.CALENDAR(':idws')} component={() => <div><br /><br /><br /><br />NYI</div>} />
+                  <Route path={PAGE.WORKSPACE.CONTENT(':idws', ':type', ':idcts')} component={WorkspaceContent} />
+                  <Route exact path={PAGE.WORKSPACE.CONTENT_LIST(':idws')} component={WorkspaceContent} />
+
+                  <Route path={PAGE.ACCOUNT} component={Account} />
+                  <Route path={PAGE.ADMIN.ROOT} component={AppFullscreenManager} />
+                </div>
+              } />
+            )
+            : props.user.logged === false && props.location.pathname !== '/login' &&
+              <Redirect to={{pathname: '/login', state: {from: props.location}}} />
+          }
+
+          <Route path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
 
           <div id='appFeatureContainer' />
         </div>
@@ -110,5 +128,5 @@ class Tracim extends React.Component {
   }
 }
 
-const mapStateToProps = ({ flashMessage }) => ({ flashMessage })
+const mapStateToProps = ({ user, appList, contentType, workspaceList, flashMessage }) => ({ user, appList, contentType, workspaceList, flashMessage })
 export default withRouter(connect(mapStateToProps)(translate()(Tracim)))

frontend/src/container/WorkspaceContent.jsx

@@ -3,7 +3,6 @@ import { connect } from 'react-redux'
 import { withRouter, Route } from 'react-router-dom'
 import appFactory from '../appFactory.js'
 import { PAGE } from '../helper.js'
-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'
@@ -108,7 +107,7 @@ class WorkspaceContent extends React.Component {
 
   handleClickContentItem = content => {
     console.log('%c<WorkspaceContent> content clicked', 'color: #c17838', content)
-    this.props.history.push(`/workspaces/${content.idWorkspace}/${content.type}/${content.id}`)
+    this.props.history.push(PAGE.WORKSPACE.CONTENT(content.idWorkspace, content.type, content.id))
   }
 
   handleClickEditContentItem = (e, content) => {
@@ -166,9 +165,7 @@ class WorkspaceContent extends React.Component {
       : []
 
     return (
-      <div className='sidebarpagecontainer'>
-        <Sidebar />
-
+      <div className='WorkspaceContent' style={{width: '100%'}}>
         <OpenContentApp
           // automatically open the app for the idContent in url
           idWorkspace={this.state.workspaceIdInUrl}
@@ -192,7 +189,7 @@ class WorkspaceContent extends React.Component {
             subtitle={workspaceContentList.label ? workspaceContentList.label : ''}
           >
             <DropdownCreateButton
-              parentClass='workspace__header__btnaddworkspace'
+              parentClass='workspace__header__btnaddcontent'
               idFolder={null} // null because it is workspace root content
               onClickCreateContent={this.handleClickCreateContent}
               availableApp={contentType}

frontend/src/css/AdminWorkspacePage.styl

@@ -0,0 +1,11 @@
+.adminWorkspacePage
+  &__createworkspace
+    &__btncreate
+      margin 25px 15px
+  &__description
+    margin 25px 15px
+    font-size 20px
+  &__delimiter
+    margin 25px auto 65px auto
+  &__workspaceTable
+    margin 25px 15px

frontend/src/css/Dashboard.styl

@@ -31,7 +31,6 @@ coloricon()
     color lecteur
 
 .dashboard
-  margin-left 20px
   width 100%
   &__header
     flexwrap()
@@ -59,7 +58,6 @@ coloricon()
   &__userstatut
     width 35%
     &__role
-      flexwrap()
       margin 20px 0
       font-size 18px
       &__msg
@@ -93,12 +91,15 @@ coloricon()
           font-size 30px
         &__title
           font-size 18px
-  &__wksinfo
+  &__workspaceInfo
     flexwrap()
-    margin-top 150px
   &__activity
     margin 0 35px 50px 0
     width 60%
+    &__wrapper
+      border 1px solid grey
+      height 480px
+      overflow-y scroll
     &__header
       display flex
       justify-content space-between
@@ -109,9 +110,6 @@ coloricon()
         padding 10px 25px
         font-size 18px
         cursor pointer
-    &__wrapper
-      border 1px solid grey
-      height 480px
     &__workspace
       display flex
       align-items center
@@ -137,120 +135,6 @@ coloricon()
         margin 15px
         padding 10px 25px
         cursor pointer
-  &__memberlist
-    margin 0 0 50px 0
-    width 35%
-    &__title
-      margin-bottom 20px
-      padding 6px
-      height 45px
-    &__wrapper
-      position relative
-      border 1px solid grey
-      height 480px
-    &__list
-      margin 0
-      padding 0
-      list-style none
-      height 400px
-      overflow-Y scroll
-      &__item
-        display flex
-        border-bottom 1px solid grey
-        padding 10px 15px
-        &:hover
-          background-color fourthColor
-        &:nth-last-child(1)
-          border-bottom 0
-        &:nth-child(even)
-          background-color grey-hover
-          &:hover
-            background-color fourthColor
-        &__avatar
-          margin-right 20px
-          & > img
-            width 50px
-            height 50px
-        &__info
-          &__name
-            font-size 20px
-          &__role
-            font-size 18px
-        &__delete
-          font-size 20px
-          color darkGrey
-          cursor pointer
-    &__btnadd
-      border-top 1px solid grey
-      padding 15px
-      &__button
-        display flex
-        align-items center
-        &__avatar
-          display flex
-          justify-content center
-          align-items center
-          margin-right 20px
-          border 2px dashed grey
-          border-radius 50%
-          width 50px
-          height 50px
-          cursor pointer
-          &__icon
-            color grey
-            font-size 25px
-        &__text
-          font-size 18px
-          color fontColor
-          cursor pointer
-    &__form
-      padding 15px
-      flex-direction column
-      height 100%
-      width 100%
-      background-color off-white
-      &__close
-        font-size 20px
-        & > i
-          cursor pointer
-      &__member
-        &__name
-          .name__label
-            margin 30px 0 20px 0
-            label()
-          .name__input
-            margin-bottom 20px
-            border 1px solid grey
-            border-radius 10px
-            padding 10px
-            width 300px
-        &__create
-          display flex
-          align-items center
-          margin 15px 0
-      &__role
-        margin-bottom 15px
-        coloricon()
-        &__text
-          margin 15px 0
-          label()
-        &__list
-          margin 0
-          padding 0
-          list-style none
-          &__item
-            display flex
-            align-items center
-            margin 10px 25px 10px 0
-            .item
-              &__text
-                display flex
-      &__submitbtn
-        display flex
-        justify-content flex-end
-        & > button
-          padding 8px 30px
-          cursor pointer
   &__moreinfo
     display flex
     justify-content space-between

frontend/src/css/Generic.styl

@@ -111,7 +111,7 @@ a
 
 
 .pageContentGeneric
-  margin 10px 0 0 0
+  margin 10px 15px 0 15px
   width 100%
   height 100%
 
@@ -198,23 +198,6 @@ a
   font-weight 500
   color thirdColor
 
-.btnaction
-  display flex
-  flex-direction column
-  justify-content center
-  margin 0 15px
-  border-radius 10px
-  padding 15px
-  width 230px
-  height 200px
-  box-shadow shadow-all
-  text-align center
-  cursor pointer
-  &:nth-child(1)
-    margin-left 0
-  &:nth-last-child
-    margin-right 0
-
 .genericBtnInfoDashboard
   &__btn
     display flex

frontend/src/css/Workspace.styl

@@ -4,7 +4,6 @@
     flex-wrap wrap
     margin-right 15px
   &__content
-    margin 0 15px
     &__button
       display flex
       justify-content flex-end

frontend/src/helper.js

@@ -24,14 +24,12 @@ export const workspaceConfig = {
 export const PAGE = {
   HOME: '/',
   WORKSPACE: {
+    ROOT: '/workspaces',
     DASHBOARD: (idws = ':idws') => `/workspaces/${idws}/dashboard`,
-    NEW: (idws, type) => `/workspaces/${idws}/${type}/new`,
+    NEW: (idws, type) => `/workspaces/${idws}/contents/${type}/new`,
     CALENDAR: (idws = ':idws') => `/workspaces/${idws}/calendar`,
     CONTENT_LIST: (idws = ':idws') => `/workspaces/${idws}/contents`,
-    CONTENT: (idws = ':idws', type = ':type?', idcts = ':idcts?') => `/workspaces/${idws}/${type}/${idcts}`, // @TODO add /contents/ in url and remove <Switch> in <Tracim>
-    // CONTENT_NEW: (idws = ':idws', ctstype = ':ctstype') => `/workspaces/${idws}/contents/${ctstype}/new`,
-    // CONTENT_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspaces/${idws}/contents/${idcts}/edit`,
-    // CONTENT_TITLE_EDIT: (idws = ':idws', idcts = ':idcts') => `/workspaces/${idws}/contents/${idcts}/title/edit`,
+    CONTENT: (idws = ':idws', type = ':type', idcts = ':idcts') => `/workspaces/${idws}/contents/${type}/${idcts}`,
     ADMIN: (idws = ':idws') => `/workspaces/${idws}/admin`
   },
   LOGIN: '/login',
@@ -45,24 +43,28 @@ export const PAGE = {
 
 export const ROLE = [{
   id: 0,
-  name: 'reader',
-  icon: 'fa-eye',
-  translationKey: 'role.reader'
+  slug: 'reader',
+  faIcon: 'eye',
+  hexcolor: '#15D948',
+  label: 'Reader'
 }, {
   id: 1,
-  name: 'contributor',
-  icon: 'fa-pencil',
-  translationKey: 'role.contributor'
+  slug: 'contributor',
+  faIcon: 'pencil',
+  hexcolor: '#3145F7',
+  label: 'Contributor'
 }, {
   id: 2,
-  name: 'content_manager',
-  icon: 'fa-graduation-cap',
-  translationKey: 'role.content_manager'
+  slug: 'content-manager',
+  faIcon: 'graduation-cap',
+  hexcolor: '#f2af2d',
+  label: 'Content manager'
 }, {
   id: 3,
-  name: 'manager',
-  icon: 'fa-gavel',
-  translationKey: 'role.manager'
+  slug: 'workspace-manager',
+  faIcon: 'gavel',
+  hexcolor: '#ed0007',
+  label: 'Workspace manager'
 }]
 
 export const handleRouteFromApi = route => route.startsWith('/#') ? route.slice(2) : route

frontend/src/reducer/currentWorkspace.js

@@ -1,4 +1,10 @@
-import {SET, WORKSPACE_DETAIL, WORKSPACE_MEMBER_LIST} from '../action-creator.sync.js'
+import {
+  SET,
+  WORKSPACE_DETAIL,
+  WORKSPACE_MEMBER_LIST,
+  WORKSPACE_READ_STATUS_LIST,
+  WORKSPACE_RECENT_ACTIVITY_LIST
+} from '../action-creator.sync.js'
 import { handleRouteFromApi } from '../helper.js'
 
 const defaultWorkspace = {
@@ -6,8 +12,10 @@ const defaultWorkspace = {
   slug: '',
   label: '',
   description: '',
-  sidebarEntries: [],
-  member: []
+  sidebarEntryList: [],
+  memberList: [],
+  recentActivityList: [],
+  contentReadStatusList: []
 }
 
 export default function currentWorkspace (state = defaultWorkspace, action) {
@@ -19,7 +27,7 @@ export default function currentWorkspace (state = defaultWorkspace, action) {
         slug: action.workspaceDetail.slug,
         label: action.workspaceDetail.label,
         description: action.workspaceDetail.description,
-        sidebarEntries: action.workspaceDetail.sidebar_entries.map(sbe => ({
+        sidebarEntryList: action.workspaceDetail.sidebar_entries.map(sbe => ({
           slug: sbe.slug,
           route: handleRouteFromApi(sbe.route),
           faIcon: sbe.fa_icon,
@@ -31,15 +39,40 @@ export default function currentWorkspace (state = defaultWorkspace, action) {
     case `${SET}/${WORKSPACE_MEMBER_LIST}`:
       return {
         ...state,
-        member: action.workspaceMemberList.map(m => ({
+        memberList: 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,
+          isActive: m.is_active
         }))
       }
 
+    case `${SET}/${WORKSPACE_RECENT_ACTIVITY_LIST}`:
+      return {
+        ...state,
+        recentActivityList: action.workspaceRecentActivityList.map(ra => ({
+          id: ra.content_id,
+          slug: ra.slug,
+          label: ra.label,
+          type: ra.content_type,
+          idParent: ra.parent_id,
+          showInUi: ra.show_in_ui,
+          isArchived: ra.is_archived,
+          isDeleted: ra.is_deleted,
+          statusSlug: ra.status,
+          subContentTypeSlug: ra.sub_content_types
+        }))
+      }
+
+    case `${SET}/${WORKSPACE_READ_STATUS_LIST}`:
+      return {
+        ...state,
+        contentReadStatusList: action.workspaceReadStatusList
+          .filter(content => content.read_by_user)
+          .map(content => content.content_id)
+      }
+
     default:
       return state
   }

frontend/src/reducer/workspaceContentList.js

@@ -16,7 +16,7 @@ export default function workspaceContentList (state = [], action) {
         type: wsc.content_type,
         idWorkspace: wsc.workspace_id,
         isArchived: wsc.is_archived,
-        parentId: wsc.parent_id,
+        idParent: wsc.parent_id,
         isDeleted: wsc.is_deleted,
         showInUi: wsc.show_in_ui,
         statusSlug: wsc.status,

frontend_lib/dist/index.html

@@ -17,6 +17,6 @@
 
   <div id='content'></div>
 
-  <script type='text/javascript' src='./tracim_lib.dev.js'></script>
+  <script type='text/javascript' src='./tracim_frontend_lib.dev.js'></script>
 </body>
 </html>

frontend_lib/package.json

@@ -7,8 +7,8 @@
     "servdev": "NODE_ENV=development webpack-dev-server --watch --colors --inline --hot --progress",
     "servdevwindoz": "set NODE_ENV=development&& webpack-dev-server --watch --colors --inline --hot --progress",
     "servdev-dashboard": "NODE_ENV=development webpack-dashboard -m -p 9870 -- webpack-dev-server --watch --colors --inline --hot --progress",
-    "buildwindoz": "set NODE_ENV=production&& webpack -p",
-    "build": "NODE_ENV=production webpack -p",
+    "buildwindoz": "echo 'Only use npm run buildtracimlibwindoz'",
+    "build": "echo 'Only use npm run buildtracimlib'",
     "build-translation": "node i18next.scanner.js",
     "buildtracimlib": "NODE_ENV=production webpack -p && echo '/* eslint-disable */' | cat - dist/tracim_frontend_lib.js > temp && mv temp dist/tracim_frontend_lib.js && printf '\n/* eslint-enable */\n' >> dist/tracim_frontend_lib.js",
     "buildtracimlibwindoz": "set NODE_ENV=production&& webpack -p && echo /* eslint-disable */ | cat - dist/tracim_frontend_lib.js > temp && mv temp dist/tracim_frontend_lib.js && echo /* eslint-enable */>> dist/tracim_frontend_lib.js",

frontend_lib/src/component/Input/Checkbox.jsx

@@ -0,0 +1,68 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import classnames from 'classnames'
+
+const style = {
+  label: {
+    position: 'relative',
+    width: '18px',
+    height: '18px',
+    border: '1px solid #999',
+    borderRadius: '3px',
+    backgroundColor: '#eee',
+    cursor: 'pointer'
+  },
+  checked: {
+    position: 'absolute',
+    top: '-3px',
+    left: '2px',
+    fontSize: '18px',
+    color: '#333'
+  },
+  input: {
+    width: '0',
+    height: '0',
+    visibility: 'hidden'
+  },
+  disabled: {
+    cursor: 'default'
+  }
+}
+
+export const Checkbox = props =>
+  <label
+    className={classnames('checkboxCustom', {'checked': props.checked})}
+    style={{
+      ...style.label,
+      ...(props.disabled ? style.disabled : {})
+    }}
+    onClick={props.onClickCheckbox}
+  >
+    { props.checked && <div className='checboxCustom__checked' style={style.checked}>✔</div> }
+    <input
+      type='checkbox'
+      name={`checkbox-${props.name}`}
+      checked={props.checked}
+      defaultChecked={props.defaultChecked}
+      onChange={() => {}} // to remove warning
+      style={style.input}
+      disabled={props.disabled}
+    />
+  </label>
+
+Checkbox.propTypes = {
+  name: PropTypes.string.isRequired,
+  onClickCheckbox: PropTypes.func.isRequired,
+  checked: PropTypes.bool,
+  defaultChecked: PropTypes.bool,
+  disabled: PropTypes.bool
+}
+
+Checkbox.defaultProps = {
+  name: '',
+  onClickCheckbox: () => {},
+  checked: false,
+  disabled: false
+}
+
+export default Checkbox

frontend_lib/src/index.dev.js

@@ -8,6 +8,7 @@ import PopinFixedContent from './component/PopinFixed/PopinFixedContent.jsx'
 
 import TextAreaApp from './component/Input/TextAreaApp/TextAreaApp.jsx'
 import BtnSwitch from './component/Input/BtnSwitch/BtnSwitch.jsx'
+import Checkbox from './component/Input/Checkbox.jsx'
 
 import Timeline from './component/Timeline/Timeline.jsx'
 import TimelineDebugData from './component/Timeline/debugData.js'
@@ -17,6 +18,7 @@ import Delimiter from './component/Delimiter/Delimiter.jsx'
 import CardPopup from './component/CardPopup/CardPopup.jsx'
 import CardPopupCreateContent from './component/CardPopup/CardPopupCreateContent.jsx'
 
+
 import NewVersionButton from './component/OptionComponent/NewVersionBtn.jsx'
 import ArchiveDeleteContent from './component/OptionComponent/ArchiveDeleteContent.jsx'
 
@@ -78,6 +80,11 @@ ReactDOM.render(
           <span>Here will be the app content. Style is handled by the app (obviously)</span>
           <BtnSwitch />
           {/* <TextAreaApp customClass={'randomClass'} text={'woot'} /> */}
+          <Checkbox
+            name='osef'
+            onClickCheckbox={() => {}}
+            checked
+          />
         </div>
 
         <Timeline

frontend_lib/src/index.js

@@ -1,8 +1,7 @@
-import { libAddAllResourceI18n, libHandleFetchResult } from './helper.js'
-
-// fr and en are deprecated
-import fr from './translate/fr.js'
-import en from './translate/en.js'
+import {
+  libAddAllResourceI18n,
+  libHandleFetchResult
+} from './helper.js'
 
 import libPopinFixed from './component/PopinFixed/PopinFixed.jsx'
 import libPopinFixedHeader from './component/PopinFixed/PopinFixedHeader.jsx'
@@ -13,6 +12,7 @@ import libTimeline from './component/Timeline/Timeline.jsx'
 
 import libTextAreaApp from './component/Input/TextAreaApp/TextAreaApp.jsx'
 import libBtnSwitch from './component/Input/BtnSwitch/BtnSwitch.jsx'
+import libCheckbox from './component/Input/Checkbox.jsx'
 
 import libPageWrapper from './component/Layout/PageWrapper.jsx'
 import libPageTitle from './component/Layout/PageTitle.jsx'
@@ -27,9 +27,6 @@ import libNewVersionBtn from './component/OptionComponent/NewVersionBtn.jsx'
 import libArchiveDeleteContent from './component/OptionComponent/ArchiveDeleteContent.jsx'
 import libSelectStatus from './component/Input/SelectStatus/SelectStatus.jsx'
 
-export const langFr = fr
-export const langEn = en
-
 export const addAllResourceI18n = libAddAllResourceI18n
 
 export const handleFetchResult = libHandleFetchResult
@@ -43,6 +40,7 @@ export const Timeline = libTimeline
 
 export const TextAreaApp = libTextAreaApp
 export const BtnSwitch = libBtnSwitch
+export const Checkbox = libCheckbox
 
 export const PageWrapper = libPageWrapper
 export const PageTitle = libPageTitle

install_frontend_dependencies.sh

@@ -1,51 +1,68 @@
 #!/bin/bash
 
+# shellcheck disable=SC1091
 . bash_library.sh # source bash_library.sh
 
 # install Tracim Lib
 
 log "cd frontend_lib"
-cd frontend_lib
-log "npm i"
-npm i
-log "sudo npm link"
-sudo npm link
-cd -
+(
+  cd frontend_lib
+  log "npm i"
+  npm i
+  log "sudo npm link"
+  sudo npm link
+)
 
 # install app Html Document
 
 log "cd frontend_app_html-document"
-cd frontend_app_html-document
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  cd frontend_app_html-document
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install app Thread
 
 log "cd frontend_app_thread"
-cd frontend_app_thread
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  cd frontend_app_thread
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
+
+# install app Workspace
+
+log "cd frontend_app_workspace"
+(
+  cd frontend_app_workspace
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install app Admin Workspace User
 
 log "cd frontend_app_admin_workspace_user"
-cd frontend_app_admin_workspace_user
-log "npm i"
-npm i
-log "npm link tracim_frontend_lib"
-npm link tracim_frontend_lib
-cd -
+(
+  cd frontend_app_admin_workspace_user
+  log "npm i"
+  npm i
+  log "npm link tracim_frontend_lib"
+  npm link tracim_frontend_lib
+)
 
 # install Tracim Frontend
 
 log "cd frontend"
-cd frontend
-log "npm i"
-npm i
-cd -
+(
+  cd frontend
+  log "npm i"
+  npm i
+)