fix: changes to Datatable and related schemas

stencila · Apr 15, 2019 · 837112c · 837112c
1 parent b8f9aca
commit 837112c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/schema/Collection.schema.yaml b/schema/Collection.schema.yaml
@@ -8,6 +8,9 @@ properties:
     '@id': schema:hasParts
     type: array
     items:
-      $ref: CreativeWork.schema.yaml
+      anyOf:
+        - $ref: Article.schema.yaml
+        - $ref: Datatable.schema.yaml
+        - $ref: Table.schema.yaml
 required:
   - parts
diff --git a/schema/data/DatatableColumn.schema.yaml b/schema/data/DatatableColumn.schema.yaml
@@ -4,10 +4,6 @@ $extends: ../Thing.schema.yaml
 role: secondary
 status: experimental
 properties:
-  name:
-    description: Name of the column.
-    allOf:
-      - $ref: name.schema.yaml
   meta:
     description: Metadata for the column.
     type: object

diff --git a/schema/data/DatatableColumnSchema.schema.yaml b/schema/data/DatatableColumnSchema.schema.yaml
@@ -6,8 +6,8 @@ status: experimental
 properties:
   items:
     type: object
-    allOf:
-      - $ref: json-schema-draft-07.schema.json
   uniqueItems:
     type: boolean
     default: false
+required:
+  - items