Skip to content

fix: add missing DerivedTypeConstraint annotations for protectionUnits navigation property. #792

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

Merged
andrueastman merged 1 commit into from
Mar 13, 2025
Merged

fix: add missing DerivedTypeConstraint annotations for protectionUnits navigation property. #792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions transforms/csdl/preprocess_csdl.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,18 @@
</Collection>
</Annotation>
</xsl:copy>
</xsl:template>
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='backupRestoreRoot']/edm:NavigationProperty[@Name='protectionUnits']">
<xsl:copy>
<xsl:copy-of select="@* | node()" />
<Annotation Term="Org.OData.Validation.V1.DerivedTypeConstraint">
<Collection>
<String>microsoft.graph.siteProtectionUnit</String>
<String>microsoft.graph.mailboxProtectionUnit</String>
<String>microsoft.graph.driveProtectionUnit</String>
</Collection>
</Annotation>
</xsl:copy>
</xsl:template>
<xsl:template match="edm:Schema[@Namespace='microsoft.graph']/edm:EntityType[@Name='externalUsersSelfServiceSignUpEventsFlow']/edm:Property[@Name='onAttributeCollection']">
<xsl:copy>
Expand Down
8 changes: 8 additions & 0 deletions transforms/csdl/preprocess_csdl_test_input.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,14 @@
<Property Name="displayName" Type="Edm.String" />
<NavigationProperty Name="details" Type="Collection(graph.landingPageDetail)" />
</EntityType>
<EntityType Name="protectionUnitBase" BaseType="graph.entity">
<Property Name="createdDateTime" Type="Edm.DateTimeOffset" />
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
</EntityType>
<EntityType Name="backupRestoreRoot" BaseType="graph.entity">
<Property Name="serviceStatus" Type="graph.serviceStatus" />
<NavigationProperty Name="protectionUnits" Type="Collection(graph.protectionUnitBase)" />
</EntityType>
<EntityType Name="b2xIdentityUserFlow" BaseType="graph.identityUserFlow">
<Property Name="apiConnectorConfiguration" Type="graph.userFlowApiConnectorConfiguration" />
<NavigationProperty Name="identityProviders" Type="Collection(graph.identityProvider)" />
Expand Down
16 changes: 16 additions & 0 deletions transforms/csdl/preprocess_csdl_test_output.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,22 @@
<Property Name="displayName" Type="Edm.String" />
<NavigationProperty Name="details" Type="Collection(graph.landingPageDetail)" ContainsTarget="true" />
</EntityType>
<EntityType Name="protectionUnitBase" BaseType="graph.entity">
<Property Name="createdDateTime" Type="Edm.DateTimeOffset" />
<Property Name="lastModifiedDateTime" Type="Edm.DateTimeOffset" />
</EntityType>
<EntityType Name="backupRestoreRoot" BaseType="graph.entity">
<Property Name="serviceStatus" Type="graph.serviceStatus" />
<NavigationProperty Name="protectionUnits" Type="Collection(graph.protectionUnitBase)">
<Annotation Term="Org.OData.Validation.V1.DerivedTypeConstraint" xmlns:edm="http://docs.oasis-open.org/odata/ns/edm">
<Collection>
<String>microsoft.graph.siteProtectionUnit</String>
<String>microsoft.graph.mailboxProtectionUnit</String>
<String>microsoft.graph.driveProtectionUnit</String>
</Collection>
</Annotation>
</NavigationProperty>
</EntityType>
<EntityType Name="b2xIdentityUserFlow" BaseType="graph.identityUserFlow">
<Property Name="apiConnectorConfiguration" Type="graph.userFlowApiConnectorConfiguration" />
<NavigationProperty Name="identityProviders" Type="Collection(graph.identityProvider)" />
Expand Down
Loading