Rollback some changes

Author: Hugo Marcellin

src/components/dialogs/commons/prefilled-name-input.tsx

@@ -12,6 +12,7 @@ import {
     ElementType,
     FieldConstants,
 } from '@gridsuite/commons-ui';
+import { elementExists } from '../../../utils/rest-api';
 import { useSelector } from 'react-redux';
 import { ReduxState } from '../../../redux/reducer.type';
 
@@ -79,6 +80,7 @@ const PrefilledNameInput: FunctionComponent<PrefilledNameInputProps> = ({
             name={name}
             label={label}
             elementType={elementType}
+            elementExists={elementExists}
             activeDirectory={activeDirectory}
             autoFocus={!caseFile}
             onManualChangeCallback={() => setModifiedByUser(true)}

src/components/dialogs/contingency-list/creation/contingency-list-creation-form.jsx

@@ -23,6 +23,7 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import ExplicitNamingForm from '../explicit-naming/explicit-naming-form';
 import ScriptInputForm from '../script/script-input-form';
 import { useSelector } from 'react-redux';
+import { elementExists } from '../../../../utils/rest-api';
 
 const ContingencyListCreationForm = () => {
     const { setValue } = useFormContext();
@@ -56,6 +57,7 @@ const ContingencyListCreationForm = () => {
                     elementType={ElementType.CONTINGENCY_LIST}
                     autoFocus
                     activeDirectory={activeDirectory}
+                    elementExists={elementExists}
                 />
             </Grid>
             <Grid item xs={12}>

src/components/dialogs/field-hook.jsx

@@ -7,10 +7,10 @@
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
-import { rootDirectoryExists } from '../../utils/rest-api';
+import { elementExists, rootDirectoryExists } from '../../utils/rest-api';
 import { CircularProgress, InputAdornment, TextField } from '@mui/material';
 import CheckIcon from '@mui/icons-material/Check';
-import { ElementType, useDebounce, elementExists } from '@gridsuite/commons-ui';
+import { ElementType, useDebounce } from '@gridsuite/commons-ui';
 
 const styles = {
     helperText: {

src/components/directory-content.jsx

@@ -34,7 +34,7 @@ import {
 } from '@gridsuite/commons-ui';
 import { Box, Checkbox } from '@mui/material';
 
-import { getFilterById, updateElement } from '../utils/rest-api';
+import { elementExists, getFilterById, updateElement } from '../utils/rest-api';
 
 import ContentContextualMenu from './menus/content-contextual-menu';
 import ContentToolbar from './toolbars/content-toolbar';
@@ -1054,6 +1054,7 @@ const DirectoryContent = () => {
                         broadcastChannel={broadcastChannel}
                         getFilterById={getFilterById}
                         activeDirectory={activeDirectory}
+                        elementExists={elementExists}
                         language={languageLocal}
                     />
                 );
@@ -1069,6 +1070,7 @@ const DirectoryContent = () => {
                         getFilterById={getFilterById}
                         selectionForCopy={selectionForCopy}
                         activeDirectory={activeDirectory}
+                        elementExists={elementExists}
                         language={languageLocal}
                     />
                 );
@@ -1084,6 +1086,7 @@ const DirectoryContent = () => {
                         selectionForCopy={selectionForCopy}
                         getFilterById={getFilterById}
                         activeDirectory={activeDirectory}
+                        elementExists={elementExists}
                         language={languageLocal}
                     />
                 );

src/components/menus/content-contextual-menu.jsx

@@ -30,6 +30,7 @@ import { DialogsId } from '../../utils/UIconstants';
 import {
     deleteElements,
     duplicateElement,
+    elementExists,
     moveElementsToDirectory,
     newScriptFromFilter,
     newScriptFromFiltersContingencyList,
@@ -774,6 +775,7 @@ const ContentContextualMenu = (props) => {
                                 activeElement.specificMetadata.equipmentType,
                         }}
                         activeDirectory={activeDirectory}
+                        elementExists={elementExists}
                         language={languageLocal}
                     />
                 );

src/components/menus/directory-tree-contextual-menu.jsx

@@ -32,6 +32,7 @@ import {
     insertRootDirectory,
     renameElement,
     updateAccessRights,
+    elementExists,
 } from '../../utils/rest-api';
 
 import CommonContextualMenu from './common-contextual-menu';
@@ -422,6 +423,7 @@ const DirectoryTreeContextualMenu = (props) => {
                         open={true}
                         onClose={handleCloseDialog}
                         activeDirectory={activeDirectory}
+                        elementExists={elementExists}
                         language={languageLocal}
                     />
                 );

src/utils/rest-api.js

@@ -12,12 +12,8 @@ import { ContingencyListType } from './elementType';
 import { CONTINGENCY_ENDPOINTS } from './constants-endpoints';
 import {
     ElementType,
-    fetchEnv,
-    backendFetch,
-    backendFetchJson,
-    backendFetchText,
     getRequestParamFromList,
-    getUserToken,
+    fetchEnv,
 } from '@gridsuite/commons-ui';
 
 const PREFIX_USER_ADMIN_SERVER_QUERIES =
@@ -39,6 +35,11 @@ const PREFIX_FILTERS_QUERIES =
     import.meta.env.VITE_API_GATEWAY + '/filter/v1/filters';
 const PREFIX_STUDY_QUERIES = import.meta.env.VITE_API_GATEWAY + '/study';
 
+function getToken() {
+    const state = store.getState();
+    return state.user.id_token;
+}
+
 export function connectNotificationsWsUpdateConfig() {
     const webSocketBaseUrl = document.baseURI
         .replace(/^http:\/\//, 'ws://')
@@ -50,7 +51,7 @@ export function connectNotificationsWsUpdateConfig() {
         APP_NAME;
 
     const reconnectingWebSocket = new ReconnectingWebSocket(
-        () => webSocketUrl + '&access_token=' + getUserToken()
+        () => webSocketUrl + '&access_token=' + getToken()
     );
     reconnectingWebSocket.onopen = function () {
         console.info(
@@ -60,6 +61,78 @@ export function connectNotificationsWsUpdateConfig() {
     return reconnectingWebSocket;
 }
 
+function parseError(text) {
+    try {
+        return JSON.parse(text);
+    } catch (err) {
+        return null;
+    }
+}
+
+function handleError(response) {
+    return response.text().then((text) => {
+        const errorName = 'HttpResponseError : ';
+        let error;
+        const errorJson = parseError(text);
+        if (
+            errorJson &&
+            errorJson.status &&
+            errorJson.error &&
+            errorJson.message
+        ) {
+            error = new Error(
+                errorName +
+                    errorJson.status +
+                    ' ' +
+                    errorJson.error +
+                    ', message : ' +
+                    errorJson.message
+            );
+            error.status = errorJson.status;
+        } else {
+            error = new Error(
+                errorName + response.status + ' ' + response.statusText
+            );
+            error.status = response.status;
+        }
+        throw error;
+    });
+}
+
+function prepareRequest(init, token) {
+    if (!(typeof init == 'undefined' || typeof init == 'object')) {
+        throw new TypeError(
+            'Argument 2 of backendFetch is not an object' + typeof init
+        );
+    }
+    const initCopy = Object.assign({}, init);
+    initCopy.headers = new Headers(initCopy.headers || {});
+    const tokenCopy = token ? token : getToken();
+    initCopy.headers.append('Authorization', 'Bearer ' + tokenCopy);
+    return initCopy;
+}
+
+function safeFetch(url, initCopy) {
+    return fetch(url, initCopy).then((response) =>
+        response.ok ? response : handleError(response)
+    );
+}
+
+export function backendFetch(url, init, token) {
+    const initCopy = prepareRequest(init, token);
+    return safeFetch(url, initCopy);
+}
+
+export function backendFetchText(url, init, token) {
+    const initCopy = prepareRequest(init, token);
+    return safeFetch(url, initCopy).then((safeResponse) => safeResponse.text());
+}
+
+export function backendFetchJson(url, init, token) {
+    const initCopy = prepareRequest(init, token);
+    return safeFetch(url, initCopy).then((safeResponse) => safeResponse.json());
+}
+
 const getContingencyUriParamType = (contingencyListType) => {
     switch (contingencyListType) {
         case ContingencyListType.SCRIPT.id:
@@ -411,6 +484,19 @@ export function duplicateElement(
     });
 }
 
+export function elementExists(directoryUuid, elementName, type) {
+    const elementNameEncoded = encodeURIComponent(elementName);
+    const existsElementUrl =
+        PREFIX_DIRECTORY_SERVER_QUERIES +
+        `/v1/directories/${directoryUuid}/elements/${elementNameEncoded}/types/${type}`;
+    console.debug(existsElementUrl);
+    return backendFetch(existsElementUrl, { method: 'head' }).then(
+        (response) => {
+            return response.status !== 204; // HTTP 204 : No-content
+        }
+    );
+}
+
 export function getNameCandidate(directoryUuid, elementName, type) {
     const nameCandidateUrl =
         PREFIX_DIRECTORY_SERVER_QUERIES +
@@ -632,7 +718,7 @@ export function connectNotificationsWsUpdateDirectories() {
         '/notify?updateType=directories';
 
     const reconnectingWebSocket = new ReconnectingWebSocket(
-        () => webSocketUrl + '&access_token=' + getUserToken()
+        () => webSocketUrl + '&access_token=' + getToken()
     );
     reconnectingWebSocket.onopen = function () {
         console.info(