fix import issue with merging

.travis.yml

@@ -23,6 +23,7 @@ matrix:
         - cd backend
       install:
         - pip install --upgrade pip setuptools
+        - pip install -e .
         - pip install -e ".[testing]"
         - pip install pytest-cov
         - pip install python-coveralls

backend/README.md

@@ -77,25 +77,41 @@ Initialize the database using [tracimcli](doc/cli.md) tool
 
     tracimcli db init
 
+Stamp current version of database to last (useful for migration):
+
+    alembic -c development.ini stamp head
+
 create wsgidav configuration file for webdav:
 
     cp wsgidav.conf.sample wsgidav.conf
 
-## Run Tracim_backend ##
+## Run Tracim_backend With Uwsgi : great for production ##
 
-### With Uwsgi ###
 
-Run all services with uwsgi
+#### Install Uwsgi
+
+You can either install uwsgi with pip or with you distrib package manager:
 
     # install uwsgi with pip ( unneeded if you already have uwsgi with python3 plugin enabled)
     sudo pip3 install uwsgi
+
+or on debian 9 :
+
+    # install uwsgi on debian 9
+    sudo apt install uwsgi uwsgi-plugin-python3
+
+### All in terminal way ###
+
+
+Run all services with uwsgi
+
     # set tracim_conf_file path
     export TRACIM_CONF_PATH="$(pwd)/development.ini"
     export TRACIM_WEBDAV_CONF_PATH="$(pwd)/wsgidav.conf"
     # pyramid webserver
-    uwsgi -d /tmp/tracim_web.log --http-socket :6543 --wsgi-file wsgi/web.py -H env --pidfile /tmp/tracim_web.pid
+    uwsgi -d /tmp/tracim_web.log --http-socket :6543 --plugin python3 --wsgi-file wsgi/web.py -H env --pidfile /tmp/tracim_web.pid
     # webdav wsgidav server
-    uwsgi -d /tmp/tracim_webdav.log --http-socket :3030 --wsgi-file wsgi/webdav.py -H env --pidfile /tmp/tracim_webdav.pid
+    uwsgi -d /tmp/tracim_webdav.log --http-socket :3030 --plugin python3 --wsgi-file wsgi/webdav.py -H env --pidfile /tmp/tracim_webdav.pid
 
 to stop them:
 
@@ -104,7 +120,37 @@ to stop them:
     # webdav wsgidav server
     uwsgi --stop /tmp/tracim_webdav.pid
 
-### With Waitress (legacy way, usefull for debug) ###
+## With Uwsgi ini script file ##
+
+You can also preset uwsgi config for tracim, this way, creating this kind of .ini file:
+
+    # You need to replace <PATH> with correct absolute path
+    [uwsgi]
+    plugins = python3
+    chdir = <PATH>/tracim_v2/backend/
+    module = wsgi.web:application
+    home = <PATH>/tracim_v2/backend/env/
+    env = TRACIM_CONF_PATH=<PATH>/tracim_v2/backend/development.ini
+
+and :
+
+    # You need to replace <PATH> with correct absolute path
+    [uwsgi]
+    plugins = python3
+    chdir = <PATH>/tracim_v2/backend/
+    module = wsgi.webdav:application
+    home = <PATH>/tracim_v2/backend/env/
+    env = TRACIM_CONF_PATH=<PATH>/tracim_v2/backend/development.ini
+    env = TRACIM_WEBDAV_CONF_PATH=<PATH>/tracim_v2/backend/wsgidav.conf
+
+You can then run the process this way :
+
+    # You need to replace <WSGI_CONF_WEB> with correct path
+    uwsgi --ini <WSGI_CONF_WEB>.ini --http-socket :6543
+    # You need to replace <WSGI_CONF_WEBDAV> with correct path
+    uwsgi --ini <WSGI_CONF_WEBDAV>.ini --http-socket :3030
+
+### Run Tracim_Backend with Waitress : legacy way, usefull for debug and dev ###
 
 run tracim_backend web api:
 
@@ -159,4 +205,8 @@ For example, with default config:
 
 In Tracim, only some user can access to some informations, this is also true in
 Tracim REST API. you can check the [roles documentation](doc/roles.md) to check
-what a specific user can do.
+what a specific user can do.
+
+# Known issues
+
+see [here](doc/known_issues.md)

backend/doc/known_issues.md

@@ -0,0 +1,23 @@
+# Known issue with Tracim Backend
+
+## Uwsgi
+
+### plaster.exceptions.LoaderNotFound
+
+If you obtain error with :
+
+
+    plaster.exceptions.LoaderNotFound: Could not find a matching loader for the scheme "file+ini"".
+
+
+you most probably don't set correctly TRACIM_CONF_PATH or TRACIM_WEBDAV_CONF_PATH.
+You have to set a correct absolute path.
+be careful for uwsgi ini file :
+
+
+    # incorrect
+    env = TRACIM_CONF_PATH="/home/me/tracim_v2/backend/development.ini"
+
+    # correct
+    env = TRACIM_CONF_PATH=/home/me/tracim_v2/backend/development.ini
+

backend/doc/migration.md

@@ -28,6 +28,10 @@ and active the Tracim virtualenv:
 
     alembic -c development.ini current
 
+## Set Alembic stamp to last version (first time use) ##
+
+    alembic -c development.ini stamp head
+
 ### Creating new schema migration ###
 
 This creates a new auto-generated python migration file 

backend/doc/roles.md

@@ -9,7 +9,7 @@ The other is workspace related and is called "workspace role".
 
 |                               | Normal User | Managers    | Admin          |
 |-------------------------------|-------------|-------------|----------------|
-| slug                            | users       | managers    | administrators |
+| slug                          | users       | managers    | administrators |
 |-------------------------------|-------------|-------------|---------|
 
 
@@ -20,9 +20,11 @@ The other is workspace related and is called "workspace role".
 |-------------------------------|-------------|-------------|---------|
 | create workspace              |  no         | yes         | yes     |
 | invite user to tracim         |  no         | yes, if manager of a given workspace         | yes     |
+| delete workspace              |  no         | yes, if manager of a given workspace         | yes     |
 |-------------------------------|-------------|-------------|---------|
 | set user global profile rights|  no         | no          | yes     |
-| deactivate user               |  no         | no          | yes     |
+| activate/deactivate user      |  no         | no          | yes     |
+| delete user/ undelete user    |  no         | no          | yes     |
 |-------------------------------|-------------|-------------|---------|
 | access to all user data (/users/{user_id} endpoints) |personal-only|personal-only| yes     |
 

backend/tracim_backend/__init__.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
@@ -27,6 +28,7 @@ from tracim_backend.views.core_api.user_controller import UserController
 from tracim_backend.views.core_api.workspace_controller import WorkspaceController
 from tracim_backend.views.contents_api.comment_controller import CommentController
 from tracim_backend.views.contents_api.file_controller import FileController
+from tracim_backend.views.contents_api.folder_controller import FolderController
 from tracim_backend.views.frontend import FrontendController
 from tracim_backend.views.errors import ErrorSchema
 from tracim_backend.exceptions import NotAuthenticated
@@ -115,6 +117,7 @@ def web(global_config, **local_settings):
     html_document_controller = HTMLDocumentController()
     thread_controller = ThreadController()
     file_controller = FileController()
+    folder_controller = FolderController()
     configurator.include(session_controller.bind, route_prefix=BASE_API_V2)
     configurator.include(system_controller.bind, route_prefix=BASE_API_V2)
     configurator.include(user_controller.bind, route_prefix=BASE_API_V2)
@@ -123,6 +126,7 @@ def web(global_config, **local_settings):
     configurator.include(html_document_controller.bind, route_prefix=BASE_API_V2)  # nopep8
     configurator.include(thread_controller.bind, route_prefix=BASE_API_V2)
     configurator.include(file_controller.bind, route_prefix=BASE_API_V2)
+    configurator.include(folder_controller.bind, route_prefix=BASE_API_V2)
 
     if app_config.FRONTEND_SERVE:
         configurator.include('pyramid_mako')

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/content.py

@@ -26,6 +26,8 @@ from sqlalchemy.sql.elements import and_
 from tracim_backend.lib.utils.utils import cmp_to_key
 from tracim_backend.lib.core.notifications import NotifierFactory
 from tracim_backend.exceptions import SameValueError
+from tracim_backend.exceptions import UnallowedSubContent
+from tracim_backend.exceptions import ContentTypeNotExist
 from tracim_backend.exceptions import PageOfPreviewNotFound
 from tracim_backend.exceptions import PreviewDimNotAllowed
 from tracim_backend.exceptions import RevisionDoesNotMatchThisContent
@@ -408,13 +410,37 @@ class ContentApi(object):
 
     def create(self, content_type_slug: str, workspace: Workspace, parent: Content=None, label: str = '', filename: str = '', do_save=False, is_temporary: bool=False, do_notify=True) -> Content:
         # TODO - G.M - 2018-07-16 - raise Exception instead of assert
-        assert content_type_slug in CONTENT_TYPES.query_allowed_types_slugs()
         assert content_type_slug != CONTENT_TYPES.Any_SLUG
         assert not (label and filename)
 
         if content_type_slug == CONTENT_TYPES.Folder.slug and not label:
             label = self.generate_folder_label(workspace, parent)
 
+        # TODO BS 2018-08-13: Despite that workspace is required, create_comment
+        # can call here with None. Must update create_comment tu require the
+        # workspace.
+        if not workspace:
+            workspace = parent.workspace
+
+        content_type = CONTENT_TYPES.get_one_by_slug(content_type_slug)
+        if parent and parent.properties and 'allowed_content' in parent.properties:
+            if content_type.slug not in parent.properties['allowed_content'] or not parent.properties['allowed_content'][content_type.slug]:
+                raise UnallowedSubContent(' SubContent of type {subcontent_type}  not allowed in content {content_id}'.format(  # nopep8
+                    subcontent_type=content_type.slug,
+                    content_id=parent.content_id,
+                ))
+        if not workspace and parent:
+            workspace = parent.workspace
+
+        if workspace:
+            if content_type.slug not in workspace.get_allowed_content_types():
+                raise UnallowedSubContent(
+                    ' SubContent of type {subcontent_type}  not allowed in workspace {content_id}'.format(  # nopep8
+                        subcontent_type=content_type.slug,
+                        content_id=workspace.workspace_id,
+                    )
+                )
+
         content = Content()
 
         if filename:
@@ -433,8 +459,9 @@ class ContentApi(object):
 
         content.owner = self._user
         content.parent = parent
+
         content.workspace = workspace
-        content.type = content_type_slug
+        content.type = content_type.slug
         content.is_temporary = is_temporary
         content.revision_type = ActionDescription.CREATION
 
@@ -450,18 +477,20 @@ class ContentApi(object):
         return content
 
     def create_comment(self, workspace: Workspace=None, parent: Content=None, content:str ='', do_save=False) -> Content:
+        # TODO: check parent allowed_type and workspace allowed_ type
         assert parent and parent.type != CONTENT_TYPES.Folder.slug
         if not content:
             raise EmptyCommentContentNotAllowed()
-        item = Content()
-        item.owner = self._user
-        item.parent = parent
-        if not workspace:
-            workspace = item.parent.workspace
-        item.workspace = workspace
-        item.type = CONTENT_TYPES.Comment.slug
+
+        item = self.create(
+            content_type_slug=CONTENT_TYPES.Comment.slug,
+            workspace=workspace,
+            parent=parent,
+            do_notify=False,
+            do_save=False,
+            label='',
+        )
         item.description = content
-        item.label = ''
         item.revision_type = ActionDescription.COMMENT
 
         if do_save:
@@ -1001,6 +1030,13 @@ class ContentApi(object):
             else:
                 related_active_content = content
 
+            # INFO - G.M - 2018-08-10 - re-apply general filters here to avoid
+            # issue with comments
+            if not self._show_deleted and related_active_content.is_deleted:
+                continue
+            if not self._show_archived and related_active_content.is_archived:
+                continue
+
             if related_active_content not in active_contents and related_active_content not in too_recent_content:  # nopep8
 
                 if not before_content or before_content_find:
@@ -1076,9 +1112,9 @@ class ContentApi(object):
     #
     #     return result
 
-    def set_allowed_content(self, folder: Content, allowed_content_dict:dict):
+    def _set_allowed_content(self, content: Content, allowed_content_dict: dict) -> None:  # nopep8
         """
-        :param folder: the given folder instance
+        :param content: the given content instance
         :param allowed_content_dict: must be something like this:
             dict(
                 folder = True
@@ -1086,10 +1122,37 @@ class ContentApi(object):
                 file = False,
                 page = True
             )
-        :return:
+        :return: nothing
+        """
+        properties = content.properties.copy()
+        properties['allowed_content'] = allowed_content_dict
+        content.properties = properties
+
+    def set_allowed_content(self, content: Content, allowed_content_type_slug_list: typing.List[str]) -> None:  # nopep8
+        """
+        :param content: the given content instance
+        :param allowed_content_type_slug_list: list of content_type_slug to
+        accept as subcontent.
+        :return: nothing
+        """
+        allowed_content_dict = {}
+        for allowed_content_type_slug in allowed_content_type_slug_list:
+            if allowed_content_type_slug not in CONTENT_TYPES.extended_endpoint_allowed_types_slug():
+                raise ContentTypeNotExist('Content_type {} does not exist'.format(allowed_content_type_slug))  # nopep8
+            allowed_content_dict[allowed_content_type_slug] = True
+
+        self._set_allowed_content(content, allowed_content_dict)
+
+    def restore_content_default_allowed_content(self, content: Content) -> None:
+        """
+        Return to default allowed_content_types
+        :param content: the given content instance
+        :return: nothing
         """
-        properties = dict(allowed_content = allowed_content_dict)
-        folder.properties = properties
+        if content._properties and 'allowed_content' in content._properties:
+            properties = content.properties.copy()
+            del properties['allowed_content']
+            content.properties = properties
 
     def set_status(self, content: Content, new_status: str):
         if new_status in CONTENT_STATUS.get_all_slugs_values():

backend/tracim_backend/lib/core/user.py

@@ -35,13 +35,18 @@ class UserApi(object):
             current_user: typing.Optional[User],
             session: Session,
             config: CFG,
+            show_deleted: bool = False,
     ) -> None:
         self._session = session
         self._user = current_user
         self._config = config
+        self._show_deleted = show_deleted
 
     def _base_query(self):
