Skip to content

Commit 841a3a3

Browse files
author
Hugo Marcellin
committed
Remove mutualized functions
1 parent ff0c159 commit 841a3a3

File tree

11 files changed

+22
-154
lines changed

11 files changed

+22
-154
lines changed

‎src/components/app-top-bar.jsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77
import React, { useEffect, useRef, useState } from 'react';
8-
import { LIGHT_THEME, logout, TopBar } from '@gridsuite/commons-ui';
8+
import {
9+
LIGHT_THEME,
10+
logout,
11+
TopBar,
12+
fetchAppsAndUrls,
13+
} from '@gridsuite/commons-ui';
914
import ParametersDialog, {
1015
useParameterState,
1116
} from './dialogs/parameters-dialog';
1217
import { APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../utils/config-params';
1318
import { useDispatch, useSelector } from 'react-redux';
14-
import {
15-
fetchAppsAndUrls,
16-
fetchVersion,
17-
getServersInfos,
18-
} from '../utils/rest-api';
19+
import { fetchVersion, getServersInfos } from '../utils/rest-api';
1920
import PropTypes from 'prop-types';
2021
import { useNavigate } from 'react-router-dom';
2122
import GridExploreLogoLight from '../images/GridExplore_logo_light.svg?react';

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
ElementType,
1313
FieldConstants,
1414
} from '@gridsuite/commons-ui';
15-
import { elementExists } from '../../../utils/rest-api';
1615
import { useSelector } from 'react-redux';
1716
import { ReduxState } from '../../../redux/reducer.type';
1817

