@modusoperandi/licit 0.13.10 → 0.13.18

package/dist/client/CollabConnector.js

@@ -71,7 +71,11 @@ class CollabConnector extends _SimpleConnector.default {
     });
 
     _defineProperty(this, "updateSchema", (schema, data) => {
-      this._connection.updateSchema(schema, data);
+      this._connection.updateSchema(schema, data, this._dataDefined);
+    });
+
+    _defineProperty(this, "updateContent", data => {
+      this._connection.start(data, this._dataDefined);
     });
 
     const {

package/dist/client/CollabConnector.js.flow

@@ -14,7 +14,7 @@ type IdStrict = string;
 class CollabConnector extends SimpleConnector {
   _clientID: string;
   _connected: boolean;
-  _connection: any;
+  _connection: EditorConnection;
   _docID: IdStrict;
   _stepKeys: Object;
 
@@ -79,7 +79,11 @@ class CollabConnector extends SimpleConnector {
   // FS IRAD-1040 2020-09-02
   // Send the modified schema to server
   updateSchema = (schema: Schema, data: any) => {
-    this._connection.updateSchema(schema, data);
+    this._connection.updateSchema(schema, data, this._dataDefined);
+  };
+
+  updateContent = (data: any) => {
+    this._connection.start(data, this._dataDefined);
   };
 }
 

package/dist/client/EditorConnection.js

@@ -158,8 +158,9 @@ class EditorConnection {
   } // Load the document from the server and start up
 
 
-  start(input) {
-    this.run((0, _http.PUT)(this.url, JSON.stringify(input), 'application/json')).then(data => {
+  start(input, dataDefined) {
+    const query = '?dataDefined=' + dataDefined;
+    this.run(input ? (0, _http.PUT)(this.url + query, JSON.stringify(input), 'application/json') : (0, _http.GET)(this.url, 'application/json')).then(data => {
       data = JSON.parse(data);
       this.report.success();
       this.backOff = 0;
@@ -266,14 +267,14 @@ class EditorConnection {
   // Send the modified schema to server
 
 
-  updateSchema(schema, input) {
+  updateSchema(schema, input, dataDefined) {
     // to avoid cyclic reference error, use flatted string.
     const schemaFlatted = (0, _flatted.stringify)(schema);
     this.run((0, _http.POST)(this.url + '/schema/', schemaFlatted, 'text/plain')).then(data => {
       console.log("collab server's schema updated"); // [FS] IRAD-1040 2020-09-08
 
       this.schema = schema;
-      this.start(input);
+      this.start(input, dataDefined);
     }, err => {
       this.report.failure(err);
     });

package/dist/client/EditorConnection.js.flow

@@ -144,8 +144,13 @@ class EditorConnection {
   }
 
   // Load the document from the server and start up
-  start(input: any): void {
-    this.run(PUT(this.url, JSON.stringify(input), 'application/json')).then(
+  start(input: any, dataDefined: boolean): void {
+    const query = '?dataDefined=' + dataDefined;
+    this.run(
+      input
+        ? PUT(this.url + query, JSON.stringify(input), 'application/json')
+        : GET(this.url, 'application/json')
+    ).then(
       (data) => {
         data = JSON.parse(data);
         this.report.success();
@@ -253,7 +258,7 @@ class EditorConnection {
 
   // [FS] IRAD-1040 2020-09-02
   // Send the modified schema to server
-  updateSchema(schema: Schema, input: any) {
+  updateSchema(schema: Schema, input: any, dataDefined: boolean) {
     // to avoid cyclic reference error, use flatted string.
     const schemaFlatted = stringify(schema);
     this.run(POST(this.url + '/schema/', schemaFlatted, 'text/plain')).then(
@@ -261,7 +266,7 @@ class EditorConnection {
         console.log("collab server's schema updated");
         // [FS] IRAD-1040 2020-09-08
         this.schema = schema;
-        this.start(input);
+        this.start(input, dataDefined);
       },
       (err) => {
         this.report.failure(err);

package/dist/client/Licit.js

@@ -121,17 +121,21 @@ class Licit extends React.Component {
 
     _defineProperty(this, "setContent", function () {
       let content = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      // [FS] IRAD-1571 2021-09-27
+      let dataType = arguments.length > 1 ? arguments[1] : undefined;
+      _this.skipDataTypeCheck = false; // [FS] IRAD-1571 2021-09-27
       // dispatch a transaction that MUST start from the view’s current state;
+
       const editorState = _this._editorView.state;
       const {
-        doc,
-        schema
+        doc
       } = editorState;
       let {
         tr
       } = editorState;
-      const document = schema.nodeFromJSON(content ? content : _createEmptyEditorState.EMPTY_DOC_JSON); // [FS] IRAD-1593 2021-10-12
+
+      const document = _this.getDocument(content, editorState, dataType);
+
+      _this.skipDataTypeCheck = true; // [FS] IRAD-1593 2021-10-12
       // Reset lastKeyCode since the content is set dynamically and so lastKeyCode is invalid now.
 
       _this._editorView.lastKeyCode = null;
@@ -252,9 +256,10 @@ class Licit extends React.Component {
         propsCopy.readOnly = false;
         delete propsCopy.data;
         this.setState(propsCopy);
-      } // Need to go through shouldComponentUpdate lifecycle here, when updated from outside,
-      // so that content is modified gracefully using transaction so that undo/redo works too.
+      }
 
+      this.skipDataTypeCheck = false; // Need to go through shouldComponentUpdate lifecycle here, when updated from outside,
+      // so that content is modified gracefully using transaction so that undo/redo works too.
 
       this._skipSCU = false;
       this.setState(props);
@@ -295,7 +300,10 @@ class Licit extends React.Component {
     // Handle Image Upload from Angular App
 
     const runtime = props.runtime || null;
-    const plugins = props.plugins || null;
+    const plugins = props.plugins || null; // This flag decides whether DataType.HTML check is needed when
+    // changing document. If it forcefully done, it is not needed, otherwise needed.
+
+    this.skipDataTypeCheck = false;
     this._defaultEditorSchema = new _prosemirrorModel.Schema({
       nodes: _EditorNodes.default,
       marks: _EditorMarks.default
@@ -308,7 +316,8 @@ class Licit extends React.Component {
       docID,
       collabServiceURL
     }, this._defaultEditorSchema, this._defaultEditorPlugins, // [FS] IRAD-1578 2021-09-27
-    this.onReady.bind(this)) : new _SimpleConnector.default(editorState, setState); // FS IRAD-989 2020-18-06
+    this.onReady.bind(this)) : new _SimpleConnector.default(editorState, setState);
+    this._connector._dataDefined = !!props.data; // FS IRAD-989 2020-18-06
     // updating properties should automatically render the changes
 
     this.state = {
@@ -324,7 +333,8 @@ class Licit extends React.Component {
       debug,
       disabled,
       embedded,
-      runtime
+      runtime,
+      dataType
     }; // FS IRAD-1040 2020-26-08
     // Get the modified schema from editorstate and send it to collab server
 
@@ -474,7 +484,23 @@ class Licit extends React.Component {
     return node.attrs && node.attrs[attrName];
   }
 
-  hasDataChanged(nextData) {
+  getDocument(content, editorState, dataType) {
+    let document = null;
+    const {
+      schema
+    } = editorState;
+
+    if (DataType.JSON === dataType || this.skipDataTypeCheck) {
+      document = schema.nodeFromJSON(content ? content : _createEmptyEditorState.EMPTY_DOC_JSON);
+    } else {
+      const tempEState = (0, _convertFromHTML.default)(content ? content : '', schema, editorState.plugins);
+      document = tempEState.doc;
+    }
+
+    return document;
+  }
+
+  hasDataChanged(nextData, nextDataType) {
     let dataChanged = false; // [FS] IRAD-1571 2021-09-27
     // dispatch a transaction that MUST start from the view’s current state;
     // [FS] IRAD-1589 2021-10-04
@@ -482,19 +508,19 @@ class Licit extends React.Component {
 
     if ((0, _flatted.stringify)(this.state.data) !== (0, _flatted.stringify)(nextData)) {
       const editorState = this._editorView.state;
-      const nextDoc = editorState.schema.nodeFromJSON(nextData ? nextData : _createEmptyEditorState.EMPTY_DOC_JSON);
+      const nextDoc = this.getDocument(nextData, editorState, nextDataType);
       dataChanged = !nextDoc.eq(editorState.doc);
     }
 
     return dataChanged;
   }
 
-  changeContent(data) {
-    if (this.hasDataChanged(data)) {
+  changeContent(data, dataType) {
+    if (this.hasDataChanged(data, dataType)) {
       // FS IRAD-1592 2021-11-10
       // Release here quickly, so that update doesn't care about at this point.
       // data changed, so update document content
-      setTimeout(this.setContent.bind(this, data), 1);
+      setTimeout(this.setContent.bind(this, data, dataType), 1);
     }
   }
 
@@ -502,13 +528,14 @@ class Licit extends React.Component {
     // Only interested if properties are set from outside.
     if (!this._skipSCU) {
       this._skipSCU = false;
-      this.changeContent(nextState.data);
+      this.changeContent(nextState.data, nextState.dataType);
 
       if (this.state.docID !== nextState.docID) {
         setTimeout(this.setDocID.bind(this, nextState), 1);
       }
     }
 
+    this.skipDataTypeCheck = true;
     return true;
   }
 

package/dist/client/Licit.js.flow

@@ -51,7 +51,7 @@ export const DataType = Object.freeze({
  */
 class Licit extends React.Component<any, any> {
   _runtime: EditorRuntime;
-  _connector: any;
+  _connector: SimpleConnector;
   _clientID: string;
   _editorView: EditorView; // This will be handy in updating document's content.
   _skipSCU: boolean; // Flag to decide whether to skip shouldComponentUpdate
@@ -107,6 +107,9 @@ class Licit extends React.Component<any, any> {
     // Handle Image Upload from Angular App
     const runtime = props.runtime || null;
     const plugins = props.plugins || null;
+    // This flag decides whether DataType.HTML check is needed when
+    // changing document. If it forcefully done, it is not needed, otherwise needed.
+    this.skipDataTypeCheck = false;
 
     this._defaultEditorSchema = new Schema({
       nodes: EditorNodes,
@@ -135,6 +138,8 @@ class Licit extends React.Component<any, any> {
         )
       : new SimpleConnector(editorState, setState);
 
+    this._connector._dataDefined = !!props.data;
+
     // FS IRAD-989 2020-18-06
     // updating properties should automatically render the changes
 
@@ -152,6 +157,7 @@ class Licit extends React.Component<any, any> {
       disabled,
       embedded,
       runtime,
+      dataType,
     };
 
     // FS IRAD-1040 2020-26-08
@@ -313,13 +319,33 @@ class Licit extends React.Component<any, any> {
     return node.attrs && node.attrs[attrName];
   }
 
-  setContent = (content: any = {}): void => {
+  getDocument(content: any, editorState: EditorState, dataType: DataType) {
+    let document = null;
+    const { schema } = editorState;
+
+    if (DataType.JSON === dataType || this.skipDataTypeCheck) {
+      document = schema.nodeFromJSON(content ? content : EMPTY_DOC_JSON);
+    } else {
+      const tempEState = convertFromHTML(
+        content ? content : '',
+        schema,
+        editorState.plugins
+      );
+      document = tempEState.doc;
+    }
+
+    return document;
+  }
+
+  setContent = (content: any = {}, dataType: DataType): void => {
+    this.skipDataTypeCheck = false;
     // [FS] IRAD-1571 2021-09-27
     // dispatch a transaction that MUST start from the view’s current state;
     const editorState = this._editorView.state;
-    const { doc, schema } = editorState;
+    const { doc } = editorState;
     let { tr } = editorState;
-    const document = schema.nodeFromJSON(content ? content : EMPTY_DOC_JSON);
+    const document = this.getDocument(content, editorState, dataType);
+    this.skipDataTypeCheck = true;
 
     // [FS] IRAD-1593 2021-10-12
     // Reset lastKeyCode since the content is set dynamically and so lastKeyCode is invalid now.
@@ -339,7 +365,7 @@ class Licit extends React.Component<any, any> {
     this._editorView.dispatch(tr);
   };
 
-  hasDataChanged(nextData: any) {
+  hasDataChanged(nextData: any, nextDataType: DataType) {
     let dataChanged = false;
 
     // [FS] IRAD-1571 2021-09-27
@@ -348,21 +374,19 @@ class Licit extends React.Component<any, any> {
     // Do a proper circular JSON comparison.
     if (stringify(this.state.data) !== stringify(nextData)) {
       const editorState = this._editorView.state;
-      const nextDoc = editorState.schema.nodeFromJSON(
-        nextData ? nextData : EMPTY_DOC_JSON
-      );
+      const nextDoc = this.getDocument(nextData, editorState, nextDataType);
       dataChanged = !nextDoc.eq(editorState.doc);
     }
 
     return dataChanged;
   }
 
-  changeContent(data: any) {
-    if (this.hasDataChanged(data)) {
+  changeContent(data: any, dataType: DataType) {
+    if (this.hasDataChanged(data, dataType)) {
       // FS IRAD-1592 2021-11-10
       // Release here quickly, so that update doesn't care about at this point.
       // data changed, so update document content
-      setTimeout(this.setContent.bind(this, data), 1);
+      setTimeout(this.setContent.bind(this, data, dataType), 1);
     }
   }
 
@@ -371,13 +395,15 @@ class Licit extends React.Component<any, any> {
     if (!this._skipSCU) {
       this._skipSCU = false;
 
-      this.changeContent(nextState.data);
+      this.changeContent(nextState.data, nextState.dataType);
 
       if (this.state.docID !== nextState.docID) {
         setTimeout(this.setDocID.bind(this, nextState), 1);
       }
     }
 
+    this.skipDataTypeCheck = true;
+
     return true;
   }
 
@@ -628,6 +654,7 @@ class Licit extends React.Component<any, any> {
       delete propsCopy.data;
       this.setState(propsCopy);
     }
+    this.skipDataTypeCheck = false;
     // Need to go through shouldComponentUpdate lifecycle here, when updated from outside,
     // so that content is modified gracefully using transaction so that undo/redo works too.
     this._skipSCU = false;

package/dist/client/SimpleConnector.js

@@ -25,11 +25,16 @@ var bpfrpt_proptype_SetStateCall = _propTypes.default.func;
 exports.bpfrpt_proptype_SetStateCall = bpfrpt_proptype_SetStateCall;
 
 class SimpleConnector {
+  // This flag is used to deteremine if data passed in or not
+  // If not passed in, use the data from collab server when in collab mode.
+  // else use empty content.
   constructor(_editorState, setState) {
     _defineProperty(this, "_setState", void 0);
 
     _defineProperty(this, "_editorState", void 0);
 
+    _defineProperty(this, "_dataDefined", void 0);
+
     _defineProperty(this, "onEdit", (transaction, view) => {
       _reactDom.default.unstable_batchedUpdates(() => {
         const editorState = this._editorState.apply(transaction); // [FS] IRAD-1236 2020-03-05
@@ -57,6 +62,8 @@ class SimpleConnector {
 
     _defineProperty(this, "updateSchema", (schema, data) => {});
 
+    _defineProperty(this, "updateContent", data => {});
+
     _defineProperty(this, "cleanUp", () => {});
 
     this._editorState = _editorState;

package/dist/client/SimpleConnector.js.flow

@@ -14,6 +14,10 @@ export type SetStateCall = (
 class SimpleConnector {
   _setState: SetStateCall;
   _editorState: EditorState;
+  // This flag is used to deteremine if data passed in or not
+  // If not passed in, use the data from collab server when in collab mode.
+  // else use empty content.
+  _dataDefined: boolean;
 
   constructor(editorState: EditorState, setState: SetStateCall) {
     this._editorState = editorState;
@@ -49,6 +53,8 @@ class SimpleConnector {
   // Send the modified schema to server
   updateSchema = (schema: Schema, data: any) => {};
 
+  updateContent = (data: any) => {};
+
   cleanUp = () => {};
 }
 

package/dist/convertFromHTML.js

@@ -15,6 +15,14 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function convertFromHTML(html, schema, plugins) {
   const root = document.createElement('html');
-  root.innerHTML = html;
+  root.innerHTML = unEscape(html ? html : ' ');
   return (0, _convertFromDOMElement.default)(root, schema, plugins);
+}
+
+function unEscape(htmlStr) {
+  if (htmlStr) {
+    htmlStr = htmlStr.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&amp;/g, '&');
+  }
+
+  return htmlStr;
 }

package/dist/convertFromHTML.js.flow

@@ -12,6 +12,18 @@ export default function convertFromHTML(
   plugins: Array<Plugin>
 ): EditorState {
   const root = document.createElement('html');
-  root.innerHTML = html;
+  root.innerHTML = unEscape(html ? html : ' ');
   return convertFromDOMElement(root, schema, plugins);
 }
+
+function unEscape(htmlStr) {
+  if (htmlStr) {
+    htmlStr = htmlStr
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/&amp;/g, '&');
+  }
+  return htmlStr;
+}

package/dist/ui/czi-link-tooltip.css

@@ -1,4 +1,4 @@
-@import '@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-custom-button.css';
 @import './czi-vars.css';
 
 .czi-link-tooltip {

package/dist/ui/czi-vars.css

@@ -1,2 +1,2 @@
-@import '@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
+@import '~@modusoperandi/licit-ui-commands/dist/ui/czi-vars.css';
 

package/licit/server/collab/instance.js

@@ -183,10 +183,8 @@ export function initEditorSchema(effectiveSchema: Schema) {
   }
 }
 
-export function getInstance(id: any, ip: any, doc: any) {
-  const inst =
-    instances[id] ||
-    newInstance(id, !doc ? undefined : _editorSchema.nodeFromJSON(doc));
+export function getInstance(id: any, ip: any) {
+  const inst = instances[id] || newInstance(id);
   if (ip) inst.registerUser(ip);
   inst.lastActive = Date.now();
   return inst;
@@ -208,6 +206,20 @@ function newInstance(id: any, doc: any) {
   return (instances[id] = new Instance(id, doc));
 }
 
+export function updateInstance(id: any, ip: any, doc: any) {
+  let inst = instances[id];
+  if (inst) {
+    if (doc) {
+      inst.doc = _editorSchema.nodeFromJSON(doc);
+    }
+  } else {
+    inst = newInstance(id, !doc ? undefined : _editorSchema.nodeFromJSON(doc));
+  }
+  if (ip) inst.registerUser(ip);
+  inst.lastActive = Date.now();
+  return inst;
+}
+
 export function instanceInfo() {
   const found = [];
   for (const id in instances)

package/licit/server/collab/server.js

@@ -9,6 +9,7 @@ import {
   instanceInfo,
   setEditorSchema,
   initEditorSchema,
+  updateInstance,
 } from './instance';
 // [FS] IRAD-899 2020-03-13
 // This is for Capcomode document attribute. Shared Step, so that capcomode can be dealt collaboratively.
@@ -152,9 +153,23 @@ handle('GET', [DOCS], () => {
   return Output.json(instanceInfo());
 });
 
-// Output the current state of a document instance.
+// Save & Output the current state of a document instance.
 handle('PUT', [DOCS, null], (data, id, req) => {
-  const inst = getInstance(id, reqIP(req), data);
+  const inst = updateInstance(
+    id,
+    reqIP(req),
+    req.query.dataDefined === 'false' ? null : data
+  );
+  return Output.json({
+    doc_json: inst.doc.toJSON(),
+    users: inst.userCount,
+    version: inst.version,
+  });
+});
+
+// Output the current state of a document instance.
+handle('GET', [DOCS, null], (id, req) => {
+  const inst = getInstance(id, reqIP(req));
   return Output.json({
     doc_json: inst.doc.toJSON(),
     users: inst.userCount,

package/licit/server/collab/start.js

@@ -10,4 +10,4 @@ createServer((req, resp) => {
   handleCollabRequest(req, resp);
 }).listen(PORT);
 
-console.log('Licit Collab server listening on ' + PORT);
+console.log('Licit Collab v0.13.17 server listening on ' + PORT);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modusoperandi/licit",
-  "version": "0.13.10",
+  "version": "0.13.18",
   "subversion": "1",
   "description": "Rich text editor built with React and ProseMirror",
   "main": "dist/index.js",

package/src/client/CollabConnector.js

@@ -14,7 +14,7 @@ type IdStrict = string;
 class CollabConnector extends SimpleConnector {
   _clientID: string;
   _connected: boolean;
-  _connection: any;
+  _connection: EditorConnection;
   _docID: IdStrict;
   _stepKeys: Object;
 
@@ -79,7 +79,11 @@ class CollabConnector extends SimpleConnector {
   // FS IRAD-1040 2020-09-02
   // Send the modified schema to server
   updateSchema = (schema: Schema, data: any) => {
-    this._connection.updateSchema(schema, data);
+    this._connection.updateSchema(schema, data, this._dataDefined);
+  };
+
+  updateContent = (data: any) => {
+    this._connection.start(data, this._dataDefined);
   };
 }
 

package/src/client/EditorConnection.js

@@ -144,8 +144,13 @@ class EditorConnection {
   }
 
   // Load the document from the server and start up
-  start(input: any): void {
-    this.run(PUT(this.url, JSON.stringify(input), 'application/json')).then(
+  start(input: any, dataDefined: boolean): void {
+    const query = '?dataDefined=' + dataDefined;
+    this.run(
+      input
+        ? PUT(this.url + query, JSON.stringify(input), 'application/json')
+        : GET(this.url, 'application/json')
+    ).then(
       (data) => {
         data = JSON.parse(data);
         this.report.success();
@@ -253,7 +258,7 @@ class EditorConnection {
 
   // [FS] IRAD-1040 2020-09-02
   // Send the modified schema to server
-  updateSchema(schema: Schema, input: any) {
+  updateSchema(schema: Schema, input: any, dataDefined: boolean) {
     // to avoid cyclic reference error, use flatted string.
     const schemaFlatted = stringify(schema);
     this.run(POST(this.url + '/schema/', schemaFlatted, 'text/plain')).then(
@@ -261,7 +266,7 @@ class EditorConnection {
         console.log("collab server's schema updated");
         // [FS] IRAD-1040 2020-09-08
         this.schema = schema;
-        this.start(input);
+        this.start(input, dataDefined);
       },
       (err) => {
         this.report.failure(err);