@gridsuite/commons-ui 0.100.0 → 0.102.0

package/dist/components/authentication/utils/authService.d.ts

@@ -1,8 +1,7 @@
 import { Dispatch } from 'react';
 import { Location, NavigateFunction } from 'react-router';
-import { Log, User, UserManager } from 'oidc-client';
+import { Log, UserManager } from 'oidc-client';
 import { AuthenticationActions } from '../../../redux/actions/authActions';
-type UserValidationFunc = (user: User) => Promise<boolean>;
 type IdpSettingsGetter = () => Promise<IdpSettings>;
 export type IdpSettings = {
     authority: string;
@@ -25,10 +24,10 @@ declare global {
 }
 export declare function login(location: Location, userManagerInstance: UserManager | null): Promise<void> | undefined;
 export declare function logout(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: UserManager | null): Promise<void> | undefined;
-export declare function dispatchUser(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: CustomUserManager, validateUser: UserValidationFunc): Promise<void>;
+export declare function dispatchUser(dispatch: Dispatch<AuthenticationActions>, userManagerInstance: CustomUserManager): Promise<void>;
 export declare function getPreLoginPath(): string | null;
 export declare function handleSigninCallback(dispatch: Dispatch<AuthenticationActions>, navigate: NavigateFunction, userManagerInstance: UserManager): void;
 export declare function handleSilentRenewCallback(userManagerInstance: UserManager): void;
-export declare function initializeAuthenticationDev(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, validateUser: UserValidationFunc, isSigninCallback: boolean): Promise<UserManager>;
-export declare function initializeAuthenticationProd(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, idpSettingsGetter: IdpSettingsGetter, validateUser: UserValidationFunc, isSigninCallback: boolean): Promise<CustomUserManager>;
+export declare function initializeAuthenticationDev(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, isSigninCallback: boolean): Promise<UserManager>;
+export declare function initializeAuthenticationProd(dispatch: Dispatch<AuthenticationActions>, isSilentRenew: boolean, idpSettingsGetter: IdpSettingsGetter, isSigninCallback: boolean): Promise<CustomUserManager>;
 export {};

package/dist/components/authentication/utils/authService.js

@@ -1,7 +1,7 @@
 import { jwtDecode } from "jwt-decode";
 import { Log, UserManager } from "oidc-client";
 import { UserManagerMock } from "./userManagerMock.js";
-import { setLoggedUser, setLogoutError, setUnauthorizedUserInfo, setUserValidationError, setSignInCallbackError, setShowAuthenticationRouterLogin, resetAuthenticationRouterError } from "../../../redux/actions/authActions.js";
+import { setLoggedUser, setLogoutError, setSignInCallbackError, setShowAuthenticationRouterLogin, resetAuthenticationRouterError } from "../../../redux/actions/authActions.js";
 window.OIDCLog = Log;
 const hackAuthorityKey = "oidc.hack.authority";
 const oidcHackReloadedKey = "gridsuite-oidc-hack-reloaded";
@@ -104,40 +104,21 @@ function logout(dispatch, userManagerInstance) {
     return Promise.resolve();
   });
 }
