@xh/hoist 76.0.0-SNAPSHOT.1756835394167 → 76.0.0-SNAPSHOT.1756991850787

package/cmp/viewmanager/ViewManagerModel.ts

@@ -705,11 +705,13 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         const latestInfo = latest.info,
             {typeDisplayName, globalDisplayName} = this,
             msgs: ReactNode[] = [`Save ${view.typedName}?`];
+
         if (isGlobal) {
             msgs.push(
                 span(
-                    `This is a ${globalDisplayName} ${typeDisplayName}. `,
-                    strong('Changes will be visible to all users.')
+                    strong(
+                        `This is a ${globalDisplayName} ${typeDisplayName}. Changes will be visible to all users.`
+                    )
                 )
             );
         }
@@ -725,7 +727,9 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         return XH.confirm({
             message: fragment(msgs.map(m => p(m))),
             confirmProps: {
-                text: 'Yes, save changes',
+                text: isGlobal
+                    ? `Yes, update ${globalDisplayName} ${typeDisplayName}`
+                    : 'Yes, save changes',
                 intent: 'primary',
                 outlined: true,
                 autoFocus: false

package/core/exception/Exception.ts

@@ -7,7 +7,7 @@
 import {PlainObject, XH} from '@xh/hoist/core';
 import {FetchOptions} from '@xh/hoist/svc';
 import {pluralize} from '@xh/hoist/utils/js';
-import {isPlainObject, truncate} from 'lodash';
+import {isPlainObject, isString, truncate} from 'lodash';
 import {FetchException, HoistException, TimeoutException, TimeoutExceptionConfig} from './Types';
 
 /**
@@ -91,14 +91,13 @@ export class Exception {
         try {
             const cType = headers.get('Content-Type');
             if (cType?.includes('application/json')) {
-                const obj = safeParseJson(responseText),
-                    message = obj ? obj.message : truncate(responseText?.trim(), {length: 255});
+                const parsedResp = safeParseJson(responseText);
                 return this.createFetchException({
                     ...defaults,
-                    name: obj?.name ?? defaults.name,
-                    message: message ?? statusText,
-                    isRoutine: obj?.isRoutine ?? false,
-                    serverDetails: obj ?? responseText
+                    name: parsedResp?.name ?? defaults.name,
+                    message: extractMessage(parsedResp, responseText, statusText),
+                    isRoutine: parsedResp?.isRoutine ?? false,
+                    serverDetails: parsedResp ?? responseText
                 });
             }
         } catch (ignored) {}
@@ -234,6 +233,24 @@ function safeParseJson(txt: string): PlainObject {
     }
 }
 
+function extractMessage(parsedResp: PlainObject, responseText: string, statusText: string): string {
+    let ret: string;
+    if (parsedResp) {
+        // From parsed response, including cause if provided (e.g. ExternalHttpException)
+        ret = parsedResp.message;
+        if (isString(parsedResp.cause)) {
+            const cause = truncate(parsedResp.cause, {length: 255});
+            ret = ret ? `${ret} (Caused by: ${cause})` : cause;
+        }
+    } else {
+        // Use raw text if not JSON parseable
+        ret = truncate(responseText?.trim(), {length: 255});
+    }
+
+    // Fallback to statusText if we have nothing else.
+    return ret || statusText;
+}
+
 export function isHoistException(src: unknown): src is HoistException {
     return src?.['isHoistException'];
 }

package/package.json

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