@xh/hoist 73.0.0-SNAPSHOT.1747350649241 → 73.0.0-SNAPSHOT.1747359414796

package/core/HoistAppModel.ts

@@ -66,21 +66,20 @@ export class HoistAppModel extends HoistModel {
      */
     getAboutDialogItems(): AboutDialogItem[] {
         const XH = window['XH'],
-            svc = XH.environmentService;
-
+            svc = XH.environmentService,
+            clientVersionBuild = `${svc.get('clientVersion')} (build ${svc.get('clientBuild')})`,
+            serverVersionBuild = `${svc.get('appVersion')} (build ${svc.get('appBuild')})`;
         return [
             {label: 'App', value: `${svc.get('appName')} (${svc.get('appCode')})`},
             {label: 'Current User', value: XH.identityService.username},
             {label: 'Environment', value: svc.get('appEnvironment')},
-            {label: 'Instance', value: svc.serverInstance},
-            {label: 'Server', value: `${svc.get('appVersion')} (build ${svc.get('appBuild')})`},
-            {
-                label: 'Client',
-                value: `${svc.get('clientVersion')} (build ${svc.get('clientBuild')})`
-            },
+            {label: 'Server', value: serverVersionBuild},
+            {label: 'Client', value: clientVersionBuild},
             {label: 'Hoist Core', value: svc.get('hoistCoreVersion')},
             {label: 'Hoist React', value: svc.get('hoistReactVersion')},
             {label: 'User Agent', value: window.navigator.userAgent},
+            {label: 'Tab/Load IDs', value: XH.tabId + ' / ' +  XH.loadId},
+            {label: 'Server', value: svc.serverInstance},
             {label: 'WebSockets', value: webSocketIndicator()}
         ];
     }

package/desktop/appcontainer/VersionBar.scss

@@ -42,7 +42,8 @@
     margin-left: var(--xh-pad-px);
   }
 
-  &__instance {
+  &__tabid {
+    margin-left: var(--xh-pad-px);
     cursor: pointer;
   }
 

package/desktop/appcontainer/VersionBar.ts

@@ -19,24 +19,20 @@ export const versionBar = hoistCmp.factory({
             envSvc = XH.environmentService,
             env = envSvc.get('appEnvironment'),
             version = envSvc.get('clientVersion'),
-            build = envSvc.get('clientBuild'),
-            instance = envSvc.serverInstance,
-            isAdminApp = window.location.pathname?.startsWith('/admin/'),
-            versionAndBuild =
-                !build || build === 'UNKNOWN' ? version : `${version} (build ${build})`;
+            isAdminApp = window.location.pathname?.startsWith('/admin/');
 
         return box({
             className: `xh-version-bar xh-version-bar--${env.toLowerCase()}`,
             items: [
-                [XH.appName, env, versionAndBuild].join(' • '),
+                [XH.appName, env, version].join(' • '),
                 span({
                     className: 'xh-version-bar__spacer',
                     items: '|'
                 }),
                 span({
-                    className: 'xh-version-bar__instance',
-                    title: 'Currently Connected Server Instance',
-                    items: [Icon.server(), instance]
+                    className: 'xh-version-bar__tabid',
+                    title: 'Tab ID',
+                    item: XH.tabId
                 }),
                 span({
                     className: 'xh-version-bar__spacer',

package/mobile/appcontainer/VersionBar.ts

@@ -20,7 +20,7 @@ export const versionBar = hoistCmp.factory({
         const svc = XH.environmentService,
             env = svc.get('appEnvironment'),
             version = svc.get('clientVersion'),
-            instance = svc.serverInstance;
+            tabId = XH.tabId
 
         return box({
             justifyContent: 'center',
@@ -28,7 +28,7 @@ export const versionBar = hoistCmp.factory({
             flex: 'none',
             className: `xh-version-bar xh-version-bar--${env.toLowerCase()}`,
             items: [
-                [env, version, instance].join(' • '),
+                [env, version, tabId].join(' • '),
                 button({
                     icon: Icon.info(),
                     minimal: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1747350649241",
+  "version": "73.0.0-SNAPSHOT.1747359414796",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@auth0/auth0-spa-js": "~2.1.3",
-    "@azure/msal-browser": "~4.8.0",
+    "@azure/msal-browser": "~4.12.0",
     "@blueprintjs/core": "^5.10.5",
     "@blueprintjs/datetime": "^5.3.7",
     "@blueprintjs/datetime2": "^2.3.7",

package/svc/ClientHealthService.ts

@@ -141,11 +141,7 @@ export class ClientHealthService extends HoistService {
             message: 'Submitted health report',
             ...rest,
             ...opts,
-            data: {
-                loadId: XH.loadId,
-                tabId: XH.tabId,
-                ...this.getReport()
-            }
+            data: this.getReport()
         });
     }
 }