fix errors

Author: Tristan-WorkGH

jest.setup.ts

@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { TextEncoder, TextDecoder } from 'util';
+import { TextEncoder, TextDecoder } from 'node:util';
 
 // fix for ReferenceError: TextDecoder / TextEncoder is not defined
 Object.assign(global, { TextDecoder, TextEncoder });

src/components/App/app-wrapper.tsx

@@ -30,13 +30,12 @@ import {
     top_bar_en,
     top_bar_fr,
 } from '@gridsuite/commons-ui';
-import { IntlProvider } from 'react-intl';
+import { IntlConfig, IntlProvider } from 'react-intl';
 import { Provider, useSelector } from 'react-redux';
 import messages_en from '../../translations/en.json';
 import messages_fr from '../../translations/fr.json';
 import { store } from '../../redux/store';
 import { PARAM_THEME } from '../../utils/config-params';
-import { IntlConfig } from 'react-intl/src/types';
 import { AppState } from '../../redux/reducer';
 import { AppWithAuthRouter } from '../../routes';
 

src/pages/profiles/modification/custom-mui-dialog.tsx

@@ -12,7 +12,7 @@ import { Grid, IconButton, Tooltip } from '@mui/material';
 import { useIntl } from 'react-intl';
 import { DirectoryItemSelector, ElementType } from '@gridsuite/commons-ui';
 import { useController, useWatch } from 'react-hook-form';
-import { fetchPath } from 'services/directory';
+import { DirectorySrv } from '../../../services';
 import LinkedPathDisplay from './linked-path-display';
 
 export interface ParameterSelectionProps {
@@ -45,7 +45,7 @@ const ParameterSelection: FunctionComponent<ParameterSelectionProps> = (
             setSelectedElementName(undefined);
             setParameterLinkValid(undefined);
         } else {
-            fetchPath(watchParamId)
+            DirectorySrv.fetchPath(watchParamId)
                 .then((res: any) => {
                     setParameterLinkValid(true);
                     setSelectedElementName(

src/pages/profiles/modification/parameter-selection.tsx

@@ -10,7 +10,7 @@ import ProfileModificationForm, {
     PROFILE_NAME,
     USER_QUOTAS,
 } from './profile-modification-form';
-import yup from 'utils/yup-config';
+import yup from '../../../utils/yup-config';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useForm } from 'react-hook-form';
 import {
@@ -20,18 +20,17 @@ import {
     useMemo,
     useState,
 } from 'react';
-import { useSnackMessage } from '@gridsuite/commons-ui';
-import { getProfile, modifyProfile, UserProfile } from 'services/user-admin';
-import CustomMuiDialog from './custom-mui-dialog';
+import { CustomMuiDialog, useSnackMessage } from '@gridsuite/commons-ui';
+import { UserAdminSrv, UserProfile } from '../../../services';
 import { UUID } from 'crypto';
 
-// TODO remove FetchStatus when available in commons-ui (available soon)
-export const FetchStatus = {
-    IDLE: 'IDLE',
-    FETCHING: 'FETCHING',
-    FETCH_SUCCESS: 'FETCH_SUCCESS',
-    FETCH_ERROR: 'FETCH_ERROR',
-};
+// TODO remove FetchStatus when exported in commons-ui (available soon)
+export enum FetchStatus {
+    IDLE = 'IDLE',
+    FETCHING = 'FETCHING',
+    FETCH_SUCCESS = 'FETCH_SUCCESS',
+    FETCH_ERROR = 'FETCH_ERROR',
+}
 
 export interface ProfileModificationDialogProps {
     profileId: UUID | undefined;
@@ -44,7 +43,9 @@ const ProfileModificationDialog: FunctionComponent<
     ProfileModificationDialogProps
 > = ({ profileId, open, onClose, onUpdate }) => {
     const { snackError } = useSnackMessage();
-    const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
+    const [dataFetchStatus, setDataFetchStatus] = useState<FetchStatus>(
+        FetchStatus.IDLE
+    );
 
     const formSchema = yup
         .object()
@@ -57,6 +58,7 @@ const ProfileModificationDialog: FunctionComponent<
                 .nullable(),
         })
         .required();
+    console.log('formSchema =', formSchema);
 
     const formMethods = useForm({
         resolver: yupResolver(formSchema),
@@ -73,7 +75,8 @@ const ProfileModificationDialog: FunctionComponent<
                     loadFlowParameterId: profileFormData[LF_PARAM_ID],
                     maxAllowedCases: profileFormData[USER_QUOTAS],
                 };
-                modifyProfile(profileData)
+                console.log('modify', profileData);
+                UserAdminSrv.modifyProfile(profileData)
                     .catch((error) => {
                         snackError({
                             messageTxt: error.message,
@@ -96,9 +99,10 @@ const ProfileModificationDialog: FunctionComponent<
     useEffect(() => {
         if (profileId && open) {
             setDataFetchStatus(FetchStatus.FETCHING);
-            getProfile(profileId)
+            UserAdminSrv.getProfile(profileId)
                 .then((response) => {
                     setDataFetchStatus(FetchStatus.FETCH_SUCCESS);
+                    console.log('reset', response);
                     reset({
                         [PROFILE_NAME]: response.name,
                         [LF_PARAM_ID]: response.loadFlowParameterId

src/pages/profiles/modification/profile-modification-dialog.tsx

@@ -5,10 +5,21 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { Env, IdpSettings } from '@gridsuite/commons-ui';
+import { Env } from '@gridsuite/commons-ui';
 import { getErrorMessage } from '../utils/error';
 import { Url } from '../utils/api-rest';
 
+// TODO remove when exported in commons-ui (src/utils/AuthService.ts)
+type IdpSettings = {
+    authority: string;
+    client_id: string;
+    redirect_uri: string;
+    post_logout_redirect_uri: string;
+    silent_redirect_uri: string;
+    scope: string;
+    maxExpiresIn?: number;
+};
+
 export type EnvJson = Env & typeof import('../../public/env.json');
 
 function fetchEnv(): Promise<EnvJson> {

src/services/apps-metadata.ts

@@ -1,18 +1,3 @@
-import * as Config from './config';
-import * as ConfigNotif from './config-notification';
-import * as AppsMetadata from './apps-metadata';
-import * as Study from './study';
-import * as UserAdmin from './user-admin';
-
-const _ = {
-    ...Config,
-    ...ConfigNotif,
-    ...AppsMetadata,
-    ...Study,
-    ...UserAdmin,
-};
-export default _;
-
 export * as ConfigSrv from './config';
 export type * from './config';
 
@@ -27,3 +12,6 @@ export type * from './study';
 
 export * as UserAdminSrv from './user-admin';
 export type * from './user-admin';
+
+export * as DirectorySrv from './directory';
+export type * from './directory';