rename htmlpage to html-documents

tracim/models/applications.py

@@ -79,19 +79,19 @@ markdownpluspage = Application(
     main_route='/#/workspaces/{workspace_id}/contents?type=markdownpluspage',
 )
 
-htmlpage = Application(
+html_documents = Application(
     label='Text Documents',  # TODO - G.M - 24-05-2018 - Check label
-    slug='contents/htmlpage',
+    slug='contents/html-documents',
     fa_icon='file-text-o',
     hexcolor='#3f52e3',
     is_active=True,
     config={},
-    main_route='/#/workspaces/{workspace_id}/contents?type=htmlpage',
+    main_route='/#/workspaces/{workspace_id}/contents?type=html-documents',
 )
 # TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
 # List of applications
 applications = [
-    htmlpage,
+    html_documents,
     markdownpluspage,
     _file,
     thread,

tracim/models/contents.py

@@ -3,7 +3,7 @@ import typing
 from enum import Enum
 
 from tracim.exceptions import ContentStatusNotExist, ContentTypeNotExist
-from tracim.models.applications import htmlpage, _file, thread, markdownpluspage
+from tracim.models.applications import html_documents, _file, thread, markdownpluspage
 
 
 ####
@@ -159,10 +159,10 @@ markdownpluspage_type = NewContentType(
     available_statuses=CONTENT_DEFAULT_STATUS,
 )
 
-htmlpage_type = NewContentType(
+html_documents_type = NewContentType(
     slug='html-documents',
-    fa_icon=htmlpage.fa_icon,
-    hexcolor=htmlpage.hexcolor,
+    fa_icon=html_documents.fa_icon,
+    hexcolor=html_documents.hexcolor,
     label='Text Document',
     creation_label='Write a document',
     available_statuses=CONTENT_DEFAULT_STATUS,
@@ -182,7 +182,7 @@ CONTENT_DEFAULT_TYPE = [
     thread_type,
     file_type,
     markdownpluspage_type,
-    htmlpage_type,
+    html_documents_type,
     folder_type,
 ]
 
@@ -227,7 +227,7 @@ class ContentTypeLegacy(NewContentType):
 
     File = file_type.slug
     Thread = thread_type.slug
-    Page = htmlpage_type.slug
+    Page = html_documents_type.slug
     MarkdownPage = markdownpluspage_type.slug
 
     def __init__(self, slug: str):

tracim/tests/functional/test_system.py

@@ -25,7 +25,7 @@ class TestApplicationEndpoint(FunctionalTest):
         res = res.json_body
         application = res[0]
         assert application['label'] == "Text Documents"
-        assert application['slug'] == 'contents/htmlpage'
+        assert application['slug'] == 'contents/html-documents'
         assert application['fa_icon'] == 'file-text-o'
         assert application['hexcolor'] == '#3f52e3'
         assert application['is_active'] is True

tracim/tests/functional/test_user.py

@@ -48,9 +48,9 @@ class TestUserWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == ""
 
         sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/htmlpage'
+        assert sidebar_entry['slug'] == 'contents/html-documents'
         assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=htmlpage'  # nopep8
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
         assert sidebar_entry['hexcolor'] == "#3f52e3"
         assert sidebar_entry['fa_icon'] == "file-text-o"
 

tracim/tests/functional/test_workspaces.py

@@ -48,9 +48,9 @@ class TestWorkspaceEndpoint(FunctionalTest):
         assert sidebar_entry['fa_icon'] == ""
 
         sidebar_entry = workspace['sidebar_entries'][2]
-        assert sidebar_entry['slug'] == 'contents/htmlpage'
+        assert sidebar_entry['slug'] == 'contents/html-documents'
         assert sidebar_entry['label'] == 'Text Documents'
-        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=htmlpage'  # nopep8
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
         assert sidebar_entry['hexcolor'] == "#3f52e3"
         assert sidebar_entry['fa_icon'] == "file-text-o"
 

tracim/views/contents_api/html_document_controller.py

@@ -26,7 +26,7 @@ from tracim.exceptions import InsufficientUserWorkspaceRole
 from tracim.exceptions import NotAuthenticated
 from tracim.exceptions import AuthenticationFailed
 from tracim.models.contents import ContentTypeLegacy as ContentType
-from tracim.models.contents import htmlpage_type
+from tracim.models.contents import html_documents_type
 from tracim.models.revision_protection import new_revision
 
 HTML_DOCUMENT_ENDPOINTS_TAG = 'HTML documents'
@@ -41,7 +41,7 @@ class HTMLDocumentController(Controller):
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
     @hapic.handle_exception(ContentTypeNotAllowed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([htmlpage_type])
+    @require_content_types([html_documents_type])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(HtmlDocumentContentSchema())
     def get_html_document(self, context, request: TracimRequest, hapic_data=None):  # nopep8
@@ -66,7 +66,7 @@ class HTMLDocumentController(Controller):
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([htmlpage_type])
+    @require_content_types([html_documents_type])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(HtmlDocumentModifySchema())
     @hapic.output_body(HtmlDocumentContentSchema())
@@ -104,7 +104,7 @@ class HTMLDocumentController(Controller):
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.READER)
-    @require_content_types([htmlpage_type])
+    @require_content_types([html_documents_type])
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.output_body(HtmlDocumentRevisionSchema(many=True))
     def get_html_document_revisions(self, context, request: TracimRequest, hapic_data=None):  # nopep8
@@ -133,7 +133,7 @@ class HTMLDocumentController(Controller):
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
     @require_workspace_role(UserRoleInWorkspace.CONTRIBUTOR)
-    @require_content_types([htmlpage_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

tracim/views/core_api/schemas.py

@@ -336,7 +336,7 @@ class ContentCreationSchema(marshmallow.Schema):
         description='Title of the content to create'
     )
     content_type = marshmallow.fields.String(
-        example='htmlpage',
+        example='html-documents',
         validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
     )