@xh/hoist 73.0.0-SNAPSHOT.1747181587236 → 73.0.0-SNAPSHOT.1747259771286

package/appcontainer/AppContainerModel.ts

@@ -343,6 +343,10 @@ export class AppContainerModel extends HoistModel {
         return !isEmpty(this.aboutDialogModel.getItems());
     }
 
+    openAdmin() {
+        XH.openWindow('/admin', XH.appCode + '_xhAdmin');
+    }
+
     //----------------------------
     // Implementation
     //-----------------------------

package/build/types/appcontainer/AppContainerModel.d.ts

@@ -82,6 +82,7 @@ export declare class AppContainerModel extends HoistModel {
      */
     showUpdateBanner(version: string, build?: string): void;
     hasAboutDialog(): boolean;
+    openAdmin(): void;
     private setDocTitle;
     private startRouter;
     private startOptionsDialog;

package/desktop/appcontainer/VersionBar.ts

@@ -55,7 +55,7 @@ export const versionBar = hoistCmp.factory({
                 Icon.wrench({
                     omit: isAdminApp || !XH.getUser().isHoistAdminReader,
                     title: 'Open Admin Console',
-                    onClick: () => XH.openWindow('/admin', 'xhAdmin')
+                    onClick: () => XH.appContainerModel.openAdmin()
                 })
             ]
         });

package/desktop/cmp/button/AppMenuButton.ts

@@ -143,7 +143,7 @@ function buildMenuItems(props: AppMenuButtonProps) {
             omit: hideAdminItem,
             text: 'Admin',
             icon: Icon.wrench(),
-            actionFn: () => XH.openWindow('/admin', 'xhAdmin')
+            actionFn: () => XH.appContainerModel.openAdmin()
         },
         {
             omit: hideImpersonateItem,

package/desktop/cmp/button/LaunchAdminButton.ts

@@ -25,7 +25,7 @@ export const [LaunchAdminButton, launchAdminButton] = hoistCmp.withFactory<Launc
             ref,
             icon: Icon.wrench(),
             title: 'Launch admin client...',
-            onClick: () => XH.openWindow('/admin', 'xhAdmin'),
+            onClick: () => XH.appContainerModel.openAdmin(),
             ...props
         });
     }

package/mobx/overrides.ts

@@ -23,10 +23,16 @@ export function makeObservable(
     options?: CreateObservableOptions
 ) {
     // Finish creating 'bindable' properties for this instance.
-    const bindables = target._xhBindableProperties;
-    forEach(bindables, ({isRef}, name) => {
-        const propName = `_${name}_bindable`,
-            initVal = target[name];
+    forEach(target._xhBindableProperties, ({isRef}, name) => {
+        const propName = `_${name}_bindable`;
+
+        // makeObservable is called by each constructor in the class hierarchy.
+        // Don't process the property before initialized...or if its already processed
+        if (!target.hasOwnProperty(name) || target.hasOwnProperty(propName)) {
+            return;
+        }
+
+        const initVal = target[name];
         target[propName] = isRef ? observable.box(initVal, {deep: false}) : observable.box(initVal);
         Object.defineProperty(target, name, {
             get() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1747181587236",
+  "version": "73.0.0-SNAPSHOT.1747259771286",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",