@gridsuite/commons-ui 0.57.0 → 0.59.0

package/dist/services/explore.js

@@ -0,0 +1,62 @@
+import { backendFetch, getRequestParamFromList, backendFetchJson } from "./utils.js";
+const PREFIX_EXPLORE_SERVER_QUERIES = "api/gateway/explore";
+function createFilter(newFilter, name, description, parentDirectoryUuid, token) {
+  let urlSearchParams = new URLSearchParams();
+  urlSearchParams.append("name", name);
+  urlSearchParams.append("description", description);
+  parentDirectoryUuid && urlSearchParams.append("parentDirectoryUuid", parentDirectoryUuid);
+  return backendFetch(
+    PREFIX_EXPLORE_SERVER_QUERIES + "/v1/explore/filters?" + urlSearchParams.toString(),
+    {
+      method: "post",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(newFilter)
+    },
+    token
+  );
+}
+function saveFilter(filter, name, token) {
+  let urlSearchParams = new URLSearchParams();
+  urlSearchParams.append("name", name);
+  return backendFetch(
+    PREFIX_EXPLORE_SERVER_QUERIES + "/v1/explore/filters/" + filter.id + "?" + urlSearchParams.toString(),
+    {
+      method: "put",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(filter)
+    },
+    token
+  );
+}
+function fetchElementsInfos(ids, elementTypes, equipmentTypes) {
+  console.info("Fetching elements metadata");
+  const idsParams = getRequestParamFromList(
+    ids.filter((id) => id),
+    // filter falsy elements
+    "ids"
+  );
+  const equipmentTypesParams = getRequestParamFromList(
+    equipmentTypes,
+    "equipmentTypes"
+  );
+  const elementTypesParams = getRequestParamFromList(
+    elementTypes,
+    "elementTypes"
+  );
+  const urlSearchParams = new URLSearchParams([
+    ...idsParams,
+    ...equipmentTypesParams,
+    ...elementTypesParams
+  ]).toString();
+  const url = `${PREFIX_EXPLORE_SERVER_QUERIES}/v1/explore/elements/metadata?${urlSearchParams}`;
+  console.debug(url);
+  return backendFetchJson(url, {
+    method: "get",
+    headers: { "Content-Type": "application/json" }
+  });
+}
+export {
+  createFilter,
+  fetchElementsInfos,
+  saveFilter
+};

package/dist/services/index.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2024, 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 * from './utils';
+export type * from './utils';
+export * from './explore';
+export type * from './explore';
+export * from './apps-metadata';
+export type * from './apps-metadata';
+export * from './directory';
+export type * from './directory';
+export * from './study';
+export type * from './study';

package/dist/services/index.js

@@ -0,0 +1,20 @@
+import { backendFetch, backendFetchJson, getRequestParamFromList } from "./utils.js";
+import { createFilter, fetchElementsInfos, saveFilter } from "./explore.js";
+import { fetchAppsMetadata, fetchEnv, fetchStudyMetadata } from "./apps-metadata.js";
+import { fetchDirectoryContent, fetchDirectoryElementPath, fetchRootFolders } from "./directory.js";
+import { exportFilter } from "./study.js";
+export {
+  backendFetch,
+  backendFetchJson,
+  createFilter,
+  exportFilter,
+  fetchAppsMetadata,
+  fetchDirectoryContent,
+  fetchDirectoryElementPath,
+  fetchElementsInfos,
+  fetchEnv,
+  fetchRootFolders,
+  fetchStudyMetadata,
+  getRequestParamFromList,
+  saveFilter
+};

package/dist/services/study.d.ts

@@ -0,0 +1,3 @@
+import { UUID } from 'crypto';
+
+export declare function exportFilter(studyUuid: UUID, filterUuid?: UUID, token?: string): Promise<any>;

package/dist/services/study.js

@@ -0,0 +1,16 @@
+import { backendFetchJson } from "./utils.js";
+const PREFIX_STUDY_QUERIES = "api/gateway/study";
+function exportFilter(studyUuid, filterUuid, token) {
+  console.info("get filter export on study root node");
+  return backendFetchJson(
+    PREFIX_STUDY_QUERIES + "/v1/studies/" + studyUuid + "/filters/" + filterUuid + "/elements",
+    {
+      method: "get",
+      headers: { "Content-Type": "application/json" }
+    },
+    token
+  );
+}
+export {
+  exportFilter
+};