@@ -80,7 +79,6 @@ const PrefilledNameInput: FunctionComponent<PrefilledNameInputProps> = ({
8079
name={name}
8180
label={label}
8281
elementType={elementType}
83-
elementExists={elementExists}
8482
activeDirectory={activeDirectory}
8583
autoFocus={!caseFile}
8684
onManualChangeCallback={() => setModifiedByUser(true)}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { useFormContext, useWatch } from 'react-hook-form';
2323
import ExplicitNamingForm from '../explicit-naming/explicit-naming-form';
2424
import ScriptInputForm from '../script/script-input-form';
2525
import { useSelector } from 'react-redux';
26-
import { elementExists } from '../../../../utils/rest-api';
2726

2827
const ContingencyListCreationForm = () => {
2928
const { setValue } = useFormContext();
@@ -57,7 +56,6 @@ const ContingencyListCreationForm = () => {
5756
elementType={ElementType.CONTINGENCY_LIST}
5857
autoFocus
5958
activeDirectory={activeDirectory}
60-
elementExists={elementExists}
6159
/>
6260
</Grid>
6361
<Grid item xs={12}>

‎src/components/dialogs/field-hook.jsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77

88
import React, { useCallback, useEffect, useMemo, useState } from 'react';
99
import { FormattedMessage, useIntl } from 'react-intl';
10-
import { elementExists, rootDirectoryExists } from '../../utils/rest-api';
10+
import { rootDirectoryExists } from '../../utils/rest-api';
1111
import { CircularProgress, InputAdornment, TextField } from '@mui/material';
1212
import CheckIcon from '@mui/icons-material/Check';
13-
import { ElementType } from '@gridsuite/commons-ui';
14-
import { useDebounce } from '@gridsuite/commons-ui';
13+
import { ElementType, useDebounce, elementExists } from '@gridsuite/commons-ui';
1514

1615
const styles = {
1716
helperText: {

‎src/components/dialogs/move-dialog.jsx‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ import PropTypes from 'prop-types';
1010
import { DirectoryItemSelector } from '@gridsuite/commons-ui';
1111
import { useIntl } from 'react-intl';
1212
import { ElementType } from '@gridsuite/commons-ui';
13-
import {
14-
fetchDirectoryContent,
15-
fetchElementsInfos,
16-
fetchRootFolders,
17-
} from '../../utils/rest-api';
1813

1914
const MoveDialog = ({ open, onClose, items }) => {
2015
const intl = useIntl();
@@ -38,9 +33,6 @@ const MoveDialog = ({ open, onClose, items }) => {
3833
id: 'moveItemTitle',
3934
})}
4035
contentText={intl.formatMessage({ id: 'moveItemContentText' })}
41-
fetchDirectoryContent={fetchDirectoryContent}
42-
fetchRootFolders={fetchRootFolders}
43-
fetchElementsInfos={fetchElementsInfos}
4436
/>
4537
);
4638
};

‎src/components/directory-content.jsx‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,11 @@ import {
3030
ExpertFilterEditionDialog,
3131
CriteriaBasedFilterEditionDialog,
3232
DescriptionModificationDialog,
33+
fetchElementsInfos,
3334
} from '@gridsuite/commons-ui';
3435
import { Box, Checkbox } from '@mui/material';
3536

36-
import {
37-
elementExists,
38-
fetchAppsAndUrls,
39-
fetchElementsInfos,
40-
getFilterById,
41-
fetchDirectoryContent,
42-
fetchRootFolders,
43-
updateElement,
44-
} from '../utils/rest-api';
37+
import { getFilterById, updateElement } from '../utils/rest-api';
4538

4639
import ContentContextualMenu from './menus/content-contextual-menu';
4740
import ContentToolbar from './toolbars/content-toolbar';
@@ -1059,10 +1052,8 @@ const DirectoryContent = () => {
10591052
titleId={'editFilter'}
10601053
name={name}
10611054
broadcastChannel={broadcastChannel}
1062-
fetchAppsAndUrls={fetchAppsAndUrls}
10631055
getFilterById={getFilterById}
10641056
activeDirectory={activeDirectory}
1065-
elementExists={elementExists}
10661057
language={languageLocal}
10671058
/>
10681059
);
@@ -1075,11 +1066,9 @@ const DirectoryContent = () => {
10751066
titleId={'editFilter'}
10761067
name={name}
10771068
broadcastChannel={broadcastChannel}
1078-
fetchAppsAndUrls={fetchAppsAndUrls}
10791069
getFilterById={getFilterById}
10801070
selectionForCopy={selectionForCopy}
10811071
activeDirectory={activeDirectory}
1082-
elementExists={elementExists}
10831072
language={languageLocal}
10841073
/>
10851074
);
@@ -1092,15 +1081,10 @@ const DirectoryContent = () => {
10921081
titleId={'editFilter'}
10931082
name={name}
10941083
broadcastChannel={broadcastChannel}
1095-
fetchAppsAndUrls={fetchAppsAndUrls}
10961084
selectionForCopy={selectionForCopy}
10971085
getFilterById={getFilterById}
10981086
activeDirectory={activeDirectory}
1099-
elementExists={elementExists}
11001087
language={languageLocal}
1101-
fetchDirectoryContent={fetchDirectoryContent}
1102-
fetchRootFolders={fetchRootFolders}
1103-
fetchElementsInfos={fetchElementsInfos}
11041088
/>
11051089
);
11061090
default:

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,12 @@ import { DialogsId } from '../../utils/UIconstants';
3030
import {
3131
deleteElements,
3232
duplicateElement,
33-
elementExists,
34-
fetchAppsAndUrls,
3533
moveElementsToDirectory,
3634
newScriptFromFilter,
3735
newScriptFromFiltersContingencyList,
3836
renameElement,
3937
replaceFiltersWithScript,
4038
replaceFormContingencyListWithScript,
41-
fetchDirectoryContent,
42-
fetchRootFolders,
43-
fetchElementsInfos,
44-
fetchPath,
4539
} from '../../utils/rest-api';
4640

4741
import { ContingencyListType, FilterType } from '../../utils/elementType';
@@ -780,13 +774,7 @@ const ContentContextualMenu = (props) => {
780774
activeElement.specificMetadata.equipmentType,
781775
}}
782776
activeDirectory={activeDirectory}
783-
fetchAppsAndUrls={fetchAppsAndUrls}
784-
elementExists={elementExists}
785777
language={languageLocal}
786-
fetchDirectoryContent={fetchDirectoryContent}
787-
fetchRootFolders={fetchRootFolders}
788-
fetchElementsInfos={fetchElementsInfos}
789-
fetchPath={fetchPath}
790778
/>
791779
);
792780
case DialogsId.ADD_NEW_STUDY_FROM_CASE:

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ import {
3232
insertRootDirectory,
3333
renameElement,
3434
updateAccessRights,
35-
fetchDirectoryContent,
36-
fetchRootFolders,
37-
fetchAppsAndUrls,
38-
fetchElementsInfos,
39-
elementExists,
4035
} from '../../utils/rest-api';
4136

4237
import CommonContextualMenu from './common-contextual-menu';
@@ -427,12 +422,7 @@ const DirectoryTreeContextualMenu = (props) => {
427422
open={true}
428423
onClose={handleCloseDialog}
429424
activeDirectory={activeDirectory}
430-
fetchAppsAndUrls={fetchAppsAndUrls}
431-
elementExists={elementExists}
432425
language={languageLocal}
433-
fetchDirectoryContent={fetchDirectoryContent}
434-
fetchRootFolders={fetchRootFolders}
435-
fetchElementsInfos={fetchElementsInfos}
436426
/>
437427
);
438428
case DialogsId.ADD_NEW_CASE:

‎src/components/search/search-bar.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,20 @@ import {
1515
useState,
1616
} from 'react';
1717
import { Autocomplete, TextField } from '@mui/material';
18+
import { searchElementsInfos } from '../../utils/rest-api';
1819
import {
20+
useDebounce,
21+
useSnackMessage,
1922
fetchDirectoryContent,
20-
searchElementsInfos,
21-
} from '../../utils/rest-api';
22-
import { useDebounce, useSnackMessage } from '@gridsuite/commons-ui';
23+
} from '@gridsuite/commons-ui';
2324
import { Search } from '@mui/icons-material';
2425
import { useDispatch, useSelector } from 'react-redux';
2526
import { setSelectedDirectory, setTreeData } from '../../redux/actions';
2627
import { updatedTree } from '../tree-views-container';
2728
import { useIntl } from 'react-intl';
2829
import { SearchItem } from './search-item';
2930
import { IDirectory, ITreeData, ReduxState } from '../../redux/reducer.type';
31+
import { UUID } from 'crypto';
3032