-function dispatchUser(dispatch, userManagerInstance, validateUser) {
+function dispatchUser(dispatch, userManagerInstance) {
   return userManagerInstance.getUser().then((user) => {
+    var _a;
     if (user) {
       if (getIdTokenExpiresIn(user) < 0) {
         console.debug("User token is expired and will not be dispatched");
         return Promise.resolve();
       }
-      const validateUserPromise = (validateUser == null ? void 0 : validateUser(user)) || Promise.resolve(true);
-      return validateUserPromise.then((valid) => {
-        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, ""));
-        }
-        console.debug("User has been successfully loaded from store.");
-        reloadTimerOnExpiresIn(
-          user,
-          userManagerInstance,
-          computeMinExpiresIn(
-            user.expires_in,
-            user.id_token,
-            (_b = userManagerInstance.idpSettings) == null ? void 0 : _b.maxExpiresIn
-          )
-        );
-        return dispatch(setLoggedUser(user));
-      }).catch((e) => {
-        var _a;
-        console.log("Error in dispatchUser", e);
-        return dispatch(
-          setUserValidationError((_a = user == null ? void 0 : user.profile) == null ? void 0 : _a.name, {
-            error: e
-          })
-        );
-      });
+      console.debug("User has been successfully loaded from store.");
+      reloadTimerOnExpiresIn(
+        user,
+        userManagerInstance,
+        computeMinExpiresIn(user.expires_in, user.id_token, (_a = userManagerInstance.idpSettings) == null ? void 0 : _a.maxExpiresIn)
+      );
+      return dispatch(setLoggedUser(user));
     }
     console.debug("You are not logged in.");
     return Promise.resolve();
@@ -175,10 +156,10 @@ function handleSigninCallback(dispatch, navigate, userManagerInstance) {
 function handleSilentRenewCallback(userManagerInstance) {
   userManagerInstance.signinSilentCallback();
 }
-function handleUser(dispatch, userManager, validateUser) {
+function handleUser(dispatch, userManager) {
   userManager.events.addUserLoaded((user) => {
     console.debug("user loaded", user);
-    dispatchUser(dispatch, userManager, validateUser);
+    dispatchUser(dispatch, userManager);
   });
   userManager.events.addSilentRenewError((error) => {
     console.debug(error);
@@ -223,19 +204,19 @@ function handleUser(dispatch, userManager, validateUser) {
     }, accessTokenExpiringNotificationTime * 1e3);
   });
   console.debug("dispatch user");
-  dispatchUser(dispatch, userManager, validateUser);
+  dispatchUser(dispatch, userManager);
 }
-async function initializeAuthenticationDev(dispatch, isSilentRenew, validateUser, isSigninCallback) {
+async function initializeAuthenticationDev(dispatch, isSilentRenew, isSigninCallback) {
   const userManager = new UserManagerMock({});
   if (!isSilentRenew) {
-    handleUser(dispatch, userManager, validateUser);
+    handleUser(dispatch, userManager);
     if (!isSigninCallback) {
       handleSigninSilent(dispatch, userManager);
     }
   }
   return userManager;
 }
-async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettingsGetter, validateUser, isSigninCallback) {
+async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettingsGetter, isSigninCallback) {
   const idpSettings = await idpSettingsGetter();
   try {
     const settings = {
@@ -252,7 +233,7 @@ async function initializeAuthenticationProd(dispatch, isSilentRenew, idpSettings
     const userManager = new UserManager(settings);
     userManager.idpSettings = idpSettings;
     if (!isSilentRenew) {
-      handleUser(dispatch, userManager, validateUser);
+      handleUser(dispatch, userManager);
       if (!isSigninCallback) {
         handleSigninSilent(dispatch, userManager);
       }

package/dist/components/parameters/loadflow/load-flow-parameters-content.js

@@ -44,6 +44,11 @@ const styles = {
   },
   maxWidth: {
     width: "100%"
+  },
+  wrapper: {
+    flexGrow: 1,
+    overflow: "auto",
+    paddingLeft: 1
   }
 };
 function LoadFlowParametersContent({
@@ -53,29 +58,19 @@ function LoadFlowParametersContent({
   params,
   defaultLimitReductions
 }) {
-  return /* @__PURE__ */ jsx(
-    Box,
-    {
-      sx: {
-        flexGrow: 1,
-        overflow: "auto",
-        paddingLeft: 1
-      },
-      children: /* @__PURE__ */ jsx(Grid, { container: true, sx: styles.container, children: /* @__PURE__ */ jsxs(Grid, { item: true, sx: styles.maxWidth, children: [
-        /* @__PURE__ */ jsx(TabPanel, { value: selectedTab, index: TabValues.GENERAL, children: /* @__PURE__ */ jsx(LoadFlowGeneralParameters, { provider: currentProvider, specificParams: specificParameters }) }),
-        /* @__PURE__ */ jsx(TabPanel, { value: selectedTab, index: TabValues.LIMIT_REDUCTIONS, children: /* @__PURE__ */ jsx(Grid, { container: true, sx: { width: "100%" }, children: currentProvider === PARAM_PROVIDER_OPENLOADFLOW ? /* @__PURE__ */ jsx(LimitReductionsTableForm, { limits: (params == null ? void 0 : params.limitReductions) ?? defaultLimitReductions }) : /* @__PURE__ */ jsx(
-          ParameterLineSlider,
-          {
-            name: PARAM_LIMIT_REDUCTION,
-            label: "LimitReduction",
-            marks: alertThresholdMarks,
-            minValue: MIN_VALUE_ALLOWED_FOR_LIMIT_REDUCTION,
-            maxValue: MAX_VALUE_ALLOWED_FOR_LIMIT_REDUCTION
-          }
-        ) }) })
-      ] }) })
-    }
-  );
+  return /* @__PURE__ */ jsx(Box, { sx: styles.wrapper, children: /* @__PURE__ */ jsx(Grid, { container: true, sx: styles.container, children: /* @__PURE__ */ jsxs(Grid, { item: true, sx: styles.maxWidth, children: [
+    /* @__PURE__ */ jsx(TabPanel, { value: selectedTab, index: TabValues.GENERAL, children: /* @__PURE__ */ jsx(LoadFlowGeneralParameters, { provider: currentProvider, specificParams: specificParameters }) }),
+    /* @__PURE__ */ jsx(TabPanel, { value: selectedTab, index: TabValues.LIMIT_REDUCTIONS, children: /* @__PURE__ */ jsx(Grid, { container: true, sx: { width: "100%" }, children: currentProvider === PARAM_PROVIDER_OPENLOADFLOW ? /* @__PURE__ */ jsx(LimitReductionsTableForm, { limits: (params == null ? void 0 : params.limitReductions) ?? defaultLimitReductions }) : /* @__PURE__ */ jsx(
+      ParameterLineSlider,
+      {
+        name: PARAM_LIMIT_REDUCTION,
+        label: "LimitReduction",
+        marks: alertThresholdMarks,
+        minValue: MIN_VALUE_ALLOWED_FOR_LIMIT_REDUCTION,
+        maxValue: MAX_VALUE_ALLOWED_FOR_LIMIT_REDUCTION
+      }
+    ) }) })
+  ] }) }) });
 }
 export {
   LoadFlowParametersContent as default

package/dist/components/parameters/loadflow/load-flow-parameters-dialog.d.ts

@@ -7,7 +7,7 @@ export interface ParametersEditionDialogProps {
     titleId: string;
     name: string;
     description: string | null;
-    activeDirectory?: UUID;
+    activeDirectory: UUID;
     language?: string;
     user: User | null;
     enableDeveloperMode: boolean;

package/dist/components/parameters/loadflow/load-flow-parameters-dialog.js

@@ -70,6 +70,10 @@ function LoadFlowParametersEditionDialog({
     getLoadFlowDefaultLimitReductions
   );
   const loadflowMethods = useLoadFlowParametersForm(parametersBackend, enableDeveloperMode, id, name, description);
+  const {
+    formState: { errors, dirtyFields }
+  } = loadflowMethods.formMethods;
+  const disableSave = Object.keys(errors).length > 0 || Object.keys(dirtyFields).length === 0;
   return /* @__PURE__ */ jsx(
     CustomMuiDialog,
     {
@@ -82,6 +86,7 @@ function LoadFlowParametersEditionDialog({
       titleId,
       removeOptional: true,
       language,
+      disabledSave: disableSave,
       children: /* @__PURE__ */ jsx(LoadFlowProvider, { children: /* @__PURE__ */ jsx(
         LoadFlowParametersForm,
         {
@@ -92,6 +97,7 @@ function LoadFlowParametersEditionDialog({
                 UniqueNameInput,
                 {
                   name: FieldConstants.NAME,
+                  currentName: name,
                   label: "nameProperty",
                   elementType: ElementType.LOADFLOW_PARAMETERS,
                   activeDirectory,

package/dist/components/parameters/loadflow/load-flow-parameters-form.js

@@ -1,5 +1,5 @@
-import { jsxs, jsx } from "react/jsx-runtime";
-import { Box, LinearProgress } from "@mui/material";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Box, Grid, LinearProgress } from "@mui/material";
 import LoadFlowParametersHeader from "./load-flow-parameters-header.js";
 import LoadFlowParametersContent from "./load-flow-parameters-content.js";
 import "react-intl";
@@ -29,6 +29,31 @@ import "../../inputs/reactQueryBuilder/CustomReactQueryBuilder.js";
 import "uuid";
 import "../../inputs/reactQueryBuilder/PropertyValueEditor.js";
 import "react-querybuilder";
+const styles = {
+  form: {
+    height: "100%",
+    display: "flex",
+    position: "relative",
+    flexDirection: "column"
+  },
+  loadflowParameters: {
+    flexGrow: 1,
+    paddingLeft: 1,
+    overflow: "auto"
+  },
+  actions: {
+    flexGrow: 0
+  },
+  content: (theme) => ({
+    overflowY: "auto",
+    overflowX: "hidden",
+    maxHeight: "calc(100% - 15vh)",
+    paddingRight: theme.spacing(2),
+    paddingTop: theme.spacing(2),
+    paddingBottom: theme.spacing(1),
+    flexGrow: 1
+  })
+};
 function LoadFlowParametersForm({
   loadflowMethods,
   renderTitleFields,
@@ -47,55 +72,31 @@ function LoadFlowParametersForm({
     defaultLimitReductions,
     paramsLoaded
   } = loadflowMethods;
-  return /* @__PURE__ */ jsxs(CustomFormProvider, { validationSchema: formSchema, ...formMethods, removeOptional: true, children: [
+  return /* @__PURE__ */ jsx(CustomFormProvider, { validationSchema: formSchema, ...formMethods, removeOptional: true, children: /* @__PURE__ */ jsxs(Box, { sx: styles.form, children: [
     renderTitleFields == null ? void 0 : renderTitleFields(),
-    /* @__PURE__ */ jsxs(
-      Box,
-      {
-        sx: {
-          height: "100%",
-          display: "flex",
-          position: "relative",
-          flexDirection: "column"
-        },
-        children: [
-          paramsLoaded ? /* @__PURE__ */ jsxs(
-            Box,
-            {
-              sx: {
-                height: "100%",
-                display: "flex",
-                position: "relative",
-                flexDirection: "column"
-              },
-              children: [
-                /* @__PURE__ */ jsx(
-                  LoadFlowParametersHeader,
-                  {
-                    selectedTab,
-                    handleTabChange,
-                    tabIndexesWithError,
-                    formattedProviders
-                  }
-                ),
-                /* @__PURE__ */ jsx(
-                  LoadFlowParametersContent,
-                  {
-                    selectedTab,
-                    currentProvider: currentProvider ?? "",
-                    specificParameters,
-                    params,
-                    defaultLimitReductions
-                  }
-                )
-              ]
-            }
-          ) : /* @__PURE__ */ jsx(LinearProgress, {}),
-          renderActions == null ? void 0 : renderActions()
-        ]
-      }
-    )
-  ] });
+    paramsLoaded ? /* @__PURE__ */ jsxs(Box, { sx: styles.loadflowParameters, children: [
+      /* @__PURE__ */ jsx(
+        LoadFlowParametersHeader,
+        {
+          selectedTab,
+          handleTabChange,
+          tabIndexesWithError,
+          formattedProviders
+        }
+      ),
+      /* @__PURE__ */ jsx(Grid, { container: true, sx: styles.content, children: /* @__PURE__ */ jsx(
+        LoadFlowParametersContent,
+        {
+          selectedTab,
+          currentProvider: currentProvider ?? "",
+          specificParameters,
+          params,
+          defaultLimitReductions
+        }
+      ) })
+    ] }) : /* @__PURE__ */ jsx(LinearProgress, {}),
+    renderActions && /* @__PURE__ */ jsx(Box, { sx: styles.actions, children: renderActions == null ? void 0 : renderActions() })
+  ] }) });
 }
 export {
   LoadFlowParametersForm

package/dist/translations/en/parameters.js

@@ -44,7 +44,7 @@ const parametersEn = {
   descLfCountries: "Countries",
   descLfAllCountries: "All countries",
   descLfCountriesToBalance: "Countries participating in balancing",
-  editParameters: "Edit parameter",
+  editParameters: "Edit parameters",
   RealPercentage: "This value must be between 0 and 1",
   General: "General",
   LimitReductions: "Limit reductions",

package/dist/translations/fr/parameters.js

@@ -44,7 +44,7 @@ const parametersFr = {
   descLfCountries: "Pays",
   descLfAllCountries: "Tous les pays",
   descLfCountriesToBalance: "Pays participant à la compensation",
-  editParameters: "Éditer le paramètre",
+  editParameters: "Éditer les paramètres",
   RealPercentage: "Cette valeur doit être comprise entre 0 et 1",
   General: "Général",
   LimitReductions: "Abattements",

package/package.json

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