package/dist/services/utils.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) 2024, 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 const backendFetch: (url: string, init: any, token?: string) => Promise<any>;
+export declare const backendFetchJson: (url: string, init: any, token?: string) => Promise<any>;
+export declare const getRequestParamFromList: (params: string[] | undefined, paramName: string) => URLSearchParams;

package/dist/services/utils.js

@@ -0,0 +1,62 @@
+import { getUserToken } from "../redux/commonStore.js";
+const backendFetch = (url, init, token) => {
+  const initCopy = prepareRequest(init, token);
+  return safeFetch(url, initCopy);
+};
+const backendFetchJson = (url, init, token) => {
+  const initCopy = prepareRequest(init, token);
+  return safeFetch(url, initCopy).then(
+    (safeResponse) => safeResponse.status === 204 ? null : safeResponse.json()
+  );
+};
+const prepareRequest = (init, token) => {
+  if (!(typeof init === "undefined" || typeof init === "object")) {
+    throw new TypeError(
+      "First argument of prepareRequest is not an object : " + typeof init
+    );
+  }
+  const initCopy = Object.assign({}, init);
+  initCopy.headers = new Headers(initCopy.headers || {});
+  const tokenCopy = token ?? getUserToken();
+  initCopy.headers.append("Authorization", "Bearer " + tokenCopy);
+  return initCopy;
+};
+const safeFetch = (url, initCopy) => {
+  return fetch(url, initCopy).then(
+    (response) => response.ok ? response : handleError(response)
+  );
+};
+const handleError = (response) => {
+  return response.text().then((text) => {
+    const errorName = "HttpResponseError : ";
+    const errorJson = parseError(text);
+    let customError;
+    if (errorJson && errorJson.status && errorJson.error && errorJson.message) {
+      customError = new Error(
+        errorName + errorJson.status + " " + errorJson.error + ", message : " + errorJson.message
+      );
+      customError.status = errorJson.status;
+    } else {
+      customError = new Error(
+        errorName + response.status + " " + response.statusText + ", message : " + text
+      );
+      customError.status = response.status;
+    }
+    throw customError;
+  });
+};
+const parseError = (text) => {
+  try {
+    return JSON.parse(text);
+  } catch (err) {
+    return null;
+  }
+};
+const getRequestParamFromList = (params = [], paramName) => {
+  return new URLSearchParams(params.map((param) => [paramName, param]));
+};
+export {
+  backendFetch,
+  backendFetchJson,
+  getRequestParamFromList
+};

package/dist/utils/AuthService.d.ts

@@ -1,9 +1,20 @@
-import { UserManagerMock } from './UserManagerMock';
-export function initializeAuthenticationDev(dispatch: any, isSilentRenew: any, validateUser: any, isSigninCallback: any): Promise<UserManagerMock>;
-export function initializeAuthenticationProd(dispatch: any, isSilentRenew: any, idpSettings: any, validateUser: any, authorizationCodeFlowEnabled: any, isSigninCallback: any): any;
-export function handleSilentRenewCallback(userManagerInstance: any): void;
-export function login(location: any, userManagerInstance: any): any;
-export function logout(dispatch: any, userManagerInstance: any): any;
-export function dispatchUser(dispatch: any, userManagerInstance: any, validateUser: any): any;
-export function handleSigninCallback(dispatch: any, navigate: any, userManagerInstance: any): void;
-export function getPreLoginPath(): string | null;
+import { NavigateFunction } from 'react-router-dom';
+import { Dispatch } from 'react';
+import { User, UserManager } from 'oidc-client';
+
+type UserValidationFunc = (user: User) => Promise<boolean>;
+type CustomUserManager = UserManager & {
+    authorizationCodeFlowEnabled?: boolean;
+    idpSettings?: {
+        maxExpiresIn?: number;
+    };
+};
+declare function initializeAuthenticationDev(dispatch: Dispatch<unknown>, isSilentRenew: boolean, validateUser: UserValidationFunc, isSigninCallback: boolean): Promise<UserManager>;
+declare function initializeAuthenticationProd(dispatch: Dispatch<unknown>, isSilentRenew: boolean, idpSettings: Promise<Response>, validateUser: UserValidationFunc, authorizationCodeFlowEnabled: boolean, isSigninCallback: boolean): Promise<CustomUserManager>;
+declare function login(location: Location, userManagerInstance: UserManager): Promise<void>;
+declare function logout(dispatch: Dispatch<unknown>, userManagerInstance: UserManager): Promise<void | undefined>;
+declare function dispatchUser(dispatch: Dispatch<unknown>, userManagerInstance: CustomUserManager, validateUser: UserValidationFunc): Promise<void | undefined>;
+declare function getPreLoginPath(): string | null;
+declare function handleSigninCallback(dispatch: Dispatch<unknown>, navigate: NavigateFunction, userManagerInstance: UserManager): void;
+declare function handleSilentRenewCallback(userManagerInstance: UserManager): void;
+export { initializeAuthenticationDev, initializeAuthenticationProd, handleSilentRenewCallback, login, logout, dispatchUser, handleSigninCallback, getPreLoginPath, };

