chore(dep) Upgrade to latest Concert with metamodel support

Signed-off-by: jeromesimeon <[email protected]>
accordproject · Jul 26, 2021 · 74f014e · 74f014e
1 parent d24ee4c
commit 74f014e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/storybook/package.json b/packages/storybook/package.json
@@ -3,7 +3,7 @@
   "version": "0.98.0",
   "private": true,
   "dependencies": {
-    "@accordproject/concerto-core": "1.0.5-20210721165725",
+    "@accordproject/concerto-core": "1.0.5-20210726212028",
     "@accordproject/cicero-core": "0.22.0",
     "@accordproject/markdown-slate": "0.13.0",
     "@accordproject/markdown-transform": "0.13.0",

diff --git a/packages/storybook/src/stories/3-ConcertoForm.stories.js b/packages/storybook/src/stories/3-ConcertoForm.stories.js
@@ -16,6 +16,35 @@ export default {
   }
 };
 
+const initialJson = null;
+
+// const initialJson = {
+//   "$class": "concerto.metamodel.ModelFile",
+//   "namespace": "org.litle.test",
+//   "imports": [],
+//   "declarations": [
+//     {
+//       "$class": "concerto.metamodel.ConceptDeclaration",
+//       "isAbstract": false,
+//       "name": "Person",
+//       "fields": [
+//         {
+//           "$class": "concerto.metamodel.StringFieldDeclaration",
+//           "name": "name",
+//           "isArray": false,
+//           "isOptional": false
+//         }, 
+//         {
+//           "$class": "concerto.metamodel.IntegerFieldDeclaration",
+//           "name": "age",
+//           "isArray": false,
+//           "isOptional": false
+//         }
+//       ]
+//     }
+//   ]
+// };
+
 export const SimpleExample = () => {
   const readOnly = boolean('Read-only', false);
   const type = text('Type', 'test.Person');
@@ -117,7 +146,7 @@ export const ModelBuilder = () => {
         models={[model]}
         options={options}
         type={type}
-        json={null}
+        json={initialJson}
         onValueChange={handleValueChange}
       />
     </div>

diff --git a/packages/storybook/src/stories/concerto.models.js b/packages/storybook/src/stories/concerto.models.js
@@ -59,6 +59,8 @@ concept DecoratorBoolean extends DecoratorLiteral {
 concept TypeIdentifier {
   @FormEditor("selectOptions", "types")
   o String name default="Concept"
+  @FormEditor( "hide", true)
+  o String fullyQualifiedName optional
 }
 
 concept DecoratorIdentifier extends DecoratorLiteral {
@@ -201,7 +203,7 @@ concept ImportAll extends Import {
 }
 
 concept ImportType extends Import {
-  o TypeIdentifier identifier
+  o String name
 }
 
 concept ModelFile {

diff --git a/packages/ui-concerto/package.json b/packages/ui-concerto/package.json
@@ -3,7 +3,7 @@
   "version": "0.98.0",
   "private": false,
   "dependencies": {
-    "@accordproject/concerto-core": "1.0.5-20210721165725",
+    "@accordproject/concerto-core": "1.0.5-20210726212028",
     "@babel/runtime": "^7.10.3",
     "lodash.get": "^4.4.2",
     "lodash.isequal": "^4.5.0",