Merge branch 'develop' into feature/734_add_lang_to_user

.gitignore

@@ -6,3 +6,11 @@ frontend_app_html-document/dist/html-document.app.js
 frontend_lib/dist/tracim_frontend_lib.js
 npm-debug.log
 package-lock.json
+color.json
+
+#ignore file or folder about cypress tests
+functionnal_tests/package.json
+functionnal_tests/cypress.json
+functionnal_tests/node_modules/
+functionnal_tests/cypress/
+

README.md

@@ -3,6 +3,7 @@ develop branch status:
 [![Coverage Status](https://coveralls.io/repos/github/tracim/tracim_v2/badge.svg?branch=develop)](https://coveralls.io/github/tracim/tracim_v2?branch=develop)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/tracim/tracim_v2/badges/quality-score.png?b=develop)](https://scrutinizer-ci.com/g/tracim/tracim_v2/?branch=develop)
 
+
 ## Install Tracim on your server ##
 
 Following the installation documentation below, you'll be able to run your own instance on your server.
@@ -13,30 +14,40 @@ Following the installation documentation below, you'll be able to run your own i
 
 ## Get the source ##
 
-Get the sources from GitHub:
+Get the sources from GitHub (you need git):
 
     git clone https://github.com/tracim/tracim_v2.git
     cd tracim_v2/
 
-## Install backend ##
+## Install backend
+### Option 1: Install backend manually ###
+
+see [Backend README](backend/README.md)
+
+### Option2: Install backend: Automated script for easy setup ###
+
+This script run backend with simple default conf: development.ini conf file, use
+default config file, sqlite database, etc...
 
     ./setup_default_backend.sh
 
-For debugging you can uncomment this 2 lines in '/backend/development.ini'
-    
-    ~~~
-    #pyramid.includes =
-    #    pyramid_debugtoolbar
-    ~~~
+For each conf file missing, this script will generated them from default conf.
+If sqlite default database is missing, script will generate it.
+This script is also able to serve for update. If you want to update a script
+generated tracim install, you can just update source code with git pull and
+rerun the same script to update database model, system deps and python deps.
+
+for more information about configuring tracim_backend, see [Backend README](backend/README.md)
+for more information about configuration file, see development.ini.sample documentation
+and [Backend setting file doc](backend/doc/setting.md).
 
-If you use debugtoolbar, you can seen one red button on right of the Tracim web interface.
 
-## Install frontend ##
+## Install frontend: Automated Script for easy setup ##
 
     ./install_frontend_dependencies.sh
     ./build_full_frontend.sh
 
-## Running Tracim  ##
+## Running Tracim using pserve ##
 
     cd backend/
     source env/bin/activate
@@ -45,7 +56,33 @@ If you use debugtoolbar, you can seen one red button on right of the Tracim web
 You can now enter the application at
 [http://127.0.0.1:6543](http://127.0.0.1:6543) and login with admin user:
 
- * user : `admin@admin.admin`
- * password : `admin@admin.admin`
+ * user: `admin@admin.admin`
+ * password: `admin@admin.admin`
+
+----
+
+## Running tests with cypress ##
+
+----
+
+## Installation of cypress: Automated script for easy setup ##
+
+This script check if nodejs is installed (npm is necessary to install Cypress), if file package.json and cypress.json exist in 'functionnal_tests' folder. if not the script install necessary file and install Cypress and his dependency's.
+
+    ./install_cypress.sh
+
+## Run tests with command line ##
+
+This command run all test present in 'cypress_test' folder.
+
+    cd functionnal_tests/
+    ./node_modules/.bin/cypress run
+
+## Run tests with cypressgui ##
+
+Open Cypress with graphical interface. You can show test running directly in web interface.
+
+    cd functionnal_tests/
+    ./node_modules/.bin/cypress open
 
 

backend/README.md

@@ -85,8 +85,11 @@ create wsgidav configuration file for webdav:
 
     cp wsgidav.conf.sample wsgidav.conf
 
-## Run Tracim_backend With Uwsgi : great for production ##
+if not did before, you need to create a color.json file at root of tracim_v2 :
+   
+    cp ../color.json.sample ../color.json
 
+## Run Tracim_backend With Uwsgi : great for production ##
 
 #### Install Uwsgi
 

backend/color-test.json

@@ -0,0 +1,6 @@
+{
+  "primary": "#7d4e24",
+  "contents/html-document": "#3f52e3",
+  "contents/thread": "#ad4cf9",
+  "contents/file": "#ff9900"
+}

backend/development.ini.sample

@@ -35,6 +35,8 @@ retry.attempts = 3
 
 ### Global
 
+# Enable debug mode
+# debug = True
 cache_dir = %(here)s/data
 # preview generator cache directory
 preview_cache_dir = /tmp/tracim/preview/
@@ -193,6 +195,13 @@ frontend.serve = True
 # organisation.
 # frontend.dist_folder_path = /home/user/tracim_v2/frontend/dist
 
+### Color
+# check for color.json file in tracim_v2, check by default in tracim_v2 parent
+# dir of backend.
+# you can set a specific file path here
+# color.config_file_path = /home/user/tracim_v2/color.json
+
+
 ###
 # wsgi server configuration
 ###

backend/doc/setting.md

@@ -1,8 +1,13 @@
-# Setting #
+# Settings #
 
-Here is a short description of settings available in the file `development.ini`.
+Here is a short description of settings available in backend config files.
 
-## Listening port ##
+# Tracim config ini file #
+
+This file is called'development.ini' file by default, it's located is backend
+subdir, default config is [development.ini.sample](../development.ini.sample) with some doc.
+
+## Listening port (for pserve only) ##
 
 Default configuration is to listen on port 6534.
 If you want to adapt this to your environment, edit the `.ini` file and setup the port you want:
@@ -17,30 +22,93 @@ To allow other computer to access to this website, listen to "*" instead of loca
     ...
     listen = *:6534
 
-## Prod/Debug configuration ##
+## Database path ##
+
+To configure a database, you need to provide a valid sqlalchemy url:
+
+for sqlite, a valid value is something like this:
+
+    sqlalchemy.url = sqlite:///%(here)s/tracim.sqlite
+
+to know more about this, see [sqlalchemy documentation](http://docs.sqlalchemy.org/en/latest/core/engines.html).
+
+Be carefull, if sqlalchemy support many kind of Database, Tracim support is **not** guarantee.
+Tracim is officially supporting sqlite, postgresql and mysql.
+
+## Debugging and Logs ##
+### Debug params ###
+
+
+For debugging you can uncomment this 2 lines in '/backend/development.ini' to
+enable pyramid debugtoolbar.
+If you use debugtoolbar, you can seen one red button on right of the Tracim web interface.
+
+    ~~~
+    #pyramid.includes =
+    #    pyramid_debugtoolbar
+    ~~~
+
+you can add this line to active pyramid debug mode for almost anything:
+
+    ~~~
+    pyramid.debug_all = true
+    ~~~
+
+
+Hapic debug mode: this line is needed for more explicit json error,
+raised error traceback will be send through json. you can uncomment it
+
+   ~~~
+   # debug = True
+   ~~~
+
+pyramid.reload_templates = true
+
+### Prod/Debug configuration example ###
 
 
 To enable simple debug conf:
 
-    [app:main]
+    [app:tracim_web]
     ...
     pyramid.reload_templates = true
     pyramid.debug_all = true
     pyramid.includes =
         pyramid_debugtoolbar
 
+    [DEFAULT]
+    ...
+    debug = True
+
+
 production conf (no reload, no debugtoolbar):
 
-    [app:main]
+    [app:tracim_web]
     ...
     pyramid.reload_templates = false
     pyramid.debug_authorization = false
     pyramid.debug_notfound = false
     pyramid.debug_routematch = false
 
-You can, of course, also set level of one of the different logger to have more/less log
-about something.
+    [DEFAULT]
+    ...
+    debug = False
+
+You can, of course, also set level of one of the different logger
+to have more/less log about something.
 
     [logger_sqlalchemy]
     ...
     level = INFO
+
+# Color File #
+
+You can change default color of apps by setting color.json file, by default,
+placed at root of tracim_v2 dir, see [color.json.sample](../../color.json.sample)
+for default config file.
+
+# Wsgidav File
+
+This file is by default placed in backend subdir,
+it by default called wsigdav.conf, for more information, see default
+conf file [wsigdav.conf.sample](../wsgidav.conf.sample).

backend/setup.py

@@ -43,7 +43,6 @@ requires = [
     'rq',
     # frontend file serve
     'pyramid_mako',
-    'spectra',
 ]
 
 tests_require = [

backend/tests_configs.ini

@@ -5,6 +5,8 @@ depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
+
 [app:command_test]
 use = egg:tracim_backend
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -13,6 +15,7 @@ depot_storage_dir = /tmp/test/depot
 user.auth_token.validity = 604800
 preview_cache_dir = /tmp/test/preview_cache
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [mail_test]
 sqlalchemy.url = sqlite:///:memory:
@@ -39,6 +42,7 @@ email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [mail_test_async]
 sqlalchemy.url = sqlite:///:memory:
@@ -66,6 +70,7 @@ email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [functional_test]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -76,6 +81,7 @@ preview_cache_dir = /tmp/test/preview_cache
 preview.jpg.restricted_dims = True
 email.notification.activated = false
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [functional_test_no_db]
 sqlalchemy.url = sqlite://
@@ -86,6 +92,7 @@ preview_cache_dir = /tmp/test/preview_cache
 preview.jpg.restricted_dims = True
 email.notification.activated = false
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [functional_test_with_mail_test_sync]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -111,6 +118,7 @@ email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
 
 [functional_test_with_mail_test_async]
 sqlalchemy.url = sqlite:///tracim_test.sqlite
@@ -136,3 +144,14 @@ email.notification.smtp.port = 1025
 email.notification.smtp.user = test_user
 email.notification.smtp.password = just_a_password
 website.base_url = http://localhost:6543
+color.config_file_path = %(here)s/color-test.json
+
+[webdav_test]
+website.base_url = http://localhost:6543
+sqlalchemy.url = sqlite:///:memory:
+user.auth_token.validity = 604800
+depot_storage_dir = /tmp/test/depot
+depot_storage_name = test
+preview_cache_dir = /tmp/test/preview_cache
+color.config_file_path = %(here)s/color-test.json
+wsgidav.config_path = %(here)s/wsgidav-test.conf

backend/tracim_backend/app_models/applications.py

@@ -0,0 +1,76 @@
+# coding=utf-8
+import typing
+
+from tracim_backend.app_models.contents import ContentType
+if typing.TYPE_CHECKING:
+    from tracim_backend.config import CFG
+    from tracim_backend.app_models.contents import ContentStatus
+
+
+class Application(object):
+    """
+    Application class with data needed for frontend
+    """
+    def __init__(
+            self,
+            label: str,
+            slug: str,
+            fa_icon: str,
+            is_active: bool,
+            config: typing.Dict[str, str],
+            main_route: str,
+            app_config: 'CFG',
+    ) -> None:
+        """
+        @param label: public label of application
+        @param slug: identifier of application
+        @param fa_icon: font awesome icon class
+        @param is_active: True if application enable, False if inactive
+        @param config: a dict with eventual application config
+        @param main_route: the route of the frontend "home" screen of
+        the application. For exemple, if you have an application
+        called "calendar", the main route will be something
+        like /#/workspace/{wid}/calendar.
+        """
+        self.label = label
+        self.slug = slug
+        self.fa_icon = fa_icon
+        self.hexcolor = self._get_hexcolor_or_default(slug, app_config)
+        self.is_active = is_active
+        self.config = config
+        self.main_route = main_route
+        self.content_types = []
+
+    # TODO - G.M - 2018-08-07 - Refactor slug coherence issue like this one.
+    # we probably should not have 2 kind of slug
+    @property
+    def minislug(self):
+        return self.slug.replace('contents/', '')
+
+    def add_content_type(
+            self,
+            label: str,
+            slug: str,
+            creation_label: str,
+            available_statuses: typing.List['ContentStatus'],
+            slug_alias: typing.List[str] = None,
+            allow_sub_content: bool = False,
+    ):
+        content_type = ContentType(
+            slug=slug,
+            fa_icon=self.fa_icon,
+            label=label,
+            hexcolor=self.hexcolor,
+            creation_label=creation_label,
+            available_statuses=available_statuses,
+            slug_alias=slug_alias,
+            allow_sub_content=allow_sub_content,
+        )
+        self.content_types.append(content_type)
+
+    def _get_hexcolor_or_default(self, slug: str, app_config: 'CFG') -> str:
+        assert app_config.APPS_COLORS
+        assert 'primary' in app_config.APPS_COLORS
+        if slug in app_config.APPS_COLORS:
+            return app_config.APPS_COLORS[slug]
+        return app_config.APPS_COLORS['primary']

backend/tracim_backend/models/contents.py → backend/tracim_backend/app_models/contents.py

@@ -2,17 +2,15 @@
 import typing
 from enum import Enum
 
+from tracim_backend.extensions import app_list
 from tracim_backend.exceptions import ContentTypeNotExist
 from tracim_backend.exceptions import ContentStatusNotExist
-from tracim_backend.models.applications import html_documents
-from tracim_backend.models.applications import _file
-from tracim_backend.models.applications import folder
-from tracim_backend.models.applications import thread
-from tracim_backend.models.applications import markdownpluspage
-
 
 ####
 # Content Status
+from tracim_backend.lib.core.application import ApplicationApi
+if typing.TYPE_CHECKING:
+    from tracim_backend.app_models.applications import Application
 
 
 class GlobalStatus(Enum):
@@ -134,60 +132,17 @@ class ContentType(object):
         self.allow_sub_content = allow_sub_content
 
 
-thread_type = ContentType(
-    slug='thread',
-    fa_icon=thread.fa_icon,
-    hexcolor=thread.hexcolor,
-    label='Thread',
-    creation_label='Discuss about a topic',
-    available_statuses=CONTENT_STATUS.get_all(),
-)
-
-file_type = ContentType(
-    slug='file',
-    fa_icon=_file.fa_icon,
-    hexcolor=_file.hexcolor,
-    label='File',
-    creation_label='Upload a file',
-    available_statuses=CONTENT_STATUS.get_all(),
-)
-
-markdownpluspage_type = ContentType(
-    slug='markdownpage',
-    fa_icon=markdownpluspage.fa_icon,
-    hexcolor=markdownpluspage.hexcolor,
-    label='Rich Markdown File',
-    creation_label='Create a Markdown document',
-    available_statuses=CONTENT_STATUS.get_all(),
-)
-
-html_documents_type = ContentType(
-    slug='html-document',
-    fa_icon=html_documents.fa_icon,
-    hexcolor=html_documents.hexcolor,
-    label='Text Document',
-    creation_label='Write a document',
-    available_statuses=CONTENT_STATUS.get_all(),
-    slug_alias=['page']
-)
-
-# TODO - G.M - 31-05-2018 - Set Better folder params
-folder_type = ContentType(
-    slug='folder',
-    fa_icon=folder.fa_icon,
-    hexcolor=folder.hexcolor,
-    label='Folder',
-    creation_label='Create a folder',
-    available_statuses=CONTENT_STATUS.get_all(),
-    allow_sub_content=True,
-)
-
+THREAD_TYPE = 'thread'
+FILE_TYPE = 'file'
+MARKDOWNPLUSPAGE_TYPE = 'markdownpage'
+HTML_DOCUMENTS_TYPE = 'html-document'
+FOLDER_TYPE = 'folder'
 
 # TODO - G.M - 31-05-2018 - Set Better Event params
 event_type = ContentType(
     slug='event',
-    fa_icon=thread.fa_icon,
-    hexcolor=thread.hexcolor,
+    fa_icon='',
+    hexcolor='',
     label='Event',
     creation_label='Event',
     available_statuses=CONTENT_STATUS.get_all(),
@@ -196,8 +151,8 @@ event_type = ContentType(
 # TODO - G.M - 31-05-2018 - Set Better Event params
 comment_type = ContentType(
     slug='comment',
-    fa_icon=thread.fa_icon,
-    hexcolor=thread.hexcolor,
+    fa_icon='',
+    hexcolor='',
     label='Comment',
     creation_label='Comment',
     available_statuses=CONTENT_STATUS.get_all(),
@@ -209,19 +164,36 @@ class ContentTypeList(object):
     ContentType List
     """
     Any_SLUG = 'any'
-    Folder = folder_type
     Comment = comment_type
     Event = event_type
-    File = file_type
-    Page = html_documents_type
-    Thread = thread_type
 
-    def __init__(self, extend_content_status: typing.List[ContentType]):
-        self._content_types = [self.Folder]
-        self._content_types.extend(extend_content_status)
+    @property
+    def Folder(self):
+        return self.get_one_by_slug(FOLDER_TYPE)
+
+    @property
+    def File(self):
+        return self.get_one_by_slug(FILE_TYPE)
+
+    @property
+    def Page(self):
+        return self.get_one_by_slug(HTML_DOCUMENTS_TYPE)
+
+    @property
+    def Thread(self):
+        return self.get_one_by_slug(THREAD_TYPE)
+
+    def __init__(self, app_list: typing.List['Application']):
+        self.app_list = app_list
         self._special_contents_types = [self.Comment]
         self._extra_slugs = [self.Any_SLUG]
 
+    @property
+    def _content_types(self):
+        app_api = ApplicationApi(self.app_list)
+        content_types = app_api.get_content_types()
+        return content_types
+
     def get_one_by_slug(self, slug: str) -> ContentType:
         """
         Get ContentType object according to slug
@@ -235,21 +207,24 @@ class ContentTypeList(object):
                 return item
         raise ContentTypeNotExist()
 
-    def endpoint_allowed_types_slug(self) -> typing.List[str]:
+    def restricted_allowed_types_slug(self) -> typing.List[str]:
         """
-        Return restricted list of content_type:
-        dont return special content_type like  comment, don't return
+        Return restricted list of content_type: don't return
         "any" slug, dont return content type slug alias , don't return event.
         Useful to restrict slug param in schema.
         """
         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 endpoint_allowed_types_slug(self) -> typing.List[str]:
+        """
+        Same as restricted_allowed_types_slug but with special content_type
+        included like comments.
+        """
+        content_types = self._content_types
+        content_types.extend(self._special_contents_types)
+        allowed_type_slug = [contents_type.slug for contents_type in content_types]  # nopep8
+        return allowed_type_slug
 
     def query_allowed_types_slugs(self) -> typing.List[str]:
         """
@@ -258,19 +233,19 @@ class ContentTypeList(object):
         Usefull allowed value to perform query to database.
         """
         allowed_types_slug = []
-        for content_type in self._content_types:
+        content_types = self._content_types
+        content_types.extend(self._special_contents_types)
+        for content_type in content_types:
             allowed_types_slug.append(content_type.slug)
             if content_type.slug_alias:
                 allowed_types_slug.extend(content_type.slug_alias)
-        for content_type in self._special_contents_types:
-            allowed_types_slug.append(content_type.slug)
         allowed_types_slug.extend(self._extra_slugs)
         return allowed_types_slug
 
     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()
+            sub_content_allowed = self.endpoint_allowed_types_slug()
         else:
             sub_content_allowed = [self.Comment.slug]
 
@@ -280,12 +255,4 @@ class ContentTypeList(object):
         return properties_dict
 
 
-CONTENT_TYPES = ContentTypeList(
-    [
-        thread_type,
-        file_type,
-        # TODO - G.M - 2018-08-02 - Restore markdown page content
-        #    markdownpluspage_type,
-        html_documents_type,
-    ]
-)
+CONTENT_TYPES = ContentTypeList(app_list)

backend/tracim_backend/app_models/validator.py

@@ -0,0 +1,11 @@
+from marshmallow.validate import OneOf
+from tracim_backend.app_models.contents import CONTENT_TYPES
+
+# TODO - G.M - 2018-08-08 - [GlobalVar] Refactor Global var
+# of tracim_backend, Be careful all_content_types_validator is a global_var !
+
+all_content_types_validator = OneOf(choices=[])
+
+
+def update_validators():
+    all_content_types_validator.choices = CONTENT_TYPES.endpoint_allowed_types_slug()  # nopep8

backend/tracim_backend/app_models/workspace_menu_entries.py

@@ -0,0 +1,33 @@
+class WorkspaceMenuEntry(object):
+    """
+    Application class with data needed for frontend
+    """
+    def __init__(
+            self,
+            label: str,
+            slug: str,
+            fa_icon: str,
+            hexcolor: str,
+            route: str,
+    ) -> None:
+        self.slug = slug
+        self.label = label
+        self.route = route
+        self.hexcolor = hexcolor
+        self.fa_icon = fa_icon
+
+
+dashboard_menu_entry = WorkspaceMenuEntry(
+  slug='dashboard',
+  label='Dashboard',
+  route='/#/workspaces/{workspace_id}/dashboard',
+  hexcolor='#252525',
+  fa_icon="signal",
+)
+all_content_menu_entry = WorkspaceMenuEntry(
+  slug="contents/all",
+  label="All Contents",
+  route="/#/workspaces/{workspace_id}/contents",
+  hexcolor="#fdfdfd",
+  fa_icon="th",
+)

backend/tracim_backend/config.py

@@ -1,15 +1,19 @@
 # -*- coding: utf-8 -*-
+import json
 from urllib.parse import urlparse
 
 import os
 from paste.deploy.converters import asbool
+from tracim_backend.app_models.validator import update_validators
+from tracim_backend.extensions import app_list
 from tracim_backend.lib.utils.logger import logger
 from depot.manager import DepotManager
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.applications import Application
+from tracim_backend.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_STATUS
 from tracim_backend.models.data import ActionDescription
 
 
-
 class CFG(object):
     """Object used for easy access to config file parameters."""
 
@@ -41,7 +45,36 @@ class CFG(object):
         ###
         # General
         ###
+        backend_folder = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))  # nopep8
+        tracim_v2_folder = os.path.dirname(backend_folder)
+        default_color_config_file_path = os.path.join(tracim_v2_folder, 'color.json')  # nopep8
+        self.COLOR_CONFIG_FILE_PATH = settings.get(
+            'color.config_file_path', default_color_config_file_path
+        )
+        if not os.path.exists(self.COLOR_CONFIG_FILE_PATH):
+            raise Exception(
+                'ERROR: {} file does not exist. '
+                'please create it or set color.config_file_path'
+                'with a correct value'.format(self.COLOR_CONFIG_FILE_PATH)
+            )
+
+        try:
+            with open(self.COLOR_CONFIG_FILE_PATH) as json_file:
+                self.APPS_COLORS = json.load(json_file)
+        except Exception as e:
+            raise Exception(
+                'Error: {} file could not be load as json'.format(self.COLOR_CONFIG_FILE_PATH) # nopep8
+            ) from e
 
+        try:
+            self.APPS_COLORS['primary']
+        except KeyError as e:
+            raise Exception(
+                'Error: primary color is required in {} file'.format(
+                    self.COLOR_CONFIG_FILE_PATH)  # nopep8
+            ) from e
+
+        self._set_default_app()
         mandatory_msg = \
             'ERROR: {} configuration is mandatory. Set it before continuing.'
         self.DEPOT_STORAGE_DIR = settings.get(
@@ -450,8 +483,6 @@ class CFG(object):
         # INFO - G.M - 2018-08-06 - we pretend that frontend_dist_folder
         # is probably in frontend subfolder
         # of tracim_v2 parent of both backend and frontend
-        backend_folder = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))  # nopep8
-        tracim_v2_folder = os.path.dirname(backend_folder)
         frontend_dist_folder = os.path.join(tracim_v2_folder, 'frontend', 'dist')  # nopep8
 
         self.FRONTEND_DIST_FOLDER_PATH = settings.get(
@@ -467,6 +498,10 @@ class CFG(object):
             )
 
     def configure_filedepot(self):
+
+        # TODO - G.M - 2018-08-08 - [GlobalVar] Refactor Global var
+        # of tracim_backend, Be careful DepotManager is a Singleton !
+
         depot_storage_name = self.DEPOT_STORAGE_NAME
         depot_storage_path = self.DEPOT_STORAGE_DIR
         depot_storage_settings = {'depot.storage_path': depot_storage_path}
@@ -475,6 +510,116 @@ class CFG(object):
             depot_storage_settings,
         )
 
+    def _set_default_app(self):
+        calendar = Application(
+            label='Calendar',
+            slug='calendar',
+            fa_icon='calendar',
+            is_active=False,
+            config={},
+            main_route='/#/workspaces/{workspace_id}/calendar',
+            app_config=self
+        )
+
+        thread = Application(
+            label='Threads',
+            slug='contents/thread',
+            fa_icon='comments-o',
+            is_active=True,
+            config={},
+            main_route='/#/workspaces/{workspace_id}/contents?type=thread',
+            app_config=self
+        )
+        thread.add_content_type(
+            slug='thread',
+            label='Thread',
+            creation_label='Discuss about a topic',
+            available_statuses=CONTENT_STATUS.get_all(),
+        )
+
+        folder = Application(
+            label='Folder',
+            slug='contents/folder',
+            fa_icon='folder-open-o',
+            is_active=True,
+            config={},
+            main_route='',
+            app_config=self
+        )
+        folder.add_content_type(
+            slug='folder',
+            label='Folder',
+            creation_label='Create a folder',
+            available_statuses=CONTENT_STATUS.get_all(),
+            allow_sub_content=True,
+        )
+
+        _file = Application(
+            label='Files',
+            slug='contents/file',
+            fa_icon='paperclip',
+            is_active=True,
+            config={},
+            main_route='/#/workspaces/{workspace_id}/contents?type=file',
+            app_config=self,
+        )
+        _file.add_content_type(
+            slug='file',
+            label='File',
+            creation_label='Upload a file',
+            available_statuses=CONTENT_STATUS.get_all(),
+        )
+
+        markdownpluspage = Application(
+            label='Markdown Plus Documents',
+            # TODO - G.M - 24-05-2018 - Check label
+            slug='content/markdownpluspage',
+            fa_icon='file-code-o',
+            is_active=False,
+            config={},
+            main_route='/#/workspaces/{workspace_id}/contents?type=markdownpluspage',
+            # nopep8
+            app_config=self,
+        )
+        markdownpluspage.add_content_type(
+            slug='markdownpage',
+            label='Rich Markdown File',
+            creation_label='Create a Markdown document',
+            available_statuses=CONTENT_STATUS.get_all(),
+        )
+
+        html_documents = Application(
+            label='Text Documents',  # TODO - G.M - 24-05-2018 - Check label
+            slug='contents/html-document',
+            fa_icon='file-text-o',
+            is_active=True,
+            config={},
+            main_route='/#/workspaces/{workspace_id}/contents?type=html-document',
+            app_config=self
+        )
+        html_documents.add_content_type(
+            slug='html-document',
+            label='Text Document',
+            creation_label='Write a document',
+            available_statuses=CONTENT_STATUS.get_all(),
+            slug_alias=['page']
+        )
+
+        # TODO - G.M - 2018-08-08 - [GlobalVar] Refactor Global var
+        # of tracim_backend, Be careful app_list is a global_var
+        app_list.clear()
+        app_list.extend([
+            html_documents,
+            markdownpluspage,
+            _file,
+            thread,
+            folder,
+            calendar,
+        ])
+        # TODO - G.M - 2018-08-08 - We need to update validators each time
+        # app_list is updated.
+        update_validators()
+
     class CST(object):
         ASYNC = 'ASYNC'
         SYNC = 'SYNC'

backend/tracim_backend/exceptions.py

@@ -204,9 +204,11 @@ class PageOfPreviewNotFound(NotFound):
 class PreviewDimNotAllowed(TracimException):
     pass
 
+
 class UnallowedSubContent(TracimException):
     pass
 
+
 class TooShortAutocompleteString(TracimException):
     pass
 
@@ -215,5 +217,9 @@ class PageNotFound(TracimException):
     pass
 
 
+class AppDoesNotExist(TracimException):
+    pass
+
+
 class EmailAlreadyExistInDb(TracimException):
     pass

backend/tracim_backend/extensions.py

@@ -1,3 +1,14 @@
 from hapic import Hapic
 
 hapic = Hapic()
+
+# TODO - G.M - 2018-08-08 - [GlobalVar] Refactor Global var of tracim_backend
+
+# INFO - G.M - 2018-08-08 - app_list
+# app_list is one of the few "global_val" in tracim_backend, with hapic
+# and all_content_types_validator.
+# The goal of this is to be able to get current list of loaded app.
+# List is empty until config load apps.
+# If you need to update app_list, think about updating Content validator like
+# all_content_types_validator , see  update_validators() method.
+app_list = []

backend/tracim_backend/fixtures/content.py

@@ -8,7 +8,7 @@ from tracim_backend.fixtures.users_and_groups import Test
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.revision_protection import new_revision
 

backend/tracim_backend/lib/core/application.py

@@ -0,0 +1,70 @@
+import typing
+from copy import copy
+
+from tracim_backend.exceptions import AppDoesNotExist
+from tracim_backend.app_models.workspace_menu_entries import WorkspaceMenuEntry
+from tracim_backend.app_models.workspace_menu_entries import dashboard_menu_entry
+from tracim_backend.app_models.workspace_menu_entries import all_content_menu_entry
+
+
+class ApplicationApi(object):
+
+    def __init__(
+        self,
+        app_list,
+        show_all: bool = False,
+    ) ->  None:
+        self.apps = app_list
+        self.show_all = show_all
+
+    def get_one(self, slug):
+        for app in self.apps:
+            if app.slug == slug:
+                return app
+        raise AppDoesNotExist('Application {app} does not exist'.format(app=slug))  # nopep8
+
+    def get_all(self):
+        active_apps = []
+        for app in self.apps:
+            if self.show_all or app.is_active:
+                active_apps.append(app)
+
+        return active_apps
+
+    def get_content_types(self):
+        active_content_types = []
+        for app in self.get_all():
+            if app.content_types:
+                for content_type in app.content_types:
+                    active_content_types.append(content_type)
+        return active_content_types
+
+    def get_default_workspace_menu_entry(
+            self,
+            workspace: 'Workspace',
+    ) -> typing.List[WorkspaceMenuEntry]:
+        """
+        Get default menu entry for a workspace
+        """
+        menu_entries = [
+            copy(dashboard_menu_entry),
+            copy(all_content_menu_entry),
+        ]
+        for app in self.get_all():
+            if app.main_route:
+                new_entry = WorkspaceMenuEntry(
+                    slug=app.slug,
+                    label=app.label,
+                    hexcolor=app.hexcolor,
+                    fa_icon=app.fa_icon,
+                    route=app.main_route
+                )
+                menu_entries.append(new_entry)
+
+        for entry in menu_entries:
+            entry.route = entry.route.replace(
+                '{workspace_id}',
+                str(workspace.workspace_id)
+            )
+
+        return menu_entries

backend/tracim_backend/lib/core/content.py

@@ -36,9 +36,9 @@ from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.exceptions import ContentNotFound
 from tracim_backend.exceptions import WorkspacesDoNotMatch
 from tracim_backend.lib.utils.utils import current_date_for_filename
-from tracim_backend.models.contents import CONTENT_STATUS
-from tracim_backend.models.contents import ContentType
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_STATUS
+from tracim_backend.app_models.contents import ContentType
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.data import ActionDescription
@@ -1137,7 +1137,7 @@ class ContentApi(object):
         """
         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():
+            if allowed_content_type_slug not in CONTENT_TYPES.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
 

backend/tracim_backend/lib/mail_notifier/notifier.py

@@ -20,7 +20,7 @@ from tracim_backend.lib.utils.logger import logger
 from tracim_backend.lib.utils.utils import get_login_frontend_url
 from tracim_backend.lib.utils.utils import get_email_logo_frontend_url
 from tracim_backend.models.auth import User
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import WorkspaceInContext
 from tracim_backend.models.data import ActionDescription

backend/tracim_backend/lib/utils/authentification.py

@@ -3,7 +3,7 @@ import typing
 from pyramid.request import Request
 from sqlalchemy.orm.exc import NoResultFound
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.models import User

backend/tracim_backend/lib/utils/authorization.py

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

backend/tracim_backend/lib/utils/request.py

@@ -15,7 +15,7 @@ from tracim_backend.exceptions import UserNotFoundInTracimRequest
 from tracim_backend.exceptions import UserDoesNotExist
 from tracim_backend.exceptions import WorkspaceNotFound
 from tracim_backend.exceptions import ImmutableAttribute
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.lib.core.workspace import WorkspaceApi

backend/tracim_backend/lib/utils/utils.py

@@ -3,11 +3,13 @@ import datetime
 import random
 import string
 from enum import Enum
+import colorsys
 
 from redis import Redis
 from rq import Queue
-
-from tracim_backend.config import CFG
+import typing
+if typing.TYPE_CHECKING:
+    from tracim_backend.config import CFG
 
 DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 DEFAULT_WEBDAV_CONFIG_FILE = "wsgidav.conf"
@@ -16,7 +18,7 @@ CONTENT_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}/contents/{content_type}
 WORKSPACE_FRONTEND_URL_SCHEMA = 'workspaces/{workspace_id}'  # nopep8
 
 
-def get_root_frontend_url(config: CFG) -> str:
+def get_root_frontend_url(config: 'CFG') -> str:
     """
     Return website base url with always '/' at the end
     """
@@ -28,19 +30,19 @@ def get_root_frontend_url(config: CFG) -> str:
     return base_url
 
 
-def get_login_frontend_url(config: CFG):
+def get_login_frontend_url(config: 'CFG'):
     """
     Return login page url
     """
     return get_root_frontend_url(config) + 'login'
 
 
-def get_email_logo_frontend_url(config: CFG):
+def get_email_logo_frontend_url(config: 'CFG'):
     # TODO - G.M - 11-06-2018 - [emailTemplateURL] correct value for email_logo_frontend_url  # nopep8
     return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4QUTDjMSlsws9AAAB89JREFUaN7tmWtwlFcZx3/PeXeXXLmKQJEGsFZApIUBnaqjUm4VgdYyCUib0cJoKLmHW5EWmlGoQkMICURgEPuhtiYDU7XcyVgKVugULZVCQAwUYyENYAmEXHb3PH7IFjYQNgnZHfnA+bKz+7573v//PPf/C/fWvdWhJWHfMbO4P479OpCAigeowWglPq3ARWfU9AJ7Cb/3MAXZn95dBLKKHsfIQmAUIq7rv6t6gU+BKCAGaEBkN9h88tLe7sgjTdjAJ5Y4OGYMIo80Aw8g4kakJyLxiDiIxABPoMwj5+XP3R0ESpP8WC1H1YuqBj4bUWwIB5gA0d/6/xFQFUpKHBJLHADyU9chTEc1BdEZqJ0O+ofb4xcPyuBIxoBQuHc4ov3w2zrwH0Nd0aBDccwgVPsjEg/4Uc4jegKfvkfMmQ9JSfECkFP0HGJeuu0TrJZhSacg9Xh4Caze2wsXC1B9GugO+BAqUIkC/QIinhYsYoEqYDt+fY2s8WXkFE5CnBIg+vaWtJuQukzy5te2l4Bz2ysTkxchshCRWERMU2BKT4RuiLT0vwagHsENPIyR7zAx2eGybws09AUZEQLHcNS5wMEdB8NjgaKyBNTuQuTLoWOAs6AHUd5DpRzxX0KMBe0M+gA4D4Hdw5mT72LJQORxkM6IfgxSC3wjyHpHEN8M8jKPtYeAq2VgvhHg9A4RvPUIKzCyBVe346SM9LZw1y5KShzOxfUhL60SmMfcNUXgisXYS/iNA/IzhNmBgH4I3E8Cxzpmgby9ffFoMSKTQxA4jZjRpI35qENZbF5Rb1SWgcwM7HsQr28KhZnVd55GPfqTkOCbaB+i2lR1uHa8nHYeda0EygJWGILHGXzndaBgz3CQ5Fb8/hSqr5E7uj4sBXBVSjlqN6FaixKHlS8BxCYtHhs/bUly9JT597U9C30/eRYiU4Nc5Q1gH+AG/gvsxJBH2vg3w9pDPTjqFDGxX0FkKOih2PtHOcbIBiPMMi5XT9eDo9/xlu+rDW2BpX+MAQnOCudRWcWFA3OwncYhrke5VpuK1SrW7+sTVgKv5NYjsr2p6TMY1QEGvhi4mmw89unWXaiX6QQEN1YHuHjpELm5lsxvV2MbhxAdWwCSiNfnCXsb7mc/Ih8hXED8J1T1k6awEAG+R+LCLqEJOL2vInwQOP46VHaSm9QYiI1nMU4xwv2oa3OHs0+LiaHuHKr/wOo/r1yuOQwcDEqVw2KdqITQBFJGelFWojITPz8kY+wmAAp3pWLkJVT7oGwkY3R5REar/Ln1qO7AyIfsLGxQ1eB60E3UDmi9kKWPOwmcvP69cM8kROYCXVB5FW18I4LToeLSbTGnKh2T9MIChLHBOI2lT9srMUDB9s7AM8CApj7H/yaZExsiOd9GnbngcjzOciPyVPOuW0RFB7ZvHnDck4FJgbOpwPoPRHpAdxs782bwQSwei3ty0aC2EVh61ANMutEy63Gi/l0VUfSJC7sIjAnhYYON4x7eNgI9KgeifDPIOyuuDygRWnGuKDcQF6roWrGxbSNgzDAgqBuV6ki7z9WT5y4DR0LdoqoVbSOgZhAi7hv4bXzEFarDG7yqbPmsgN2aovhdLdf+2jqBorIE4JGbIugZCvcsijQHr5ojN1tbVaustUWNNP6S0vy60AR+ut4Ndj7CYzdlgL7AixTtmRnRLOToVNAhQeDfR+yPr+iJrIbf/+pM62l0WP8RKNNCSCCTySuJjgT42MTnv4rqjEDvg6J+VH5T8/qynZSW+ts40EgCQtcQDcsDEN2d9IKe4U2hiR5jmG1ERt4QKrS4pkqK2zmRSQMaUsj6D5cuu3C5ppCY6IQLf2dn8CIjZk4Q+N961VnJvlxf+4Z6v/cojvsDYEQL4BXRHVTXfkysjqPfd3tA6YqOnXx293gnLgvV5xFBVa2iv/b6dEX91p+fbf9ImTnxX6gWAadbILARX+0rbEjxohwCFpBVlH1nyJea2KTFY+OduHUGeaFJoNN3gcwr1smu37qsze16y7pQ4a7pYFYj0iuAvho0jbTxJQBkrB6Ky70VGIDqamA9+WmnWtwrZ20/fN4uQA1rss52Slw8wIOZKg4/QIlTKBfY32DttobSZafDJS0Ka3YXYEx6UCXZid8/n6wJRwHIXrsEI7kB6+xHtQTDn8hLPQuipBb2oJOkgSQBPREuAlupq98cfa6mXsXnOFpfV5uQMBRxlMpP/kJpbmP4tNHC3SNBNiLycJAbleLlOXLGVTB33edRLUBkepAuegyRd1D7Pphh10Wr5mJuMT5fNo67L45NQSUlIBqsYlXqkqaiGy51es3eWQh5CDfmUeufTcaE9QBkFY7AyIuImXxT3bfI7doUvQayFbUDMSZYRHiLq64n2JByOXzvBzLGbkJ1GarnP4OPmBt60Or0v+E381Fdj+ILOhYT4p1ADOhTzcA3EdjeXvCtEwDIGNc0J6vNB/0FDXXbmk9uc05wMSYLq+nAgYArtWJ3keYW0eVUVheE9/3ArbYXkND+mbO2H8gk0AnAlGZAb3WlWpQ/I/o6q9JevWMxIyJdWWZ+V4xnOUaebQH4MVS2I/59eO3bFGbWdEiNiVhrmVncH+NfhMg0IA4RH1bfQnQlq9LKwiYnRbTB/9HmKLrWfg2j94HUoI1/Z3XOOe6te+vuWf8DkM0cb7DOQZgAAAAASUVORK5CYII='  # nopep8'
 
 
-def get_redis_connection(config: CFG) -> Redis:
+def get_redis_connection(config: 'CFG') -> Redis:
     """
     :param config: current app_config
     :return: redis connection
@@ -125,3 +127,62 @@ def password_generator(
     """
     return ''.join(random.choice(chars) for char_number in range(length))
 
+
+def clamp(val: float, minimum: float = 0.0, maximum: float= 255.0) -> int:
+    """ Fix value between min an max"""
+    if val < minimum:
+        return minimum
+    if val > maximum:
+        return maximum
+    return int(val)
+
+
+COLOR_DARKEN_SCALE_FACTOR = 0.85
+COLOR_LIGHTEN_SCALE_FACTOR = 1.15
+
+
+class Color(object):
+    def __init__(self, base_hex_code: str):
+        """
+        :param base_hex_code: hex color like '#FFFFFF'
+        """
+
+        assert len(base_hex_code) == 7
+        self._base_hex_code = base_hex_code
+
+    # INFO - G.M - 2018-08-10 - get_hexcolor, inspired by
+    # https://thadeusb.com/weblog/2010/10/10/python_scale_hex_color/
+
+    def get_hexcolor(self, scalefactor: float) -> str:
+        """
+
+        :param scalefactor: factor of scaling,
+        value between 0 and 1 darken the color,
+        value >1 lighten the color.
+        :return: new hex_color
+        """
+
+        hex_color = self._base_hex_code.strip('#')
+        assert scalefactor > 0
+
+        r = int(hex_color[:2], 16)
+        g = int(hex_color[2:4], 16)
+        b = int(hex_color[4:], 16)
+
+        h, l, s = colorsys.rgb_to_hls(r, g, b)
+        l = scalefactor * l
+        r, g, b = colorsys.hls_to_rgb(h, l, s)
+
+        return "#%02x%02x%02x" % (clamp(r), clamp(g), clamp(b))
+
+    @property
+    def normal(self):
+        return self._base_hex_code
+
+    @property
+    def darken(self):
+        return self.get_hexcolor(COLOR_DARKEN_SCALE_FACTOR)
+
+    @property
+    def lighten(self):
+        return self.get_hexcolor(COLOR_LIGHTEN_SCALE_FACTOR)

backend/tracim_backend/lib/webdav/dav_provider.py

@@ -8,7 +8,7 @@ from sqlalchemy.orm.exc import NoResultFound
 from tracim_backend import CFG
 from tracim_backend.lib.webdav.utils import transform_to_bdd, HistoryType, \
     SpecialFolderExtension
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 
 from wsgidav.dav_provider import DAVProvider
 from wsgidav.lock_manager import LockManager

backend/tracim_backend/lib/webdav/design.py

@@ -1,7 +1,7 @@
 #coding: utf8
 from datetime import datetime
 
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import VirtualEvent
 from tracim_backend.models import data
 

backend/tracim_backend/lib/webdav/resources.py

@@ -19,7 +19,7 @@ from tracim_backend.lib.webdav.utils import transform_to_display, HistoryType, \
     FakeFileStream
 from tracim_backend.lib.webdav.utils import transform_to_bdd
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import User, ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import Content

backend/tracim_backend/lib/webdav/utils.py

@@ -4,7 +4,7 @@ import transaction
 from os.path import normpath as base_normpath
 
 from sqlalchemy.orm import Session
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from wsgidav import util
 from wsgidav import compat
 

backend/tracim_backend/models/__init__.py

@@ -5,7 +5,7 @@ from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import configure_mappers
 import zope.sqlalchemy
 from .meta import DeclarativeBase
-from .revision_protection import prevent_content_revision_delete
+from tracim_backend.models.revision_protection import prevent_content_revision_delete
 # import or define all models here to ensure they are attached to the
 # Base.metadata prior to any initialization routines
 from tracim_backend.models.auth import User, Group, Permission

backend/tracim_backend/models/applications.py

@@ -1,117 +0,0 @@
-# coding=utf-8
-import typing
-
-
-class Application(object):
-    """
-    Application class with data needed for frontend
-    """
-    def __init__(
-            self,
-            label: str,
-            slug: str,
-            fa_icon: str,
-            hexcolor: str,
-            is_active: bool,
-            config: typing.Dict[str, str],
-            main_route: str,
-    ) -> None:
-        """
-        @param label: public label of application
-        @param slug: identifier of application
-        @param icon: font awesome icon class
-        @param hexcolor: hexa color of application main color
-        @param is_active: True if application enable, False if inactive
-        @param config: a dict with eventual application config
-        @param main_route: the route of the frontend "home" screen of
-        the application. For exemple, if you have an application
-        called "calendar", the main route will be something
-        like /#/workspace/{wid}/calendar.
-        """
-        self.label = label
-        self.slug = slug
-        self.fa_icon = fa_icon
-        self.hexcolor = hexcolor
-        self.is_active = is_active
-        self.config = config
-        self.main_route = main_route
-
-    # TODO - G.M - 2018-08-07 - Refactor slug coherence issue like this one.
-    # we probably should not have 2 kind of slug
-    @property
-    def minislug(self):
-        return self.slug.replace('contents/', '')
-
-
-# default apps
-calendar = Application(
-    label='Calendar',
-    slug='calendar',
-    fa_icon='calendar',
-    hexcolor='#757575',
-    is_active=True,
-    config={},
-    main_route='/#/workspaces/{workspace_id}/calendar',
-)
-
-thread = Application(
-    label='Threads',
-    slug='contents/thread',
-    fa_icon='comments-o',
-    hexcolor='#ad4cf9',
-    is_active=True,
-    config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=thread',
-
-)
-
-folder = Application(
-    label='Folder',
-    slug='contents/folder',
-    fa_icon='folder-open-o',
-    hexcolor='#252525',
-    is_active=True,
-    config={},
-    main_route='',
-)
-
-_file = Application(
-    label='Files',
-    slug='contents/file',
-    fa_icon='paperclip',
-    hexcolor='#FF9900',
-    is_active=True,
-    config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=file',
-)
-
-markdownpluspage = Application(
-    label='Markdown Plus Documents',  # TODO - G.M - 24-05-2018 - Check label
-    slug='contents/markdownpluspage',
-    fa_icon='file-code-o',
-    hexcolor='#f12d2d',
-    is_active=True,
-    config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=markdownpluspage',
-)
-
-html_documents = Application(
-    label='Text Documents',  # TODO - G.M - 24-05-2018 - Check label
-    slug='contents/html-document',
-    fa_icon='file-text-o',
-    hexcolor='#3f52e3',
-    is_active=True,
-    config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=html-document',
-)
-# TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
-# List of applications
-applications = [
-    html_documents,
-    # TODO - G.M - 2018-08-02 - Restore markdownpage app
-    # markdownpluspage,
-    _file,
-    thread,
-    folder,
-    # calendar,
-]

backend/tracim_backend/models/context_models.py

@@ -7,6 +7,8 @@ from slugify import slugify
 from sqlalchemy.orm import Session
 from tracim_backend.config import CFG
 from tracim_backend.config import PreviewDim
+from tracim_backend.extensions import app_list
+from tracim_backend.lib.core.application import ApplicationApi
 from tracim_backend.lib.utils.utils import get_root_frontend_url
 from tracim_backend.lib.utils.utils import password_generator
 from tracim_backend.lib.utils.utils import CONTENT_FRONTEND_URL_SCHEMA
@@ -19,9 +21,8 @@ from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.roles import WorkspaceRoles
-from tracim_backend.models.workspace_menu_entries import default_workspace_menu_entry  # nopep8
-from tracim_backend.models.workspace_menu_entries import WorkspaceMenuEntry
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.workspace_menu_entries import WorkspaceMenuEntry
+from tracim_backend.app_models.contents import CONTENT_TYPES
 
 
 class PreviewAllowedDim(object):
@@ -500,7 +501,10 @@ class WorkspaceInContext(object):
         # order to not use hardcoded list
         # list should be able to change (depending on activated/disabled
         # apps)
-        return default_workspace_menu_entry(self.workspace)
+        app_api = ApplicationApi(
+            app_list
+        )
+        return app_api.get_default_workspace_menu_entry(self.workspace)
 
     @property
     def frontend_url(self):

backend/tracim_backend/models/data.py

@@ -87,7 +87,7 @@ class Workspace(DeclarativeBase):
 
     def get_allowed_content_types(self):
         # @see Content.get_allowed_content_types()
-        return CONTENT_TYPES.extended_endpoint_allowed_types_slug()
+        return CONTENT_TYPES.endpoint_allowed_types_slug()
 
     def get_valid_children(
             self,
@@ -282,9 +282,9 @@ class ActionDescription(object):
                 ]
 
 
-from tracim_backend.models.contents import CONTENT_STATUS
-from tracim_backend.models.contents import ContentStatus
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_STATUS
+from tracim_backend.app_models.contents import ContentStatus
+from tracim_backend.app_models.contents import CONTENT_TYPES
 # TODO - G.M - 30-05-2018 - Drop this old code when whe are sure nothing
 # is lost .
 
@@ -552,7 +552,7 @@ class ContentChecker(object):
                 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
+                    if not content_slug in CONTENT_TYPES.endpoint_allowed_types_slug():  # nopep8
                         return False
             if 'origin' in properties.keys():
                 pass

backend/tracim_backend/models/workspace_menu_entries.py

@@ -1,71 +0,0 @@
-# coding=utf-8
-import typing
-from copy import copy
-
-from tracim_backend.models.applications import applications
-from tracim_backend.models.data import Workspace
-
-
-class WorkspaceMenuEntry(object):
-    """
-    Application class with data needed for frontend
-    """
-    def __init__(
-            self,
-            label: str,
-            slug: str,
-            fa_icon: str,
-            hexcolor: str,
-            route: str,
-    ) -> None:
-        self.slug = slug
-        self.label = label
-        self.route = route
-        self.hexcolor = hexcolor
-        self.fa_icon = fa_icon
-
-dashboard_menu_entry = WorkspaceMenuEntry(
-  slug='dashboard',
-  label='Dashboard',
-  route='/#/workspaces/{workspace_id}/dashboard',
-  hexcolor='#252525',
-  fa_icon="signal",
-)
-all_content_menu_entry = WorkspaceMenuEntry(
-  slug="contents/all",
-  label="All Contents",
-  route="/#/workspaces/{workspace_id}/contents",
-  hexcolor="#fdfdfd",
-  fa_icon="th",
-)
-
-# TODO - G.M - 08-06-2018 - This is hardcoded default menu entry,
-#  of app, make this dynamic (and loaded from application system)
-def default_workspace_menu_entry(
-    workspace: Workspace,
-)-> typing.List[WorkspaceMenuEntry]:
-    """
-    Get default menu entry for a workspace
-    """
-    menu_entries = [
-        copy(dashboard_menu_entry),
-        copy(all_content_menu_entry),
-    ]
-    for app in applications:
-        if app.main_route:
-            new_entry = WorkspaceMenuEntry(
-                slug=app.slug,
-                label=app.label,
-                hexcolor=app.hexcolor,
-                fa_icon=app.fa_icon,
-                route=app.main_route
-            )
-            menu_entries.append(new_entry)
-
-    for entry in menu_entries:
-        entry.route = entry.route.replace(
-            '{workspace_id}',
-            str(workspace.workspace_id)
-        )
-
-    return menu_entries

backend/tracim_backend/tests/__init__.py

@@ -14,7 +14,7 @@ from tracim_backend.models import get_engine
 from tracim_backend.models import DeclarativeBase
 from tracim_backend.models import get_session_factory
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
 from tracim_backend.models.data import ContentRevisionRO
 from tracim_backend.models.data import Content

backend/tracim_backend/tests/functional/test_contents.py

@@ -5,7 +5,7 @@ from tracim_backend import models
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 import io
 

backend/tracim_backend/tests/functional/test_mail_notification.py

@@ -11,7 +11,7 @@ from tracim_backend.fixtures.users_and_groups import Base as BaseFixture
 from tracim_backend.fixtures.content import Content as ContentFixture
 from tracim_backend.lib.utils.utils import get_redis_connection
 from tracim_backend.lib.utils.utils import get_rq_queue
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi

backend/tracim_backend/tests/functional/test_system.py

@@ -1,7 +1,10 @@
 # coding=utf-8
-from tracim_backend.models.contents import CONTENT_TYPES
+import transaction
+from tracim_backend.extensions import app_list
+from tracim_backend.lib.core.application import ApplicationApi
+from tracim_backend.models import get_tm_session
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.tests import FunctionalTest
-from tracim_backend.models.applications import applications
 
 """
 Tests for /api/v2/system subpath endpoints.
@@ -26,6 +29,11 @@ class TestApplicationEndpoint(FunctionalTest):
         )
         res = self.testapp.get('/api/v2/system/applications', status=200)
         res = res.json_body
+        dbsession = get_tm_session(self.session_factory, transaction.manager)
+        app_api = ApplicationApi(
+            app_list=app_list,
+        )
+        applications = app_api.get_all()
         assert len(res) == len(applications)
         for counter, application in enumerate(applications):
             assert res[counter]['label'] == application.label

backend/tracim_backend/tests/functional/test_user.py

@@ -8,13 +8,15 @@ import requests
 import transaction
 
 from tracim_backend import models
+from tracim_backend.extensions import app_list
+from tracim_backend.lib.core.application import ApplicationApi
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.tests import FunctionalTest
@@ -2390,6 +2392,22 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         """
         Check obtain all workspaces reachables for user with user auth.
         """
+        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(
+            session=dbsession,
+            current_user=admin,
+            config=self.app_config,
+        )
+        workspace = workspace_api.get_one(1)
+        app_api = ApplicationApi(
+            app_list
+        )
+
+        default_sidebar_entry = app_api.get_default_workspace_menu_entry(workspace=workspace)  # nope8
         self.testapp.authorization = (
             'Basic',
             (
@@ -2404,44 +2422,14 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         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
-        # not fixed on active application/content-file
-        sidebar_entry = workspace['sidebar_entries'][0]
-        assert sidebar_entry['slug'] == 'dashboard'
-        assert sidebar_entry['label'] == 'Dashboard'
-        assert sidebar_entry['route'] == '/#/workspaces/1/dashboard'  # nopep8
-        assert sidebar_entry['hexcolor'] == "#252525"
-        assert sidebar_entry['fa_icon'] == "signal"
-
-        sidebar_entry = workspace['sidebar_entries'][1]
-        assert sidebar_entry['slug'] == 'contents/all'
-        assert sidebar_entry['label'] == 'All Contents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#fdfdfd"
-        assert sidebar_entry['fa_icon'] == "th"
-
-        sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/html-document'
-        assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-document'  # nopep8
-        assert sidebar_entry['hexcolor'] == "#3f52e3"
-        assert sidebar_entry['fa_icon'] == "file-text-o"
-
-        sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/file'
-        assert sidebar_entry['label'] == 'Files'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#FF9900"
-        assert sidebar_entry['fa_icon'] == "paperclip"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
-        assert sidebar_entry['slug'] == 'contents/thread'
-        assert sidebar_entry['label'] == 'Threads'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#ad4cf9"
-        assert sidebar_entry['fa_icon'] == "comments-o"
+
+        assert len(workspace['sidebar_entries']) == len(default_sidebar_entry)
+        for counter, sidebar_entry in enumerate(default_sidebar_entry):
+            workspace['sidebar_entries'][counter]['slug'] = sidebar_entry.slug
+            workspace['sidebar_entries'][counter]['label'] = sidebar_entry.label
+            workspace['sidebar_entries'][counter]['route'] = sidebar_entry.route
+            workspace['sidebar_entries'][counter]['hexcolor'] = sidebar_entry.hexcolor  # nopep8
+            workspace['sidebar_entries'][counter]['fa_icon'] = sidebar_entry.fa_icon  # nopep8
 
     def test_api__get_user_workspaces__err_403__unallowed_user(self):
         """

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -7,13 +7,15 @@ import transaction
 from depot.io.utils import FileIntent
 
 from tracim_backend import models
+from tracim_backend.extensions import app_list
+from tracim_backend.lib.core.application import ApplicationApi
 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.lib.core.userworkspace import RoleApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
 from tracim_backend.models import get_tm_session
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.tests import FunctionalTest
 from tracim_backend.tests import set_html_document_slug_to_legacy
@@ -32,6 +34,22 @@ class TestWorkspaceEndpoint(FunctionalTest):
         """
         Check obtain workspace reachable for user.
         """
+        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(
+            session=dbsession,
+            current_user=admin,
+            config=self.app_config,
+        )
+        workspace = workspace_api.get_one(1)
+        app_api = ApplicationApi(
+            app_list
+        )
+        default_sidebar_entry = app_api.get_default_workspace_menu_entry(workspace=workspace)  # nope8
+
         self.testapp.authorization = (
             'Basic',
             (
@@ -46,49 +64,35 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
         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
-        # not fixed on active application/content-file
-        sidebar_entry = workspace['sidebar_entries'][0]
-        assert sidebar_entry['slug'] == 'dashboard'
-        assert sidebar_entry['label'] == 'Dashboard'
-        assert sidebar_entry['route'] == '/#/workspaces/1/dashboard'  # nopep8
-        assert sidebar_entry['hexcolor'] == "#252525"
-        assert sidebar_entry['fa_icon'] == "signal"
-
-        sidebar_entry = workspace['sidebar_entries'][1]
-        assert sidebar_entry['slug'] == 'contents/all'
-        assert sidebar_entry['label'] == 'All Contents'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#fdfdfd"
-        assert sidebar_entry['fa_icon'] == "th"
-
-        sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/html-document'
-        assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-document'  # nopep8
-        assert sidebar_entry['hexcolor'] == "#3f52e3"
-        assert sidebar_entry['fa_icon'] == "file-text-o"
-
-        sidebar_entry = workspace['sidebar_entries'][3]
-        assert sidebar_entry['slug'] == 'contents/file'
-        assert sidebar_entry['label'] == 'Files'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#FF9900"
-        assert sidebar_entry['fa_icon'] == "paperclip"
-
-        sidebar_entry = workspace['sidebar_entries'][4]
-        assert sidebar_entry['slug'] == 'contents/thread'
-        assert sidebar_entry['label'] == 'Threads'
-        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
-        assert sidebar_entry['hexcolor'] == "#ad4cf9"
-        assert sidebar_entry['fa_icon'] == "comments-o"
+
+        assert len(workspace['sidebar_entries']) == len(default_sidebar_entry)
+        for counter, sidebar_entry in enumerate(default_sidebar_entry):
+            workspace['sidebar_entries'][counter]['slug'] = sidebar_entry.slug
+            workspace['sidebar_entries'][counter]['label'] = sidebar_entry.label
+            workspace['sidebar_entries'][counter]['route'] = sidebar_entry.route
+            workspace['sidebar_entries'][counter]['hexcolor'] = sidebar_entry.hexcolor  # nopep8
+            workspace['sidebar_entries'][counter]['fa_icon'] = sidebar_entry.fa_icon  # nopep8
 
     def test_api__update_workspace__ok_200__nominal_case(self) -> None:
         """
         Test update workspace
         """
+        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(
+            session=dbsession,
+            current_user=admin,
+            config=self.app_config,
+        )
+        workspace = workspace_api.get_one(1)
+        app_api = ApplicationApi(
+            app_list
+        )
+        default_sidebar_entry = app_api.get_default_workspace_menu_entry(workspace=workspace)  # nope8
+
         self.testapp.authorization = (
             'Basic',
             (
@@ -111,8 +115,8 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'business'
         assert workspace['label'] == 'Business'
         assert workspace['description'] == 'All importants documents'
+        assert len(workspace['sidebar_entries']) == len(default_sidebar_entry)
         assert workspace['is_deleted'] is False
-        assert len(workspace['sidebar_entries']) == 5
 
         # modify workspace
         res = self.testapp.put_json(
@@ -126,8 +130,8 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
+        assert len(workspace['sidebar_entries']) == len(default_sidebar_entry)
         assert workspace['is_deleted'] is False
-        assert len(workspace['sidebar_entries']) == 5
 
         # after
         res = self.testapp.get(
@@ -140,8 +144,8 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert workspace['slug'] == 'superworkspace'
         assert workspace['label'] == 'superworkspace'
         assert workspace['description'] == 'mysuperdescription'
+        assert len(workspace['sidebar_entries']) == len(default_sidebar_entry)
         assert workspace['is_deleted'] is False
-        assert len(workspace['sidebar_entries']) == 5
 
     def test_api__update_workspace__err_400__empty_label(self) -> None:
         """

backend/tracim_backend/tests/library/test_content_api.py

@@ -16,7 +16,7 @@ from tracim_backend.exceptions import UnallowedSubContent
 from tracim_backend.lib.core.workspace import RoleApi
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.auth import User
 from tracim_backend.models.auth import Group

backend/tracim_backend/tests/library/test_webdav.py

@@ -22,22 +22,15 @@ from unittest.mock import MagicMock
 
 class TestWebdavFactory(StandardTest):
 
+    config_section = 'webdav_test'
+
     def test_unit__initConfig__ok__nominal_case(self):
         """
         Check if config is correctly modify for wsgidav using mocked
         wsgidav and tracim conf (as dict)
         :return:
         """
-        tracim_settings = {
-            'website.base_url': 'http://localhost:6543',
-            'sqlalchemy.url': 'sqlite:///:memory:',
-            'user.auth_token.validity': '604800',
-            'depot_storage_dir': '/tmp/test/depot',
-            'depot_storage_name': 'test',
-            'preview_cache_dir': '/tmp/test/preview_cache',
-            'wsgidav.config_path': 'development.ini'
-
-        }
+        tracim_settings = self.settings
         wsgidav_setting = DEFAULT_CONFIG.copy()
         wsgidav_setting.update(
             {

backend/tracim_backend/tests/models/test_content.py

@@ -15,7 +15,7 @@ from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models import User
 from tracim_backend.models.data import ActionDescription
 from tracim_backend.models.data import ContentRevisionRO
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.data import Workspace
 from tracim_backend.tests import StandardTest
 

backend/tracim_backend/tests/models/test_content_revision.py

@@ -5,7 +5,7 @@ from sqlalchemy import inspect
 
 from tracim_backend.models import ContentRevisionRO
 from tracim_backend.models import User
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.tests import DefaultTest
 from tracim_backend.tests import eq_
 

backend/tracim_backend/views/contents_api/comment_controller.py

@@ -7,7 +7,7 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.lib.core.workspace import WorkspaceApi
@@ -20,7 +20,7 @@ from tracim_backend.views.core_api.schemas import SetCommentSchema
 from tracim_backend.views.core_api.schemas import WorkspaceAndContentIdPathSchema
 from tracim_backend.views.core_api.schemas import NoContentSchema
 from tracim_backend.exceptions import EmptyCommentContentNotAllowed
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.models.data import UserRoleInWorkspace
 

backend/tracim_backend/views/contents_api/file_controller.py

@@ -12,7 +12,7 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.views.controllers import Controller
@@ -32,8 +32,8 @@ from tracim_backend.lib.utils.authorization import require_workspace_role
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.context_models import ContentInContext
 from tracim_backend.models.context_models import RevisionInContext
-from tracim_backend.models.contents import CONTENT_TYPES
-from tracim_backend.models.contents import file_type
+from tracim_backend.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import FILE_TYPE
 from tracim_backend.models.revision_protection import new_revision
 from tracim_backend.exceptions import EmptyLabelNotAllowed
 from tracim_backend.exceptions import PageOfPreviewNotFound
@@ -50,7 +50,7 @@ class FileController(Controller):
     # File data
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     # TODO - G.M - 2018-07-24 - Use hapic for input file
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
@@ -88,7 +88,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_file([])
     def download_file(self, context, request: TracimRequest, hapic_data=None):
@@ -115,7 +115,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentRevisionIdPathSchema())
     @hapic.output_file([])
     def download_revisions_file(self, context, request: TracimRequest, hapic_data=None):  # nopep8
@@ -148,7 +148,7 @@ class FileController(Controller):
     # pdf
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(UnavailablePreviewType, HTTPStatus.BAD_REQUEST)
     @hapic.handle_exception(PageOfPreviewNotFound, HTTPStatus.BAD_REQUEST)
     @hapic.input_query(PageQuerySchema())
@@ -179,7 +179,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(UnavailablePreviewType, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_file([])
@@ -204,7 +204,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(UnavailablePreviewType, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(WorkspaceAndContentRevisionIdPathSchema())
     @hapic.input_query(PageQuerySchema())
@@ -239,7 +239,7 @@ class FileController(Controller):
     # jpg
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(PageOfPreviewNotFound, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_query(PageQuerySchema())
@@ -272,7 +272,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(PageOfPreviewNotFound, HTTPStatus.BAD_REQUEST)
     @hapic.handle_exception(PreviewDimNotAllowed, HTTPStatus.BAD_REQUEST)
     @hapic.input_query(PageQuerySchema())
@@ -305,7 +305,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.handle_exception(PageOfPreviewNotFound, HTTPStatus.BAD_REQUEST)
     @hapic.handle_exception(PreviewDimNotAllowed, HTTPStatus.BAD_REQUEST)
     @hapic.input_path(RevisionPreviewSizedPathSchema())
@@ -342,7 +342,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(AllowedJpgPreviewDimSchema())
     def allowed_dim_preview_jpg(self, context, request: TracimRequest, hapic_data=None):  # nopep8
@@ -363,7 +363,7 @@ class FileController(Controller):
     # File infos
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(FileContentSchema())
     def get_file_infos(self, context, request: TracimRequest, hapic_data=None) -> ContentInContext:  # nopep8
@@ -387,7 +387,7 @@ class FileController(Controller):
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(FileContentModifySchema())
     @hapic.output_body(FileContentSchema())
@@ -423,7 +423,7 @@ class FileController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(FileRevisionSchema(many=True))
     def get_file_revisions(
@@ -456,7 +456,7 @@ class FileController(Controller):
     @hapic.with_api_doc(tags=[SWAGGER_TAG__FILE_ENDPOINTS])
     @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([file_type])
+    @require_content_types([FILE_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(SetContentStatusSchema())
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8

backend/tracim_backend/views/contents_api/folder_controller.py

@@ -25,8 +25,8 @@ 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.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import FOLDER_TYPE
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG__Folders_ENDPOINTS = 'Folders'
@@ -36,7 +36,7 @@ class FolderController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([folder_type])
+    @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
@@ -60,7 +60,7 @@ class FolderController(Controller):
     @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])
+    @require_content_types([FOLDER_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(FolderContentModifySchema())
     @hapic.output_body(TextBasedContentSchema())
@@ -100,7 +100,7 @@ class FolderController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([folder_type])
+    @require_content_types([FOLDER_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(TextBasedRevisionSchema(many=True))
     def get_folder_revisions(
@@ -132,7 +132,7 @@ class FolderController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__Folders_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([folder_type])
+    @require_content_types([FOLDER_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(SetContentStatusSchema())
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8

backend/tracim_backend/views/contents_api/html_document_controller.py

@@ -11,7 +11,7 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.views.controllers import Controller
@@ -26,8 +26,8 @@ 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 html_documents_type
+from tracim_backend.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import HTML_DOCUMENTS_TYPE
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG__HTML_DOCUMENT_ENDPOINTS = 'HTML documents'
@@ -37,7 +37,7 @@ class HTMLDocumentController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__HTML_DOCUMENT_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([html_documents_type])
+    @require_content_types([HTML_DOCUMENTS_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(TextBasedContentSchema())
     def get_html_document(self, context, request: TracimRequest, hapic_data=None) -> ContentInContext:  # nopep8
@@ -61,7 +61,7 @@ class HTMLDocumentController(Controller):
     @hapic.with_api_doc(tags=[SWAGGER_TAG__HTML_DOCUMENT_ENDPOINTS])
     @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([html_documents_type])
+    @require_content_types([HTML_DOCUMENTS_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(TextBasedContentModifySchema())
     @hapic.output_body(TextBasedContentSchema())
@@ -97,7 +97,7 @@ class HTMLDocumentController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__HTML_DOCUMENT_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([html_documents_type])
+    @require_content_types([HTML_DOCUMENTS_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(TextBasedRevisionSchema(many=True))
     def get_html_document_revisions(
@@ -129,7 +129,7 @@ class HTMLDocumentController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__HTML_DOCUMENT_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([html_documents_type])
+    @require_content_types([HTML_DOCUMENTS_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(SetContentStatusSchema())
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8

backend/tracim_backend/views/contents_api/threads_controller.py

@@ -10,7 +10,7 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
 from tracim_backend.lib.core.content import ContentApi
 from tracim_backend.views.controllers import Controller
@@ -25,8 +25,8 @@ 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 thread_type
+from tracim_backend.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import THREAD_TYPE
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG__THREAD_ENDPOINTS = 'Threads'
@@ -36,7 +36,7 @@ class ThreadController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__THREAD_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([thread_type])
+    @require_content_types([THREAD_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(TextBasedContentSchema())
     def get_thread(self, context, request: TracimRequest, hapic_data=None) -> ContentInContext:  # nopep8
@@ -60,7 +60,7 @@ class ThreadController(Controller):
     @hapic.with_api_doc(tags=[SWAGGER_TAG__THREAD_ENDPOINTS])
     @hapic.handle_exception(EmptyLabelNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([thread_type])
+    @require_content_types([THREAD_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(TextBasedContentModifySchema())
     @hapic.output_body(TextBasedContentSchema())
@@ -96,7 +96,7 @@ class ThreadController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__THREAD_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([thread_type])
+    @require_content_types([THREAD_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(TextBasedRevisionSchema(many=True))
     def get_thread_revisions(
@@ -128,7 +128,7 @@ class ThreadController(Controller):
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG__THREAD_ENDPOINTS])
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([thread_type])
+    @require_content_types([THREAD_TYPE])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(SetContentStatusSchema())
     @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8

backend/tracim_backend/views/core_api/schemas.py

@@ -7,11 +7,12 @@ from marshmallow.validate import Range
 
 from tracim_backend.lib.utils.utils import DATETIME_FORMAT
 from tracim_backend.models.auth import Profile
+
+from tracim_backend.app_models.contents import GlobalStatus
+from tracim_backend.app_models.contents import CONTENT_STATUS
+from tracim_backend.app_models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import open_status
 from tracim_backend.models.auth import Group
-from tracim_backend.models.contents import GlobalStatus
-from tracim_backend.models.contents import CONTENT_STATUS
-from tracim_backend.models.contents import CONTENT_TYPES
-from tracim_backend.models.contents import open_status
 from tracim_backend.models.context_models import ActiveContentFilter
 from tracim_backend.models.context_models import FolderContentUpdate
 from tracim_backend.models.context_models import AutocompleteQuery
@@ -41,6 +42,7 @@ from tracim_backend.models.context_models import ContentFilter
 from tracim_backend.models.context_models import LoginCredentials
 from tracim_backend.models.data import UserRoleInWorkspace
 from tracim_backend.models.data import ActionDescription
+from tracim_backend.app_models.validator import all_content_types_validator
 
 
 class UserDigestSchema(marshmallow.Schema):
@@ -417,7 +419,7 @@ class FilterContentQuerySchema(marshmallow.Schema):
     content_type = marshmallow.fields.String(
         example=CONTENT_TYPES.Any_SLUG,
         default=CONTENT_TYPES.Any_SLUG,
-        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug())
+        validate=all_content_types_validator
     )
 
     @post_load
@@ -668,7 +670,7 @@ class StatusSchema(marshmallow.Schema):
 class ContentTypeSchema(marshmallow.Schema):
     slug = marshmallow.fields.String(
         example='pagehtml',
-        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
+        validate=all_content_types_validator,
     )
     fa_icon = marshmallow.fields.String(
         example='fa-file-text-o',
@@ -722,7 +724,7 @@ class ContentCreationSchema(marshmallow.Schema):
     )
     content_type = marshmallow.fields.String(
         example='html-document',
-        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
+        validate=all_content_types_validator,
     )
     parent_id = marshmallow.fields.Integer(
         example=35,
@@ -757,12 +759,12 @@ class ContentDigestSchema(marshmallow.Schema):
     label = marshmallow.fields.Str(example='Intervention Report 12')
     content_type = marshmallow.fields.Str(
         example='html-document',
-        validate=OneOf(CONTENT_TYPES.endpoint_allowed_types_slug()),
+        validate=all_content_types_validator,
     )
     sub_content_types = marshmallow.fields.List(
         marshmallow.fields.String(
             example='html-content',
-            validate=OneOf(CONTENT_TYPES.extended_endpoint_allowed_types_slug())
+            validate=all_content_types_validator
         ),
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '
@@ -912,7 +914,7 @@ class FolderContentModifySchema(ContentModifyAbstractSchema, TextBasedDataAbstra
     sub_content_types = marshmallow.fields.List(
         marshmallow.fields.String(
             example='html-document',
-            validate=OneOf(CONTENT_TYPES.extended_endpoint_allowed_types_slug())
+            validate=all_content_types_validator,
         ),
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '

backend/tracim_backend/views/core_api/session_controller.py

@@ -5,7 +5,7 @@ try:  # Python 3.5+
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
 from tracim_backend.lib.core.user import UserApi
 from tracim_backend.views.controllers import Controller

backend/tracim_backend/views/core_api/system_controller.py

@@ -2,18 +2,19 @@
 from pyramid.config import Configurator
 from tracim_backend.exceptions import NotAuthenticated
 from tracim_backend.exceptions import InsufficientUserProfile
+from tracim_backend.lib.core.application import ApplicationApi
 from tracim_backend.lib.utils.authorization import require_profile
 from tracim_backend.models import Group
-from tracim_backend.models.applications import applications
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
     from http import client as HTTPStatus
 
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.extensions import hapic
+from tracim_backend.extensions import app_list
 from tracim_backend.views.controllers import Controller
 from tracim_backend.views.core_api.schemas import ApplicationSchema
 from tracim_backend.views.core_api.schemas import ContentTypeSchema
@@ -30,7 +31,11 @@ class SystemController(Controller):
         """
         Get list of alls applications installed in this tracim instance.
         """
-        return applications
+        app_config = request.registry.settings['CFG']
+        app_api = ApplicationApi(
+            app_list=app_list,
+        )
+        return app_api.get_all()
 
     @hapic.with_api_doc(tags=[SWAGGER_TAG_SYSTEM_ENDPOINTS])
     @require_profile(Group.TIM_USER)

backend/tracim_backend/views/core_api/user_controller.py

@@ -7,7 +7,7 @@ except ImportError:
     from http import client as HTTPStatus
 
 from tracim_backend import hapic
-from tracim_backend import TracimRequest
+from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.models import Group
 from tracim_backend.lib.core.group import GroupApi
 from tracim_backend.lib.core.user import UserApi
@@ -36,7 +36,7 @@ from tracim_backend.views.core_api.schemas import UserWorkspaceAndContentIdPathS
 from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import ActiveContentFilterQuerySchema
 from tracim_backend.views.core_api.schemas import WorkspaceDigestSchema
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 
 SWAGGER_TAG__USER_ENDPOINTS = 'Users'
 

backend/tracim_backend/views/core_api/workspace_controller.py

@@ -12,8 +12,8 @@ except ImportError:
     from http import client as HTTPStatus
 
 from tracim_backend import hapic
+from tracim_backend.lib.utils.request import TracimRequest
 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
@@ -52,7 +52,7 @@ from tracim_backend.views.core_api.schemas import ContentDigestSchema
 from tracim_backend.views.core_api.schemas import WorkspaceSchema
 from tracim_backend.views.core_api.schemas import WorkspaceIdPathSchema
 from tracim_backend.views.core_api.schemas import WorkspaceMemberSchema
-from tracim_backend.models.contents import CONTENT_TYPES
+from tracim_backend.app_models.contents import CONTENT_TYPES
 from tracim_backend.models.revision_protection import new_revision
 
 SWAGGER_TAG_WORKSPACE_ENDPOINTS = 'Workspaces'

backend/tracim_backend/views/frontend.py

@@ -2,12 +2,13 @@ import os
 
 from pyramid.renderers import render_to_response
 from pyramid.config import Configurator
+from tracim_backend.extensions import app_list
 from tracim_backend.exceptions import PageNotFound
-from tracim_backend.models.applications import applications
+from tracim_backend.lib.core.application import ApplicationApi
+from tracim_backend.lib.utils.utils import Color
 from tracim_backend.views import BASE_API_V2
 from tracim_backend.lib.utils.request import TracimRequest
 from tracim_backend.views.controllers import Controller
-import spectra
 
 INDEX_PAGE_NAME = 'index.mak'
 APP_FRONTEND_PATH = 'app/{minislug}.app.js'
@@ -34,6 +35,10 @@ class FrontendController(Controller):
         app_config = request.registry.settings['CFG']
         # TODO - G.M - 2018-08-07 - Refactor autogen valid app list for frontend
         frontend_apps = []
+        app_api = ApplicationApi(
+            app_list=app_list,
+        )
+        applications = app_api.get_all()
         for app in applications:
             app_frontend_path = APP_FRONTEND_PATH.replace('{minislug}',
                                                           app.minislug)  # nopep8
@@ -41,11 +46,12 @@ class FrontendController(Controller):
                                     app_frontend_path)  # nopep8
             if os.path.exists(app_path):
                 frontend_apps.append(app)
+
         return render_to_response(
             self._get_index_file_path(),
             {
                 'colors': {
-                    'primary': spectra.html('#7d4e24'),
+                    'primary': Color(app_config.APPS_COLORS['primary']),
                 },
                 'applications': frontend_apps,
             }

backend/wsgidav-test.conf

@@ -0,0 +1,10 @@
+host  = "0.0.0.0"
+port = 3030
+show_history = True
+show_deleted = True
+show_archived = True
+manager_locks = True
+root_path = ''
+acceptbasic = True
+acceptdigest = False
+defaultdigest = False

backend_lib.sh

@@ -37,6 +37,11 @@ function setup_config_file {
        log "generate missing wsgidav.conf ..."
        cp wsgidav.conf.sample wsgidav.conf
     fi
+
+    if [ ! -f ../color.json ]; then
+       log "generate missing color.json ..."
+       cp ../color.json.sample ../color.json
+    fi
 }
 
 function setup_db {

bash_library.sh

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

color.json.sample

@@ -1,6 +1,6 @@
 {
   "primary": "#7d4e24",
-  "html-document": "#3f52e3",
-  "thread": "#ad4cf9",
-  "file": "#ff9900"
+  "contents/html-document": "#3f52e3",
+  "contents/thread": "#ad4cf9",
+  "contents/file": "#ff9900"
 }

frontend/dist/index.mak

@@ -21,37 +21,37 @@
         param = 'color'
         color_change_value = 15
       %>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
       <% html_class = '.primaryColorFont{state}Hover:hover' %>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
 
       <%
         html_class = '.primaryColorBg{state}'
         param = 'background-color'
       %>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
       <% html_class = '.primaryColorBg{state}Hover:hover'%>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
 
       <%
         param = 'border-color'
         html_class = '.primaryColorBorder{state}'
       %>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
       <% html_class = '.primaryColorBorder{state}Hover:hover' %>
-      ${html_class.replace('{state}', '')} { ${param}: ${primary.hexcode}; }
-      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken(color_change_value).hexcode}; }
-      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.brighten(color_change_value).hexcode}; }
+      ${html_class.replace('{state}', '')} { ${param}: ${primary.normal}; }
+      ${html_class.replace('{state}', 'Darken')} { ${param}: ${primary.darken}; }
+      ${html_class.replace('{state}', 'Lighten')} { ${param}: ${primary.lighten}; }
     </style>
   </head>
 

frontend/i18next.scanner/en/translation.json

@@ -10,7 +10,6 @@
   "Search...": "Search...",
   "Create a workspace": "Create a workspace",
   "Title": "Title",
-  "Change": "Change",
   "Move": "Move",
   "Download": "Download",
   "Archive": "Archive",
@@ -58,9 +57,35 @@
   "You have subscribed to this workspace's notifications": "You have subscribed to this workspace's notifications",
   "Connection": "Connection",
   "Forgotten password ?": "Forgotten password ?",
-  "An error has happened when fetching workspace detail": "An error has happened when fetching workspace detail",
-  "An error has happened while fetching member list": "An error has happened while fetching member list",
-  "An error has happened while fetching recent activity list": "An error has happened while fetching recent activity list",
-  "An error has happened while fetching read status list": "An error has happened while fetching read status list",
-  "Hi {{name}} ! Currently, you are ": "Hi {{name}} ! Currently, you are "
+  "Hi {{name}} ! Currently, you are ": "Hi {{name}} ! Currently, you are ",
+  "Workspace management": "Workspace management",
+  "ID": "ID",
+  "Description": "Description",
+  "Member's number": "Member's number",
+  "Delete workspace": "Delete workspace",
+  "An error has happened while fetching": "An error has happened while fetching",
+  "workspace detail": "workspace detail",
+  "member list": "member list",
+  "recent activity list": "recent activity list",
+  "read status list": "read status list",
+  "An error has happened while fetching \"mark all as read\"": "An error has happened while fetching \"mark all as read\"",
+  "known members list": "known members list",
+  "Please set a name or email": "Please set a name or email",
+  "Please set a role": "Please set a role",
+  "An error has happened while adding the member": "An error has happened while adding the member",
+  "Welcome on Tracim": "Welcome on Tracim",
+  "Thank you for trusting us and using our collaborative tool": "Thank you for trusting us and using our collaborative tool",
+  "Error while archiving document": "Error while archiving document",
+  "Error while deleting document": "Error while deleting document",
+  "subscribed": "subscribed",
+  "Feature": "Feature",
+  "Explore": "Explore",
+  "About": "About",
+  "Admin workspace": "Admin workspace",
+  "Admin user": "Admin user",
+  "You will create your first workspace": "You will create your first workspace",
+  "create a workspace": "create a workspace",
+  "This page list all workspaces": "This page list all workspaces",
+  "Create ...": "Create ...",
+  "Edit": "Edit"
 }

frontend/i18next.scanner/fr/translation.json

@@ -10,7 +10,6 @@
   "Search...": "Rechercher ...",
   "Create a workspace": "Créer un espace de travail",
   "Title": "Titre",
-  "Change": "Modifier",
   "Move": "Déplacer",
   "Download": "Télécharger",
   "Archive": "Archiver",
@@ -58,9 +57,35 @@
   "You have subscribed to this workspace's notifications": "Vous êtes abonné aux notifications de cet espace de travail.",
   "Connection": "Connexion",
   "Forgotten password ?": "Mot de passe oublié ?",
-  "An error has happened when fetching workspace detail": "__NOT_TRANSLATED__",
-  "An error has happened while fetching member list": "__NOT_TRANSLATED__",
-  "An error has happened while fetching recent activity list": "__NOT_TRANSLATED__",
-  "An error has happened while fetching read status list": "__NOT_TRANSLATED__",
-  "Hi {{name}} ! Currently, you are ": "Bonjour {{name}} ! Vous êtes actuellement"
+  "Hi {{name}} ! Currently, you are ": "Bonjour {{name}} ! Vous êtes actuellement",
+  "Workspace management": "Gestion des espaces de travail",
+  "ID": "ID",
+  "Description": "Description",
+  "Member's number": "Nombre de membre",
+  "Delete workspace": "Supprimer un espace de travail",
+  "An error has happened while fetching": "Erreur lors de la récupération de données",
+  "workspace detail": "Detail de l'espace de travail",
+  "member list": "Liste des membres",
+  "recent activity list": "Liste des activités récente",
+  "read status list": "Lire la liste des statuts",
+  "An error has happened while fetching \"mark all as read\"": "__NOT_TRANSLATED__",
+  "known members list": "Liste des membres connus",
+  "Please set a name or email": "Entrez un nom, s'il vous plaît",
+  "Please set a role": "Choisissez un rôle s'il vous plaît",
+  "An error has happened while adding the member": "Une erreur s'est produite lors de l'ajout d'un membre",
+  "Welcome on Tracim": "Bienvenue sur Tracim",
+  "Thank you for trusting us and using our collaborative tool": "Merci de nous faire confiance et d'utiliser notre outil collaboratif.",
+  "Error while archiving document": "Erreur lors de l'archivage d'un document",
+  "Error while deleting document": "Erreur lors de la suppression d'un document",
+  "subscribed": "Abonné(e)",
+  "Feature": "Fonctionnalité",
+  "Explore": "Exploré",
+  "About": "A propos",
+  "Admin workspace": "Administration des espaces de travail",
+  "Admin user": "Administration des utilisateurs",
+  "You will create your first workspace": "Vous allez créer votre premier espace de travail",
+  "create a workspace": "créer un espace de travail",
+  "This page list all workspaces": "Cette page liste tous les espaces de travail",
+  "Create ...": "Créer ...",
+  "Edit": "Editer"
 }

frontend/src/component/Dashboard/MemberList.styl

@@ -1,8 +1,8 @@
 @import "../../../node_modules/tracim_frontend_lib/src/css/Variable.styl"
 
 .memberlist
-  margin 0 0 50px 0
-  width 35%
+  margin 0 0 50px 10px
+  width 37%
   &__title
     margin-bottom 20px
     padding 6px
@@ -10,13 +10,12 @@
   &__wrapper
     position relative
     border 1px solid grey
-    height 480px
+    min-height 480px
   &__list
     margin 0
     padding 0
     list-style none
     height 400px
-    overflow-Y scroll
     &__item
       display flex
       border-bottom 1px solid grey

frontend/src/component/Dashboard/RecentActivity.styl

@@ -5,8 +5,7 @@
   width 60%
   &__wrapper
     border 1px solid grey
-    height 480px
-    overflow-y scroll
+    min-height 480px
   &__header
     display flex
     justify-content space-between

frontend/src/component/Header/MenuLinkList.jsx

@@ -1,22 +1,29 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { translate } from 'react-i18next'
 
 const MenuLinkList = props => {
   return (
     <ul className='header__menu__list text-center navbar-nav mr-auto'>
       <li className='list__item nav-item'>
-        <a className='list__item__link' href='' onClick={props.onClickFeature}>Fonctionnalité</a>
+        <a className='list__item__link' href='' onClick={props.onClickFeature}>
+          {props.t('Feature')}
+        </a>
       </li>
       <li className='list__item nav-item'>
-        <a className='list__item__link' href='' onClick={props.onClickExplore}>Explorer</a>
+        <a className='list__item__link' href='' onClick={props.onClickExplore}>
+          {props.t('Explore')}
+        </a>
       </li>
       <li className='list__item nav-item'>
-        <a className='list__item__link' href='' onClick={props.onClickAbout}>A Propos</a>
+        <a className='list__item__link' href='' onClick={props.onClickAbout}>
+          {props.t('About')}
+        </a>
       </li>
     </ul>
   )
 }
-export default MenuLinkList
+export default translate()(MenuLinkList)
 
 MenuLinkList.propTypes = {
   onClickFeature: PropTypes.func.isRequired,

frontend/src/component/Workspace/BtnExtandedAction.jsx

@@ -23,7 +23,7 @@ const ExtandedAction = props => {
             <i className='fa fa-fw fa-pencil' />
           </div>
           <div className='subdropdown__item__text'>
-            {props.t('Change')}
+            {props.t('Edit')}
           </div>
         </div>
 

frontend/src/component/Workspace/ContentItem.jsx

@@ -24,7 +24,7 @@ const ContentItem = props => {
       </div>
 
       <div className={classnames('content__status')} style={{color: status.hexcolor}}>
-        <div className='content__status__text d-none d-xl-block'>
+        <div className='content__status__text d-none d-xl-flex align-items-center justify-content-between'>
           {status.label}
           <i className={`fa fa-fw fa-${status.faIcon}`} />
         </div>

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

@@ -2,6 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import SubDropdownCreateButton from './SubDropdownCreateButton.jsx'
+import { translate } from 'react-i18next'
 
 const DropdownCreateButton = props => {
   return (
@@ -15,7 +16,7 @@ const DropdownCreateButton = props => {
         aria-expanded='false'
       >
         <div className={classnames(`${props.parentClass}__label__text`, 'dropdownCreateBtn__label__text')}>
-          Créer ...
+          {props.t('Create ...')}
         </div>
       </button>
 
@@ -33,7 +34,7 @@ const DropdownCreateButton = props => {
   )
 }
 
-export default DropdownCreateButton
+export default translate()(DropdownCreateButton)
 
 DropdownCreateButton.propTypes = {
   availableApp: PropTypes.array.isRequired,

frontend/src/container/AdminWorkspacePage.jsx

@@ -13,13 +13,13 @@ class AdminWorkspacePage extends React.Component {
       <PageWrapper customClass='adminWorkspacePage'>
         <PageTitle
           parentClass={'adminWorkspacePage'}
-          title={'Workspace management'}
+          title={this.props.t('Workspace management')}
         />
 
         <PageContent parentClass='adminWorkspacePage'>
 
           <div className='adminWorkspacePage__description'>
-            This page informs all workspaces of the instances
+            {this.props.t('This page list all workspaces')}
           </div>
 
           { /*
@@ -39,14 +39,26 @@ class AdminWorkspacePage extends React.Component {
             <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'>
+                    {this.props.t('ID')}
+                  </th>
+                  <th scope='col'>
+                    {this.props.t('Workspace')}
+                  </th>
+                  <th scope='col'>
+                    {this.props.t('Description')}
+                  </th>
+                  <th scope='col'>
+                    {this.props.t("Member's number")}
+                  </th>
                   { /*
-                    <th scope='col'>Calendar</th>
+                    <th scope='col'>
+                      {this.props.t('Calendar')}
+                    </th>
                   */ }
-                  <th scope='col'>Delete workspace</th>
+                  <th scope='col'>
+                    {this.props.t('Delete workspace')}
+                  </th>
                 </tr>
               </thead>
               <tbody>

frontend/src/container/Home.jsx

@@ -3,6 +3,7 @@ import Card from '../component/common/Card/Card.jsx'
 import CardHeader from '../component/common/Card/CardHeader.jsx'
 import CardBody from '../component/common/Card/CardBody.jsx'
 import LogoHomepage from '../img/logoHeader.svg'
+import { translate } from 'react-i18next'
 
 class Home extends Component {
   render () {
@@ -14,17 +15,17 @@ class Home extends Component {
             <CardBody customClass='homepagecard'>
               <div>
                 <div className='homepagecard__title text-center my-4'>
-                  Bienvenue sur Tracim
+                  {this.props.t('Welcome on Tracim')}
                 </div>
                 <div className='homepagecard__thanks text-center'>
-                  Merci de nous faire confiance et d'utiliser notre outil collaboratif
+                  {this.props.t('Thank you for trusting us and using our collaborative tool')}
                 </div>
                 <div className='homepagecard__delimiter delimiter' />
                 <div className='homepagecard__text text-center mb-5'>
-                  Vous allez créez votre premier espace de travail
+                  {this.props.t('You will create your first workspace')}
                 </div>
                 <div className='homepagecard__btn btn btn-outline-primary'>
-                  Créer votre espace de travail
+                  {this.props.t('create a workspace')}
                 </div>
                 <div className='homepagecard__logo mt-5 mb-3'>
                   <img src={LogoHomepage} alt='logo homepage' />
@@ -38,4 +39,4 @@ class Home extends Component {
   }
 }
 
-export default Home
+export default translate()(Home)

frontend/src/css/Generic.styl

@@ -111,7 +111,7 @@ a
 
 
 .pageContentGeneric
-  margin 10px 15px 0 15px
+  margin 10px 30px 0 30px
   width 100%
   height 100%
 

frontend_app_html-document/i18next.scanner/en/translation.json

@@ -2,5 +2,12 @@
   "Last version": "Last version",
   "Validate and create": "Validate and create",
   "Document's title": "Document's title",
-  "New Document": "New Document"
+  "New Document": "New Document",
+  "Error while archiving document": "Error while archiving document",
+  "Error while deleting document": "Error while deleting document",
+  "Error while restoring document": "Error while restoring document",
+  "This content is archived.": "This content is archived.",
+  "Restore": "Restore",
+  "This content is deleted.": "This content is deleted.",
+  "latest version :": "latest version :"
 }

frontend_app_html-document/i18next.scanner/fr/translation.json

@@ -2,5 +2,12 @@
   "Last version": "Dernière version",
   "Validate and create": "Valider et créer",
   "Document's title": "Titre du document",
-  "New Document": "Nouveau document"
+  "New Document": "Nouveau document",
+  "Error while archiving document": "Erreur lors de l'archivage d'un document",
+  "Error while deleting document": "Erreur lors de la suppression d'un document",
+  "Error while restoring document": "Erreur lors de la restauration du document",
+  "This content is archived.": "Ce contenu est archivé.",
+  "Restore": "Restaurer",
+  "This content is deleted.": "Ce contenu est supprimé.",
+  "latest version :": "Dernière version"
 }

frontend_app_html-document/src/component/HtmlDocument.jsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { TextAreaApp } from 'tracim_frontend_lib'
 import { MODE } from '../helper.js'
+import { translate } from 'react-i18next'
 
 const HtmlDocument = props => {
   return (
@@ -9,12 +10,12 @@ const HtmlDocument = props => {
         <div className='html-document__contentpage__textnote__state'>
           <div className='html-document__contentpage__textnote__state__msg'>
             <i className='fa fa-fw fa-archive' />
-            This content is archived.
+            {props.t('This content is archived.')}
           </div>
 
           <button className='html-document__contentpage__textnote__state__btnrestore btn' onClick={props.onClickRestoreArchived}>
             <i className='fa fa-fw fa-archive' />
-            Restore
+            {props.t('Restore')}
           </button>
         </div>
       }
@@ -23,12 +24,12 @@ const HtmlDocument = props => {
         <div className='html-document__contentpage__textnote__state'>
           <div className='html-document__contentpage__textnote__state__msg'>
             <i className='fa fa-fw fa-trash' />
-            Ce contenu est supprimé.
+            {props.t('This content is deleted.')}
           </div>
 
           <button className='html-document__contentpage__textnote__state__btnrestore btn' onClick={props.onClickRestoreDeleted}>
             <i className='fa fa-fw fa-trash' />
-            Restore
+            {props.t('Restore')}
           </button>
         </div>
       }
@@ -40,7 +41,7 @@ const HtmlDocument = props => {
             <div dangerouslySetInnerHTML={{__html: props.mode === MODE.VIEW ? props.lastVersion : props.version}} />
             {props.mode === MODE.REVISION &&
               <div className='html-document__contentpage__textnote__lastversion'>
-                (dernière version : {props.lastVersion})
+                ({props.t('latest version :')} {props.lastVersion})
               </div>
             }
           </div>
@@ -64,4 +65,4 @@ const HtmlDocument = props => {
   )
 }
 
-export default HtmlDocument
+export default translate()(HtmlDocument)

frontend_lib/i18next.scanner/en/translation.json

@@ -1 +1,6 @@
-{}
+{
+  "Timeline": "Timeline",
+  "This content is archived.": "This content is archived.",
+  "Restore": "Restore",
+  "This content is deleted.": "This content is deleted."
+}

frontend_lib/i18next.scanner/fr/translation.json

@@ -1 +1,6 @@
-{}
+{
+  "Timeline": "Historique",
+  "This content is archived.": "Ce contenu est archivé.",
+  "Restore": "Restaurer",
+  "This content is deleted.": "Ce contenu est supprimé."
+}

frontend_lib/src/component/Input/BtnSwitch/BtnSwitch.jsx

@@ -9,7 +9,7 @@ export const BtnSwitch = props =>
       <span className='slider round' />
     </label>
     <div className='btnswitch__text'>
-      { props.checked ? 'actif' : 'inactif'}
+      { props.checked ? 'active' : 'inactive' }
     </div>
   </div>
 

frontend_lib/src/component/Timeline/Timeline.jsx

@@ -5,6 +5,7 @@ import Radium from 'radium'
 import color from 'color'
 import Comment from './Comment.jsx'
 import Revision from './Revision.jsx'
+import { translate } from 'react-i18next'
 
 require('./Timeline.styl')
 
@@ -38,7 +39,7 @@ class Timeline extends React.Component {
               <i className={classnames('fa fa-fw', {'fa-angle-double-right': props.rightPartOpen, 'fa-angle-double-left': !props.rightPartOpen})} />
             </div>
             <div className='timeline__header__title'>
-              Timeline
+              {this.props.t('Timeline')}
             </div>
             <div className='timeline__header__icon mb-3 mt-auto'>
               <i className={classnames('fa fa-fw', {'fa-angle-double-right': props.rightPartOpen, 'fa-angle-double-left': !props.rightPartOpen})} />
@@ -50,12 +51,12 @@ class Timeline extends React.Component {
           <div className='timeline__info'>
             <div className='timeline__info__msg'>
               <i className='fa fa-fw fa-archive' />
-              This content is archived.
+              {this.props.t('This content is archived.')}
             </div>
 
             <button className='timeline__info__btnrestore btn' onClick={props.onClickRestoreArchived}>
               <i className='fa fa-fw fa-archive' />
-              Restore
+              {this.props.t('Restore')}
             </button>
           </div>
         }
@@ -64,12 +65,12 @@ class Timeline extends React.Component {
           <div className='timeline__info'>
             <div className='timeline__info__msg'>
               <i className='fa fa-fw fa-trash' />
-              This content is deleted.
+              {this.props.t('This content is deleted.')}
             </div>
 
             <button className='timeline__info__btnrestore btn' onClick={props.onClickRestoreDeleted}>
               <i className='fa fa-fw fa-trash' />
-              Restore
+              {this.props.t('Restore')}
             </button>
           </div>
         }
@@ -135,7 +136,7 @@ class Timeline extends React.Component {
                   }}
                   key={'timeline__comment__advancedtext'}
                 >
-                  {props.wysiwyg ? 'Texte Simple' : 'Texte Riche'}
+                  {props.wysiwyg ? 'Texte simple' : 'Texte riche'}
                 </button>
               </div>
 
@@ -169,7 +170,7 @@ class Timeline extends React.Component {
   }
 }
 
-export default Radium(Timeline)
+export default Radium(translate()(Timeline))
 
 Timeline.propTypes = {
   timelineData: PropTypes.array.isRequired,

frontend_lib/src/component/Timeline/Timeline.styl

@@ -50,7 +50,7 @@
       overflow-y auto
       list-style none
       &__item
-        padding 0 25px 0 35px
+        padding 0 25px 15px 35px
         &__avatar
           position relative
           top 60px

functionnal_tests/cypress.json.sample

@@ -0,0 +1,6 @@
+{
+  "baseUrl": "http://localhost:6543",
+  "viewportWidth": 1280,
+  "viewportHeight": 1024,
+  "integrationFolder": "{path_test_file}"
+}

functionnal_tests/app_html-document/operation_create_html-document.js → functionnal_tests/cypress_test/app_html-document/operation_create_html-document.js

@@ -33,8 +33,8 @@ describe('operation :: workspace > create_new > html-document', function () {
     it ('all content > header button ', function () {
         var titre2='all content button'
         cy.url().should('include', '/workspaces/1/contents')
-        cy.get('.workspace__header__btnaddcontent').should('be.visible')
-        cy.get('.workspace__header__btnaddcontent').click()
+        cy.get('.workspace__header__btnaddcontent__label').should('be.visible')
+        cy.get('.workspace__header__btnaddcontent__label').click()
         cy.get('.workspace__header__btnaddcontent__setting div:nth-child(4).subdropdown__link').click()
         cy.get('.createcontent .createcontent__contentname').should('be.visible')
         cy.get('.createcontent .createcontent__form__input').should('have.attr', 'placeholder')