Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

serialize Locked #731

Merged
merged 4 commits into from
Dec 18, 2024
Merged

serialize Locked #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
016682d
serialize Locked
Dec 18, 2024
55d3839
rename Locked to IsLocked
Dec 18, 2024
a137822
remove isLocked from children
Dec 18, 2024
8d7554b
move IsLocked after variant and text json version update
Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions schemas/pa-yaml/v3.0/pa.schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ definitions:
Layout:
type: string
minLength: 1
IsLocked:
type: boolean
Group: true
Properties: true
Children: { $ref: "#/definitions/Children-Control-instance-sequence" }
Expand Down
4 changes: 2 additions & 2 deletions src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="[13.0.1,)" />
<PackageReference Include="System.Text.Json" Version="[6.0,)" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="[9.0,)" />
<PackageReference Include="System.Text.Encodings.Web" Version="9.0.0" />
<PackageReference Include="YamlDotNet" Version="$(YamlDotNetVersion)" />
</ItemGroup>
</Project>
69 changes: 38 additions & 31 deletions src/PAModel/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@
},
"System.Text.Encodings.Web": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "e2hMgAErLbKyUUwt18qSBf9T5Y+SFAL3ZedM8fLupkVj8Rj2PZ9oxQ37XX2LF8fTO1wNIxvKpihD7Of7D/NxZw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Memory": "4.5.4",
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==",
"dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
"Microsoft.Bcl.AsyncInterfaces": "9.0.0",
"System.Buffers": "4.5.1",
"System.Memory": "4.5.4",
"System.Numerics.Vectors": "4.5.0",
"System.IO.Pipelines": "9.0.0",
"System.Memory": "4.5.5",
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0",
"System.Text.Encodings.Web": "9.0.0",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
Expand All @@ -51,8 +51,8 @@
},
"Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==",
"resolved": "9.0.0",
"contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==",
"dependencies": {
"System.Threading.Tasks.Extensions": "4.5.4"
}
Expand All @@ -67,10 +67,20 @@
"resolved": "4.5.1",
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
},
"System.IO.Pipelines": {
"type": "Transitive",
"resolved": "9.0.0",
"contentHash": "eA3cinogwaNB4jdjQHOP3Z3EuyiDII7MT35jgtnsA4vkn0LUrrSHsU0nzHTzFzmaFYeKV7MYyMxOocFzsBHpTw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Memory": "4.5.5",
"System.Threading.Tasks.Extensions": "4.5.4"
}
},
"System.Memory": {
"type": "Transitive",
"resolved": "4.5.4",
"contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
"dependencies": {
"System.Buffers": "4.5.1",
"System.Numerics.Vectors": "4.4.0",
Expand All @@ -79,8 +89,8 @@
},
"System.Numerics.Vectors": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
"resolved": "4.4.0",
"contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
Expand All @@ -105,21 +115,18 @@
},
"System.Text.Encodings.Web": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "Vg8eB5Tawm1IFqj4TVK1czJX89rhFxJo9ELqc/Eiq0eXy13RK00eubyU6TJE6y+GQXjyV5gSfiewDUZjQgSE0w==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "e2hMgAErLbKyUUwt18qSBf9T5Y+SFAL3ZedM8fLupkVj8Rj2PZ9oxQ37XX2LF8fTO1wNIxvKpihD7Of7D/NxZw=="
},
"System.Text.Json": {
"type": "Direct",
"requested": "[6.0.0, )",
"resolved": "6.0.0",
"contentHash": "zaJsHfESQvJ11vbXnNlkrR46IaMULk/gHxYsJphzSF+07kTjPHv+Oc14w6QEOfo3Q4hqLJgStUaYB9DBl0TmWg==",
"requested": "[9.0.0, )",
"resolved": "9.0.0",
"contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==",
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
"System.Text.Encodings.Web": "6.0.0"
"System.IO.Pipelines": "9.0.0",
"System.Text.Encodings.Web": "9.0.0"
}
},
"YamlDotNet": {
Expand All @@ -128,10 +135,10 @@
"resolved": "15.1.6",
"contentHash": "T/cQEK/KHK96Q8kytJ4iUGDXg1/fj2Qtk6rCQeIlHYU1zTeyGVHW0QNZgREQyxZpygGMDMmrXNWt0sj5TsQnjA=="
},
"System.Runtime.CompilerServices.Unsafe": {
"System.IO.Pipelines": {
"type": "Transitive",
"resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
"resolved": "9.0.0",
"contentHash": "eA3cinogwaNB4jdjQHOP3Z3EuyiDII7MT35jgtnsA4vkn0LUrrSHsU0nzHTzFzmaFYeKV7MYyMxOocFzsBHpTw=="
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/Persistence/PaYaml/Models/SchemaV3/ControlInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ public ControlInstance(string controlType)

public string? Layout { get; init; }

public bool? IsLocked { get; init; }

/// <summary>
/// The name of the group of controls that this control should be grouped with.
/// This does not impact the visual layout of the control or behavior, but is used to group controls together for organizational purposes from within the Studio.
Expand Down
13 changes: 13 additions & 0 deletions src/schemas-tests/pa-yaml/v3.0/Examples/Src/Screens/FormsScreen2.pa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Screens:
- "First Name_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="firstname"
Expand Down Expand Up @@ -122,6 +123,7 @@ Screens:
- "Last Name_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="lastname"
Expand Down Expand Up @@ -197,6 +199,7 @@ Screens:
- "Company Name_DataCard1":
Control: TypedDataCard
Variant: blankPolymorphicEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="_parentcustomerid_value"
Expand All @@ -213,6 +216,7 @@ Screens:
- "Job Title_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="jobtitle"
Expand Down Expand Up @@ -288,6 +292,7 @@ Screens:
- "Mobile Phone_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="mobilephone"
Expand Down Expand Up @@ -363,6 +368,7 @@ Screens:
- "User Name_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="adx_identity_username"
Expand Down Expand Up @@ -438,6 +444,7 @@ Screens:
- "Address 1_DataCard1":
Control: TypedDataCard
Variant: textualViewCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="address1_composite"
Expand Down Expand Up @@ -480,6 +487,7 @@ Screens:
- Website_DataCard1:
Control: TypedDataCard
Variant: urlEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="websiteurl"
Expand Down Expand Up @@ -553,6 +561,7 @@ Screens:
- Birthday_DataCard1:
Control: TypedDataCard
Variant: dateEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="birthdate"
Expand Down Expand Up @@ -625,6 +634,7 @@ Screens:
- Description_DataCard1:
Control: TypedDataCard
Variant: textualMultiLineEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="description"
Expand Down Expand Up @@ -700,6 +710,7 @@ Screens:
- "Full Name_DataCard1":
Control: TypedDataCard
Variant: textualViewCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="fullname"
Expand Down Expand Up @@ -742,6 +753,7 @@ Screens:
- Email_DataCard1:
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="emailaddress1"
Expand Down Expand Up @@ -817,6 +829,7 @@ Screens:
- "Business Phone_DataCard1":
Control: TypedDataCard
Variant: textualEditCard
IsLocked: true
Properties:
BorderStyle: =BorderStyle.Solid
DataField: ="telephone1"
Expand Down
2 changes: 2 additions & 0 deletions src/schemas/pa-yaml/v3.0/pa.schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ definitions:
Layout:
type: string
minLength: 1
IsLocked:
type: boolean
Group: true
Properties: true
Children: { $ref: "#/definitions/Children-Control-instance-sequence" }
Expand Down
Loading