Merge pull request #52 from accordproject/dl-add-to-contract

feat(ContractEditor): update to use new SlateAsInputEditor from cicero-ui

demo/src/defaultClauseValue.js

@@ -0,0 +1,36 @@
+export default {
+  object: 'value',
+  document: {
+    object: 'document',
+    data: {},
+    nodes: [
+      {
+        object: 'block',
+        type: 'clause',
+        data: {
+          tag: 'clause',
+          attributes: {
+            src: 'https://templates.accordproject.org/archives/[email protected]'
+          },
+          attributeString: 'src = "https://templates.accordproject.org/archives/[email protected]"',
+          content: '\n  Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.\n  ',
+          closed: false
+        },
+        nodes: [
+          {
+            object: 'block',
+            type: 'paragraph',
+            data: {},
+            nodes: [
+              {
+                object: 'text',
+                text: '\n  Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.\n  ',
+                marks: []
+              }
+            ]
+          }
+        ]
+      },
+    ]
+  }
+};

demo/src/defaultContractValue.js

@@ -0,0 +1,123 @@
+export default {
+  object: 'value',
+  document: {
+    object: 'document',
+    data: {},
+    nodes: [
+      {
+        object: 'block',
+        type: 'heading_one',
+        data: {},
+        nodes: [
+          {
+            object: 'text',
+            text: 'Supply Agreement',
+            marks: []
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'paragraph',
+        data: {},
+        nodes: [
+          {
+            object: 'text',
+            text: 'This is a supply agreement between Party A and Party B.',
+            marks: []
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'heading_one',
+        data: {},
+        nodes: [
+          {
+            object: 'text',
+            text: 'Payment',
+            marks: []
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'clause',
+        data: {
+          tag: 'clause',
+          attributes: {
+            src: 'https://templates.accordproject.org/archives/[email protected]'
+          },
+          attributeString: 'src = "https://templates.accordproject.org/archives/[email protected]"',
+          content: '\n  Upon the signing of this Agreement, "Dan" shall pay the total purchase price to "Steve" in the amount of 0.01 USD.\n  ',
+          closed: false
+        },
+        nodes: [
+          {
+            object: 'block',
+            type: 'paragraph',
+            data: {},
+            nodes: [
+              {
+                object: 'text',
+                text: '\n  Upon the signing of this Agreement, "Dan" shall pay the total purchase price to "Steve" in the amount of 0.01 USD.\n  ',
+                marks: []
+              }
+            ]
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'heading_two',
+        data: {},
+        nodes: [
+          {
+            object: 'text',
+            text: 'Late Delivery And Penalty',
+            marks: []
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'clause',
+        data: {
+          tag: 'clause',
+          attributes: {
+            src: 'https://templates.accordproject.org/archives/[email protected]'
+          },
+          attributeString: 'src = "https://templates.accordproject.org/archives/[email protected]"',
+          content: '\n  Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.\n  ',
+          closed: false
+        },
+        nodes: [
+          {
+            object: 'block',
+            type: 'paragraph',
+            data: {},
+            nodes: [
+              {
+                object: 'text',
+                text: '\n  Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.\n  ',
+                marks: []
+              }
+            ]
+          }
+        ]
+      },
+      {
+        object: 'block',
+        type: 'paragraph',
+        data: {},
+        nodes: [
+          {
+            object: 'text',
+            text: 'End.',
+            marks: []
+          }
+        ]
+      }
+    ]
+  }
+};

demo/src/index.js

@@ -8,28 +8,8 @@ import { Template, Clause } from '@accordproject/cicero-core';
 import 'semantic-ui-css/semantic.min.css';
 import ClauseEditor from '../../src/ClauseEditor';
 import ContractEditor from '../../src/ContractEditor';
-
-const clauseEditorInitialMarkdown = `<clause src="https://templates.accordproject.org/archives/[email protected]">
-Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.
-</clause>`;
-
-const contractEditorInitialMarkdown = `# Supply Agreement
-  This is a supply agreement between Party A and Party B.
-  
-  # Payment
-  
-  <clause src="https://templates.accordproject.org/archives/[email protected]">
-  Upon the signing of this Agreement, <variable name="buyer">"Dan"</variable> shall pay the total purchase price to <variable name="seller">"Steve"</variable> in the amount of 0.01 USD.
-  </clause>
-  
-  ## Late Delivery And Penalty
-  
-  <clause src="https://templates.accordproject.org/archives/[email protected]">
-  Late Delivery and Penalty. In case of delayed delivery except for Force Majeure cases, "Dan" (the Seller) shall pay to "Steve" (the Buyer) for every 2 days of delay penalty amounting to 10.5% of the total value of the Equipment whose delivery has been delayed. Any fractional part of a days is to be considered a full days. The total amount of penalty shall not however, exceed 55% of the total value of the Equipment involved in late delivery. If the delay is more than 15 days, the Buyer is entitled to terminate this Contract.
-  </clause>
-  
-  End.
-  `;
+import defaultContractValue from './defaultContractValue';
+import defaultClauseValue from './defaultClauseValue';
 
 /**
  * A demo component that uses ContractEditor and
@@ -66,13 +46,13 @@ function Demo() {
   const demo = activeItem === 'clauseEditor'
     ? <ClauseEditor
   lockText={false}
-  markdown={clauseEditorInitialMarkdown}
+  value={defaultClauseValue}
   onChange={onChange}
   onParse={onParse}
   />
     : <ContractEditor
   lockText={false}
-  markdown={contractEditorInitialMarkdown}
+  value={defaultContractValue}
   onChange={onChange}
   />;
 

package.json

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@accordproject/cicero-core": "^0.12.3",
-    "@accordproject/markdown-editor": "^0.4.9",
+    "@accordproject/markdown-editor": "^0.4.13",
     "lodash": "^4.17.11",
     "mini-css-extract-plugin": "^0.7.0",
     "node-sass": "^4.12.0",

src/ClauseEditor/__snapshots__/index.test.js.snap

@@ -2,13 +2,11 @@
 
 exports[`<ClauseEditor /> on initialization renders page correctly 1`] = `
 <div>
-  <MarkdownEditor
+  <ContractEditor
     lockText={true}
-    markdown=""
-    markdownMode={false}
     onChange={[Function]}
-    plugins={Array []}
     showEditButton={true}
+    value={null}
   />
   <ParseResult
     parseResult={null}

src/ClauseEditor/index.js

@@ -71,7 +71,7 @@ function ClauseEditor(props) {
   return (
       <div>
         <ContractEditor
-          markdown={props.markdown}
+          value={props.value}
           lockText={props.lockText}
           plugins={props.plugins}
           onChange={onChange}

src/ClauseEditor/index.test.js

@@ -5,7 +5,7 @@ import toJson from 'enzyme-to-json';
 import ClauseEditor from './index';
 
 const props = {
-  markdown: '',
+  value: null,
   onParse: () => 1,
   onChange: () => 1,
   lockText: true,