-        return self._session.query(User)
+        query = self._session.query(User)
+        if not self._show_deleted:
+            query = query.filter(User.is_deleted == False)
+        return query
 
     def get_user_with_context(self, user: User) -> UserInContext:
         """
@@ -404,6 +409,16 @@ class UserApi(object):
         if do_save:
             self.save(user)
 
+    def delete(self, user: User, do_save=False):
+        user.is_deleted = True
+        if do_save:
+            self.save(user)
+
+    def undelete(self, user: User, do_save=False):
+        user.is_deleted = False
+        if do_save:
+            self.save(user)
+
     def save(self, user: User):
         self._session.flush()
 

backend/tracim_backend/lib/core/workspace.py

@@ -27,7 +27,8 @@ class WorkspaceApi(object):
             session: Session,
             current_user: User,
             config: CFG,
-            force_role: bool=False
+            force_role: bool=False,
+            show_deleted: bool=False,
     ):
         """
         :param current_user: Current user of context
@@ -37,18 +38,22 @@ class WorkspaceApi(object):
         self._user = current_user
         self._config = config
         self._force_role = force_role
+        self.show_deleted = show_deleted
 
     def _base_query_without_roles(self):
-        return self._session.query(Workspace).filter(Workspace.is_deleted == False)
+        query = self._session.query(Workspace)
+        if not self.show_deleted:
+            query = query.filter(Workspace.is_deleted == False)
+        return query
 
     def _base_query(self):
         if not self._force_role and self._user.profile.id>=Group.TIM_ADMIN:
             return self._base_query_without_roles()
 
-        return self._session.query(Workspace).\
-            join(Workspace.roles).\
-            filter(UserRoleInWorkspace.user_id == self._user.user_id).\
-            filter(Workspace.is_deleted == False)
+        query = self._base_query_without_roles()
+        query = query.join(Workspace.roles).\
+            filter(UserRoleInWorkspace.user_id == self._user.user_id)
+        return query
 
     def get_workspace_with_context(
             self,
@@ -207,17 +212,13 @@ class WorkspaceApi(object):
     def save(self, workspace: Workspace):
         self._session.flush()
 
-    def delete_one(self, workspace_id, flush=True):
-        workspace = self.get_one(workspace_id)
+    def delete(self, workspace: Workspace, flush=True):
         workspace.is_deleted = True
 
         if flush:
             self._session.flush()
 
-    def restore_one(self, workspace_id, flush=True):
-        workspace = self._session.query(Workspace)\
-            .filter(Workspace.is_deleted==True)\
-            .filter(Workspace.workspace_id==workspace_id).one()
+    def undelete(self, workspace: Workspace, flush=True):
         workspace.is_deleted = False
 
         if flush:

backend/tracim_backend/lib/utils/authorization.py

@@ -90,6 +90,40 @@ def require_profile(group: int) -> typing.Callable:
     return decorator
 
 
+def require_profile_or_other_profile_with_workspace_role(
+        allow_all_group: int,
+        allow_if_role_group: int,
+        minimal_required_role: int,
+) -> typing.Callable:
+    """
+    Allow access for allow_all_group profile
+    or allow access for allow_if_role_group
+    profile if mininal_required_role is correct.
+    :param allow_all_group: value from Group Object
+    like Group.TIM_USER or Group.TIM_MANAGER
+    :param allow_if_role_group: value from Group Object
+    like Group.TIM_USER or Group.TIM_MANAGER
+    :param minimal_required_role: value from UserInWorkspace Object like
+    UserRoleInWorkspace.CONTRIBUTOR or UserRoleInWorkspace.READER
+    :return: decorator
+    """
+    def decorator(func: typing.Callable) -> typing.Callable:
+        @functools.wraps(func)
+        def wrapper(self, context, request: 'TracimRequest') -> typing.Callable:
+            user = request.current_user
+            workspace = request.current_workspace
+            if user.profile.id >= allow_all_group:
+                return func(self, context, request)
+            elif user.profile.id >= allow_if_role_group:
+                if workspace.get_user_role(user) >= minimal_required_role:
+                    return func(self, context, request)
+                raise InsufficientUserRoleInWorkspace()
+            else:
+                raise InsufficientUserProfile()
+        return wrapper
+    return decorator
+
+
 def require_workspace_role(minimal_required_role: int) -> typing.Callable:
     """
     Restricts access to endpoint to minimal role or raise an exception.

backend/tracim_backend/lib/utils/request.py

@@ -293,7 +293,7 @@ class TracimRequest(Request):
         :return: user found from header/body
         """
         app_config = request.registry.settings['CFG']
-        uapi = UserApi(None, session=request.dbsession, config=app_config)
+        uapi = UserApi(None, show_deleted=True, session=request.dbsession, config=app_config)
         login = ''
         try:
             login = None
@@ -355,7 +355,8 @@ class TracimRequest(Request):
             wapi = WorkspaceApi(
                 current_user=user,
                 session=request.dbsession,
-                config=request.registry.settings['CFG']
+                config=request.registry.settings['CFG'],
+                show_deleted=True,
             )
             workspace = wapi.get_one(workspace_id)
         except NoResultFound as exc:
@@ -390,7 +391,8 @@ class TracimRequest(Request):
             wapi = WorkspaceApi(
                 current_user=user,
                 session=request.dbsession,
-                config=request.registry.settings['CFG']
+                config=request.registry.settings['CFG'],
+                show_deleted=True,
             )
             workspace = wapi.get_one(workspace_id)
         except JSONDecodeError as exc:

backend/tracim_backend/lib/webdav/resources.py

@@ -295,14 +295,6 @@ class WorkspaceResource(DAVCollection):
             parent=self.content
         )
 
-        subcontent = dict(
-            folder=True,
-            thread=True,
-            file=True,
-            page=True
-        )
-
-        self.content_api.set_allowed_content(folder, subcontent)
         self.content_api.save(folder)
 
         transaction.commit()

backend/tracim_backend/migration/versions/78b52ca39419_add_is_deleted_to_user.py

@@ -0,0 +1,26 @@
+"""add_is_deleted_to_user
+
+Revision ID: 78b52ca39419
+Revises: ad79f58ec2bf
+Create Date: 2018-08-09 15:50:49.656925
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '78b52ca39419'
+down_revision = 'ad79f58ec2bf'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('is_deleted', sa.Boolean(), server_default=sa.sql.expression.literal(False), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'is_deleted')
+    # ### end Alembic commands ###

backend/tracim_backend/models/auth.py

@@ -15,6 +15,7 @@ from datetime import datetime
 from hashlib import sha256
 from typing import TYPE_CHECKING
 
+import sqlalchemy
 from sqlalchemy import Column
 from sqlalchemy import ForeignKey
 from sqlalchemy import Sequence
@@ -135,6 +136,7 @@ class User(DeclarativeBase):
     _password = Column('password', Unicode(128))
     created = Column(DateTime, default=datetime.utcnow)
     is_active = Column(Boolean, default=True, nullable=False)
+    is_deleted = Column(Boolean, default=False, nullable=False, server_default=sqlalchemy.sql.expression.literal(False))
     imported_from = Column(Unicode(32), nullable=True)
     timezone = Column(Unicode(255), nullable=False, server_default='')
     # TODO - G.M - 04-04-2018 - [auth] Check if this is already needed

backend/tracim_backend/models/contents.py

@@ -122,6 +122,7 @@ class ContentType(object):
             creation_label: str,
             available_statuses: typing.List[ContentStatus],
             slug_alias: typing.List[str] = None,
+            allow_sub_content: bool = False,
     ):
         self.slug = slug
         self.fa_icon = fa_icon
@@ -130,6 +131,7 @@ class ContentType(object):
         self.creation_label = creation_label
         self.available_statuses = available_statuses
         self.slug_alias = slug_alias
+        self.allow_sub_content = allow_sub_content
 
 
 thread_type = ContentType(
@@ -177,6 +179,7 @@ folder_type = ContentType(
     label='Folder',
     creation_label='Create a folder',
     available_statuses=CONTENT_STATUS.get_all(),
+    allow_sub_content=True,
 )
 
 
@@ -226,6 +229,7 @@ class ContentTypeList(object):
         """
         content_types = self._content_types.copy()
         content_types.extend(self._special_contents_types)
+        content_types.append(self.Event)
         for item in content_types:
             if item.slug == slug or (item.slug_alias and slug in item.slug_alias):  # nopep8
                 return item
@@ -241,6 +245,12 @@ class ContentTypeList(object):
         allowed_type_slug = [contents_type.slug for contents_type in self._content_types]  # nopep8
         return allowed_type_slug
 
+    def extended_endpoint_allowed_types_slug(self) -> typing.List[str]:
+        allowed_types_slug = self.endpoint_allowed_types_slug().copy()
+        for content_type in self._special_contents_types:
+            allowed_types_slug.append(content_type.slug)
+        return allowed_types_slug
+
     def query_allowed_types_slugs(self) -> typing.List[str]:
         """
         Return alls allowed types slug : content_type slug + all alias, any
@@ -257,6 +267,18 @@ class ContentTypeList(object):
         allowed_types_slug.extend(self._extra_slugs)
         return allowed_types_slug
 
+    def default_allowed_content_properties(self, slug) -> dict:
+        content_type = self.get_one_by_slug(slug)
+        if content_type.allow_sub_content:
+            sub_content_allowed = self.extended_endpoint_allowed_types_slug()
+        else:
+            sub_content_allowed = [self.Comment.slug]
+
+        properties_dict = {}
+        for elem in sub_content_allowed:
+            properties_dict[elem] = True
+        return properties_dict
+
 
 CONTENT_TYPES = ContentTypeList(
     [

backend/tracim_backend/models/context_models.py

@@ -297,10 +297,10 @@ class ContentCreation(object):
     Content creation model
     """
     def __init__(
-            self,
-            label: str,
-            content_type: str,
-            parent_id: typing.Optional[int] = None,
+        self,
+        label: str,
+        content_type: str,
+        parent_id: typing.Optional[int] = None,
     ) -> None:
         self.label = label
         self.content_type = content_type
@@ -312,8 +312,8 @@ class CommentCreation(object):
     Comment creation model
     """
     def __init__(
-            self,
-            raw_content: str,
+        self,
+        raw_content: str,
     ) -> None:
         self.raw_content = raw_content
 
@@ -323,8 +323,8 @@ class SetContentStatus(object):
     Set content status
     """
     def __init__(
-            self,
-            status: str,
+        self,
+        status: str,
     ) -> None:
         self.status = status
 
@@ -334,12 +334,27 @@ class TextBasedContentUpdate(object):
     TextBasedContent update model
     """
     def __init__(
-            self,
-            label: str,
-            raw_content: str,
+        self,
+        label: str,
+        raw_content: str,
+    ) -> None:
+        self.label = label
+        self.raw_content = raw_content
+
+
+class FolderContentUpdate(object):
+    """
+    Folder Content update model
+    """
+    def __init__(
+        self,
+        label: str,
+        raw_content: str,
+        sub_content_types: typing.List[str],
     ) -> None:
         self.label = label
         self.raw_content = raw_content
+        self.sub_content_types = sub_content_types
 
 
 class TypeUser(Enum):
@@ -393,6 +408,10 @@ class UserInContext(object):
     def profile(self) -> Profile:
         return self.user.profile.name
 
+    @property
+    def is_deleted(self) -> bool:
+        return self.user.is_deleted
+
     # Context related
 
     @property
@@ -457,6 +476,13 @@ class WorkspaceInContext(object):
         return slugify(self.workspace.label)
 
     @property
+    def is_deleted(self) -> bool:
+        """
+        Is the workspace deleted ?
+        """
+        return self.workspace.is_deleted
+
+    @property
     def sidebar_entries(self) -> typing.List[WorkspaceMenuEntry]:
         """
         get sidebar entries, those depends on activated apps.

backend/tracim_backend/models/data.py

@@ -32,15 +32,6 @@ from tracim_backend.models.meta import DeclarativeBase
 from tracim_backend.models.auth import User
 from tracim_backend.models.roles import WorkspaceRoles
 
-DEFAULT_PROPERTIES = dict(
-    allowed_content=dict(
-        folder=True,
-        file=True,
-        page=True,
-        thread=True,
-    ),
-)
-
 
 class Workspace(DeclarativeBase):
 
@@ -96,7 +87,7 @@ class Workspace(DeclarativeBase):
 
     def get_allowed_content_types(self):
         # @see Content.get_allowed_content_types()
