@gridsuite/commons-ui 0.157.0 → 0.159.0

package/dist/services/utils.js

@@ -3,13 +3,6 @@ import { ProblemDetailError } from "../utils/types/ProblemDetailError.js";
 import { NetworkTimeoutError } from "../utils/types/NetworkTimeoutError.js";
 import { CustomError } from "../utils/types/CustomError.js";
 const DEFAULT_TIMEOUT_MS = 5e4;
-const parseError = (text) => {
-  try {
-    return JSON.parse(text);
-  } catch {
-    return null;
-  }
-};
 const ensureSignal = (init) => {
   if (init?.signal) return init;
   const timeoutMs = typeof init?.timeoutMs === "number" ? init.timeoutMs : DEFAULT_TIMEOUT_MS;
@@ -28,35 +21,67 @@ const prepareRequest = (init, token) => {
   initWithSignal.headers.append("Authorization", `Bearer ${tokenCopy}`);
   return initWithSignal;
 };
-const convertToCustomError = (textError) => {
-  const errorJson = parseError(textError);
-  if (errorJson?.server && errorJson?.timestamp && errorJson?.traceId && errorJson?.detail) {
-    let date = /* @__PURE__ */ new Date();
-    try {
-      date = new Date(errorJson.timestamp);
-    } catch {
-    }
+const isProblemDetail = (error) => {
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+  const e = error;
+  return typeof e.status === "number" && typeof e.server === "string" && typeof e.timestamp === "string" && typeof e.traceId === "string" && typeof e.detail === "string";
+};
+const parseError = (errorTxt) => {
+  let error;
+  try {
+    error = JSON.parse(errorTxt);
+  } catch {
+    return new Error(errorTxt);
+  }
+  if (isProblemDetail(error)) {
     return new ProblemDetailError(
-      errorJson.detail,
-      errorJson.server,
-      date,
-      errorJson.traceId,
-      errorJson.status,
-      errorJson.businessErrorCode,
-      errorJson.businessErrorValues
+      error.status,
+      error.detail,
+      error.server,
+      error.timestamp,
+      error.traceId,
+      error.businessErrorCode,
+      error.businessErrorValues
     );
   }
-  return new CustomError(
-    errorJson.detail,
-    errorJson.status,
-    errorJson.businessErrorCode,
-    errorJson.businessErrorValues
-  );
+  return new Error(errorTxt);
 };
-const handleError = (response) => {
-  return response.text().then((text) => {
-    throw convertToCustomError(text);
-  });
+const handleNotOkResponse = async (response) => {
+  let bodyText;
+  try {
+    bodyText = await response.text();
+  } catch (error) {
+    throw new CustomError(response.status, "Error in error: unable to read response body", {
+      cause: error
+    });
+  }
+  const contentType = response.headers.get("content-type") ?? "";
+  if (!contentType.includes("application/json") && !contentType.includes("application/problem+json")) {
+    throw new CustomError(response.status, bodyText);
+  }
+  let body;
+  try {
+    body = JSON.parse(bodyText);
+  } catch (error) {
+    throw new CustomError(response.status, `Error in error: unable to parse json response from text
+${bodyText}`, {
+      cause: error
+    });
+  }
+  if (isProblemDetail(body)) {
+    throw new ProblemDetailError(
+      body.status,
+      body.detail,
+      body.server,
+      body.timestamp,
+      body.traceId,
+      body.businessErrorCode,
+      body.businessErrorValues
+    );
+  }
+  throw new CustomError(response.status, bodyText);
 };
 const handleTimeoutError = (error) => {
   if (error instanceof Error && (error.name === "AbortError" || error.name === "TimeoutError")) {
@@ -65,7 +90,7 @@ const handleTimeoutError = (error) => {
   throw error;
 };
 const safeFetch = (url, initCopy) => {
-  return fetch(url, initCopy).then((response) => response.ok ? response : handleError(response)).catch(handleTimeoutError);
+  return fetch(url, initCopy).then((response) => response.ok ? response : handleNotOkResponse(response)).catch(handleTimeoutError);
 };
 const backendFetch = (url, init, token) => {
   const initCopy = prepareRequest(init, token);
@@ -91,6 +116,7 @@ export {
   backendFetchFile,
   backendFetchJson,
   backendFetchText,
-  convertToCustomError,
-  getRequestParamFromList
+  getRequestParamFromList,
+  handleNotOkResponse,
+  parseError
 };

package/dist/utils/error.js

@@ -1,7 +1,5 @@
-import { ProblemDetailError } from "./types/ProblemDetailError.js";
+import { ProblemDetailError, formatMessageValues } from "./types/ProblemDetailError.js";
 import { NetworkTimeoutError } from "./types/NetworkTimeoutError.js";
-import { formatMessageValues } from "./types/CustomError.js";
-import "./types/equipmentType.js";
 function catchErrorHandler(error, callback) {
   if (error instanceof Object && "message" in error && typeof error.message === "string") {
     callback(error.message);
@@ -30,8 +28,7 @@ function snackWithFallback(snackError, error, headerInputs) {
         messageValues: {
           message: error.message,
           serverName: error.serverName,
-          timestamp: error.timestamp.toLocaleString(),
-          // It would require refactoring to adapt with GS language so we keep it like that for now
+          timestamp: error.timestamp,
           traceId: error.traceId
         },
         ...headerInputs

package/dist/utils/index.js

@@ -14,8 +14,8 @@ import { equipmentTypesForPredefinedPropertiesMapper } from "./mapper/equipmentT
 import { copyToClipboard } from "./navigator-clipboard.js";
 import { NotificationsUrlKeys, PREFIX_CONFIG_NOTIFICATION_WS, PREFIX_DIRECTORY_NOTIFICATION_WS, PREFIX_STUDY_NOTIFICATION_WS } from "./constants/notificationsProvider.js";
 import { DARK_THEME, LIGHT_THEME, makeComposeClasses, mergeSx, toNestedGlobalSelectors } from "./styles.js";
-import { CustomError, formatMessageValues } from "./types/CustomError.js";
-import { ProblemDetailError } from "./types/ProblemDetailError.js";
+import { CustomError } from "./types/CustomError.js";
+import { ProblemDetailError, formatMessageValues } from "./types/ProblemDetailError.js";
 import { NetworkTimeoutError } from "./types/NetworkTimeoutError.js";
 import { ElementType } from "./types/elementType.js";
 import { ALL_EQUIPMENTS, BASE_EQUIPMENTS, EquipmentType, ExtendedEquipmentType, HvdcType, OperatingStatus, SEARCH_EQUIPMENTS, TYPE_TAG_MAX_SIZE, VL_TAG_MAX_SIZE, equipmentStyles, getEquipmentsInfosForSearchBar } from "./types/equipmentType.js";

package/dist/utils/types/CustomError.d.ts

@@ -1,13 +1,10 @@
 /**
- * Copyright (c) 2025, RTE (http://www.rte-france.com)
+ * Copyright (c) 2026, RTE (http://www.rte-france.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 export declare class CustomError extends Error {
     status: number;
-    businessErrorCode?: string;
-    businessErrorValues?: Record<string, unknown>;
-    constructor(message: string, status: number, businessErrorCode?: string, businessErrorValues?: Record<string, unknown>);
+    constructor(status: number, message: string, options?: ErrorOptions);
 }
-export declare function formatMessageValues(properties: Record<string, unknown>): Record<string, string>;

package/dist/utils/types/CustomError.js

@@ -1,20 +1,9 @@
 class CustomError extends Error {
-  constructor(message, status, businessErrorCode, businessErrorValues) {
-    super(message);
+  constructor(status, message, options) {
+    super(message, options);
     this.status = status;
-    this.businessErrorCode = businessErrorCode;
-    this.businessErrorValues = businessErrorValues;
   }
 }
-function formatMessageValues(properties) {
-  return Object.fromEntries(
-    Object.entries(properties).map(([key, value]) => [
-      key,
-      typeof value === "object" && value !== null ? JSON.stringify(value) : String(value)
-    ])
-  );
-}
 export {
-  CustomError,
-  formatMessageValues
+  CustomError
 };

package/dist/utils/types/ProblemDetailError.d.ts

@@ -1,7 +1,10 @@
 import { CustomError } from './CustomError';
 export declare class ProblemDetailError extends CustomError {
     serverName: string;
-    timestamp: Date;
+    timestamp: string;
     traceId: string;
-    constructor(message: string, serverName: string, timestamp: Date, traceId: string, status: number, businessErrorCode?: string, businessErrorValues?: Record<string, unknown>);
+    businessErrorCode?: string;
+    businessErrorValues?: Record<string, unknown>;
+    constructor(status: number, message: string, serverName: string, timestamp: string, traceId: string, businessErrorCode?: string, businessErrorValues?: Record<string, unknown>);
 }
+export declare function formatMessageValues(properties: Record<string, unknown>): Record<string, string>;

package/dist/utils/types/ProblemDetailError.js

@@ -1,12 +1,23 @@
 import { CustomError } from "./CustomError.js";
 class ProblemDetailError extends CustomError {
-  constructor(message, serverName, timestamp, traceId, status, businessErrorCode, businessErrorValues) {
-    super(message, status, businessErrorCode, businessErrorValues);
+  constructor(status, message, serverName, timestamp, traceId, businessErrorCode, businessErrorValues) {
+    super(status, message);
     this.serverName = serverName;
     this.timestamp = timestamp;
     this.traceId = traceId;
+    this.businessErrorCode = businessErrorCode;
+    this.businessErrorValues = businessErrorValues;
   }
 }
+function formatMessageValues(properties) {
+  return Object.fromEntries(
+    Object.entries(properties).map(([key, value]) => [
+      key,
+      typeof value === "object" && value !== null ? JSON.stringify(value) : String(value)
+    ])
+  );
+}
 export {
-  ProblemDetailError
+  ProblemDetailError,
+  formatMessageValues
 };

package/dist/utils/types/index.js

@@ -1,5 +1,5 @@
-import { CustomError, formatMessageValues } from "./CustomError.js";
-import { ProblemDetailError } from "./ProblemDetailError.js";
+import { CustomError } from "./CustomError.js";
+import { ProblemDetailError, formatMessageValues } from "./ProblemDetailError.js";
 import { NetworkTimeoutError } from "./NetworkTimeoutError.js";
 import { ElementType } from "./elementType.js";
 import { ALL_EQUIPMENTS, BASE_EQUIPMENTS, EquipmentType, ExtendedEquipmentType, HvdcType, OperatingStatus, SEARCH_EQUIPMENTS, TYPE_TAG_MAX_SIZE, VL_TAG_MAX_SIZE, equipmentStyles, getEquipmentsInfosForSearchBar } from "./equipmentType.js";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.157.0",
+    "version": "0.159.0",
     "description": "common react components for gridsuite applications",
     "author": "gridsuite team",
     "homepage": "https://github.com/gridsuite",