-
Notifications
You must be signed in to change notification settings - Fork 214
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Co-authored-by: Grigas <[email protected]> Co-authored-by: imodeljs-admin <[email protected]>
- Loading branch information
3 people
authored
Jan 16, 2025
1 parent
4148165
commit 546a0a4
Showing
6 changed files
with
270 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
common/changes/@itwin/core-backend/JonasD-property-coinstraints_2025-01-15-10-30.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@itwin/core-backend", | ||
| "comment": "", | ||
| "type": "none" | ||
| } | ||
| ], | ||
| "packageName": "@itwin/core-backend" | ||
| } |
10 changes: 10 additions & 0 deletions
10
common/changes/@itwin/presentation-common/JonasD-property-coinstraints_2025-01-10-13-51.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "@itwin/presentation-common", | ||
| "comment": "Add value constraints to `PropertyInfo`", | ||
| "type": "none" | ||
| } | ||
| ], | ||
| "packageName": "@itwin/presentation-common" | ||
| } |
183 changes: 183 additions & 0 deletions
183
full-stack-tests/presentation/src/frontend/content/PrimitiveProperties.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Bentley Systems, Incorporated. All rights reserved. | ||
| * See LICENSE.md in the project root for license terms and full copyright notice. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { expect } from "chai"; | ||
| import { assert, Guid, using } from "@itwin/core-bentley"; | ||
| import { IModelConnection } from "@itwin/core-frontend"; | ||
| import { Content, ContentSpecificationTypes, DefaultContentDisplayTypes, InstanceKey, KeySet, Ruleset, RuleTypes } from "@itwin/presentation-common"; | ||
| import { PresentationManager } from "@itwin/presentation-frontend"; | ||
| import { | ||
| buildTestIModelConnection, | ||
| importSchema, | ||
| insertPhysicalElement, | ||
| insertPhysicalModelWithPartition, | ||
| insertSpatialCategory, | ||
| } from "../../IModelSetupUtils"; | ||
| import { collect, getFieldByLabel } from "../../Utils"; | ||
| import { describeContentTestSuite } from "./Utils"; | ||
|
|
||
| describeContentTestSuite("Primitive properties", () => { | ||
| it("sets constraints for numeric type properties", async function () { | ||
| let elementKey!: InstanceKey; | ||
| const imodel = await buildTestIModelConnection(this.test!.title, async (db) => { | ||
| const schema = importSchema( | ||
| this, | ||
| db, | ||
| ` | ||
| <ECSchemaReference name="BisCore" version="01.00.16" alias="bis" /> | ||
| <ECEntityClass typeName="X"> | ||
| <BaseClass>bis:PhysicalElement</BaseClass> | ||
| <ECProperty propertyName="Prop1" typeName="int" /> | ||
| <ECProperty propertyName="Prop2" typeName="int" minimumValue="0" maximumValue="2" /> | ||
| <ECProperty propertyName="Prop3" typeName="long" minimumValue="123456789876" /> | ||
| <ECProperty propertyName="Prop4" typeName="double" maximumValue="2.6" /> | ||
| </ECEntityClass> | ||
| `, | ||
| ); | ||
| const model = insertPhysicalModelWithPartition({ db, codeValue: "model" }); | ||
| const category = insertSpatialCategory({ db, codeValue: "category" }); | ||
| elementKey = insertPhysicalElement({ | ||
| db, | ||
| classFullName: schema.items.X.fullName, | ||
| modelId: model.id, | ||
| categoryId: category.id, | ||
| }); | ||
| }); | ||
|
|
||
| const content = await getContent(imodel, elementKey); | ||
| const field1 = getFieldByLabel(content.descriptor.fields, "Prop1"); | ||
| const field2 = getFieldByLabel(content.descriptor.fields, "Prop2"); | ||
| const field3 = getFieldByLabel(content.descriptor.fields, "Prop3"); | ||
| const field4 = getFieldByLabel(content.descriptor.fields, "Prop4"); | ||
|
|
||
| assert(field1.isPropertiesField()); | ||
| assert(field2.isPropertiesField()); | ||
| assert(field3.isPropertiesField()); | ||
| assert(field4.isPropertiesField()); | ||
|
|
||
| expect(field1.properties[0].property.constraints).to.be.undefined; | ||
| expect(field2.properties[0].property.constraints).to.deep.eq({ minimumValue: 0, maximumValue: 2 }); | ||
| expect(field3.properties[0].property.constraints).to.deep.eq({ minimumValue: 123456789876 }); | ||
| expect(field4.properties[0].property.constraints).to.deep.eq({ maximumValue: 2.6 }); | ||
| }); | ||
|
|
||
| it("sets constraints for string type properties", async function () { | ||
| let elementKey!: InstanceKey; | ||
| const imodel = await buildTestIModelConnection(this.test!.title, async (db) => { | ||
| const schema = importSchema( | ||
| this, | ||
| db, | ||
| ` | ||
| <ECSchemaReference name="BisCore" version="01.00.16" alias="bis" /> | ||
| <ECEntityClass typeName="X"> | ||
| <BaseClass>bis:PhysicalElement</BaseClass> | ||
| <ECProperty propertyName="Prop1" typeName="string" /> | ||
| <ECProperty propertyName="Prop2" typeName="string" minimumLength="1" maximumLength="5" /> | ||
| <ECProperty propertyName="Prop3" typeName="string" minimumLength="1" /> | ||
| <ECProperty propertyName="Prop4" typeName="string" maximumLength="5" /> | ||
| </ECEntityClass> | ||
| `, | ||
| ); | ||
| const model = insertPhysicalModelWithPartition({ db, codeValue: "model" }); | ||
| const category = insertSpatialCategory({ db, codeValue: "category" }); | ||
| elementKey = insertPhysicalElement({ | ||
| db, | ||
| classFullName: schema.items.X.fullName, | ||
| modelId: model.id, | ||
| categoryId: category.id, | ||
| }); | ||
| }); | ||
|
|
||
| const content = await getContent(imodel, elementKey); | ||
| const field1 = getFieldByLabel(content.descriptor.fields, "Prop1"); | ||
| const field2 = getFieldByLabel(content.descriptor.fields, "Prop2"); | ||
| const field3 = getFieldByLabel(content.descriptor.fields, "Prop3"); | ||
| const field4 = getFieldByLabel(content.descriptor.fields, "Prop4"); | ||
|
|
||
| assert(field1.isPropertiesField()); | ||
| assert(field2.isPropertiesField()); | ||
| assert(field3.isPropertiesField()); | ||
| assert(field4.isPropertiesField()); | ||
|
|
||
| expect(field1.properties[0].property.constraints).to.be.undefined; | ||
| expect(field2.properties[0].property.constraints).to.deep.eq({ minimumLength: 1, maximumLength: 5 }); | ||
| expect(field3.properties[0].property.constraints).to.deep.eq({ minimumLength: 1 }); | ||
| expect(field4.properties[0].property.constraints).to.deep.eq({ maximumLength: 5 }); | ||
| }); | ||
|
|
||
| it("sets constraints for array type properties", async function () { | ||
| let elementKey!: InstanceKey; | ||
| const imodel = await buildTestIModelConnection(this.test!.title, async (db) => { | ||
| const schema = importSchema( | ||
| this, | ||
| db, | ||
| ` | ||
| <ECSchemaReference name="BisCore" version="01.00.16" alias="bis" /> | ||
| <ECEntityClass typeName="X"> | ||
| <BaseClass>bis:PhysicalElement</BaseClass> | ||
| <ECArrayProperty propertyName="Prop1" typeName="string" /> | ||
| <ECArrayProperty propertyName="Prop2" typeName="string" minOccurs="1" maxOccurs="unbounded" /> | ||
| <ECArrayProperty propertyName="Prop3" typeName="string" minOccurs="1" /> | ||
| <ECArrayProperty propertyName="Prop4" typeName="string" maxOccurs="5" /> | ||
| </ECEntityClass> | ||
| `, | ||
| ); | ||
| const model = insertPhysicalModelWithPartition({ db, codeValue: "model" }); | ||
| const category = insertSpatialCategory({ db, codeValue: "category" }); | ||
| elementKey = insertPhysicalElement({ | ||
| db, | ||
| classFullName: schema.items.X.fullName, | ||
| modelId: model.id, | ||
| categoryId: category.id, | ||
| }); | ||
| }); | ||
|
|
||
| const content = await getContent(imodel, elementKey); | ||
| const field1 = getFieldByLabel(content.descriptor.fields, "Prop1"); | ||
| const field2 = getFieldByLabel(content.descriptor.fields, "Prop2"); | ||
| const field3 = getFieldByLabel(content.descriptor.fields, "Prop3"); | ||
| const field4 = getFieldByLabel(content.descriptor.fields, "Prop4"); | ||
|
|
||
| assert(field1.isPropertiesField()); | ||
| assert(field2.isPropertiesField()); | ||
| assert(field3.isPropertiesField()); | ||
| assert(field4.isPropertiesField()); | ||
|
|
||
| // ECArrayProperty doesn't have a way to determine if minOccurs is defined. By default minOccurs is set to 0. | ||
| // If maxOccurs is set to "unbounded" then maxOccurs is set to undefined. | ||
| expect(field1.properties[0].property.constraints).to.deep.eq({ minOccurs: 0 }); | ||
| expect(field2.properties[0].property.constraints).to.deep.eq({ minOccurs: 1 }); | ||
| expect(field3.properties[0].property.constraints).to.deep.eq({ minOccurs: 1 }); | ||
| expect(field4.properties[0].property.constraints).to.deep.eq({ minOccurs: 0, maxOccurs: 5 }); | ||
| }); | ||
| }); | ||
|
|
||
| async function getContent(imodel: IModelConnection, key: InstanceKey): Promise<Content> { | ||
| const keys = new KeySet([key]); | ||
| const ruleset: Ruleset = { | ||
| id: Guid.createValue(), | ||
| rules: [ | ||
| { | ||
| ruleType: RuleTypes.Content, | ||
| specifications: [{ specType: ContentSpecificationTypes.SelectedNodeInstances }], | ||
| }, | ||
| ], | ||
| }; | ||
|
|
||
| return using(PresentationManager.create(), async (manager) => { | ||
| const descriptor = await manager.getContentDescriptor({ | ||
| imodel, | ||
| rulesetOrId: ruleset, | ||
| keys, | ||
| displayType: DefaultContentDisplayTypes.Grid, | ||
| }); | ||
| expect(descriptor).to.not.be.undefined; | ||
| const content = await manager | ||
| .getContentIterator({ imodel, rulesetOrId: ruleset, keys, descriptor: descriptor! }) | ||
| .then(async (x) => x && new Content(x.descriptor, await collect(x.items))); | ||
| expect(content).to.not.be.undefined; | ||
| return content!; | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters