Merge branch 'master' into tree-widget/node-selection-predicate

iTwin · Dec 18, 2024 · f5c1ca6 · f5c1ca6
2 parents 50f3760 + 5005c67
commit f5c1ca6
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 141 deletions.
diff --git a/change/@itwin-ec3-widget-react-1b256e82-02c4-467a-90fd-76b3e2183a43.json b/change/@itwin-ec3-widget-react-1b256e82-02c4-467a-90fd-76b3e2183a43.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Upgraded insights-client to version 0.15.1",
+  "packageName": "@itwin/ec3-widget-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@itwin-grouping-mapping-widget-a389e0a3-784f-43ed-8ef5-2b376e3fca61.json b/change/@itwin-grouping-mapping-widget-a389e0a3-784f-43ed-8ef5-2b376e3fca61.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Upgraded insights-client to version 0.15.1",
+  "packageName": "@itwin/grouping-mapping-widget",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@itwin-one-click-lca-react-a82bd9ea-3385-4041-8a46-d2a26a8e86bb.json b/change/@itwin-one-click-lca-react-a82bd9ea-3385-4041-8a46-d2a26a8e86bb.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Upgraded insights-client to version 0.15.1",
+  "packageName": "@itwin/one-click-lca-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@itwin-reports-config-widget-react-a08d4554-356c-49c5-b26d-21a277fbc9be.json b/change/@itwin-reports-config-widget-react-a08d4554-356c-49c5-b26d-21a277fbc9be.json
@@ -0,0 +1,7 @@
+{
+  "type": "minor",
+  "comment": "Upgraded insights-client to version 0.15.1",
+  "packageName": "@itwin/reports-config-widget-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/packages/itwin/ec3-widget/package.json b/packages/itwin/ec3-widget/package.json
@@ -57,7 +57,7 @@
     }
   },
   "dependencies": {
-    "@itwin/insights-client": "^0.13.0",
+    "@itwin/insights-client": "^0.15.1",
     "@itwin/itwinui-icons-react": "^2.4.0",
     "@itwin/itwinui-react": "^2.12.0",
     "classnames": "^2.3.1",
@@ -115,7 +115,7 @@
     "@itwin/appui-react": "^4.0.0",
     "@itwin/core-bentley": "^4.0.0",
     "@itwin/core-frontend": "^4.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^17.0.2 || ^18.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0"
   }
 }
diff --git a/packages/itwin/ec3-widget/pnpm-lock.yaml b/packages/itwin/ec3-widget/pnpm-lock.yaml
diff --git a/packages/itwin/grouping-mapping-widget/package.json b/packages/itwin/grouping-mapping-widget/package.json
@@ -65,15 +65,14 @@
     "@itwin/imodels-access-common": "^4.1.2",
     "@itwin/imodels-access-frontend": "^4.1.2",
     "@itwin/imodels-client-management": "^4.2.1",
-    "@itwin/insights-client": "^0.13.0",
+    "@itwin/insights-client": "^0.15.1",
     "@itwin/itwins-client": "^1.1.0",
     "@itwin/itwinui-icons-color-react": "2.1.0",
     "@itwin/itwinui-icons-react": "^2.2.0",
     "@itwin/itwinui-react": "^2.11.2",
     "@tanstack/query-core": "^4.36.1",
     "@tanstack/react-query": "^4.36.1",
     "classnames": "^2.3.1",
-    "cross-fetch": "^3.1.8",
     "fast-equals": "^4.0.2",
     "immer": "^9.0.7",
     "lodash": "^4.17.21",
@@ -148,9 +147,9 @@
     "@itwin/components-react": "^4.1.0",
     "@itwin/core-frontend": "^4.1.0",
     "@itwin/core-react": "^4.1.0",
-    "@itwin/presentation-components": "^4.1.0",
+    "@itwin/presentation-components": "^4.1.0 || ^5.0.0",
     "@itwin/presentation-frontend": "^4.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^17.0.2 || ^18.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0"
   }
 }
diff --git a/packages/itwin/grouping-mapping-widget/pnpm-lock.yaml b/packages/itwin/grouping-mapping-widget/pnpm-lock.yaml
diff --git a/packages/itwin/one-click-lca-widget/package.json b/packages/itwin/one-click-lca-widget/package.json
@@ -38,7 +38,7 @@
     "cover": "nyc npm test"
   },
   "dependencies": {
-    "@itwin/insights-client": "^0.13.0",
+    "@itwin/insights-client": "^0.15.1",
     "@itwin/itwinui-icons-react": "^2.2.0",
     "@itwin/itwinui-react": "^2.11.2"
   },
@@ -98,8 +98,8 @@
     "@itwin/appui-react": "^4.0.0",
     "@itwin/core-frontend": "^4.0.0",
     "@itwin/core-react": "^4.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^17.0.2 || ^18.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0"
   },
   "nyc": {
     "nycrc-path": "./node_modules/@itwin/build-tools/.nycrc",

diff --git a/packages/itwin/one-click-lca-widget/pnpm-lock.yaml b/packages/itwin/one-click-lca-widget/pnpm-lock.yaml
diff --git a/packages/itwin/one-click-lca-widget/src/components/api/OCLCAApiHelper.ts b/packages/itwin/one-click-lca-widget/src/components/api/OCLCAApiHelper.ts
@@ -9,6 +9,10 @@ import { OperationsBase } from "@itwin/insights-client";
  * @internal
  */
 export class OCLCAApiHelper extends OperationsBase  {
+  constructor() {
+    super("https://oneclicklcaapp.com/app/api");
+  }
+
   public async getOCLCAAccessToken(username: string, apiPassword: string) {
     if (username === undefined || apiPassword === undefined) {
       return undefined;

diff --git a/packages/itwin/reports-config-widget/package.json b/packages/itwin/reports-config-widget/package.json
@@ -62,7 +62,7 @@
     "@itwin/imodels-access-common": "^4.1.4",
     "@itwin/imodels-access-frontend": "^4.1.4",
     "@itwin/imodels-client-management": "^4.2.3",
-    "@itwin/insights-client": "^0.13.0",
+    "@itwin/insights-client": "^0.15.1",
     "@itwin/itwinui-icons-color-react": "^2.1.0",
     "@itwin/itwinui-icons-react": "^2.4.0",
     "@itwin/itwinui-react": "^2.11.0",
@@ -130,8 +130,8 @@
     "@itwin/appui-react": "^4.0.0",
     "@itwin/core-bentley": "^4.0.0",
     "@itwin/core-frontend": "^4.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^17.0.2 || ^18.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0",
     "react-redux": "^7.2.0"
   }
 }
diff --git a/packages/itwin/reports-config-widget/pnpm-lock.yaml b/packages/itwin/reports-config-widget/pnpm-lock.yaml