-        return CONTENT_TYPES.endpoint_allowed_types_slug()
+        return CONTENT_TYPES.extended_endpoint_allowed_types_slug()
 
     def get_valid_children(
             self,
@@ -545,22 +536,8 @@ class ContentChecker(object):
 
     @classmethod
     def check_properties(cls, item):
-        if item.type == CONTENT_TYPES.Folder.slug:
-            properties = item.properties
-            if 'allowed_content' not in properties.keys():
-                return False
-            if 'folders' not in properties['allowed_content']:
-                return False
-            if 'files' not in properties['allowed_content']:
-                return False
-            if 'pages' not in properties['allowed_content']:
-                return False
-            if 'threads' not in properties['allowed_content']:
-                return False
-            return True
-
+        properties = item.properties
         if item.type == CONTENT_TYPES.Event.slug:
-            properties = item.properties
             if 'name' not in properties.keys():
                 return False
             if 'raw' not in properties.keys():
@@ -570,22 +547,16 @@ class ContentChecker(object):
             if 'end' not in properties.keys():
                 return False
             return True
-
-        # TODO - G.M - 15-03-2018 - Choose only correct Content-type for origin
-        # Only content who can be copied need this
-        if item.type == CONTENT_TYPES.Any_SLUG:
-            properties = item.properties
+        else:
+            if 'allowed_content' in properties.keys():
+                for content_slug, value in properties['allowed_content'].items():  # nopep8
+                    if not isinstance(value, bool):
+                        return False
+                    if not content_slug in CONTENT_TYPES.extended_endpoint_allowed_types_slug():  # nopep8
+                        return False
             if 'origin' in properties.keys():
-                return True
-        raise NotImplementedError
-
-    @classmethod
-    def reset_properties(cls, item):
-        if item.type == CONTENT_TYPES.Folder.slug:
-            item.properties = DEFAULT_PROPERTIES
-            return
-
-        raise NotImplementedError
+                pass
+            return True
 
 
 class ContentRevisionRO(DeclarativeBase):
@@ -1204,9 +1175,15 @@ class Content(DeclarativeBase):
     @hybrid_property
     def properties(self) -> dict:
         """ return a structure decoded from json content of _properties """
+
         if not self._properties:
-            return DEFAULT_PROPERTIES
-        return json.loads(self._properties)
+            properties = {}
+        else:
+            properties = json.loads(self._properties)
+        if CONTENT_TYPES.get_one_by_slug(self.type) != CONTENT_TYPES.Event:
+            if not 'allowed_content' in properties:
+                properties['allowed_content'] = CONTENT_TYPES.default_allowed_content_properties(self.type)  # nopep8
+        return properties
 
     @properties.setter
     def properties(self, properties_struct: dict) -> None:
@@ -1347,7 +1324,11 @@ class Content(DeclarativeBase):
             allowed_types = self.properties['allowed_content']
             for type_label, is_allowed in allowed_types.items():
                 if is_allowed:
-                    types.append(CONTENT_TYPES.get_one_by_slug(type_label))
+                   types.append(
+                        CONTENT_TYPES.get_one_by_slug(type_label)
+                   )
+        # TODO BS 2018-08-13: This try/except is not correct: except exception
+        # if we know what to except.
         except Exception as e:
             print(e.__str__())
             print('----- /*\ *****')

backend/tracim_backend/tests/functional/test_contents.py

@@ -24,6 +24,767 @@ from tracim_backend.tests import set_html_document_slug_to_legacy
 from tracim_backend.fixtures.content import Content as ContentFixtures
 from tracim_backend.fixtures.users_and_groups import Base as BaseFixture
 
+class TestFolder(FunctionalTest):
+    """
+    Tests for /api/v2/workspaces/{workspace_id}/folders/{content_id}
+    endpoint
+    """
+
+    fixtures = [BaseFixture]
+
+    def test_api__get_folder__ok_200__nominal_case(self) -> None:
+        """
+        Get one folder content
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test-folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'folder'
+        assert content['content_id'] == folder.content_id
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'test-folder'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'test-folder'
+        assert content['status'] == 'open'
+        assert content['workspace_id'] == test_workspace.workspace_id
+        assert content['current_revision_id'] == folder.revision_id
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['created']
+        assert content['author']
+        assert content['author']['user_id'] == 1
+        assert content['author']['avatar_url'] is None
+        assert content['author']['public_name'] == 'Global manager'
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['modified']
+        assert content['last_modifier']['user_id'] == 1
+        assert content['last_modifier']['public_name'] == 'Global manager'
+        assert content['last_modifier']['avatar_url'] is None
+        assert content['raw_content'] == ''
+
+    def test_api__get_folder__err_400__wrong_content_type(self) -> None:
+        """
+        Get one folder of a content content 7 is not folder
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        thread = content_api.create(
+            label='thread',
+            content_type_slug=CONTENT_TYPES.Thread.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.get(
+            '/api/v2/workspaces/2/folders/7',
+            status=400
+        )
+
+    def test_api__get_folder__err_400__content_does_not_exist(self) -> None:  # nopep8
+        """
+        Get one folder content (content 170 does not exist in db)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        transaction.commit()
+        self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/170'.format(workspace_id=test_workspace.workspace_id),  # nopep8
+            status=400
+        )
+
+    def test_api__get_folder__err_400__content_not_in_workspace(self) -> None:  # nopep8
+        """
+        Get one folders of a content (content is in another workspace)
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        test_workspace2 = workspace_api.create_workspace(
+            label='test2',
+            save_now=True,
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(
+                workspace_id=test_workspace2.workspace_id,
+                content_id=folder.content_id,
+            ),
+            status=400
+        )
+
+    def test_api__get_folder__err_400__workspace_does_not_exist(self) -> None:  # nopep8
+        """
+        Get one folder content (Workspace 40 does not exist)
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/workspaces/40/folders/{content_id}'.format(content_id=folder.content_id),  # nopep8
+            status=400
+        )
+
+    def test_api__get_folder__err_400__workspace_id_is_not_int(self) -> None:  # nopep8
+        """
+        Get one folder content, workspace id is not int
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/workspaces/coucou/folders/{content_id}'.format(content_id=folder.content_id),  # nopep8
+            status=400
+        )
+
+    def test_api__get_folder__err_400__content_id_is_not_int(self) -> None:  # nopep8
+        """
+        Get one folder content, content_id is not int
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/coucou'.format(workspace_id=test_workspace.workspace_id),  # nopep8
+            status=400
+        )
+
+    def test_api__update_folder__err_400__empty_label(self) -> None:  # nopep8
+        """
+        Update(put) one folder content
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': '',
+            'raw_content': '<p> Le nouveau contenu </p>',
+            'sub_content_types': [CONTENT_TYPES.Folder.slug]
+        }
+        self.testapp.put_json(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            params=params,
+            status=400
+        )
+
+    def test_api__update_folder__ok_200__nominal_case(self) -> None:
+        """
+        Update(put) one html document of a content
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'My New label',
+            'raw_content': '<p> Le nouveau contenu </p>',
+            'sub_content_types': [CONTENT_TYPES.Folder.slug]
+        }
+        res = self.testapp.put_json(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            params=params,
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'folder'
+        assert content['content_id'] == folder.content_id
+        assert content['is_archived'] is False
+        assert content['is_deleted'] is False
+        assert content['label'] == 'My New label'
+        assert content['parent_id'] is None
+        assert content['show_in_ui'] is True
+        assert content['slug'] == 'my-new-label'
+        assert content['status'] == 'open'
+        assert content['workspace_id'] == test_workspace.workspace_id
+        assert content['current_revision_id']
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['created']
+        assert content['author']
+        assert content['author']['user_id'] == 1
+        assert content['author']['avatar_url'] is None
+        assert content['author']['public_name'] == 'Global manager'
+        # TODO - G.M - 2018-06-173 - check date format
+        assert content['modified']
+        assert content['last_modifier'] == content['author']
+        assert content['raw_content'] == '<p> Le nouveau contenu </p>'
+        assert content['sub_content_types'] == [CONTENT_TYPES.Folder.slug]
+
+    def test_api__get_folder_revisions__ok_200__nominal_case(
+            self
+    ) -> None:
+        """
+        Get one html document of a content
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test-folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        with new_revision(
+           session=dbsession,
+           tm=transaction.manager,
+           content=folder,
+        ):
+            content_api.update_content(
+                folder,
+                new_label='test-folder-updated',
+                new_content='Just a test'
+            )
+        content_api.save(folder)
+        with new_revision(
+           session=dbsession,
+           tm=transaction.manager,
+           content=folder,
+        ):
+            content_api.archive(
+                folder,
+            )
+        content_api.save(folder)
+        with new_revision(
+           session=dbsession,
+           tm=transaction.manager,
+           content=folder,
+        ):
+            content_api.unarchive(
+                folder,
+            )
+        content_api.save(folder)
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        res = self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}/revisions'.format(  # nopep8
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            status=200
+        )
+        revisions = res.json_body
+        assert len(revisions) == 4
+        revision = revisions[0]
+        assert revision['content_type'] == 'folder'
+        assert revision['content_id'] == folder.content_id
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'] == 'test-folder'
+        assert revision['parent_id'] is None
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] == 'test-folder'
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == test_workspace.workspace_id
+        assert revision['revision_id']
+        assert revision['revision_type'] == 'creation'
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comment_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 1
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Global manager'
+
+        revision = revisions[1]
+        assert revision['content_type'] == 'folder'
+        assert revision['content_id'] == folder.content_id
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'] == 'test-folder-updated'
+        assert revision['parent_id'] is None
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] == 'test-folder-updated'
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == test_workspace.workspace_id
+        assert revision['revision_id']
+        assert revision['revision_type'] == 'edition'
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comment_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 1
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Global manager'
+
+        revision = revisions[2]
+        assert revision['content_type'] == 'folder'
+        assert revision['content_id'] == folder.content_id
+        assert revision['is_archived'] is True
+        assert revision['is_deleted'] is False
+        assert revision['label'] != 'test-folder-updated'
+        assert revision['label'].startswith('test-folder-updated')
+        assert revision['parent_id'] is None
+        assert revision['show_in_ui'] is True
+        assert revision['slug'] != 'test-folder-updated'
+        assert revision['slug'].startswith('test-folder-updated')
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == test_workspace.workspace_id
+        assert revision['revision_id']
+        assert revision['revision_type'] == 'archiving'
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comment_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 1
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Global manager'
+
+        revision = revisions[3]
+        assert revision['content_type'] == 'folder'
+        assert revision['content_id'] == folder.content_id
+        assert revision['is_archived'] is False
+        assert revision['is_deleted'] is False
+        assert revision['label'].startswith('test-folder-updated')
+        assert revision['parent_id'] is None
+        assert revision['show_in_ui'] is True
+        assert revision['slug'].startswith('test-folder-updated')
+        assert revision['status'] == 'open'
+        assert revision['workspace_id'] == test_workspace.workspace_id
+        assert revision['revision_id']
+        assert revision['revision_type'] == 'unarchiving'
+        assert revision['sub_content_types']
+        # TODO - G.M - 2018-06-173 - Test with real comments
+        assert revision['comment_ids'] == []
+        # TODO - G.M - 2018-06-173 - check date format
+        assert revision['created']
+        assert revision['author']
+        assert revision['author']['user_id'] == 1
+        assert revision['author']['avatar_url'] is None
+        assert revision['author']['public_name'] == 'Global manager'
+
+    def test_api__set_folder_status__ok_200__nominal_case(self) -> None:
+        """
+        Get one folder content
+        """
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'status': 'closed-deprecated',
+        }
+
+        # before
+        res = self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(  # nopep8
+                # nopep8
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'folder'
+        assert content['content_id'] == folder.content_id
+        assert content['status'] == 'open'
+
+        # set status
+        self.testapp.put_json(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}/status'.format(  # nopep8
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            params=params,
+            status=204
+        )
+
+        # after
+        res = self.testapp.get(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}'.format(
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            status=200
+        )
+        content = res.json_body
+        assert content['content_type'] == 'folder'
+        assert content['content_id'] == folder.content_id
+        assert content['status'] == 'closed-deprecated'
+
+    def test_api__set_folder_status__err_400__wrong_status(self) -> None:
+        """
+        Get one folder content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'status': 'unexistant-status',
+        }
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        admin = dbsession.query(models.User) \
+            .filter(models.User.email == 'admin@admin.admin') \
+            .one()
+        workspace_api = WorkspaceApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        content_api = ContentApi(
+            current_user=admin,
+            session=dbsession,
+            config=self.app_config
+        )
+        test_workspace = workspace_api.create_workspace(
+            label='test',
+            save_now=True,
+        )
+        folder = content_api.create(
+            label='test_folder',
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=test_workspace,
+            do_save=True,
+            do_notify=False
+        )
+        transaction.commit()
+        self.testapp.put_json(
+            '/api/v2/workspaces/{workspace_id}/folders/{content_id}/status'.format(  # nopep8
+                workspace_id=test_workspace.workspace_id,
+                content_id=folder.content_id,
+            ),
+            params=params,
+            status=400
+        )
+
 
 class TestHtmlDocuments(FunctionalTest):
     """

backend/tracim_backend/tests/functional/test_user.py

@@ -2383,6 +2383,7 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert workspace['workspace_id'] == 1
         assert workspace['label'] == 'Business'
         assert workspace['slug'] == 'business'
+        assert workspace['is_deleted'] is False
         assert len(workspace['sidebar_entries']) == 5
 
         # TODO - G.M - 2018-08-02 - Better test for sidebar entry, make it
@@ -2480,8 +2481,9 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
 
 
 class TestUserEndpoint(FunctionalTest):
+    # -*- coding: utf-8 -*-
     """
-    Tests for GET/POST /api/v2/users/{user_id}
+    Tests for GET /api/v2/users/{user_id}
     """
     fixtures = [BaseFixture]
 
@@ -2533,6 +2535,7 @@ class TestUserEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'bob'
         assert res['timezone'] == 'Europe/Paris'
+        assert res['is_deleted'] is False
 
     def test_api__get_user__ok_200__user_itself(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -2582,6 +2585,7 @@ class TestUserEndpoint(FunctionalTest):
         assert res['email'] == 'test@test.test'
         assert res['public_name'] == 'bob'
         assert res['timezone'] == 'Europe/Paris'
+        assert res['is_deleted'] is False
 
     def test_api__get_user__err_403__other_normal_user(self):
         dbsession = get_tm_session(self.session_factory, transaction.manager)
@@ -2931,11 +2935,57 @@ class TestUserWithNotificationEndpoint(FunctionalTest):
         # TODO - G.M - 2018-08-02 - Place cleanup outside of the test
         requests.delete('http://127.0.0.1:8025/api/v1/messages')
 
+    def test_api_delete_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'
+            )
+        )
+        self.testapp.put(
+            '/api/v2/users/{}/delete'.format(user_id),
+            status=204
+        )
+        res = self.testapp.get(
+            '/api/v2/users/{}'.format(user_id),
+            status=200
+        ).json_body
+        assert res['is_deleted'] is True
+
 
 class TestUsersEndpoint(FunctionalTest):
     # -*- coding: utf-8 -*-
     """
-    Tests for GET /api/v2/users
+    Tests for GET /api/v2/users/{user_id}
     """
     fixtures = [BaseFixture]
 

backend/tracim_backend/tests/library/test_content_api.py

@@ -10,6 +10,8 @@ from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.exceptions import SameValueError
+from tracim_backend.exceptions import EmptyLabelNotAllowed
+from tracim_backend.exceptions import UnallowedSubContent
 # TODO - G.M - 28-03-2018 - [RoleApi] Re-enable RoleApi
 from tracim_backend.lib.core.workspace import RoleApi
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
@@ -101,6 +103,310 @@ class TestContentApi(DefaultTest):
             'value is {} instead of {}'.format(sorteds[1].content_id,
                                                c1.content_id))
 
+    def test_unit__create_content__OK_nominal_case(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        item = api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=None,
+            label='not_deleted',
+            do_save=True
+        )
+        assert isinstance(item, Content)
+
+    def test_unit__create_content__err_empty_label(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        with pytest.raises(EmptyLabelNotAllowed):
+            api.create(
+                content_type_slug=CONTENT_TYPES.Thread.slug,
+                workspace=workspace,
+                parent=None,
+                label='',
+                do_save=True
+            )
+
+    def test_unit__create_content__err_content_type_not_allowed_in_this_folder(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        folder = api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=None,
+            label='plop',
+            do_save=False
+        )
+        allowed_content_dict = {CONTENT_TYPES.Folder.slug: True, CONTENT_TYPES.File.slug: False} # nopep8
+        api._set_allowed_content(
+            folder,
+            allowed_content_dict=allowed_content_dict
+        )
+        api.save(content=folder)
+        # not in list -> do not allow
+        with pytest.raises(UnallowedSubContent):
+            api.create(
+                content_type_slug=CONTENT_TYPES.Event.slug,
+                workspace=workspace,
+                parent=folder,
+                label='lapin',
+                do_save=True
+            )
+        # in list but false -> do not allow
+        with pytest.raises(UnallowedSubContent):
+            api.create(
+                content_type_slug=CONTENT_TYPES.File.slug,
+                workspace=workspace,
+                parent=folder,
+                label='lapin',
+                do_save=True
+            )
+        # in list and true -> allow
+        api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=folder,
+            label='lapin',
+            do_save=True
+        )
+
+    def test_unit__create_content__err_content_type_not_allowed_in_this_workspace(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        with pytest.raises(UnallowedSubContent):
+            api.create(
+                content_type_slug=CONTENT_TYPES.Event.slug,
+                workspace=workspace,
+                parent=None,
+                label='lapin',
+                do_save=True
+           )
+
+    def test_unit__set_allowed_content__ok__private_method(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        folder = api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=None,
+            label='plop',
+            do_save=False
+        )
+        allowed_content_dict = {CONTENT_TYPES.Folder.slug: True, CONTENT_TYPES.File.slug: False}  # nopep8
+        api._set_allowed_content(
+            folder,
+            allowed_content_dict=allowed_content_dict
+        )
+        assert 'allowed_content' in folder.properties
+        assert folder.properties['allowed_content'] == {CONTENT_TYPES.Folder.slug: True, CONTENT_TYPES.File.slug: False}
+
+    def test_unit__set_allowed_content__ok__nominal_case(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        folder = api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=None,
+            label='plop',
+            do_save=False
+        )
+        allowed_content_type_slug_list = [CONTENT_TYPES.Folder.slug, CONTENT_TYPES.File.slug]  # nopep8
+        api.set_allowed_content(
+            folder,
+            allowed_content_type_slug_list=allowed_content_type_slug_list
+        )
+        assert 'allowed_content' in folder.properties
+        assert folder.properties['allowed_content'] == {CONTENT_TYPES.Folder.slug: True, CONTENT_TYPES.File.slug: True}
+
+    def test_unit__restore_content_default_allowed_content__ok__nominal_case(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace('test workspace', save_now=True)
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        )
+        folder = api.create(
+            content_type_slug=CONTENT_TYPES.Folder.slug,
+            workspace=workspace,
+            parent=None,
+            label='plop',
+            do_save=False
+        )
+        allowed_content_type_slug_list = [CONTENT_TYPES.Folder.slug, CONTENT_TYPES.File.slug]  # nopep8
+        api.set_allowed_content(
+            folder,
+            allowed_content_type_slug_list=allowed_content_type_slug_list
+        )
+        assert 'allowed_content' in folder.properties
+        assert folder.properties['allowed_content'] == {CONTENT_TYPES.Folder.slug: True, CONTENT_TYPES.File.slug: True} # nopep8
+        api.restore_content_default_allowed_content(folder)
+        assert 'allowed_content' in folder.properties
+        assert folder.properties['allowed_content'] == CONTENT_TYPES.default_allowed_content_properties(folder.type)  # nopep8
+
     def test_delete(self):
         uapi = UserApi(
             session=self.session,
@@ -2057,6 +2363,101 @@ class TestContentApi(DefaultTest):
         # (workspace2)
         assert last_actives[8] == main_folder_workspace2
 
+    def test_unit__get_last_active__ok__do_no_show_deleted_archived(self):
+        uapi = UserApi(
+            session=self.session,
+            config=self.app_config,
+            current_user=None,
+        )
+        group_api = GroupApi(
+            current_user=None,
+            session=self.session,
+            config=self.app_config,
+        )
+        groups = [group_api.get_one(Group.TIM_USER),
+                  group_api.get_one(Group.TIM_MANAGER),
+                  group_api.get_one(Group.TIM_ADMIN)]
+
+        user = uapi.create_minimal_user(email='this.is@user',
+                                        groups=groups, save_now=True)
+        workspace = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace',
+            save_now=True
+        )
+        workspace2 = WorkspaceApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+        ).create_workspace(
+            'test workspace2',
+            save_now=True
+        )
+
+        api = ContentApi(
+            current_user=user,
+            session=self.session,
+            config=self.app_config,
+            show_deleted=False,
+            show_archived=False,
+        )
+        main_folder = api.create(CONTENT_TYPES.Folder.slug, workspace, None, 'this is randomized folder', '', True)  # nopep8
+        archived = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'archived', '', True)  # nopep8
+        deleted = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'deleted', '', True)  # nopep8
+        comment_archived = api.create_comment(workspace, parent=archived, content='just a comment', do_save=True)  # nopep8
+        comment_deleted = api.create_comment(workspace, parent=deleted, content='just a comment', do_save=True)  # nopep8
+        with new_revision(
+            session=self.session,
+            tm=transaction.manager,
+            content=archived,
+        ):
+            api.archive(archived)
+            api.save(archived)
+
+        with new_revision(
+            session=self.session,
+            tm=transaction.manager,
+            content=deleted,
+        ):
+            api.delete(deleted)
+            api.save(deleted)
+        normal = api.create(CONTENT_TYPES.Page.slug, workspace, main_folder, 'normal', '', True)  # nopep8
+        comment_normal = api.create_comment(workspace, parent=normal, content='just a comment', do_save=True)  # nopep8
+
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 2
+        assert last_actives[0].content_id == normal.content_id
+        assert last_actives[1].content_id == main_folder.content_id
+
+
+        api._show_deleted = True
+        api._show_archived = False
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 3
+        assert last_actives[0] == normal
+        assert last_actives[1] == deleted
+        assert last_actives[2] == main_folder
+
+        api._show_deleted = False
+        api._show_archived = True
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 3
+        assert last_actives[0]== normal
+        assert last_actives[1] == archived
+        assert last_actives[2] == main_folder
+
+        api._show_deleted = True
+        api._show_archived = True
+        last_actives = api.get_last_active()
+        assert len(last_actives) == 4
+        assert last_actives[0] == normal
+        assert last_actives[1] == deleted
+        assert last_actives[2] == archived
+        assert last_actives[3] == main_folder
+
     def test_unit__get_last_active__ok__workspace_filter_workspace_full(self):
         uapi = UserApi(
             session=self.session,

backend/tracim_backend/views/contents_api/folder_controller.py

@@ -0,0 +1,198 @@
+# coding=utf-8
+import typing
+
+import transaction
+from pyramid.config import Configurator
+from tracim_backend.models.data import UserRoleInWorkspace
+
+try:  # Python 3.5+
+    from http import HTTPStatus
+except ImportError:
+    from http import client as HTTPStatus
+
+from tracim_backend import TracimRequest
+from tracim_backend.extensions import hapic
+from tracim_backend.lib.core.content import ContentApi
+from tracim_backend.views.controllers import Controller
+from tracim_backend.views.core_api.schemas import TextBasedContentSchema
+from tracim_backend.views.core_api.schemas import FolderContentModifySchema
+from tracim_backend.views.core_api.schemas import TextBasedRevisionSchema
+from tracim_backend.views.core_api.schemas import SetContentStatusSchema
+from tracim_backend.views.core_api.schemas import WorkspaceAndContentIdPathSchema  # nopep8
+from tracim_backend.views.core_api.schemas import NoContentSchema
+from tracim_backend.lib.utils.authorization import require_content_types
+from tracim_backend.lib.utils.authorization import require_workspace_role
+from tracim_backend.exceptions import EmptyLabelNotAllowed
+from tracim_backend.models.context_models import ContentInContext
+from tracim_backend.models.context_models import RevisionInContext
+from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.models.contents import folder_type
+from tracim_backend.models.revision_protection import new_revision
+
+SWAGGER_TAG__Folders_ENDPOINTS = 'Folders'
+
+
+class FolderController(Controller):
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
+    @require_workspace_role(UserRoleInWorkspace.READER)
+    @require_content_types([folder_type])
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(TextBasedContentSchema())
+    def get_folder(self, context, request: TracimRequest, hapic_data=None) -> ContentInContext:  # nopep8
+        """
+        Get folder info
+        """
+        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,
+        )
+        content = api.get_one(
+            hapic_data.path.content_id,
+            content_type=CONTENT_TYPES.Any_SLUG
+        )
+        return api.get_content_in_context(content)
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @require_content_types([folder_type])
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.input_body(FolderContentModifySchema())
+    @hapic.output_body(TextBasedContentSchema())
+    def update_folder(self, context, request: TracimRequest, hapic_data=None) -> ContentInContext:  # nopep8
+        """
+        update folder
+        """
+        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,
+        )
+        content = api.get_one(
+            hapic_data.path.content_id,
+            content_type=CONTENT_TYPES.Any_SLUG
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.update_content(
+                item=content,
+                new_label=hapic_data.body.label,
+                new_content=hapic_data.body.raw_content,
+
+            )
+            api.set_allowed_content(
+                content=content,
+                allowed_content_type_slug_list=hapic_data.body.sub_content_types  # nopep8
+            )
+            api.save(content)
+        return api.get_content_in_context(content)
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
+    @require_workspace_role(UserRoleInWorkspace.READER)
+    @require_content_types([folder_type])
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(TextBasedRevisionSchema(many=True))
+    def get_folder_revisions(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None
+    ) -> typing.List[RevisionInContext]:
+        """
+        get folder revisions
+        """
+        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,
+        )
+        content = api.get_one(
+            hapic_data.path.content_id,
+            content_type=CONTENT_TYPES.Any_SLUG
+        )
+        revisions = content.revisions
+        return [
+            api.get_revision_in_context(revision)
+            for revision in revisions
+        ]
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
+    @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
+    @require_content_types([folder_type])
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.input_body(SetContentStatusSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def set_folder_status(self, context, request: TracimRequest, hapic_data=None) -> None:  # nopep8
+        """
+        set folder status
+        """
+        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,
+        )
+        content = api.get_one(
+            hapic_data.path.content_id,
+            content_type=CONTENT_TYPES.Any_SLUG
+        )
+        with new_revision(
+                session=request.dbsession,
+                tm=transaction.manager,
+                content=content
+        ):
+            api.set_status(
+                content,
+                hapic_data.body.status,
+            )
+            api.save(content)
+        return
+
+    def bind(self, configurator: Configurator) -> None:
+        # Get folder
+        configurator.add_route(
+            'folder',
+            '/workspaces/{workspace_id}/folders/{content_id}',
+            request_method='GET'
+        )
+        configurator.add_view(self.get_folder, route_name='folder')  # nopep8
+
+        # update folder
+        configurator.add_route(
+            'update_folder',
+            '/workspaces/{workspace_id}/folders/{content_id}',
+            request_method='PUT'
+        )  # nopep8
+        configurator.add_view(self.update_folder, route_name='update_folder')  # nopep8
+
+        # get folder revisions
+        configurator.add_route(
+            'folder_revisions',
+            '/workspaces/{workspace_id}/folders/{content_id}/revisions',  # nopep8
+            request_method='GET'
+        )
+        configurator.add_view(self.get_folder_revisions, route_name='folder_revisions')  # nopep8
+
+        # get folder revisions
+        configurator.add_route(
+            'set_folder_status',
+            '/workspaces/{workspace_id}/folders/{content_id}/status',  # nopep8
+            request_method='PUT'
+        )
+        configurator.add_view(self.set_folder_status, route_name='set_folder_status')  # nopep8

backend/tracim_backend/views/core_api/schemas.py

@@ -13,6 +13,7 @@ from tracim_backend.models.contents import CONTENT_STATUS
 from tracim_backend.models.contents import CONTENT_TYPES
 from tracim_backend.models.contents import open_status
 from tracim_backend.models.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
@@ -75,6 +76,10 @@ class UserSchema(UserDigestSchema):
         example=True,
         description='Is user account activated ?'
     )
+    is_deleted = marshmallow.fields.Bool(
+        example=False,
+        description='Is user account deleted ?'
+    )
     # TODO - G.M - 17-04-2018 - Restrict timezone values
     timezone = marshmallow.fields.String(
         example="Europe/Paris",
@@ -326,6 +331,7 @@ class AutocompleteQuerySchema(marshmallow.Schema):
         example='test',
         description='search text to query',
         validate=Length(min=2),
+        required=True,
     )
     @post_load
     def make_autocomplete(self, data):
@@ -536,6 +542,7 @@ class WorkspaceDigestSchema(marshmallow.Schema):
         WorkspaceMenuEntrySchema,
         many=True,
     )
+    is_deleted = marshmallow.fields.Bool(example=False, default=False)
 
     class Meta:
         description = 'Digest of workspace informations'