3133
export const SEARCH_FETCH_TIMEOUT_MILLIS = 1000; // 1 second
3234

@@ -152,7 +154,7 @@ export const SearchBar: FunctionComponent<SearchBarProps> = ({ inputRef }) => {
152154
if (matchingElement !== undefined) {
153155
const elementUuidPath = matchingElement?.pathUuid.reverse();
154156
const promises = elementUuidPath.map((e: string) => {
155-
return fetchDirectoryContent(e)
157+
return fetchDirectoryContent(e as UUID)
156158
.then((res) => {
157159
updateMapData(e, res);
158160
})

‎src/components/tree-views-container.jsx‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@ import {
1616
setTreeData,
1717
} from '../redux/actions';
1818

19+
import { connectNotificationsWsUpdateDirectories } from '../utils/rest-api';
20+
import DirectoryTreeView from './directory-tree-view';
1921
import {
20-
connectNotificationsWsUpdateDirectories,
22+
useSnackMessage,
2123
fetchDirectoryContent,
2224
fetchRootFolders,
23-
} from '../utils/rest-api';
24-
25-
import DirectoryTreeView from './directory-tree-view';
26-
27-
import { useSnackMessage } from '@gridsuite/commons-ui';
28-
import { ElementType } from '@gridsuite/commons-ui';
25+
ElementType,
26+
} from '@gridsuite/commons-ui';
2927
import { notificationType } from '../utils/notificationType';
3028

3129
import * as constants from '../utils/UIconstants';

0 commit comments

Comments
 (0)