Skip to content

Commit b9a3d37

Browse files
lindalu-MSFTlindalu-MSFT
authored
Merge pull request #586 from microsoft/lindalu/resolve-pr-584-conflicts
Lindalu/resolve pr 584 conflicts
2 parents 8fa3471 + 87b8921 commit b9a3d37

18 files changed

Lines changed: 7218 additions & 2 deletions

File tree

‎fabric/common/auxiliaryTypes/1.0.0/schema.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,35 @@
77
"type": "string",
88
"format": "uuid"
99
},
10+
"GuidOrVar": {
11+
"description": "A Guid value or a reference to a variable of type Guid.",
12+
"oneOf": [
13+
{ "$ref": "#/definitions/Guid" },
14+
{
15+
"allOf": [
16+
{ "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/variableReference/1.0.0/schema.json#/definitions/SchemaTypedVariableReference" },
17+
{ "varRef": { "type": "Guid" } }
18+
]
19+
}
20+
]
21+
},
1022
"DateTime": {
1123
"description": "A string representing date and time in UTC format. For example 2024-11-25T08:30:10Z.",
1224
"type": "string",
1325
"format": "date-time",
1426
"pattern": "^.*Z$"
27+
},
28+
"DateTimeOrVar": {
29+
"description": "A DateTime value or a reference to a variable of type DateTime.",
30+
"oneOf": [
31+
{ "$ref": "#/definitions/DateTime" },
32+
{
33+
"allOf": [
34+
{ "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/variableReference/1.0.0/schema.json#/definitions/SchemaTypedVariableReference" },
35+
{ "varRef": { "type": "DateTime" } }
36+
]
37+
}
38+
]
1539
}
1640
}
1741
}

‎fabric/common/connectionReference/1.0.0/schema.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"$schema": "http://json-schema.org/draft-07/schema#",
44
"definitions": {
55
"ConnectionReference": {
6-
"description": "Defines a reference to a shared cloud connection.",
6+
"description": "Defines a reference to a connection.",
77
"type": "object",
88
"additionalProperties": false,
99
"properties": {
@@ -13,6 +13,18 @@
1313
}
1414
},
1515
"required": [ "connectionId" ]
16+
},
17+
"ConnectionReferenceOrVar": {
18+
"description": "A ConnectionReference value or a reference to a variable of type ConnectionReference.",
19+
"oneOf": [
20+
{ "$ref": "#/definitions/ConnectionReference" },
21+
{
22+
"allOf": [
23+
{ "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/variableReference/1.0.0/schema.json#/definitions/SchemaTypedVariableReference" },
24+
{ "varRef": { "type": "ConnectionReference" } }
25+
]
26+
}
27+
]
1628
}
1729
}
1830
}

‎fabric/common/itemReference/1.0.0/schema.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@
1717
}
1818
},
1919
"required": [ "workspaceId", "itemId" ]
20+
},
21+
"ItemReferenceOrVar": {
22+
"description": "An ItemReference value or a reference to a variable of type ItemReference.",
23+
"oneOf": [
24+
{ "$ref": "#/definitions/ItemReference" },
25+
{
26+
"allOf": [
27+
{ "$ref": "https://developer.microsoft.com/json-schemas/fabric/common/variableReference/1.0.0/schema.json#/definitions/SchemaTypedVariableReference" },
28+
{ "varRef": { "type": "ItemReference" } }
29+
]
30+
}
31+
]
2032
}
2133
}
2234
}

‎fabric/common/variableReference/1.0.0/schema.json‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
{
2+
"$id": "https://developer.microsoft.com/json-schemas/fabric/common/variableReference/1.0.0/schema.json",
3+
"$schema": "http://json-schema.org/draft-07/schema#",
4+
"definitions": {
5+
"VariableReference": {
6+
"description": "A reference to a variable. Format: $(<content>). The content inside the parentheses is validated by the semantic validator.",
7+
"$anchor": "VariableReference",
8+
"type": "string",
9+
"pattern": "^\\$\\(.+\\)$"
10+
},
11+
"NotVariableReference": {
12+
"description": "Matches any value that is not a variable reference.",
13+
"not": { "type": "string", "pattern": "^\\$\\(.+\\)$" }
14+
},
15+
"SchemaTypedVariableReference": {
16+
"description": "A reference to a variable, with expected type of the value to be specified by the parent schema via the varRef keyword.",
17+
"type": "string",
18+
"$anchor": "SchemaTypedVariableReference",
19+
"pattern": "^\\$\\(.+\\)$"
20+
},
21+
"StringOrVar": {
22+
"description": "A String value or a reference to a variable of type String.",
23+
"oneOf": [
24+
{
25+
"allOf": [
26+
{ "type": "string" },
27+
{ "$ref": "#/definitions/NotVariableReference" }
28+
]
29+
},
30+
{
31+
"allOf": [
32+
{ "$ref": "#/definitions/SchemaTypedVariableReference" },
33+
{ "varRef": { "type": "String" } }
34+
]
35+
}
36+
]
37+
},
38+
"IntegerOrVar": {
39+
"description": "An Integer value or a reference to a variable of type Integer.",
40+
"oneOf": [
41+
{ "type": "integer" },
42+
{
43+
"allOf": [
44+
{ "$ref": "#/definitions/SchemaTypedVariableReference" },
45+
{ "varRef": { "type": "Integer" } }
46+
]
47+
}
48+
]
49+
},
50+
"NumberOrVar": {
51+
"description": "A Number value or a reference to a variable of type Number.",
52+
"oneOf": [
53+
{ "type": "number" },
54+
{
55+
"allOf": [
56+
{ "$ref": "#/definitions/SchemaTypedVariableReference" },
57+
{ "varRef": { "type": "Number" } }
58+
]
59+
}
60+
]
61+
},
62+
"BooleanOrVar": {
63+
"description": "A Boolean value or a reference to a variable of type Boolean.",
64+
"oneOf": [
65+
{ "type": "boolean" },
66+
{
67+
"allOf": [
68+
{ "$ref": "#/definitions/SchemaTypedVariableReference" },
69+
{ "varRef": { "type": "Boolean" } }
70+
]
71+
}
72+
]
73+
},
74+
"ValueOrVar": {
75+
"description": "Any JSON value, or a variable reference.",
76+
"oneOf": [
77+
{ "$ref": "#/definitions/NotVariableReference" },
78+
{ "$ref": "#/definitions/VariableReference" }
79+
]
80+
}
81+
}
82+
}

‎fabric/item/report/definition/pagesMetadata/1.1.0/schema.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"$id": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/pagesMetadata/1.1.0/schema.json",
3+
"$schema": "http://json-schema.org/draft-07/schema#",
4+
"title": "Pages metadata",
5+
"description": "Defines additional information about the report's pages.",
6+
"type": "object",
7+
"properties": {
8+
"pageOrder": {
9+
"description": "Defines the order in which report pages are rendered (page names). If omitted, they will be ordered by display name by default.\nIf there are pages in this list, that don't have a corresponding definition, they will be ignored.\nPages with definitions, but not in this list will be ordered by display name and appended to the end, after pages that exist in this list.",
10+
"type": "array",
11+
"items": {
12+
"type": "string"
13+
}
14+
},
15+
"activePageName": {
16+
"description": "Report will open on this page by default - if omitted, report will open on first page based on order defined by pageOrder semantics. If both activePageName and landingPageName are set, landingPageName takes precedence.",
17+
"type": "string"
18+
},
19+
"landingPageName": {
20+
"description": "If set, the report will always open on this page for all users, overriding activePageName. The value is the page name (not display name).",
21+
"type": "string"
22+
},
23+
"$schema": {
24+
"description": "Defines the schema to use for an item.",
25+
"type": "string",
26+
"const": "https://developer.microsoft.com/json-schemas/fabric/item/report/definition/pagesMetadata/1.1.0/schema.json"
27+
}
28+
},
29+
"additionalProperties": false,
30+
"required": [
31+
"$schema"
32+
]
33+
}

‎fabric/item/report/definition/pagesMetadata/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Pages Metadata Versions
22

3+
### 1.1.0
4+
<b>Released in: </b> May 2026 <br />
5+
<b>Notes: </b>
6+
- Report Landing Page
7+
38
### 1.0.0
49

510
<b>Released in: </b> June 2024 <br />

0 commit comments

Comments
 (0)