package/dist/utils/AuthService.js

@@ -1,6 +1,6 @@
 import { Log, UserManager } from "oidc-client";
 import { UserManagerMock } from "./UserManagerMock.js";
-import { setShowAuthenticationRouterLogin, setLoggedUser, setLogoutError, setUnauthorizedUserInfo, setUserValidationError, setSignInCallbackError, resetAuthenticationRouterError } from "./actions.js";
+import { setShowAuthenticationRouterLogin, setLoggedUser, setLogoutError, setUnauthorizedUserInfo, setUserValidationError, setSignInCallbackError, resetAuthenticationRouterError } from "../redux/actions.js";
 import { jwtDecode } from "jwt-decode";
 window.OIDCLog = Log;
 const hackAuthorityKey = "oidc.hack.authority";
@@ -11,11 +11,13 @@ function isIssuerErrorForCodeFlow(error) {
 }
 function extractIssuerToSessionStorage(error) {
   const issuer = error.message.split(" ").pop();
-  sessionStorage.setItem(hackAuthorityKey, issuer);
+  if (issuer !== void 0) {
+    sessionStorage.setItem(hackAuthorityKey, issuer);
+  }
 }
 function reload() {
   if (!sessionStorage.getItem(oidcHackReloadedKey)) {
-    sessionStorage.setItem(oidcHackReloadedKey, true);
+    sessionStorage.setItem(oidcHackReloadedKey, true.toString());
     console.log("Hack oidc, reload page to make login work");
     window.location.reload();
   }
@@ -44,7 +46,9 @@ function handleSigninSilent(dispatch, userManager) {
   });
 }
 function initializeAuthenticationDev(dispatch, isSilentRenew, validateUser, isSigninCallback) {
-  let userManager = new UserManagerMock({});
+  let userManager = new UserManagerMock(
+    {}
+  );
   if (!isSilentRenew) {
     handleUser(dispatch, userManager, validateUser);
     if (!isSigninCallback) {
@@ -82,7 +86,9 @@ function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings, vali
             "oidc." + state,
             JSON.stringify(storedState)
           );
-          sessionStorage.setItem(hackAuthorityKey, authority);
+          if (authority !== void 0) {
+            sessionStorage.setItem(hackAuthorityKey, authority);
+          }
           const matched_expires = window.location.hash.match(regexexpires);
           if (matched_expires != null) {
             const expires_in = parseInt(
@@ -133,8 +139,11 @@ function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings, vali
   });
 }
 function computeMinExpiresIn(expiresIn, idToken, maxExpiresIn) {
-  const now = parseInt(Date.now() / 1e3);
+  const now = Date.now() / 1e3;
   const exp = jwtDecode(idToken).exp;
+  if (exp === void 0) {
+    return expiresIn;
+  }
   const idTokenExpiresIn = exp - now;
   let newExpiresIn = expiresIn;
   let newExpiresInReplaceReason;
@@ -182,8 +191,11 @@ function logout(dispatch, userManagerInstance) {
   });
 }
 function getIdTokenExpiresIn(user) {
-  const now = parseInt(Date.now() / 1e3);
+  const now = Date.now() / 1e3;
   const exp = jwtDecode(user.id_token).exp;
+  if (exp === void 0) {
+    return 0;
+  }
   return exp - now;
 }
 function dispatchUser(dispatch, userManagerInstance, validateUser) {
@@ -197,13 +209,13 @@ function dispatchUser(dispatch, userManagerInstance, validateUser) {
       }
       let validateUserPromise = validateUser && validateUser(user) || Promise.resolve(true);
       return validateUserPromise.then((valid) => {
-        var _a;
+        var _a, _b;
         if (!valid) {
           console.debug(
             "User isn't authorized to log in and will not be dispatched"
           );
           return dispatch(
-            setUnauthorizedUserInfo((_a = user == null ? void 0 : user.profile) == null ? void 0 : _a.name, {})
+            setUnauthorizedUserInfo((_a = user == null ? void 0 : user.profile) == null ? void 0 : _a.name, "")
           );
         }
         console.debug(
@@ -216,7 +228,7 @@ function dispatchUser(dispatch, userManagerInstance, validateUser) {
             computeMinExpiresIn(
               user.expires_in,
               user.id_token,
-              userManagerInstance.idpSettings.maxExpiresIn
+              (_b = userManagerInstance.idpSettings) == null ? void 0 : _b.maxExpiresIn
             )
           );
         }
@@ -240,7 +252,9 @@ function getPreLoginPath() {
 }
 function navigateToPreLoginPath(navigate) {
   const previousPath = getPreLoginPath();
-  navigate(previousPath);
+  if (previousPath !== null) {
+    navigate(previousPath);
+  }
 }
 function handleSigninCallback(dispatch, navigate, userManagerInstance) {
   let reloadAfterNavigate = false;
@@ -274,10 +288,12 @@ function handleUser(dispatch, userManager, validateUser) {
     console.debug(error);
     window.setTimeout(() => {
       userManager.getUser().then((user) => {
+        var _a, _b;
         if (!user) {
           console.error(
             "user is null at silent renew error, it shouldn't happen."
           );
+          return;
         }
         const idTokenExpiresIn = getIdTokenExpiresIn(user);
         if (idTokenExpiresIn < 0) {
@@ -288,12 +304,12 @@ function handleUser(dispatch, userManager, validateUser) {
           dispatch(setShowAuthenticationRouterLogin(true));
           dispatch(resetAuthenticationRouterError());
           return dispatch(setLoggedUser(null));
-        } else if (userManager.idpSettings.maxExpiresIn) {
+        } else if ((_a = userManager.idpSettings) == null ? void 0 : _a.maxExpiresIn) {
           if (idTokenExpiresIn < userManager.idpSettings.maxExpiresIn) {
             console.log(
               "Error in silent renew, but idtoken ALMOST expiring (expiring in" + idTokenExpiresIn + ") => last chance, next error will logout",
               "maxExpiresIn = " + userManager.idpSettings.maxExpiresIn,
-              "last renew attempt in " + idTokenExpiresIn - accessTokenExpiringNotificationTime + "seconds",
+              "last renew attempt in " + (idTokenExpiresIn - accessTokenExpiringNotificationTime) + "seconds",
               error
             );
             reloadTimerOnExpiresIn(
@@ -314,7 +330,7 @@ function handleUser(dispatch, userManager, validateUser) {
           }
         } else {
           console.log(
-            "Error in silent renew, unsupported configuration: token still valid for " + idTokenExpiresIn + " but maxExpiresIn is not configured:" + userManager.idpSettings.maxExpiresIn,
+            "Error in silent renew, unsupported configuration: token still valid for " + idTokenExpiresIn + " but maxExpiresIn is not configured:" + ((_b = userManager.idpSettings) == null ? void 0 : _b.maxExpiresIn),
             error
           );
         }

package/dist/utils/ElementIcon.d.ts

@@ -1 +1,4 @@
-export function getFileIcon(type: any, style: any): import("react/jsx-runtime").JSX.Element | undefined;
+import { SxProps } from '@mui/material';
+import { ElementType } from './ElementType';
+
+export declare function getFileIcon(type: ElementType, style: SxProps): import("react/jsx-runtime").JSX.Element | undefined;

package/dist/utils/UserManagerMock.d.ts

@@ -1,6 +1,16 @@
-export class UserManagerMock {
-    constructor(settings: any);
-    settings: any;
+/**
+ * Copyright (c) 2020, 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/.
+ */
+declare class Events {
+    userLoadedCallbacks: ((data: any) => void)[];
+    addUserLoaded(callback: (data: any) => void): void;
+    addSilentRenewError(callback: (data: any) => void): void;
+}
+export declare class UserManagerMock {
+    settings: unknown;
     events: Events;
     user: {
         profile: {
@@ -13,6 +23,7 @@ export class UserManagerMock {
         token_type: string;
         scope: string;
     };
+    constructor(settings: unknown);
     getUser(): Promise<any>;
     signinSilent(): Promise<any>;
     signinSilentCallback(): Promise<never>;
@@ -20,15 +31,4 @@ export class UserManagerMock {
     signoutRedirect(): Promise<null>;
     signinRedirectCallback(): Promise<string>;
 }
-/**
- * Copyright (c) 2020, 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/.
- */
-declare class Events {
-    userLoadedCallbacks: any[];
-    addUserLoaded(callback: any): void;
-    addSilentRenewError(callback: any): void;
-}
 export {};

package/dist/utils/UserManagerMock.js

@@ -1,12 +1,6 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
 class Events {
   constructor() {
-    __publicField(this, "userLoadedCallbacks", []);
+    this.userLoadedCallbacks = [];
   }
   addUserLoaded(callback) {
     this.userLoadedCallbacks.push(callback);
@@ -16,28 +10,28 @@ class Events {
 }
 class UserManagerMock {
   constructor(settings) {
-    __publicField(this, "settings");
-    __publicField(this, "events");
-    __publicField(this, "user", {
+    this.user = {
       profile: { name: "John Doe", email: "Jhon.Doe@rte-france.com" },
       id_token: "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6IllNRUxIVDBndmIwbXhvU0RvWWZvbWpxZmpZVSJ9.eyJhdWQiOiI5YzQwMjQ2MS1iMmFiLTQ3NjctOWRiMy02Njg1OWJiMGZjZDAiLCJpc3MiOiJodHRwczovL2xvZ2luLm1pY3Jvc29mdG9ubGluZS5jb20vNzUwMmRhZDUtZDY0Yy00NmM3LTlkNDctYjE2ZjU4MGZjZmE5L3YyLjAiLCJpYXQiOjE1ODUzMzEyNDksIm5iZiI6MTU4NTMzMTI0OSwiZXhwIjoyNTg1MzM1MTQ5LCJhaW8iOiJBV1FBbS84UEFBQUF3Q0xyTDRIUEUvTnVjOU9OdHN0SUV4cVpyMUlqa1FGbXJvUW5EUzJBaksyWnpneUhQTldPdkE3bitveHkvRzgxWElsb1A0TitsQjZINFJteElwakhNYVArTjIyTzVnMUFaR04yc1d6VHA5T3JWMDIvOXhndXJBMjZrdUNXbGg2RSIsImF0X2hhc2giOiJJaWRYdGRHdzVkbjlOZDFQblVvbDh3IiwiaWRwIjoiaHR0cHM6Ly9zdHMud2luZG93cy5uZXQvOTE4ODA0MGQtNmM2Ny00YzViLWIxMTItMzZhMzA0YjY2ZGFkLyIsIm5vbmNlIjoiMjkzZTcxNzhmOWE5NGZlNjg1ZWY3MjdlZTg5MTYxYjEiLCJzdWIiOiJyTnZjWXJMSXJSN25iSDJPQlhoOFkzU05wZEtPc3dfTUNkX3F3NF9vNDRJIiwidGlkIjoiNzUwMmRhZDUtZDY0Yy00NmM3LTlkNDctYjE2ZjU4MGZjZmE5IiwidXRpIjoiUFBYdkw1UWxDMG1oMGp2N3NaNGJBQSIsInZlciI6IjIuMCJ9.dPAh24KTfsqmDaRoBtMLcayAWnDqVtydQ97P1a99dg93JsDu4Jhxju9vlzvjd6Ro5a1RZdrKFKB_pgC2DkQ3wSeYjpdSNyBAlW1_ryq65JkTJVMp33OsM_7SdjaRIiJfPiJ3U9jRBSyj7ofoHCLUjD_Uu-XreKxpMGhFHOQIO72UfXg8TBpsapjkEv9Dyz2UqMa2BQvO5mxKw93LNg5BI6j2a5LhbMEmmRWqfxWGITJ9TWfHjYdFkrXKcmvWZ9D2b4tsw_5NorDxkuzVFhA89M_0ASzOXoj1Yb6LgdkzWXDimssvyyz5Oe4V3gdkAe8Jj7Uwz-9AR-MO2kNkH7ytHA",
       session_state: "session state",
       access_token: "eyJ0eXAiOiJKV1QiLCJub25jZSI6InhKWHlQeXVrU1paQ3BOeEcxZUQway1lVDF0YzZtQ01ZVkZKcnBDOTJxc28iLCJhbGciOiJSUzI1NiIsIng1dCI6IllNRUxIVDBndmIwbXhvU0RvWWZvbWpxZmpZVSIsImtpZCI6IllNRUxIVDBndmIwbXhvU0RvWWZvbWpxZmpZVSJ9.eyJhdWQiOiIwMDAwMDAwMy0wMDAwLTAwMDAtYzAwMC0wMDAwMDAwMDAwMDAiLCJpc3MiOiJodHRwczovL3N0cy53aW5kb3dzLm5ldC83NTAyZGFkNS1kNjRjLTQ2YzctOWQ0Ny1iMTZmNTgwZmNmYTkvIiwiaWF0IjoxNTg1MzMxMjQ5LCJuYmYiOjE1ODUzMzEyNDksImV4cCI6MTU4NTMzNTE0OSwiYWNjdCI6MCwiYWNyIjoiMSIsImFpbyI6IkFVUUF1LzhQQUFBQXdwc3RYMlVkY2VDQWx4dU9tVHpIY0R3RlhTWUtYanIvZUNTSi9PdTRqbTJyUVBCUml0U1dWMThmNldCVEdNdnQ5ZGx0Ry9lTXB1VXZqaTN2NCtzanh3PT0iLCJhbHRzZWNpZCI6IjE6bGl2ZS5jb206MDAwMzQwMDExOUZEOTIxMiIsImFtciI6WyJwd2QiXSwiYXBwX2Rpc3BsYXluYW1lIjoic3BhIiwiYXBwaWQiOiI5YzQwMjQ2MS1iMmFiLTQ3NjctOWRiMy02Njg1OWJiMGZjZDAiLCJhcHBpZGFjciI6IjAiLCJlbWFpbCI6ImNoYW1zZWRkaW5lLmJlbmhhbWVkQGVuc2ktdW1hLnRuIiwiZmFtaWx5X25hbWUiOiJCRU5IQU1FRCIsImdpdmVuX25hbWUiOiJDaGFtc2VkZGluZSIsImlkcCI6ImxpdmUuY29tIiwiaXBhZGRyIjoiNzcuMjA0LjE0Ni4xNTkiLCJuYW1lIjoiQ2hhbXNlZGRpbmUgQkVOSEFNRUQiLCJvaWQiOiIzNTIzYmQ3OC0yZjIxLTQ3ZjYtODhlOC1hYWIzYjZmMjdmNjAiLCJwbGF0ZiI6IjE0IiwicHVpZCI6IjEwMDMyMDAwOURFMDg1NkEiLCJzY3AiOiJVc2VyLlJlYWQgcHJvZmlsZSBvcGVuaWQgZW1haWwiLCJzdWIiOiJjVEd5LVlfV3FLR2x1cmRUVDdSUVlfY3FjSDJoVHpEdllZTmotQ3hONXA4IiwidGlkIjoiNzUwMmRhZDUtZDY0Yy00NmM3LTlkNDctYjE2ZjU4MGZjZmE5IiwidW5pcXVlX25hbWUiOiJsaXZlLmNvbSNjaGFtc2VkZGluZS5iZW5oYW1lZEBlbnNpLXVtYS50biIsInV0aSI6IlBQWHZMNVFsQzBtaDBqdjdzWjRiQUEiLCJ2ZXIiOiIxLjAiLCJ4bXNfc3QiOnsic3ViIjoick52Y1lyTElyUjduYkgyT0JYaDhZM1NOcGRLT3N3X01DZF9xdzRfbzQ0SSJ9LCJ4bXNfdGNkdCI6MTU4MjgyMDM1Mn0.W_ccOGW_AGdg37KSMi7LWHtvm3Mw5p1dHjgDIrUaXduKF2iLS4dCaPw7yeo4VjAcOyV6C0h6ABLDCtkwVt8BSDTIIU7DaT8k2bRbMCCq69BmeiYPsbp-yX6ywGCx5DHsnOLqI2oHbBQktA2Nmv9Va651Pbm3OpSPuGPdVimkFCcnisiGlUOej1ZMNwyVT6386O2pERPtxmFUt_D1dKLxBXxBNxLVUG5BG3bI7wMpBOHEUA5CbaBzYXmGrLMXVVbrj9OsF-WQ6aNoqsm9cicX6pJB60lFz1dxLeSgcFO7Zh2K3PFe4FnXCqAvNPadQMz_kJEO9_phlDV85c2MPqeXbA",
       token_type: "Bearer",
       scope: "scopes"
-    });
+    };
     this.settings = settings;
     this.events = new Events();
   }
   getUser() {
     return Promise.resolve(
-      JSON.parse(sessionStorage.getItem("powsybl-gridsuite-mock-user"))
+      JSON.parse(
+        sessionStorage.getItem("powsybl-gridsuite-mock-user") ?? "null"
+      )
     );
   }
   signinSilent() {
     console.info("signinSilent..............");
     const localStorageUser = JSON.parse(
-      localStorage.getItem("powsybl-gridsuite-mock-user")
+      localStorage.getItem("powsybl-gridsuite-mock-user") ?? "null"
     );
     if (localStorageUser === null) {
       return Promise.reject(
@@ -62,13 +56,13 @@ class UserManagerMock {
       "powsybl-gridsuite-mock-user",
       JSON.stringify(this.user)
     );
-    window.location = "./sign-in-callback";
+    window.location.href = "./sign-in-callback";
     return Promise.resolve(null);
   }
   signoutRedirect() {
     sessionStorage.removeItem("powsybl-gridsuite-mock-user");
     localStorage.removeItem("powsybl-gridsuite-mock-user");
-    window.location = ".";
+    window.location.href = ".";
     return Promise.resolve(null);
   }
   signinRedirectCallback() {

package/dist/utils/algos.d.ts

@@ -4,4 +4,4 @@
  * 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 function equalsArray(a: any, b: any): boolean;
+export declare function equalsArray(a: Array<any>, b: Array<any>): boolean;

package/dist/utils/equipment-types-for-predefined-properties-mapper.d.ts

@@ -1,3 +1,3 @@
-import { EquipmentType } from './types.ts';
+import { EquipmentType } from './types';
 
 export declare const mapEquipmentTypeForPredefinedProperties: (type: EquipmentType) => string | undefined;

package/dist/utils/functions.d.ts

@@ -10,5 +10,4 @@
  */
 export declare function keyGenerator(): () => number;
 export declare const areArrayElementsUnique: (array: unknown[]) => boolean;
-export declare const mergeSx: (...allSx: unknown[]) => unknown[];
 export declare const isObjectEmpty: (object: object) => boolean;

package/dist/utils/functions.js

@@ -6,11 +6,9 @@ const areArrayElementsUnique = (array) => {
   let uniqueValues = [...new Set(array)];
   return uniqueValues.length === array.length;
 };
-const mergeSx = (...allSx) => allSx.flat();
 const isObjectEmpty = (object) => object && Object.keys(object).length === 0;
 export {
   areArrayElementsUnique,
   isObjectEmpty,
-  keyGenerator,
-  mergeSx
+  keyGenerator
 };

package/dist/utils/styles.d.ts

@@ -1,5 +1,7 @@
-export function makeComposeClasses(generateGlobalClass: any): (classes: any, ruleName: any) => string;
-export function toNestedGlobalSelectors(styles: any, generateGlobalClass: any): {
+import { SxProps } from '@mui/material';
+
+export declare const makeComposeClasses: (generateGlobalClass: (className: string) => string) => (classes: Record<string, string>, ruleName: string) => string;
+export declare const toNestedGlobalSelectors: (styles: object, generateGlobalClass: (className: string) => string) => {
     [k: string]: any;
 };
-export function mergeSx(...allSx: any[]): any[];
+export declare const mergeSx: (...allSx: (SxProps | undefined)[]) => (boolean | import('@mui/system').SystemStyleObject<{}> | ((theme: {}) => import('@mui/system').SystemStyleObject<{}>) | ((theme: {}) => import('@mui/system').SystemStyleObject<{}>))[];

package/dist/utils/styles.js

@@ -5,7 +5,10 @@ const toNestedGlobalSelectors = (styles, generateGlobalClass) => Object.fromEntr
     v
   ])
 );
-const mergeSx = (...allSx) => allSx.flat();
+const isSxProps = (sx) => {
+  return sx !== void 0;
+};
+const mergeSx = (...allSx) => allSx.filter(isSxProps).flat();
 export {
   makeComposeClasses,
   mergeSx,

package/dist/utils/types.d.ts

@@ -1,12 +1,22 @@
-import { Battery, BusBar, DanglingLine, Generator, Hvdc, LCC, Line, Load, ShuntCompensator, Substation, SVC, ThreeWindingTransfo, TwoWindingTransfo, VoltageLevel, VSC } from '../components/filter/constants/equipment-types.ts';
-import { ElementType } from './ElementType.ts';
+import { Battery, BusBar, DanglingLine, Generator, Hvdc, LCC, Line, Load, ShuntCompensator, Substation, SVC, ThreeWindingTransfo, TwoWindingTransfo, VoltageLevel, VSC } from './equipment-types';
+import { ElementType } from './ElementType';
 import { UUID } from 'crypto';
 
 export type Input = string | number;
 export type ElementAttributes = {
     elementUuid: UUID;
     elementName: string;
-    type: keyof typeof ElementType;
+    type: ElementType;
+    accessRights: {
+        isPrivate: boolean;
+    };
+    owner: string;
+    subdirectoriesCount: number;
+    creationDate: string;
+    lastModificationDate: string;
+    lastModifiedBy: string;
+    children: any[];
+    parentUuid: null | UUID;
 };
 export type Equipment = typeof Substation | typeof Line | typeof Generator | typeof Load | typeof Battery | typeof SVC | typeof DanglingLine | typeof LCC | typeof VSC | typeof Hvdc | typeof BusBar | typeof TwoWindingTransfo | typeof ThreeWindingTransfo | typeof ShuntCompensator | typeof VoltageLevel | typeof Substation;
 export type EquipmentType = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gridsuite/commons-ui",
-    "version": "0.57.0",
+    "version": "0.59.0",
     "description": "common react components for gridsuite applications",
     "engines": {
         "npm": ">=9",
@@ -19,7 +19,7 @@
         "start": "vite demo/ --config vite.config.mts",
         "start:open": "vite demo/ --config vite.config.mts --open",
         "build": "tsc && vite build",
-        "build:prune": "npm install && tsc && vite build && npm prune --production",
+        "build:pack": "tsc && vite build && npm pack",
         "prepublishOnly": "npm run build",
         "test": "jest",
         "test:coverage": "jest --coverage",
@@ -28,8 +28,8 @@
         "licenses-check": "license-checker --summary --excludePrivatePackages --production --onlyAllow \"$( jq -r .onlyAllow[] license-checker-config.json | tr '\n' ';')\" --excludePackages \"$( jq -r .excludePackages[] license-checker-config.json | tr '\n' ';')\""
     },
     "dependencies": {
-        "@react-querybuilder/material": "^7.2.0",
         "@react-querybuilder/dnd": "^7.2.0",
+        "@react-querybuilder/material": "^7.2.0",
         "autosuggest-highlight": "^3.3.4",
         "clsx": "^2.1.0",
         "jwt-decode": "^4.0.0",
@@ -38,11 +38,11 @@
         "oidc-client": "^1.11.5",
         "prop-types": "^15.8.1",
         "react-csv-downloader": "^3.1.0",
-        "react-virtualized": "^9.22.5",
-        "uuid": "^9.0.1",
         "react-dnd": "^16.0.1",
         "react-dnd-html5-backend": "^16.0.1",
-        "react-querybuilder": "^7.2.0"
+        "react-querybuilder": "^7.2.0",
+        "react-virtualized": "^9.22.5",
+        "uuid": "^9.0.1"
     },
     "peerDependencies": {
         "@emotion/react": "^11.11.4",
@@ -79,7 +79,9 @@
         "@types/autosuggest-highlight": "^3.2.3",
         "@types/eslint": "^8.56.7",
         "@types/eslint-config-prettier": "^6.11.3",
+        "@types/json-logic-js": "^2.0.7",
         "@types/license-checker": "^25.0.6",
+        "@types/localized-countries": "^2.0.3",
         "@types/node": "^18.19.31",
         "@types/prop-types": "^15.7.12",
         "@types/react": "^18.2.75",
@@ -94,6 +96,7 @@
         "ag-grid-community": "^31.0.0",
         "ag-grid-react": "^31.2.0",
         "babel-eslint": "^10.1.0",
+        "babel-preset-vite": "^1.1.3",
         "bufferutil": "^4.0.8",
         "eslint": "^8.57.0",
         "eslint-config-prettier": "^9.1.0",
@@ -108,7 +111,6 @@
         "identity-obj-proxy": "^3.0.0",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "jest-svg-transformer": "^1.0.0",
         "license-checker": "^25.0.1",
         "notistack": "^3.0.1",
         "prettier": "^2.8.8",