@@ -728,7 +735,7 @@ class ContentDigestSchema(marshmallow.Schema):
     sub_content_types = marshmallow.fields.List(
         marshmallow.fields.String(
             example='html-content',
-            validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
+            validate=OneOf(CONTENT_TYPES.extended_endpoint_allowed_types_slug())
         ),
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '
@@ -874,6 +881,22 @@ class TextBasedContentModifySchema(ContentModifyAbstractSchema, TextBasedDataAbs
         return TextBasedContentUpdate(**data)
 
 
+class FolderContentModifySchema(ContentModifyAbstractSchema, TextBasedDataAbstractSchema):  # nopep
+    sub_content_types = marshmallow.fields.List(
+        marshmallow.fields.String(
+            example='html-document',
+            validate=OneOf(CONTENT_TYPES.extended_endpoint_allowed_types_slug())
+        ),
+        description='list of content types allowed as sub contents. '
+                    'This field is required for folder contents, '
+                    'set it to empty list in other cases'
+    )
+
+    @post_load
+    def folder_content_update(self, data):
+        return FolderContentUpdate(**data)
+
+
 class FileContentModifySchema(TextBasedContentModifySchema):
     pass
 

backend/tracim_backend/views/core_api/user_controller.py

@@ -247,6 +247,41 @@ class UserController(Controller):
     @require_profile(Group.TIM_ADMIN)
     @hapic.input_path(UserIdPathSchema())
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def delete_user(self, context, request: TracimRequest, hapic_data=None):
+        """
+        delete user
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        uapi.delete(user=request.candidate_user, do_save=True)
+        return
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_profile(Group.TIM_ADMIN)
+    @hapic.input_path(UserIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def undelete_user(self, context, request: TracimRequest, hapic_data=None):
+        """
+        undelete user
+        """
+        app_config = request.registry.settings['CFG']
+        uapi = UserApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+            show_deleted=True,
+        )
+        uapi.undelete(user=request.candidate_user, do_save=True)
+        return
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG__USER_ENDPOINTS])
+    @require_profile(Group.TIM_ADMIN)
+    @hapic.input_path(UserIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def disable_user(self, context, request: TracimRequest, hapic_data=None):
         """
         disable user
@@ -467,6 +502,14 @@ class UserController(Controller):
         configurator.add_route('disable_user', '/users/{user_id}/disable', request_method='PUT')  # nopep8
         configurator.add_view(self.disable_user, route_name='disable_user')
 
+        # delete user
+        configurator.add_route('delete_user', '/users/{user_id}/delete', request_method='PUT')  # nopep8
+        configurator.add_view(self.delete_user, route_name='delete_user')
+
+        # undelete user
+        configurator.add_route('undelete_user', '/users/{user_id}/undelete', request_method='PUT')  # nopep8
+        configurator.add_view(self.undelete_user, route_name='undelete_user')
+
         # set user profile
         configurator.add_route('set_user_profile', '/users/{user_id}/profile', request_method='PUT')  # nopep8
         configurator.add_view(self.set_profile, route_name='set_user_profile')

backend/tracim_backend/views/core_api/workspace_controller.py

@@ -1,6 +1,7 @@
 import typing
 import transaction
 from pyramid.config import Configurator
+from pyramid.httpexceptions import HTTPFound
 
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.models.roles import WorkspaceRoles
@@ -11,11 +12,13 @@ except ImportError:
     from http import client as HTTPStatus
 
 from tracim_backend import hapic
+from tracim_backend import BASE_API_V2
 from tracim_backend import TracimRequest
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.utils.authorization import require_workspace_role
+from tracim_backend.lib.utils.authorization import require_profile_or_other_profile_with_workspace_role
 from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.models import Group
 from tracim_backend.lib.utils.authorization import require_candidate_workspace_role
@@ -24,6 +27,7 @@ from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.context_models import UserRoleWorkspaceInContext
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.exceptions import EmptyLabelNotAllowed
+from tracim_backend.exceptions import UnallowedSubContent
 from tracim_backend.exceptions import EmailValidationFailed
 from tracim_backend.exceptions import UserCreationFailed
 from tracim_backend.exceptions import UserDoesNotExist
@@ -33,6 +37,7 @@ 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 ContentIdPathSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberCreationSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberInviteSchema
 from tracim_backend.views.core_api.schemas import RoleUpdateSchema
@@ -118,6 +123,51 @@ class WorkspaceController(Controller):
         return wapi.get_workspace_with_context(workspace)
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
+    @require_profile_or_other_profile_with_workspace_role(
+        Group.TIM_ADMIN,
+        Group.TIM_MANAGER,
+        UserRoleInWorkspace.WORKSPACE_MANAGER,
+    )
+    @hapic.input_path(WorkspaceIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def delete_workspace(self, context, request: TracimRequest, hapic_data=None):  # nopep8
+        """
+        delete workspace
+        """
+        app_config = request.registry.settings['CFG']
+        wapi = WorkspaceApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+        )
+        wapi.delete(request.current_workspace, flush=True)
+        return
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
+    @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
+    @require_profile_or_other_profile_with_workspace_role(
+        Group.TIM_ADMIN,
+        Group.TIM_MANAGER,
+        UserRoleInWorkspace.WORKSPACE_MANAGER,
+    )
+    @hapic.input_path(WorkspaceIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def undelete_workspace(self, context, request: TracimRequest, hapic_data=None):  # nopep8
+        """
+        restore deleted workspace
+        """
+        app_config = request.registry.settings['CFG']
+        wapi = WorkspaceApi(
+            current_user=request.current_user,  # User
+            session=request.dbsession,
+            config=app_config,
+            show_deleted=True,
+        )
+        wapi.undelete(request.current_workspace, flush=True)
+        return
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
     @hapic.input_path(WorkspaceIdPathSchema())
     @hapic.output_body(WorkspaceMemberSchema(many=True))
@@ -176,6 +226,28 @@ class WorkspaceController(Controller):
         return rapi.get_user_role_workspace_with_context(role)
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
+    @require_workspace_role(UserRoleInWorkspace.WORKSPACE_MANAGER)
+    @hapic.input_path(WorkspaceAndUserIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
+    def delete_workspaces_members_role(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None
+    ) -> None:
+        app_config = request.registry.settings['CFG']
+        rapi = RoleApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        rapi.delete_one(
+            user_id=hapic_data.path.user_id,
+            workspace_id=hapic_data.path.workspace_id,
+        )
+        return
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
     @hapic.handle_exception(UserCreationFailed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.WORKSPACE_MANAGER)
     @hapic.input_path(WorkspaceIdPathSchema())
@@ -276,6 +348,7 @@ class WorkspaceController(Controller):
     @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
     @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
+    @hapic.handle_exception(UnallowedSubContent, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(WorkspaceIdPathSchema())
     @hapic.input_body(ContentCreationSchema())
     @hapic.output_body(ContentDigestSchema())
@@ -314,6 +387,65 @@ class WorkspaceController(Controller):
         return content
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
+    @require_workspace_role(UserRoleInWorkspace.READER)
+    @hapic.input_path(WorkspaceAndContentIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.FOUND)  # nopep8
+    def get_content_from_workspace(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> None:
+        """
+        redirect to correct content file endpoint
+        """
+        app_config = request.registry.settings['CFG']
+        content = request.current_content
+        content_type = CONTENT_TYPES.get_one_by_slug(content.type).slug
+        # TODO - G.M - 2018-08-03 - Jsonify redirect response ?
+        raise HTTPFound(
+            "{base_url}workspaces/{workspace_id}/{content_type}s/{content_id}".format(
+                base_url=BASE_API_V2,
+                workspace_id=content.workspace_id,
+                content_type=content_type,
+                content_id=content.content_id,
+            )
+        )
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
+    @hapic.input_path(ContentIdPathSchema())
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.FOUND)  # nopep8
+    def get_content(
+            self,
+            context,
+            request: TracimRequest,
+            hapic_data=None,
+    ) -> None:
+        """
+        redirect to correct content file endpoint
+        """
+        app_config = request.registry.settings['CFG']
+        api = ContentApi(
+            current_user=request.current_user,
+            session=request.dbsession,
+            config=app_config,
+        )
+        content = api.get_one(
+            content_id=hapic_data.path['content_id'],
+            content_type=CONTENT_TYPES.Any_SLUG
+        )
+        content_type = CONTENT_TYPES.get_one_by_slug(content.type).slug
+        # TODO - G.M - 2018-08-03 - Jsonify redirect response ?
+        raise HTTPFound(
+            "{base_url}workspaces/{workspace_id}/{content_type}s/{content_id}".format(
+                base_url=BASE_API_V2,
+                workspace_id=content.workspace_id,
+                content_type=content_type,
+                content_id=content.content_id,
+            )
+        )
+
+    @hapic.with_api_doc(tags=[SWAGGER_TAG_WORKSPACE_ENDPOINTS])
     @hapic.handle_exception(WorkspacesDoNotMatch, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
     @require_candidate_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
@@ -512,6 +644,11 @@ class WorkspaceController(Controller):
         # Create workspace
         configurator.add_route('create_workspace', '/workspaces', request_method='POST')  # nopep8
         configurator.add_view(self.create_workspace, route_name='create_workspace')  # nopep8
+        # Delete/Undelete workpace
+        configurator.add_route('delete_workspace', '/workspaces/{workspace_id}/delete', request_method='PUT')  # nopep8
+        configurator.add_view(self.delete_workspace, route_name='delete_workspace')  # nopep8
+        configurator.add_route('undelete_workspace', '/workspaces/{workspace_id}/undelete', request_method='PUT')  # nopep8
+        configurator.add_view(self.undelete_workspace, route_name='undelete_workspace')  # nopep8
         # Update Workspace
         configurator.add_route('update_workspace', '/workspaces/{workspace_id}', request_method='PUT')  # nopep8
         configurator.add_view(self.update_workspace, route_name='update_workspace')  # nopep8
@@ -524,12 +661,21 @@ class WorkspaceController(Controller):
         # Create Workspace Members roles
         configurator.add_route('create_workspace_member', '/workspaces/{workspace_id}/members', request_method='POST')  # nopep8
         configurator.add_view(self.create_workspaces_members_role, route_name='create_workspace_member')  # nopep8
+        # Delete Workspace Members roles
+        configurator.add_route('delete_workspace_member', '/workspaces/{workspace_id}/members/{user_id}', request_method='DELETE')  # nopep8
+        configurator.add_view(self.delete_workspaces_members_role, route_name='delete_workspace_member')  # nopep8
         # Workspace Content
         configurator.add_route('workspace_content', '/workspaces/{workspace_id}/contents', request_method='GET')  # nopep8
         configurator.add_view(self.workspace_content, route_name='workspace_content')  # nopep8
         # Create Generic Content
         configurator.add_route('create_generic_content', '/workspaces/{workspace_id}/contents', request_method='POST')  # nopep8
         configurator.add_view(self.create_generic_empty_content, route_name='create_generic_content')  # nopep8
+        # Get Content
+        configurator.add_route('get_content', '/contents/{content_id}', request_method='GET')  # nopep8
+        configurator.add_view(self.get_content, route_name='get_content')
+        # Get Content From workspace
+        configurator.add_route('get_content_from_workspace', '/workspaces/{workspace_id}/contents/{content_id}', request_method='GET')  # nopep8
+        configurator.add_view(self.get_content_from_workspace, route_name='get_content_from_workspace')  # nopep8
         # Move Content
         configurator.add_route('move_content', '/workspaces/{workspace_id}/contents/{content_id}/move', request_method='PUT')  # nopep8
         configurator.add_view(self.move_content, route_name='move_content')  # nopep8

backend_lib.sh

@@ -0,0 +1,52 @@
+. bash_library.sh # source bash_library.sh
+
+function install_backend_system_dep {
+    log "install base debian-packaged-dep for backend..."
+    sudo apt update
+    sudo apt install -y python3 python3-venv python3-dev python3-pip
+    sudo apt install -y redis-server
+
+    log "install deps for dealing with most preview..."
+    sudo apt install -y zlib1g-dev libjpeg-dev
+    sudo apt install -y imagemagick libmagickwand-dev ghostscript
+    sudo apt install -y libreoffice # most office documents file and text format
+    sudo apt install -y inkscape # for .svg files.
+}
+
+function setup_pyenv {
+   log "setup python3 env.."
+   python3 -m venv env
+   source env/bin/activate
+}
+
+function install_backend_python_packages {
+    pip install --upgrade pip setuptools
+
+    log "install tracim-backend (sqlite_backend)..."
+    pip install -e ".[testing]"
+}
+
+function setup_config_file {
+    log "configure tracim with default conf..."
+    if [ ! -f development.ini ]; then
+       log "generate missing development.ini ..."
+       cp development.ini.sample development.ini
+    fi
+
+    if [ ! -f wsgidav.conf ]; then
+       log "generate missing wsgidav.conf ..."
+       cp wsgidav.conf.sample wsgidav.conf
+    fi
+}
+
+function setup_db {
+    result=$(alembic -c development.ini current)
+    if [ $? -eq 0 ] && [ ! "$result" == '' ]; then
+       log "check database migration..."
+       alembic -c development.ini upgrade head
+    else
+       log "database seems missing, init it..."
+       tracimcli db init
+       alembic -c development.ini stamp head
+    fi
+}

frontend/src/action-creator.async.js

@@ -17,6 +17,8 @@ import {
   setFolderData,
   APP_LIST,
   CONTENT_TYPE_LIST,
+  WORKSPACE_CONTENT_ARCHIVED,
+  WORKSPACE_CONTENT_DELETED,
   WORKSPACE_RECENT_ACTIVITY,
   WORKSPACE_READ_STATUS
 } from './action-creator.sync.js'
@@ -332,3 +334,33 @@ export const getContentTypeList = user => dispatch => {
     dispatch
   })
 }
+
+export const putWorkspaceContentArchived = (user, idWorkspace, idContent) => dispatch => {
+  return fetchWrapper({
+    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/archive`,
+    param: {
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
+      method: 'PUT'
+    },
+    actionName: WORKSPACE_CONTENT_ARCHIVED,
+    dispatch
+  })
+}
+
+export const putWorkspaceContentDeleted = (user, idWorkspace, idContent) => dispatch => {
+  return fetchWrapper({
+    url: `${FETCH_CONFIG.apiUrl}/workspaces/${idWorkspace}/contents/${idContent}/delete`,
+    param: {
+      headers: {
+        ...FETCH_CONFIG.headers,
+        'Authorization': 'Basic ' + user.auth
+      },
+      method: 'PUT'
+    },
+    actionName: WORKSPACE_CONTENT_DELETED,
+    dispatch
+  })
+}

frontend/src/action-creator.sync.js

@@ -38,6 +38,11 @@ export const WORKSPACE_CONTENT = `${WORKSPACE}/Content`
 export const setWorkspaceContentList = workspaceContentList => ({ type: `${SET}/${WORKSPACE_CONTENT}`, workspaceContentList })
 export const updateWorkspaceFilter = filterList => ({ type: `${UPDATE}/${WORKSPACE}/Filter`, filterList })
 
+export const WORKSPACE_CONTENT_ARCHIVED = `${WORKSPACE_CONTENT}/Archived`
+export const WORKSPACE_CONTENT_DELETED = `${WORKSPACE_CONTENT}/Deleted`
+export const setWorkspaceContentArchived = (idWorkspace, idContent) => ({ type: `${SET}/${WORKSPACE_CONTENT_ARCHIVED}`, idWorkspace, idContent })
+export const setWorkspaceContentDeleted = (idWorkspace, idContent) => ({ type: `${SET}/${WORKSPACE_CONTENT_DELETED}`, idWorkspace, idContent })
+
 export const WORKSPACE_LIST = `${WORKSPACE}/List`
 export const updateWorkspaceListData = workspaceList => ({ type: `${UPDATE}/${WORKSPACE_LIST}`, workspaceList })
 export const setWorkspaceListIsOpenInSidebar = (workspaceId, isOpenInSidebar) => ({ type: `${SET}/${WORKSPACE_LIST}/isOpenInSidebar`, workspaceId, isOpenInSidebar })

frontend/src/component/Account/Password.jsx

@@ -17,16 +17,16 @@ export const Password = props => {
           {props.t('Password')}
         </div>
         <input
-          className='personaldata__form__txtinput form-control'
+          className='personaldata__form__txtinput primaryColorBorderLighten form-control'
           type='password'
           placeholder={props.t('Old password')}
         />
         <input
-          className='personaldata__form__txtinput form-control mt-4'
+          className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-4'
           type='password'
           placeholder={props.t('New password')}
         />
-        <button type='submit' className='personaldata__form__button btn btn-outline-primary mt-4'>
+        <button type='submit' className='personaldata__form__button primaryColorBorderLighten btn btn-outline-primary mt-4'>
           {props.t('Send')}
         </button>
       </form>

frontend/src/component/Account/PersonalData.jsx

@@ -19,7 +19,7 @@ export const PersonalData = props => {
         </div>
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
           <input
-            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
+            className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-3 mt-sm-0'
             type='text'
             placeholder={props.t('Change your name')}
           />
@@ -29,12 +29,12 @@ export const PersonalData = props => {
         </div>
         <div className='d-flex align-items-center justify-content-between flex-wrap mb-4'>
           <input
-            className='personaldata__form__txtinput form-control mt-3 mt-sm-0'
+            className='personaldata__form__txtinput primaryColorBorderLighten form-control mt-3 mt-sm-0'
             type='email'
             placeholder={props.t('Change your email')}
           />
         </div>
-        <button type='submit' className='personaldata__form__button btn btn-outline-primary'>
+        <button type='submit' className='personaldata__form__button primaryColorBorderLighten btn btn-outline-primary'>
           {props.t('Send')}
         </button>
       </form>

frontend/src/component/Account/UserInfo.jsx

@@ -10,7 +10,7 @@ export const UserInfo = props => {
         <div className='account__userinformation__name mb-3'>
           {`${props.user.firstname} ${props.user.lastname}`}
         </div>
-        <a href={`mailto:${props.user.email}`} className='account__userinformation__email d-block mb-3'>
+        <a href={`mailto:${props.user.email}`} className='account__userinformation__email d-block primaryColorFontLighten mb-3'>
           {props.user.email}
         </a>
         <div className='account__userinformation__role mb-3'>
@@ -19,7 +19,7 @@ export const UserInfo = props => {
         { /* <div className='account__userinformation__job mb-3'>
           {props.user.job}
         </div>
-        <a href='http://www.algoo.fr' className='account__userinformation__company'>
+        <a href='http://www.algoo.fr' className='account__userinformation__company primaryColorFontLighten'>
           {props.user.company}
         </a> */ }
       </div>

frontend/src/component/Dashboard/ContentTypeBtn.styl

@@ -4,7 +4,7 @@
   display flex
   flex-direction column
   justify-content center
-  margin 15px
+  margin 15px 15px 0 0
   border-radius 10px
   padding 15px
   width 230px
@@ -12,7 +12,3 @@
   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

@@ -1,6 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 // import { Checkbox } from 'tracim_frontend_lib'
+import { generateAvatarFromPublicName } from 'tracim_frontend_lib'
 
 require('./MemberList.styl')
 
@@ -110,8 +111,8 @@ export class MemberList extends React.Component {
                             onClick={() => props.onClickKnownMember(u)}
                             key={u.user_id}
                           >
-                            <div className='autocomplete__item__avatar primaryColorBorder'>
-                              <img src={u.avatar_url} />
+                            <div className='autocomplete__item__avatar'>
+                              <img src={u.avatar_url ? u.avatar_url : generateAvatarFromPublicName(u.public_name)} />
                             </div>
 
                             <div className='autocomplete__item__name'>

frontend/src/component/Dashboard/MemberList.styl

@@ -97,8 +97,6 @@
               width 45px
               height 45px
               border-radius 50%
-              border-width 1px
-              border-style solid
             &__name
               margin-left 15px
       .name__input
@@ -138,14 +136,30 @@
         padding 8px 30px
         cursor pointer
 
-@media (min-width min-sm) and (max-width: max-lg)
+/***** MEDIAQUERIES *****/
+
+/*** MEDIA 992px and 1199px ***/
+
+@media (min-width: min-lg) and (max-width: max-lg)
+
   .memberlist
     width 50%
 
+/*** MEDIA 768px and 991px ***/
+
+@media (min-width: min-md) and (max-width: max-md)
+
+  .memberlist
+    width 50%
+
+/*** MEDIA 576px and 767px ***/
+
 @media (min-width: min-sm) and (max-width: max-sm)
   .memberlist
     margin 50px 0
-    width 90%
+    width 100%
+
+/*** MEDIA 575px ***/
 
 @media (max-width: max-xs)
   .memberlist

frontend/src/component/Dashboard/MoreInfo.jsx

@@ -6,7 +6,7 @@ export const MoreInfo = props =>
   <div className='moreinfo'>
     <div className='moreinfo__webdav genericBtnInfoDashboard'>
       <div
-        className='moreinfo__webdav__btn genericBtnInfoDashboard__btn'
+        className='moreinfo__webdav__btn genericBtnInfoDashboard__btn primaryColorBorderLighten primaryColorFontLighten'
         onClick={props.onClickToggleWebdav}
       >
         <div className='moreinfo__webdav__btn__icon genericBtnInfoDashboard__btn__icon'>

frontend/src/component/Dashboard/RecentActivity.styl

@@ -43,22 +43,38 @@
       padding 10px 25px
       cursor pointer
 
-@media (min-width min-sm) and (max-width: max-lg)
+
+/**** MEDIAQUERIES ****/
+
+/**** MEDIA 992px and 1199px ****/
+
+@media (min-width min-lg) and (max-width: max-lg)
   .activity
+    margin-right 0
     width 100%
 
+/**** MEDIA 768px and 991px ****/
+
 @media (min-width: min-md) and (max-width: max-md)
   .activity
-    margin 25px 15px 25px 0
+    margin 25px 0 25px 0
+    width 100%
+
+/**** MEDIA 576px and 767px ****/
 
 @media (min-width: min-sm) and (max-width: max-sm)
   .activity
-    margin 25px 15px 25px 0
+    margin 25px 0 25px 0
+    width 100%
+
+/**** MEDIA 575px ****/
 
 @media (max-width: max-xs)
   .activity
     margin 25px 0
     width 100%
+    &__wrapper
+      margin-top 45px
     &__header
       display block
       height auto

frontend/src/component/Dashboard/UserStatus.jsx

@@ -40,7 +40,7 @@ export const UserStatus = props =>
         ? (
           <div className='userstatus__notification__subscribe dropdown'>
             <button
-              className='userstatus__notification__subscribe__btn btn btn-outline-primary dropdown-toggle'
+              className='userstatus__notification__subscribe__btn btn btn-outline-primary dropdown-toggle primaryColorBorderLighten'
               type='button'
               id='dropdownMenuButton'
               data-toggle='dropdown'
@@ -62,7 +62,7 @@ export const UserStatus = props =>
         )
         : (
           <div
-            className='userstatus__notification__btn btn btn-outline-primary'
+            className='userstatus__notification__btn btn btn-outline-primary primaryColorBorderLighten'
             onClick={props.onClickToggleNotifBtn}
           >
             {props.t('Change your status')}

frontend/src/component/Dashboard/UserStatus.styl

@@ -16,15 +16,54 @@
     font-size 18px
     &__btn
       margin 20px 0
-      border 1px solid thirdColor
+      border-width 1px
+      border-style solid
       padding 10px 15px
       cursor pointer
     &__subscribe
       &__btn
         margin 20px 0
-        border 1px solid thirdColor
+        border-width 1px
+        border-style solid
         padding 10px 15px
       &__submenu
         padding 0
         &__item
           padding 10px
+
+/**** MEDIAQUERIES ****/
+
+/**** MEDIA 992px & 1199px ****/
+
+@media (min-width: min-lg) and (max-width: max-lg)
+
+  .userstatus
+    width 100%
+    &__role
+      display flex
+
+/**** MEDIA 768px & 991px ****/
+
+@media (min-width: min-md) and (max-width: max-md)
+
+  .userstatus
+    width 100%
+    &__role
+      display flex
+
+/**** MEDIA 576px & 767px ****/
+
+@media (min-width: min-sm) and (max-width: max-sm)
+
+  .userstatus
+    width 100%
+    &__role
+      display flex
+
+/**** MEDIA 575px ****/
+
+@media (max-width: max-xs)
+
+  .userstatus
+    width 100%
+

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

@@ -0,0 +1,29 @@
+import React from 'react'
+import { Link } from 'react-router-dom'
+import { PAGE } from '../../../helper.js'
+
+const AdminLink = props => {
+  return (
+    <li className='header__menu__rightside__adminlink'>
+      <div className='adminlink dropdown'>
+        <button className='adminlink__btn btn dropdown-toggle' type='button' data-toggle='dropdown'>
+          Administration
+        </button>
+
+        <div className='adminlink__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
+          <Link className='setting__link dropdown-item' to={PAGE.ADMIN.WORKSPACE}>
+            <i className='fa fa-fw fa-space-shuttle mr-2' />
+            {props.t('Admin workspace')}
+          </Link>
+
+          <Link className='setting__link dropdown-item' to={PAGE.ADMIN.USER}>
+            <i className='fa fa-fw fa-users mr-2' />
+            {props.t('Admin user')}
+          </Link>
+        </div>
+      </div>
+    </li>
+  )
+}
+
+export default AdminLink

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

@@ -5,31 +5,34 @@ import { PAGE } from '../../../helper.js'
 import { translate } from 'react-i18next'
 
 const MenuProfil = props => {
-  return props.user.logged
-    ? (
-      <li className='header__menu__rightside__itemprofil'>
-        <div className='profilgroup dropdown'>
-          <button className='profilgroup__name btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
-            <img className='profilgroup__name__imgprofil' src={props.user.avatar_url} />
-            <div className='profilgroup__name__text'>
-              {props.user.name}
-            </div>
-          </button>
-          <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
-            <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
-              <i className='fa fa-fw fa-user-o mr-2' />
-              {props.t('My Account')}
-            </Link>
-            {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
-            <div className='setting__link dropdown-item' onClick={props.onClickLogout}>
-              <i className='fa fa-fw fa-sign-out mr-2' />
-              {props.t('Logout')}
-            </div>
+  if (!props.user.logged) return null
+
+  return (
+    <li className='header__menu__rightside__itemprofil'>
+      <div className='profilgroup dropdown'>
+        <button className='profilgroup__name btn btn-outline-primary dropdown-toggle' type='button' id='dropdownMenuButton' data-toggle='dropdown' aria-haspopup='true' aria-expanded='false'>
+          <img className='profilgroup__name__imgprofil' src={props.user.avatar_url} />
+
+          <div className='profilgroup__name__text'>
+            {props.user.public_name}
+          </div>
+        </button>
+
+        <div className='profilgroup__setting dropdown-menu' aria-labelledby='dropdownMenuButton'>
+          <Link className='setting__link dropdown-item' to={PAGE.ACCOUNT}>
+            <i className='fa fa-fw fa-user-o mr-2' />
+            {props.t('My Account')}
+          </Link>
+
+          {/* <div className='setting__link dropdown-item'>Mot de passe</div> */}
+          <div className='setting__link dropdown-item' onClick={props.onClickLogout}>
+            <i className='fa fa-fw fa-sign-out mr-2' />
+            {props.t('Logout')}
           </div>
         </div>
-      </li>
-    )
-    : ''
+      </div>
+    </li>
+  )
 }
 export default translate()(MenuProfil)
 

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

@@ -14,7 +14,7 @@ const Search = props => {
           onChange={props.onChangeInput}
         />
         <button
-          className='search__addonsearch input-group-addon'
+          className='search__addonsearch input-group-addon primaryColorBgLightenHover primaryColorFontHover'
           id='headerInputSearch'
           onClick={props.onClickSubmit}
         >

frontend/src/container/Account.jsx

@@ -101,7 +101,7 @@ class Account extends React.Component {
     })()
 
     return (
-      <div className='Account'>
+      <div className='account'>
         <PageWrapper customClass='account'>
           <PageTitle
             parentClass={'account'}

frontend/src/container/AdminWorkspacePage.jsx

@@ -1,5 +1,4 @@
 import React from 'react'
-import Sidebar from './Sidebar.jsx'
 import {
   Delimiter,
   PageWrapper,
@@ -11,188 +10,184 @@ 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'}
+        />
 
-        <PageWrapper customClass='adminWorkspacePage'>
-          <PageTitle
-            parentClass={'adminWorkspacePage'}
-            title={'Workspace management'}
-          />
+        <PageContent parentClass='adminWorkspacePage'>
 
-          <PageContent parentClass='adminWorkspacePage'>
+          <div className='adminWorkspacePage__description'>
+            This page informs all workspaces of the instances
+          </div>
 
-            <div className='adminWorkspacePage__description'>
-              This page informs all workspaces of the instances
-            </div>
-
-            { /*
-              Alexi Cauvin 08/08/2018 => desactivate create workspace button due to redundancy
+          { /*
+            Alexi Cauvin 08/08/2018 => desactivate create workspace button due to redundancy
 
-              <div className='adminWorkspacePage__createworkspace'>
-                <button className='adminWorkspacePage__createworkspace__btncreate btn btn-primary primaryColorBg primaryColorBorder primaryColorBorderDarkenHover'>
-                  {this.props.t('Create a workspace')}
-                </button>
-              </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'} />
+          <Delimiter customClass={'adminWorkspacePage__delimiter'} />
 
-            <div className='adminWorkspacePage__workspaceTable'>
+          <div className='adminWorkspacePage__workspaceTable'>
 
-              <table className='table'>
-                <thead>
-                  <tr>
-                    <th scope='col'>ID</th>
-                    <th scope='col'>Workspace</th>
-                    <th scope='col'>Description</th>
-                    <th scope='col'>Member's number</th>
-                    { /*
-                      <th scope='col'>Calendar</th>
-                    */ }
-                    <th scope='col'>Delete workspace</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <th>1</th>
-                    <td>Design v_2</td>
-                    <td>Workspace about tracim v2 design</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>
-                    */ }
-                    <td>8</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+            <table className='table'>
+              <thead>
+                <tr>
+                  <th scope='col'>ID</th>
+                  <th scope='col'>Workspace</th>
+                  <th scope='col'>Description</th>
+                  <th scope='col'>Member's number</th>
+                  { /*
+                    <th scope='col'>Calendar</th>
+                  */ }
+                  <th scope='col'>Delete workspace</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <th>1</th>
+                  <td>Design v_2</td>
+                  <td>Workspace about tracim v2 design</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 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>
-                    */ }
-                    <td>5</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+                  */ }
+                  <td>8</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
                       </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>2</th>
+                  <td>New features</td>
+                  <td>Add a new features : Annotated files</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 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>
-                    */ }
-                    <td>3</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+                  */ }
+                  <td>5</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>3</th>
+                  <td>Fix Backend</td>
+                  <td>workspace referring to multiple issues on the backend </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 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>
-                    */ }
-                    <td>8</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+                  */ }
+                  <td>3</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
                       </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>4</th>
+                  <td>Design v_2</td>
+                  <td>Workspace about tracim v2 design</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 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>
-                    */ }
-                    <td>5</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+                  */ }
+                  <td>8</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>5</th>
+                  <td>New features</td>
+                  <td>Add a new features : Annotated files</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 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>
-                    */ }
-                    <td>3</td>
-                    <td>
-                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
-                        <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
-                          <i className='fa fa-fw fa-trash-o' />
-                        </div>
-                        Delete
+                  */ }
+                  <td>5</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>6</th>
+                  <td>Fix Backend</td>
+                  <td>workspace referring to multiple issues on the backend </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>
+                  */ }
+                  <td>3</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
 
-          </PageContent>
-        </PageWrapper>
-      </div>
+        </PageContent>
+      </PageWrapper>
     )
   }
 }

frontend/src/container/AppFullscreenManager.jsx → frontend/src/container/AppFullscreenRouter.jsx

@@ -1,11 +1,11 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { withRouter } from 'react-router'
-import { Route } from 'react-router-dom'
-import { PAGE } from '../helper.js'
+import { Route, Redirect } from 'react-router-dom'
+import { PAGE, PROFILE } from '../helper.js'
 import appFactory from '../appFactory.js'
 
-class AppFullscreenManager extends React.Component {
+class AppFullscreenRouter extends React.Component {
   constructor (props) {
     super(props)
     this.state = {
@@ -23,13 +23,17 @@ class AppFullscreenManager extends React.Component {
         <div id='appFullscreenContainer' />
 
         {this.state.isMounted && (// we must wait for the component to be fully mounted to be sure the div#appFullscreenContainer exists in DOM
-          <div className='emptyDiForRoute'>
+          <div className='emptyDivForRoute'>
             <Route path={PAGE.ADMIN.WORKSPACE} render={() => {
+              if (props.user.profile !== PROFILE.ADMINISTRATOR) return <Redirect to={{pathname: '/'}} />
+
               props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'workspace'}, props.user, {})
               return null
             }} />
 
             <Route path={PAGE.ADMIN.USER} render={() => {
+              if (props.user.profile !== PROFILE.ADMINISTRATOR) return <Redirect to={{pathname: '/'}} />
+
               props.renderAppFullscreen({slug: 'admin_workspace_user', hexcolor: '#7d4e24', type: 'user'}, props.user, {})
               return null
             }} />
@@ -41,4 +45,4 @@ class AppFullscreenManager extends React.Component {
 }
 
 const mapStateToProps = ({ user }) => ({ user })
-export default connect(mapStateToProps)(withRouter(appFactory(AppFullscreenManager)))
+export default withRouter(connect(mapStateToProps)(appFactory(AppFullscreenRouter)))

frontend/src/container/Dashboard.jsx

@@ -201,7 +201,7 @@ class Dashboard extends React.Component {
     const { props, state } = this
 
     return (
-      <div className='Dashboard' style={{width: '100%'}}>
+      <div className='dashboard'>
         <PageWrapper customeClass='dashboard'>
           <PageTitle
             parentClass='dashboard__header'
@@ -218,7 +218,7 @@ class Dashboard extends React.Component {
           <PageContent>
             <div className='dashboard__workspace-wrapper'>
               <div className='dashboard__workspace'>
-                <div className='dashboard__workspace__title'>
+                <div className='dashboard__workspace__title primaryColorFont'>
                   {props.curWs.label}
                 </div>
 

frontend/src/container/Header.jsx

@@ -13,6 +13,7 @@ import MenuActionListItemDropdownLang from '../component/Header/MenuActionListIt
 import MenuActionListItemHelp from '../component/Header/MenuActionListItem/Help.jsx'
 import MenuActionListItemMenuProfil from '../component/Header/MenuActionListItem/MenuProfil.jsx'
 import MenuActionListItemNotification from '../component/Header/MenuActionListItem/Notification.jsx'
+import MenuActionListAdminLink from '../component/Header/MenuActionListItem/AdminLink.jsx'
 import logoHeader from '../img/logo-tracim.png'
 import {
   newFlashMessage,
@@ -22,7 +23,7 @@ import {
 import {
   postUserLogout
 } from '../action-creator.async.js'
-import { COOKIE, PAGE } from '../helper.js'
+import { COOKIE, PAGE, PROFILE } from '../helper.js'
 
 class Header extends React.Component {
   handleClickLogo = () => {}
@@ -86,6 +87,10 @@ class Header extends React.Component {
                 onClickSubmit={this.handleClickSubmit}
               />
 
+              {user.profile === PROFILE.ADMINISTRATOR &&
+                <MenuActionListAdminLink t={this.props.t} />
+              }
+
               <MenuActionListItemDropdownLang
                 langList={lang}
                 idLangActive={user.lang}

frontend/src/container/Login.jsx

@@ -17,6 +17,7 @@ import {
   setUserConnected
 } from '../action-creator.sync.js'
 import { COOKIE, PAGE } from '../helper.js'
+import { Checkbox } from 'tracim_frontend_lib'
 
 class Login extends React.Component {
   constructor (props) {
@@ -36,7 +37,11 @@ class Login extends React.Component {
 
   handleChangeLogin = e => this.setState({inputLogin: {...this.state.inputLogin, value: e.target.value}})
   handleChangePassword = e => this.setState({inputPassword: {...this.state.inputPassword, value: e.target.value}})
-  handleChangeRememberMe = () => this.setState(prev => ({inputRememberMe: !prev.inputRememberMe}))
+  handleChangeRememberMe = e => {
+    e.preventDefault()
+    e.stopPropagation()
+    this.setState(prev => ({inputRememberMe: !prev.inputRememberMe}))
+  }
 
   handleClickSubmit = async () => {
     const { history, dispatch, t } = this.props
@@ -52,8 +57,13 @@ class Login extends React.Component {
         logged: true
       }))
 
-      Cookies.set(COOKIE.USER_LOGIN, inputLogin.value)
-      Cookies.set(COOKIE.USER_AUTH, userAuth)
+      if (inputRememberMe) {
+        Cookies.set(COOKIE.USER_LOGIN, inputLogin.value, {expires: 365})
+        Cookies.set(COOKIE.USER_AUTH, userAuth, {expires: 365})
+      } else {
+        Cookies.set(COOKIE.USER_LOGIN, inputLogin.value)
+        Cookies.set(COOKIE.USER_AUTH, userAuth)
+      }
 
       history.push(PAGE.WORKSPACE.ROOT)
     } else if (fetchPostUserLogin.status === 403) {
@@ -74,7 +84,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'>{this.props.t('Connection')}</CardHeader>
+                  <CardHeader customClass='connection__header primaryColorBgLighten text-center'>{this.props.t('Connection')}</CardHeader>
 
                   <CardBody formClass='connection__form'>
                     <div>
@@ -103,32 +113,30 @@ class Login extends React.Component {
                       />
 
                       <div className='row align-items-center mt-4 mb-4'>
-
-                        {/*
-                          <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
-                            <InputCheckbox
-                              parentClassName='connection__form__rememberme'
-                              customClass=''
-                              label='Se souvenir de moi'
+                        <div className='col-12 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
+                          <div className='connection__form__rememberme' onClick={this.handleChangeRememberMe}>
+                            <Checkbox
+                              name='inputRememberMe'
                               checked={this.state.inputRememberMe}
-                              onChange={this.handleChangeRememberMe}
                             />
+                            Se souvenir de moi
                           </div>
-                        */}
 
-                        <div className='col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
                           <LoginBtnForgotPw
                             customClass='connection__form__pwforgot'
                             label={this.props.t('Forgotten password ?')}
                           />
                         </div>
-                        <Button
-                          htmlType='button'
-                          bootstrapType='primary'
-                          customClass='connection__form__btnsubmit ml-auto'
-                          label={this.props.t('Connection')}
-                          onClick={this.handleClickSubmit}
-                        />
+
+                        <div className='col-6 col-sm-6 col-md-6 col-lg-6 col-xl-6'>
+                          <Button
+                            htmlType='button'
+                            bootstrapType='primary'
+                            customClass='connection__form__btnsubmit ml-auto'
+                            label={this.props.t('Connection')}
+                            onClick={this.handleClickSubmit}
+                          />
+                        </div>
                       </div>
                     </div>
 

frontend/src/container/ProgressBar.jsx

@@ -13,7 +13,7 @@ class ProgressBar extends Component {
               <span className='progress-right'>
                 <span className='progress-bar' />
               </span>
-              <div className='progress-value'>
+              <div className='progress-value primaryColorBg'>
                 90%
               </div>
             </div>

frontend/src/container/Sidebar.jsx

@@ -83,6 +83,7 @@ class Sidebar extends React.Component {
     this.props.history.push(PAGE.WORKSPACE.CONTENT_LIST(idWs))
   }
 
+  // @DEPRECATED
   // not used, right now, link on sidebar filters is a <Link>
   handleClickContentFilter = (idWs, filter) => {
     const { workspace, history } = this.props

frontend/src/container/Tracim.jsx

@@ -5,8 +5,7 @@ import Sidebar from './Sidebar.jsx'
 import Header from './Header.jsx'
 import Login from './Login.jsx'
 import Account from './Account.jsx'
-import AdminWorkspacePage from './AdminWorkspacePage.jsx'
-import AppFullscreenManager from './AppFullscreenManager.jsx'
+import AppFullscreenRouter from './AppFullscreenRouter.jsx'
 import FlashMessage from '../component/FlashMessage.jsx'
 import WorkspaceContent from './WorkspaceContent.jsx'
 import WIPcomponent from './WIPcomponent.jsx'
@@ -130,15 +129,15 @@ class Tracim extends React.Component {
           <Route path={PAGE.ADMIN.ROOT} render={() =>
             <div className='sidebarpagecontainer'>
               <Sidebar />
-              <AppFullscreenManager />
+
+              <AppFullscreenRouter />
             </div>
           } />
 
-          <Route path='/admin_temp/workspace' component={AdminWorkspacePage} />
-
           <Route path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
 
           <div id='appFeatureContainer' />
+          <div id='popupCreateContentContainer' />
         </div>
 
       </div>

frontend/src/container/WorkspaceContent.jsx

@@ -16,11 +16,15 @@ import {
 } from 'tracim_frontend_lib'
 import {
   getWorkspaceContentList,
-  getFolderContent
+  getFolderContent,
+  putWorkspaceContentArchived,
+  putWorkspaceContentDeleted
 } from '../action-creator.async.js'
 import {
   newFlashMessage,
-  setWorkspaceContentList
+  setWorkspaceContentList,
+  setWorkspaceContentArchived,
+  setWorkspaceContentDeleted
 } from '../action-creator.sync.js'
 
 const qs = require('query-string')
@@ -125,14 +129,34 @@ class WorkspaceContent extends React.Component {
     console.log('%c<WorkspaceContent> download nyi', 'color: #c17838', content)
   }
 
-  handleClickArchiveContentItem = (e, content) => {
+  handleClickArchiveContentItem = async (e, content) => {
+    const { props, state } = this
+
     e.stopPropagation()
-    console.log('%c<WorkspaceContent> archive nyi', 'color: #c17838', content)
+
+    const fetchPutContentArchived = await props.dispatch(putWorkspaceContentArchived(props.user, content.idWorkspace, content.id))
+    switch (fetchPutContentArchived.status) {
+      case 204:
+        props.dispatch(setWorkspaceContentArchived(content.idWorkspace, content.id))
+        this.loadContentList(state.workspaceIdInUrl)
+        break
+      default: props.dispatch(newFlashMessage(props.t('Error while archiving document')))
+    }
   }
 
-  handleClickDeleteContentItem = (e, content) => {
+  handleClickDeleteContentItem = async (e, content) => {
+    const { props, state } = this
+
     e.stopPropagation()
-    console.log('%c<WorkspaceContent> delete nyi', 'color: #c17838', content)
+
+    const fetchPutContentDeleted = await props.dispatch(putWorkspaceContentDeleted(props.user, content.idWorkspace, content.id))
+    switch (fetchPutContentDeleted.status) {
+      case 204:
+        props.dispatch(setWorkspaceContentDeleted(content.idWorkspace, content.id))
+        this.loadContentList(state.workspaceIdInUrl)
+        break
+      default: props.dispatch(newFlashMessage(props.t('Error while deleting document')))
+    }
   }
 
   handleClickFolder = folderId => {
@@ -197,8 +221,6 @@ class WorkspaceContent extends React.Component {
           </PageTitle>
 
           <PageContent parentClass='workspace__content'>
-            <div id='popupCreateContentContainer' />
-
             <div className='workspace__content__fileandfolder folder__content active'>
               <ContentItemHeader />
 

frontend/src/css/AccountPage.styl

@@ -42,6 +42,8 @@ settingText()
   width 30px
 
 .account
+  margin 45px 0 0 0
+  width 100%
   .btn-outline-primary
     color thirdColor
     border-color thirdColor
@@ -67,11 +69,8 @@ settingText()
         height 150px
     &__name
       font-size 22px
-    &__email
-      color thirdColor
     &__company
       font-size 20px
-      color thirdColor
   &__delimiter
     position relative
     top 3px
@@ -131,11 +130,13 @@ settingText()
           &__txtinput
             display block
             width auto
-            border 1px solid thirdColor
+            border-width 1px
+            border-style solid
             border-radius 5px
           &__button
             vertical-align top
-            border 1px solid thirdColor
+            border-width 1px
+            border-style solid
             border-radius 5px
             padding 8px 25px
             cursor pointer

frontend/src/css/AdminWorkspacePage.styl

@@ -1,21 +0,0 @@
-.table th
-  vertical-align middle
-
-.adminWorkspacePage
-  &__createworkspace
-    &__btncreate
-      margin 25px 15px
-  &__description
-    margin 25px 0
-    font-size 20px
-  &__delimiter
-    margin 65px auto
-  &__workspaceTable
-    margin 25px 15px
-    &__deleteworkspace
-      display flex
-      align-items center
-      flex-wrap wrap
-      cursor pointer
-
-

frontend/src/css/Dashboard.styl

@@ -60,36 +60,46 @@ flexwrap()
     &__calltoaction
       justify-content center
 
+
+/**** MEDIAQUERIES ****/
+
 /**** MEDIA 992px & 1199px ****/
 
 @media (min-width: min-lg) and (max-width: max-lg)
 
   .dashboard
-    margin-left 15px
+    &__workspace
+      width 100%
+
+/**** MEDIA 768px & 991px ****/
+
+@media (min-width: min-md) and (max-width: max-md)
+
+  .dashboard
+    &__workspace
+      width 100%
 
 /**** MEDIA 576px & 767px ****/
 
 @media (min-width: min-sm) and (max-width: max-sm)
 
   .dashboard
-    &__activity
-      margin 25px 15px 25px 0
+    &__workspace
+      width 100%
 
 /**** MEDIA 575px ****/
 
 @media (max-width: max-xs)
 
   .dashboard
-    margin-left 0
-    &__title
-      margin-left 10px
+    &__header
+      &__advancedmode
+        margin 25px 15px
     &__workspace
-      margin-left 10px
-      width auto
-    &__userstatut
-      margin-left 10px
-      width auto
+      width 100%
     &__calltoaction
+      flex-direction column
+      align-items center
       justify-content center
       &__button
-        margin 10px
+        margin 20px 0

frontend/src/css/Generic.styl

@@ -202,10 +202,10 @@ a
   &__btn
     display flex
     margin-bottom 30px
-    border 1px solid thirdColor
+    border-width 1px
+    border-style solid
     border-radius 10px
     padding 15px 25px
-    color thirdColor
     cursor pointer
     &:hover, &:focus
       background-color thirdColor

frontend/src/css/Header.styl

@@ -24,6 +24,19 @@
       display flex
       margin-top 15px
       list-style none
+      &__adminlink
+        .adminlink
+          &__btn
+            margin-right 15px
+            border 1px solid grey
+            border-radius 5px
+            background-color transparent
+            &::after
+              margin-left 15px
+          &__setting
+            padding 0
+            .setting__link
+              padding 10px
       &__itemsearch
         display none
         margin-right 8%
@@ -33,9 +46,6 @@
           .search__addonsearch
             background-color transparent
             cursor pointer
-            &:hover
-              background-color thirdColor
-              color mainColor
       .btnnavbar
         border 1px solid grey
         background-color transparent
@@ -99,6 +109,7 @@
             padding 0
             left inherit
             right 0
+            width 100%
             cursor pointer
             .setting__link
               padding 10px

frontend/src/css/Login.styl

@@ -15,13 +15,17 @@
     border none
     box-shadow shadow-right
     .connection__header
-      background-color thirdColor
-      color #FFF
+      color off-white
       font-size 25px
   .connection__form
     &__rememberme
-      &__label
-        font-size 13px
+      margin-bottom 10px
+      font-size 14px
+      line-height 23px
+      cursor pointer
+      label
+        margin-right 8px
+        top 4px
     &__groupemail
       position relative
       &__icon
@@ -55,14 +59,6 @@
     &__pwforgot
       cursor pointer
       font-size 13px
-      &:hover::after
-        position absolute
-        top 20px
-        left 15px
-        border-bottom 1px solid darkGrey
-        padding-bottom 2px
-        content ' '
-        width 130px
   &__footer
     position fixed
     bottom 2%

frontend/src/css/ProgressBar.styl

@@ -64,7 +64,6 @@
     height 90%
     border 10px solid off-white
     border-radius 50%
-    background darkBlue
     font-size 24px
     color off-white
     line-height 135px

frontend/src/css/index.styl

@@ -30,5 +30,3 @@ html, body, #content
 @import 'HomepageCard'
 
 @import 'ExtandedAction'
-
-@import 'AdminWorkspacePage'

frontend/src/helper.js

@@ -37,7 +37,7 @@ export const PAGE = {
   ADMIN: {
     ROOT: '/admin',
     WORKSPACE: '/admin/workspace',
-    USEr: '/admin/user'
+    USER: '/admin/user'
   }
 }
 
@@ -67,4 +67,9 @@ export const ROLE = [{
   label: 'Workspace manager'
 }]
 
+export const PROFILE = {
+  ADMINISTRATOR: 'administrators',
+  USER: 'users'
+}
+
 export const handleRouteFromApi = route => route.startsWith('/#') ? route.slice(2) : route

frontend/src/reducer/workspaceContentList.js

@@ -3,25 +3,29 @@ import {
   UPDATE,
   WORKSPACE,
   WORKSPACE_CONTENT,
-  FOLDER
+  FOLDER,
+  WORKSPACE_CONTENT_ARCHIVED,
+  WORKSPACE_CONTENT_DELETED
 } from '../action-creator.sync.js'
 
 export default function workspaceContentList (state = [], action) {
   switch (action.type) {
     case `${SET}/${WORKSPACE_CONTENT}`:
-      return action.workspaceContentList.map(wsc => ({
-        id: wsc.content_id,
-        label: wsc.label,
-        slug: wsc.slug,
-        type: wsc.content_type,
-        idWorkspace: wsc.workspace_id,
-        isArchived: wsc.is_archived,
-        idParent: wsc.parent_id,
-        isDeleted: wsc.is_deleted,
-        showInUi: wsc.show_in_ui,
-        statusSlug: wsc.status,
-        subContentTypeSlug: wsc.sub_content_type_slug
-      }))
+      return action.workspaceContentList
+        .sort((a, b) => a.slug < b.slug ? -1 : 1)
+        .map(wsc => ({
+          id: wsc.content_id,
+          label: wsc.label,
+          slug: wsc.slug,
+          type: wsc.content_type,
+          idWorkspace: wsc.workspace_id,
+          isArchived: wsc.is_archived,
+          idParent: wsc.parent_id,
+          isDeleted: wsc.is_deleted,
+          showInUi: wsc.show_in_ui,
+          statusSlug: wsc.status,
+          subContentTypeSlug: wsc.sub_content_type_slug
+        }))
 
     case `${UPDATE}/${WORKSPACE}/Filter`: // not used anymore ?
       return {...state, filter: action.filterList}
@@ -40,6 +44,18 @@ export default function workspaceContentList (state = [], action) {
         content: state.content.map(c => setFolderContent(c, action))
       }
 
+    case `${SET}/${WORKSPACE_CONTENT_ARCHIVED}`:
+      return state.map(wsc => wsc.idWorkspace === action.idWorkspace && wsc.id === action.idContent
+        ? {...wsc, isArchived: true}
+        : wsc
+      )
+
+    case `${SET}/${WORKSPACE_CONTENT_DELETED}`:
+      return state.map(wsc => wsc.idWorkspace === action.idWorkspace && wsc.id === action.idContent
+        ? {...wsc, isDeleted: true}
+        : wsc
+      )
+
     default:
       return state
   }

frontend_app_admin_workspace_user/src/component/AdminWorkspace.jsx

@@ -0,0 +1,194 @@
+import React from 'react'
+import {
+  Delimiter,
+  PageWrapper,
+  PageTitle,
+  PageContent
+} from 'tracim_frontend_lib'
+
+export class AdminWorkspace extends React.Component {
+  render () {
+    return (
+      <PageWrapper customClass='adminWorkspacePage'>
+        <PageTitle
+          parentClass={'adminWorkspacePage'}
+          title={'Workspace management'}
+        />
+
+        <PageContent parentClass='adminWorkspacePage'>
+
+          <div className='adminWorkspacePage__description'>
+            List of every workspaces
+          </div>
+
+          { /*
+            Alexi Cauvin 08/08/2018 => desactivate create workspace button due to redundancy
+
+            <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 className='table'>
+              <thead>
+                <tr>
+                  <th scope='col'>ID</th>
+                  <th scope='col'>Workspace</th>
+                  <th scope='col'>Description</th>
+                  <th scope='col'>Member count</th>
+                  { /*
+                      <th scope='col'>Calendar</th>
+                    */ }
+                  <th scope='col'>Delete workspace</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <th>1</th>
+                  <td>Design v_2</td>
+                  <td>Workspace about tracim v2 design</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>
+                    */ }
+                  <td>8</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>2</th>
+                  <td>New features</td>
+                  <td>Add a new features : Annotated files</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>
+                    */ }
+                  <td>5</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>3</th>
+                  <td>Fix Backend</td>
+                  <td>workspace referring to multiple issues on the backend </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>
+                    */ }
+                  <td>3</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>4</th>
+                  <td>Design v_2</td>
+                  <td>Workspace about tracim v2 design</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>
+                    */ }
+                  <td>8</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>5</th>
+                  <td>New features</td>
+                  <td>Add a new features : Annotated files</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>
+                    */ }
+                  <td>5</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <th>6</th>
+                  <td>Fix Backend</td>
+                  <td>workspace referring to multiple issues on the backend </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>
+                    */ }
+                  <td>3</td>
+                  <td>
+                    <div className='adminWorkspacePage__workspaceTable__deleteworkspace primaryColorFont primaryColorFontDarkenHover'>
+                      <div className='adminWorkspacePage__workspaceTable__deleteworkspace__removalicon mr-3'>
+                        <i className='fa fa-fw fa-trash-o' />
+                      </div>
+                      Delete
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+
+        </PageContent>
+      </PageWrapper>
+    )
+  }
+}
+
+export default AdminWorkspace

frontend_app_admin_workspace_user/src/container/AdminWorkspaceUser.jsx

@@ -2,15 +2,15 @@ import React from 'react'
 import { translate } from 'react-i18next'
 import i18n from '../i18n.js'
 import {
-  addAllResourceI18n,
-  // handleFetchResult,
-  PageWrapper,
-  PageTitle,
-  PageContent
+  addAllResourceI18n
+  // handleFetchResult
 } from 'tracim_frontend_lib'
 import { debug } from '../helper.js'
 import {
 } from '../action.async.js'
+import AdminWorkspace from '../component/AdminWorkspace.jsx'
+
+require('../css/index.styl')
 
 class AdminWorkspaceUser extends React.Component {
   constructor (props) {
@@ -32,7 +32,10 @@ class AdminWorkspaceUser extends React.Component {
 
   customEventReducer = ({ detail: { type, data } }) => { // action: { type: '', data: {} }
     switch (type) {
-      // console.log('%c<AdminWorkspaceUser> Custom event', 'color: #28a745', type, data)
+      case 'admin_workspace_user_showApp':
+        console.log('%c<AdminWorkspaceUser> Custom event', 'color: #28a745', type, data)
+        this.setState({config: data.config})
+        break
       default:
         break
     }
@@ -48,6 +51,7 @@ class AdminWorkspaceUser extends React.Component {
     const { state } = this
 
     console.log('%c<AdminWorkspaceUser> did update', `color: ${this.state.config.hexcolor}`, prevState, state)
+    if (prevState.config.type !== state.config.type) this.loadContent()
   }
 
   componentWillUnmount () {
@@ -67,17 +71,13 @@ class AdminWorkspaceUser extends React.Component {
 
     return (
       <div>
-        <PageWrapper customeClass='admin'>
-          <PageTitle
-            parentClass='admin__header'
-            customClass='justify-content-between'
-            title={'Admin'}
-          />
-
-          <PageContent parentClass='workspace__content'>
-            woot { this.state.config.type }
-          </PageContent>
-        </PageWrapper>
+        {this.state.config.type === 'workspace' &&
+          <AdminWorkspace />
+        }
+
+        {this.state.config.type === 'user' &&
+          <div>not yet implemented</div>
+        }
       </div>
     )
   }

frontend_app_admin_workspace_user/src/css/index.styl

@@ -1 +1,21 @@
 @import "../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
+
+.table th
+  vertical-align middle
+
+.adminWorkspacePage
+  &__createworkspace
+    &__btncreate
+      margin 25px 15px
+  &__description
+    margin 25px 0
+    font-size 20px
+  &__delimiter
+    margin 65px auto
+  &__workspaceTable
+    margin 25px 15px
+    &__deleteworkspace
+      display flex
+      align-items center
+      flex-wrap wrap
+      cursor pointer

frontend_app_html-document/src/action.async.js

@@ -117,3 +117,13 @@ export const putHtmlDocRestoreDeleted = (user, apiUrl, idWorkspace, idContent) =
     method: 'PUT'
   })
 }
+
+export const putHtmlDocRead = (user, apiUrl, idWorkspace, idContent) => {
+  return fetch(`${apiUrl}/users/${user.user_id}/workspaces/${idWorkspace}/contents/${idContent}/read`, {
+    headers: {
+      'Authorization': 'Basic ' + user.auth,
+      ...FETCH_CONFIG.headers
+    },
+    method: 'PUT'
+  })
+}

frontend_app_html-document/src/container/HtmlDocument.jsx

@@ -26,7 +26,8 @@ import {
   putHtmlDocIsArchived,
   putHtmlDocIsDeleted,
   putHtmlDocRestoreArchived,
-  putHtmlDocRestoreDeleted
+  putHtmlDocRestoreDeleted,
+  putHtmlDocRead
 } from '../action.async.js'
 
 class HtmlDocument extends React.Component {
@@ -165,6 +166,9 @@ class HtmlDocument extends React.Component {
         console.log('Error loading Timeline.', e)
         this.setState({timeline: []})
       })
+
+    await Promise.all([fetchResultHtmlDocument, fetchResultComment, fetchResultRevision])
+    putHtmlDocRead(loggedUser, config.apiUrl, content.workspace_id, content.content_id) // mark as read after all requests are finished
   }
 
   handleClickBtnCloseApp = () => {

frontend_app_thread/src/action.async.js

@@ -108,3 +108,13 @@ export const putThreadRestoreDeleted = (user, apiUrl, idWorkspace, idContent) =>
     method: 'PUT'
   })
 }
+
+export const putThreadRead = (user, apiUrl, idWorkspace, idContent) => {
+  return fetch(`${apiUrl}/users/${user.user_id}/workspaces/${idWorkspace}/contents/${idContent}/read`, {
+    headers: {
+      'Authorization': 'Basic ' + user.auth,
+      ...FETCH_CONFIG.headers
+    },
+    method: 'PUT'
+  })
+}

frontend_app_thread/src/container/Thread.jsx

@@ -22,7 +22,8 @@ import {
   putThreadIsArchived,
   putThreadIsDeleted,
   putThreadRestoreArchived,
-  putThreadRestoreDeleted
+  putThreadRestoreDeleted,
+  putThreadRead
 } from '../action.async.js'
 
 class Thread extends React.Component {
@@ -108,20 +109,24 @@ class Thread extends React.Component {
       handleFetchResult(await fetchResultThread),
       handleFetchResult(await fetchResultThreadComment)
     ])
-      .then(([resThread, resComment]) => this.setState({
-        content: resThread.body,
-        listMessage: resComment.body.map(c => ({
-          ...c,
-          timelineType: 'comment',
-          created: (new Date(c.created)).toLocaleString(),
-          author: {
-            ...c.author,
-            avatar_url: c.author.avatar_url
-              ? c.author.avatar_url
-              : generateAvatarFromPublicName(c.author.public_name)
-          }
-        }))
-      }))
+      .then(([resThread, resComment]) => {
+        this.setState({
+          content: resThread.body,
+          listMessage: resComment.body.map(c => ({
+            ...c,
+            timelineType: 'comment',
+            created: (new Date(c.created)).toLocaleString(),
+            author: {
+              ...c.author,
+              avatar_url: c.author.avatar_url
+                ? c.author.avatar_url
+                : generateAvatarFromPublicName(c.author.public_name)
+            }
+          }))
+        })
+
+        putThreadRead(loggedUser, config.apiUrl, content.workspace_id, content.content_id)
+      })
       .catch(e => console.log('Error loading Thread data.', e))
   }
 

frontend_lib/src/component/Input/Checkbox.jsx

@@ -59,8 +59,6 @@ Checkbox.propTypes = {
 }
 
 Checkbox.defaultProps = {
-  name: '',
-  onClickCheckbox: () => {},
   checked: false,
   disabled: false
 }

frontend_lib/src/component/Timeline/Timeline.jsx

@@ -189,7 +189,7 @@ Timeline.propTypes = {
   isArchived: PropTypes.bool,
   onClickRestoreArchived: PropTypes.func,
   isDeleted: PropTypes.bool,
-  onClickRestoreDeleted: PropTypes.func,
+  onClickRestoreDeleted: PropTypes.func
 }
 
 Timeline.defaultProps = {

setup_default_backend.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+. bash_library.sh # source bash_library.sh
+. backend_lib.sh # source backend_lib.sh
+
+install_backend_system_deb
+
+log "go to backend subdir.."
+cd backend || exit 1;
+
+
+install_backend_system_dep
+setup_pyenv
+install_backend_python_packages
+setup_config_file
+setup_db
+
+log "backend of tracim was correctly set-up."