Merge branch 'master' into MichelD/DefaultGoogleMapsOnly

Author: mdastous-bentley

packages/itwin/grouping-mapping-widget/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "@itwin/grouping-mapping-widget",
   "entries": [
+    {
+      "date": "Fri, 27 Jun 2025 03:45:17 GMT",
+      "version": "0.35.3",
+      "tag": "@itwin/grouping-mapping-widget_v0.35.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "Guillar1@users.noreply.github.com",
+            "package": "@itwin/grouping-mapping-widget",
+            "commit": "73a4ca6f89a8ea401dc2aff68d60ac8b09f18242",
+            "comment": "Fix Model property query generation."
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 28 Apr 2025 11:04:44 GMT",
       "version": "0.35.2",

packages/itwin/grouping-mapping-widget/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - @itwin/grouping-mapping-widget
 
-This log was last generated on Mon, 28 Apr 2025 11:04:44 GMT and should not be manually modified.
+<!-- This log was last generated on Fri, 27 Jun 2025 03:45:17 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.35.3
+
+Fri, 27 Jun 2025 03:45:17 GMT
+
+### Patches
+
+- Fix Model property query generation. ([#1357](https://github.com/iTwin/viewer-components-react/pull/1357))
+
 ## 0.35.2
 
 Mon, 28 Apr 2025 11:04:44 GMT

packages/itwin/grouping-mapping-widget/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/grouping-mapping-widget",
-  "version": "0.35.2",
+  "version": "0.35.3",
   "description": "An iTwin.js 3D Viewer Widget that interfaces with the iTwin Reporting Platform.",
   "keywords": [
     "Bentley",

packages/itwin/grouping-mapping-widget/src/components/Groups/QueryBuilder/QueryBuilder.ts

@@ -164,7 +164,9 @@ export class QueryBuilder {
       if (!isAspect && pathToPrimaryClass && pathToPrimaryClass.length > 0) {
         this.addRelatedToQuery(i, propertiesField, propertyName, propertyValue);
       } else {
-        this.addPropertyToQuery(i, className, propertyName, propertyValue, this.needsQuote(propertiesField), isCategory, modeledElement, isAspect);
+        // Model properties with display values always need quotes
+        const needsQuote = !!modeledElement || this.needsQuote(propertiesField);
+        this.addPropertyToQuery(i, className, propertyName, propertyValue, needsQuote, isCategory, modeledElement, isAspect);
       }
     }
     return true;
@@ -271,7 +273,12 @@ export class QueryBuilder {
       return;
     }
 
-    const foundPropertyClass = this.query.unions[unionIndex].properties.find((p) => p.className === className);
+    // Model properties should be kept separate to ensure proper JOIN generation
+    const foundPropertyClass = this.query.unions[unionIndex].properties.find((p) => {
+      // Don't merge Model properties with regular properties
+      if (!!modeledElementClass !== !!p.modeledElementClass) return false;
+      return p.className === className;
+    });
 
     if (foundPropertyClass) {
       const foundJoin = foundPropertyClass?.classProperties.find((join) => join.name === propertyName);
@@ -316,9 +323,9 @@ export class QueryBuilder {
           whereSegments.push(this.categoryWhereQuery(property.classProperties[0].value.toString()));
           continue;
         } else if (property.modeledElementClass) {
-          querySegments.set(property.modeledElementClass, [`${property.modeledElementClass}.ECInstanceId = BisCore.Element.Model.id`]);
+          querySegments.set(property.modeledElementClass, [`${property.modeledElementClass}.ECInstanceId = ${baseClassName}.Model.id`]);
           whereSegments.push(
-            `${property.modeledElementClass}.UserLabel = '${property.classProperties[0].value.toString()}' OR ${property.modeledElementClass}.CodeValue = '${property.classProperties[0].value.toString()}'`,
+            `(${property.modeledElementClass}.UserLabel = '${property.classProperties[0].value.toString()}' OR ${property.modeledElementClass}.CodeValue = '${property.classProperties[0].value.toString()}')`,
           );
           continue;
         }
@@ -342,8 +349,8 @@ export class QueryBuilder {
 
       unionSegments.push([selectClause, ...joinClauses, whereClause].join(" "));
     }
-
-    return unionSegments.join(" UNION ");
+    const result = unionSegments.join(" UNION ");
+    return result;
   }
 
   private selectClause(baseProperty: QueryProperty | undefined, baseClass: QueryClass | undefined) {

packages/itwin/grouping-mapping-widget/src/test/QueryBuilder.testdata.ts

@@ -1264,7 +1264,7 @@ export const testCases: QueryBuilderTestData = {
     {
       name: "when property is a model, return a model query string",
       expectedResult:
-        "SELECT BisCore.B.ECInstanceId, BisCore.B.ECClassId FROM BisCore.B JOIN mockModeledElement ON mockModeledElement.ECInstanceId = BisCore.Element.Model.id WHERE mockModeledElement.UserLabel = 'displayValueString' OR mockModeledElement.CodeValue = 'displayValueString'",
+        "SELECT BisCore.B.ECInstanceId, BisCore.B.ECClassId FROM BisCore.B JOIN mockModeledElement ON mockModeledElement.ECInstanceId = BisCore.B.Model.id WHERE (mockModeledElement.UserLabel = 'displayValueString' OR mockModeledElement.CodeValue = 'displayValueString')",
       operations: [
         {
           expectedResult: true,