Substance b6.

.eslintrc.js

@@ -1,21 +1,29 @@
 module.exports = {
-  "env": {
-    "browser": true,
-    "commonjs": true,
-    "node": true
-  },
   "parserOptions": {
     "sourceType": "module",
-    "ecmaVersion": 6
+    "ecmaVersion": 6,
+    "ecmaFeatures": {
+      "jsxnec": true,
+    },
   },
   "extends": "eslint:recommended",
-  "globals": {
-    "Promise": true
-  },
+  "globals": [
+    // browser
+    "window", "document", "URL", "XMLHttpRequest",
+    // browser / nodejs
+    "console", "setTimeout", "setInterval", "clearInterval",
+    // nodejs
+    "global",
+    // EcmaScript 6
+    "Promise", "Map", "Set", "WeakMap",
+    // commonjs
+    "require", "module", "exports"
+    //
+  ].reduce((m, key)=>{m[key]=true;return m}, {}),
   "rules": {
     // 0 - off, 1 - warning, 2 - error
     "indent": ["error", 2, { "SwitchCase": 1 }],
-    "semi": [0, "never"],
+    "semi": [0, "always"],
     "comma-dangle": [2, "only-multiline"],
     "no-cond-assign": 2,
     "no-console": [2, { allow: ["warn", "info", "error", "assert"] }],
@@ -40,14 +48,15 @@ module.exports = {
     // turned of as we want to be able to use this.hasOwnProperty() for instance
     "no-prototype-builtins": 0,
     "no-regex-spaces": 2,
+    "no-restricted-globals": [2, "Document", "Node"],
     "no-sparse-arrays": 0,
     "no-unexpected-multiline": 2,
     "no-unreachable": 2,
     "no-unsafe-finally": 2,
     "use-isnan": 2,
     "valid-jsdoc": 0,
     "valid-typeof": 2,
-    "strict": 0, // [2, "safe"],
+    "strict": [2, "safe"],
 
     // Best practices
     "accessor-pairs": 0,
@@ -126,6 +135,6 @@ module.exports = {
     "no-undef-init": 2,
     "no-undefined": 0,
     "no-unused-vars": 2,
-    "no-use-before-define": [2, { "functions": false }]
+    "no-use-before-define": [2, { "functions": false, "classes": false }]
   }
 };

.gitignore

@@ -38,11 +38,12 @@ config/production.json
 config/test.json
 config/dev.json
 ecosystem.json
+sync.js
 
 # Conversion data
 ost-data
 
 dist
 dist/doc
 uploads
-tmp
+tmp

client/publisher/ResourceClient.js

@@ -82,27 +82,41 @@ class ResourceClient {
   listEntities(filters, options, cb) {
     let filtersRequest = encodeURIComponent(JSON.stringify(filters))
     let optionsRequest = encodeURIComponent(JSON.stringify(options))
-    request('GET', '/api/entities?filters=' + filtersRequest + '&options=' + optionsRequest, null, cb)
+    this.request('GET', '/api/entities?filters=' + filtersRequest + '&options=' + optionsRequest, null, cb)
   }
 
   searchEntities(query, language, filters, options, cb) {
     let filtersRequest = encodeURIComponent(JSON.stringify(filters))
     let optionsRequest = encodeURIComponent(JSON.stringify(options))
-    request('GET', '/api/entities/search?query=' + query + '&language=' + language + '&filters=' + filtersRequest + '&options=' + optionsRequest, null, cb)
+    this.request('GET', '/api/entities/search?query=' + query + '&language=' + language + '&filters=' + filtersRequest + '&options=' + optionsRequest, null, cb)
   }
 
   /*
-    Read all document resources
+    Fetch all document resources
+  */
+  getDocumentCollaborators(documentId, cb) {
+    this.request('GET', '/api/collaborators/document/' + documentId, null, cb)
+  }
+
+  /*
+    Fetch all document resources
   */
   getDocumentResources(documentId, cb) {
-    request('GET', '/api/entities/document/' + documentId, null, cb)
+    this.request('GET', '/api/entities/document/' + documentId, null, cb)
   }
 
   /*
     Get subjects data
   */
   getSubjects(cb) {
-    request('GET', '/api/entities/tree/subject', null, cb)
+    this.request('GET', '/api/entities/tree/subject', null, cb)
+  }
+
+  /*
+    Get collaborator data
+  */
+  getCollaborator(userId, cb) {
+    this.request('GET', '/api/collaborators/' + userId, null, cb)
   }
 }
 

client/publisher/app.css

@@ -1,5 +1,4 @@
 /* Publisher Component styles */
-@import '../../node_modules/substance/dist/substance.next.css';
 @import '../../node_modules/leaflet/dist/leaflet.css';
 @import '../../node_modules/leaflet-control-geocoder/dist/Control.Geocoder.css';
 @import './publisher.css';

client/publisher/app.js

@@ -1,5 +1,5 @@
 import { substanceGlobals } from 'substance'
-import { Archivist, ArchivistConfigurator } from 'archivist'
+import { Archivist, ArchivistConfigurator } from 'archivist-js'
 import Package from './package'
 
 substanceGlobals.DEBUG_RENDERING = true;

client/publisher/index.html

@@ -2,22 +2,18 @@
 <head>
   <title>Archivist Publisher</title>
   <meta charset="UTF-8">
-  <script type="text/javascript" src="/substance/substance.js"></script>
-  <script type="text/javascript" src="/archivist/archivist.js"></script>
+  <script type="text/javascript" src="/libs/substance/substance.js"></script>
   <script type="text/javascript" src="./publisher.js"></script>
   <style>
-    /* Mpro Component styles */
+    @import '/libs/substance/substance.next.css';
+    @import '/libs/archivist/archivist.css';
+    @import '/libs/archivist/archivist-reset.css';
+    @import '/libs/archivist/archivist-pagestyle.css';
+    @import url('/libs/font-awesome/css/font-awesome.min.css');
     @import './publisher.css';
-    /* You may want to use your own reset and pagestyle */
-    /* @import '../substance/substance-reset.css';*/
-    @import '/archivist/archivist.css';
-    @import '/archivist/archivist-reset.css';
-    @import '/archivist/archivist-pagestyle.css';
-    /* Using url here, so font-awesome does not get bundled. */
-    @import url('/font-awesome/css/font-awesome.min.css');
   </style>
 </head>
 <body>
 
 </body>
-</html>
+</html>

client/publisher/index.production.html

@@ -2,22 +2,18 @@
 <head>
   <title>OST Publisher</title>
   <meta charset="UTF-8">
-  <script type="text/javascript" src="/substance/substance.js"></script>
-  <script type="text/javascript" src="/archivist/archivist.js"></script>
+  <script type="text/javascript" src="/libs/substance/substance.js"></script>
   <script type="text/javascript" src="./publisher.js"></script>
   <style>
-    /* Mpro Component styles */
+    @import '/libs/substance/substance.next.css';
+    @import '/libs/archivist/archivist.css';
+    @import '/libs/archivist/archivist-reset.css';
+    @import '/libs/archivist/archivist-pagestyle.css';
+    @import url('/libs/font-awesome/css/font-awesome.min.css');
     @import './publisher.css';
-    /* You may want to use your own reset and pagestyle */
-    /* @import '../substance/substance-reset.css';*/
-    @import '/archivist/archivist.css';
-    @import '/archivist/archivist-reset.css';
-    @import '/archivist/archivist-pagestyle.css';
-    /* Using url here, so font-awesome does not get bundled. */
-    @import url('/font-awesome/css/font-awesome.min.css');
   </style>
 </head>
 <body>
 
 </body>
-</html>
+</html>

client/publisher/package.js

@@ -1,7 +1,8 @@
-import { ProseArticle } from 'substance'
-import { ArchivistPackage, ArchivistSubConfigurator, CommentsPackage, DocumentsPackage, IndentationPackage, MetadataEditorPackage, ResourcesPackage, TimecodeAnnotatorPackage, UsersPackage, WhitespacePackage } from 'archivist'
+import { ProseEditorPackage } from 'substance'
+import { ArchivistPackage, ArchivistSubConfigurator, CommentsPackage, IndentationPackage, MetadataEditorPackage, ResourcesPackage, TimecodeAnnotatorPackage, UsersPackage, WhitespacePackage } from 'archivist-js'
 import InterviewPackage from '../../packages/interview/package'
 import FormsPackage from '../../packages/forms/package'
+import DocumentsPackage from '../../packages/documents/package'
 import DefinitionManagerPackage from '../../packages/definition-manager/package'
 import PersonManagerPackage from '../../packages/person-manager/package'
 import PrisonManagerPackage from '../../packages/prison-manager/package'
@@ -22,16 +23,19 @@ import Subject from '../../packages/subjects/Subject'
 import Subjects from '../../packages/subjects/package'
 import Toponym from '../../packages/toponym/Toponym'
 
+const { ProseArticle } = ProseEditorPackage
+
 let appConfig = 'ARCHIVISTCONFIG'
 appConfig = JSON.parse(appConfig)
 
 export default {
   name: 'archivist-publisher',
   configure: function(config) {
     // Use the default Archivist package
+    config.setDefaultLanguage(appConfig.defaultLanguage)
     config.import(ArchivistPackage)
     config.import(DocumentsPackage)
-    // Override Archivist form package 
+    // Override Archivist form package
     config.import(FormsPackage)
     // Manage person entity type
     config.import(PersonManagerPackage)
@@ -72,7 +76,8 @@ export default {
     let EntitiesConfigurator = new ArchivistSubConfigurator()
     EntitiesConfigurator.defineSchema({
       name: 'archivist-entities',
-      ArticleClass: ProseArticle
+      version: '1.0.0',
+      DocumentClass: ProseArticle
     })
     EntitiesConfigurator.addNode(Definition)
     EntitiesConfigurator.addNode(Person)
@@ -107,15 +112,15 @@ export default {
     config.setResourceClient(ResourceClient)
 
     config.setMenuItems([
-      {icon: 'fa-file-text', label: 'Documents', action: 'archive'},
-      {icon: 'fa-tags', label: 'Subjects', action: 'subjects'},
-      {icon: 'fa-users', label: 'Persons', action: 'persons'},
-      {icon: 'fa-th', label: 'Prisons', action: 'prisons'},
-      {icon: 'fa-globe', label: 'Toponyms', action: 'toponyms'},
-      {icon: 'fa-book', label: 'Definitions', action: 'definitions'},
-      {icon: 'fa-id-badge', label: 'Users', action: 'users'}
+      {icon: 'fa-file-text', label: 'documents', action: 'archive'},
+      {icon: 'fa-tags', label: 'subjects', action: 'subjects'},
+      {icon: 'fa-users', label: 'persons', action: 'persons'},
+      {icon: 'fa-th', label: 'prisons', action: 'prisons'},
+      {icon: 'fa-globe', label: 'toponyms', action: 'toponyms'},
+      {icon: 'fa-book', label: 'definitions', action: 'definitions'},
+      {icon: 'fa-id-badge', label: 'users', action: 'users'}
     ])
 
     config.setDefaultResourceTypes(['definition', 'person', 'prison', 'toponym'])
   }
-}
+}

client/publisher/publisher.css

@@ -1,9 +1,11 @@
 @import '../../packages/forms/_index.css';
 @import '../../packages/header/_index.css';
 @import '../../packages/definition/_index.css';
+@import '../../packages/ost-publisher/_index.css';
+@import '../../packages/documents/_index.css';
 @import '../../packages/person/_index.css';
 @import '../../packages/prison/_index.css';
 @import '../../packages/subject/_index.css';
 @import '../../packages/subject-manager/_index.css';
 @import '../../packages/subjects-editor-context/_index.css';
-@import '../../packages/toponym/_index.css';
+@import '../../packages/toponym/_index.css';

client/scholar/app.css

@@ -1,5 +1,4 @@
 /* Scholar styles */
-@import '../../node_modules/substance/dist/substance.next.css';
 @import '../../node_modules/plyr/dist/plyr.css';
 @import '../../node_modules/leaflet/dist/leaflet.css';
 @import '../../node_modules/leaflet.markercluster/dist/MarkerCluster.css';