Merge pull request #199 from michaeldfaber/update-schema

[Report Definition Schemas] Remove GUIDs, Rename BookmarkMetadata -> BookmarksMetadata, Fix $refs, Fix "2" const
microsoft · Mar 25, 2024 · 11489af · 11489af
2 parents f73dead + 00a02e4
commit 11489af
Show file tree

Hide file tree

Showing 11 changed files with 776 additions and 771 deletions.
diff --git a/fabric/item/report/definition/bookmark/1.0.0/schema.json b/fabric/item/report/definition/bookmark/1.0.0/schema.json
diff --git a/...nition/bookmarkMetadata/1.0.0/schema.json → ...ition/bookmarksMetadata/1.0.0/schema.json b/...nition/bookmarkMetadata/1.0.0/schema.json → ...ition/bookmarksMetadata/1.0.0/schema.json
@@ -1,23 +1,25 @@
 {
+    "$id": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/bookmarksMetadata/1.0.0/schema.json",
+    "$schema": "http://json-schema.org/draft-07/schema#",
     "type": "object",
     "properties": {
         "items": {
             "type": "array",
             "items": {
                 "anyOf": [
                     {
-                        "$ref": "#/definitions/SingleBookmarkMetadata.e16d14c5"
+                        "$ref": "#/definitions/SingleBookmarkMetadata"
                     },
                     {
-                        "$ref": "#/definitions/BookmarkGroupMetadata.13d948d6"
+                        "$ref": "#/definitions/BookmarkGroupMetadata"
                     }
                 ]
             }
         },
         "$schema": {
             "description": "Defines the schema to use for an item.",
             "type": "string",
-            "const": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/bookmarkMetadata/1.0.0/schema.json"
+            "const": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/bookmarksMetadata/1.0.0/schema.json"
         }
     },
     "additionalProperties": false,
@@ -26,8 +28,8 @@
         "items"
     ],
     "definitions": {
-        "SingleBookmarkMetadata.e16d14c5": {
-            "description": "Defines a bookmark that is not part of a group (standalong bookmark).",
+        "SingleBookmarkMetadata": {
+            "description": "Defines a bookmark that is not part of a group (standalone bookmark).",
             "type": "object",
             "properties": {
                 "name": {
@@ -40,7 +42,7 @@
                 "name"
             ]
         },
-        "BookmarkGroupMetadata.13d948d6": {
+        "BookmarkGroupMetadata": {
             "description": "Defines a group of related bookmarks.",
             "type": "object",
             "properties": {
@@ -67,6 +69,5 @@
                 "name"
             ]
         }
-    },
-    "$schema": "http://json-schema.org/draft-07/schema#"
+    }
 }
diff --git a/fabric/item/report/definition/formattingObjectDefinitions/1.0.0/schema.json b/fabric/item/report/definition/formattingObjectDefinitions/1.0.0/schema.json
@@ -1,42 +1,43 @@
 {
+    "$id": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/formattingObjectDefinitions/1.0.0/schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "definitions": {
-        "DataViewObjectDefinitions.022fbdf8": {
+        "DataViewObjectDefinitions": {
             "type": "object",
             "additionalProperties": {
                 "type": "array",
                 "items": {
-                    "$ref": "#/definitions/DataViewObjectDefinition.6e3faee5"
+                    "$ref": "#/definitions/DataViewObjectDefinition"
                 }
             }
         },
-        "DataViewObjectDefinition.6e3faee5": {
+        "DataViewObjectDefinition": {
             "type": "object",
             "properties": {
                 "selector": {
-                    "$ref": "#/definitions/Selector.bf3a7dcc"
+                    "$ref": "#/definitions/Selector"
                 },
                 "properties": {
-                    "$ref": "#/definitions/DataViewObjectPropertyDefinitions.88eb7485"
+                    "$ref": "#/definitions/DataViewObjectPropertyDefinitions"
                 }
             },
             "additionalProperties": false,
             "required": [
                 "properties"
             ]
         },
-        "DataViewObjectPropertyDefinitions.88eb7485": {
+        "DataViewObjectPropertyDefinitions": {
             "type": "object",
             "additionalProperties": {}
         },
-        "Selector.bf3a7dcc": {
+        "Selector": {
             "type": "object",
             "properties": {
                 "data": {
                     "description": "Scope is defined by data bound to the visual.",
                     "type": "array",
                     "items": {
-                        "$ref": "#/definitions/DataRepetitionSelector.c81ac91d"
+                        "$ref": "#/definitions/DataRepetitionSelector"
                     }
                 },
                 "metadata": {
@@ -73,18 +74,18 @@
             },
             "additionalProperties": false
         },
-        "DataRepetitionSelector.c81ac91d": {
+        "DataRepetitionSelector": {
             "type": "object",
             "properties": {
                 "scopeId": {
                     "description": "Defines the intersection of scopes. For example - product color = red.",
-                    "$ref": "../../semanticQuery/1.0.0/schema.json/#/definitions/QueryExpressionContainer.1ec1cfb2"
+                    "$ref": "../../semanticQuery/1.0.0/schema.json#/definitions/QueryExpressionContainer"
                 },
                 "wildcard": {
                     "description": "Defines a match against all instances of a given DataView scope. Does not match Subtotals.\nDeprecated: - Use roles instead.",
                     "type": "array",
                     "items": {
-                        "$ref": "../../semanticQuery/1.0.0/schema.json/#/definitions/QueryExpressionContainer.1ec1cfb2"
+                        "$ref": "../../semanticQuery/1.0.0/schema.json#/definitions/QueryExpressionContainer"
                     }
                 },
                 "roles": {
@@ -98,21 +99,21 @@
                     "description": "Matches against the totals and subtotals.",
                     "type": "array",
                     "items": {
-                        "$ref": "../../semanticQuery/1.0.0/schema.json/#/definitions/QueryExpressionContainer.1ec1cfb2"
+                        "$ref": "../../semanticQuery/1.0.0/schema.json#/definitions/QueryExpressionContainer"
                     }
                 },
                 "dataViewWildcard": {
                     "description": "Matches all instances or all totals or both.",
-                    "$ref": "#/definitions/DataViewWildcard.622371b1"
+                    "$ref": "#/definitions/DataViewWildcard"
                 }
             },
             "additionalProperties": false
         },
-        "DataViewWildcard.622371b1": {
+        "DataViewWildcard": {
             "type": "object",
             "properties": {
                 "matchingOption": {
-                    "$ref": "#/definitions/DataViewWildcardMatchingOption.ef589313",
+                    "$ref": "#/definitions/DataViewWildcardMatchingOption",
                     "description": "Defines the matching option to use."
                 }
             },
@@ -121,7 +122,7 @@
                 "matchingOption"
             ]
         },
-        "DataViewWildcardMatchingOption.ef589313": {
+        "DataViewWildcardMatchingOption": {
             "type": "number",
             "anyOf": [
                 {
@@ -139,4 +140,4 @@
             ]
         }
     }
-}
+}