Merge branch 'master' into MBudrevicius/CustomMessageV1

Dockerfile

@@ -8,7 +8,7 @@ FROM mcr.microsoft.com/playwright:v1.46.1-jammy
 RUN npm install -g @microsoft/rush
 
 # Set the work directory
-WORKDIR appui
+WORKDIR /appui
 
 # Copy for `rush install`
 COPY rush.json ./

apps/test-app/eslint.config.cjs

@@ -44,6 +44,7 @@ module.exports = [
         },
       ],
       "@typescript-eslint/unbound-method": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
     },
   },
 ];

apps/test-app/package.json

@@ -38,26 +38,27 @@
     "url": "http://www.bentley.com"
   },
   "devDependencies": {
-    "@itwin/build-tools": "4.10.0-dev.34",
-    "@itwin/eslint-plugin": "5.0.0-dev.1",
-    "@tanstack/router-plugin": "~1.46.6",
-    "@tanstack/router-devtools": "~1.46.8",
-    "@types/node": "18.11.5",
+    "@itwin/build-tools": "4.10.2",
+    "@itwin/eslint-plugin": "5.0.0-dev.2",
+    "@tanstack/router-plugin": "^1.87.6",
+    "@tanstack/router-devtools": "^1.87.6",
+    "@types/node": "20.17.8",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
-    "@types/react-redux": "^7.1.18",
-    "@typescript-eslint/parser": "^6.1.0",
+    "@typescript-eslint/parser": "~8.11.0",
     "@vitejs/plugin-react-swc": "^3.7.0",
     "cross-env": "^5.1.4",
     "copyfiles": "^2.4.1",
+    "csstype": "^3.1.3",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "electron": "^22.0.0",
+    "electron": "^28.0.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "~8.8.0",
+    "inversify": "^6.0.1",
     "npm-run-all": "^4.1.5",
-    "null-loader": "^4.0.1",
-    "rimraf": "^3.0.2",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^6.0.1",
     "sass": "^1.80.3",
     "typescript": "~5.6.2",
     "vite": "^5.4.7",
@@ -81,6 +82,7 @@
     "@itwin/core-orbitgt": "^4.0.0",
     "@itwin/core-quantity": "^4.0.0",
     "@itwin/core-react": "workspace:*",
+    "@itwin/ecschema-metadata": "^4.0.0",
     "@itwin/ecschema-rpcinterface-common": "^4.0.0",
     "@itwin/ecschema-rpcinterface-impl": "^4.0.0",
     "@itwin/editor-backend": "^4.0.0",
@@ -89,27 +91,27 @@
     "@itwin/express-server": "^4.0.0",
     "@itwin/frontend-devtools": "^4.0.0",
     "@itwin/hypermodeling-frontend": "^4.0.0",
-    "@itwin/imodel-browser-react": "^1.3.1",
+    "@itwin/imodel-browser-react": "^2.1.2",
     "@itwin/imodel-components-react": "workspace:*",
-    "@itwin/imodels-access-backend": "^3.0.0",
-    "@itwin/imodels-access-frontend": "^3.0.0",
-    "@itwin/imodels-client-authoring": "^3.0.0",
-    "@itwin/imodels-client-management": "^3.0.0",
+    "@itwin/imodels-access-backend": "^5.2.3",
+    "@itwin/imodels-access-frontend": "^5.2.3",
+    "@itwin/imodels-client-authoring": "^5.9.0",
+    "@itwin/imodels-client-management": "^5.9.0",
     "@itwin/itwinui-react": "^3.15.0",
     "@itwin/itwinui-react-v2": "npm:@itwin/itwinui-react@^2.12.26",
     "@itwin/itwinui-icons-react": "^2.8.0",
     "@itwin/itwinui-layouts-react": "~0.4.1",
     "@itwin/itwinui-layouts-css": "~0.4.0",
     "@itwin/presentation-common": "^4.0.0",
-    "@itwin/reality-data-client": "0.9.0",
+    "@itwin/reality-data-client": "1.2.2",
     "@itwin/webgl-compatibility": "^4.0.0",
-    "@tanstack/react-router": "~1.46.8",
+    "@tanstack/react-router": "^1.87.6",
     "classnames": "2.5.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-markdown": "~9.0.1",
-    "react-redux": "^7.2.2",
-    "redux": "^4.1.0",
+    "react-redux": "^9.1.2",
+    "redux": "^5.0.1",
     "ts-key-enum": "~2.0.12"
   },
   "browserslist": [

apps/test-app/src/frontend/Localization.tsx

@@ -56,6 +56,7 @@ export function AppLocalizationProvider({
 }
 
 export function AppLanguageSelect() {
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const { language, onChange } = React.useContext(LanguageContext)!;
   return <LanguageSelect language={language} onChange={onChange} />;
 }

apps/test-app/src/frontend/appui/frontstages/MainFrontstage.tsx

@@ -7,9 +7,13 @@ import {
   BackstageAppButton,
   BackstageItemUtilities,
   FrontstageUtilities,
+  RestoreFrontstageLayoutTool,
   SettingsModalFrontstage,
   StageUsage,
   StandardContentLayouts,
+  ToolbarItemUtilities,
+  ToolbarOrientation,
+  ToolbarUsage,
   UiItemsProvider,
 } from "@itwin/appui-react";
 import {
@@ -46,7 +50,17 @@ createMainFrontstage.stageId = "main";
 export function createMainFrontstageProvider() {
   return {
     id: "appui-test-app:backstageItemsProvider",
-    getToolbarItems: () => [getCustomViewSelectorPopupItem()],
+    getToolbarItems: () => [
+      getCustomViewSelectorPopupItem(),
+      ToolbarItemUtilities.createForTool(RestoreFrontstageLayoutTool, {
+        layouts: {
+          standard: {
+            orientation: ToolbarOrientation.Horizontal,
+            usage: ToolbarUsage.ContentManipulation,
+          },
+        },
+      }),
+    ],
     getBackstageItems: () => [
       BackstageItemUtilities.createStageLauncher({
         stageId: createMainFrontstage.stageId,

apps/test-app/src/frontend/config.ts

@@ -3,7 +3,7 @@
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 function createConfig() {
-  const urlPrefix = import.meta.env.IMJS_URL_PREFIX as string;
+  const urlPrefix = import.meta.env.IMJS_URL_PREFIX ?? "";
   const serverEnvironmentPrefix = toServerEnvironmentPrefix(urlPrefix);
   return {
     appClientId: import.meta.env.IMJS_APP_CLIENT_ID as string,

apps/test-app/src/main.tsx

@@ -12,6 +12,7 @@ import { routeTree } from "./routeTree.gen";
 const router = createRouter({
   routeTree,
   context: {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     auth: undefined!,
   },
 });
@@ -24,6 +25,7 @@ declare module "@tanstack/react-router" {
 }
 
 // Render the app
+// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const rootElement = document.getElementById("root")!;
 if (!rootElement.innerHTML) {
   const root = ReactDOM.createRoot(rootElement);