Migrate the filter API to commons-ui (#424)

Move createFilter and saveFilter fetch functions to commons-ui.
Also integrate the PR #428 merged in this branch by mistake.

Signed-off-by: Florent MILLOT <[email protected]>
Co-authored-by: Hugo Marcellin <[email protected]>

Author: flomillot

package-lock.json

@@ -7,7 +7,7 @@
     "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
-        "@gridsuite/commons-ui": "0.57.0",
+        "@gridsuite/commons-ui": "0.58.0",
         "@hookform/resolvers": "^3.3.4",
         "@mui/icons-material": "^5.15.14",
         "@mui/lab": "5.0.0-alpha.169",

package.json

@@ -28,10 +28,10 @@ import {
     FieldConstants,
     isObjectEmpty,
     keyGenerator,
+    ModifyElementSelection,
 } from '@gridsuite/commons-ui';
 import { useDispatch, useSelector } from 'react-redux';
 import ImportParametersSection from './importParametersSection';
-import ModifyElementSelection from '../commons/modify-element-selection';
 import {
     addUploadingElement,
     removeUploadingElement,

src/components/dialogs/commons/modify-element-selection.tsx

@@ -34,12 +34,10 @@ import {
 import { Box, Checkbox } from '@mui/material';
 
 import {
-    createFilter,
     elementExists,
     fetchAppsAndUrls,
     fetchElementsInfos,
     getFilterById,
-    saveFilter,
     fetchDirectoryContent,
     fetchRootFolders,
 } from '../utils/rest-api';
@@ -1059,8 +1057,6 @@ const DirectoryContent = () => {
                         titleId={'editFilter'}
                         name={name}
                         broadcastChannel={broadcastChannel}
-                        createfilter={createFilter}
-                        saveFilter={saveFilter}
                         fetchAppsAndUrls={fetchAppsAndUrls}
                         getFilterById={getFilterById}
                         activeDirectory={activeDirectory}
@@ -1077,8 +1073,6 @@ const DirectoryContent = () => {
                         titleId={'editFilter'}
                         name={name}
                         broadcastChannel={broadcastChannel}
-                        createfilter={createFilter}
-                        saveFilter={saveFilter}
                         fetchAppsAndUrls={fetchAppsAndUrls}
                         getFilterById={getFilterById}
                         selectionForCopy={selectionForCopy}
@@ -1096,8 +1090,6 @@ const DirectoryContent = () => {
                         titleId={'editFilter'}
                         name={name}
                         broadcastChannel={broadcastChannel}
-                        createfilter={createFilter}
-                        saveFilter={saveFilter}
                         fetchAppsAndUrls={fetchAppsAndUrls}
                         selectionForCopy={selectionForCopy}
                         getFilterById={getFilterById}

src/components/dialogs/create-study-dialog/create-study-dialog.jsx

@@ -28,7 +28,6 @@ import CreateStudyDialog from '../dialogs/create-study-dialog/create-study-dialo
 import { DialogsId } from '../../utils/UIconstants';
 
 import {
-    createFilter,
     deleteElements,
     duplicateElement,
     elementExists,
@@ -39,7 +38,10 @@ import {
     renameElement,
     replaceFiltersWithScript,
     replaceFormContingencyListWithScript,
-    saveFilter,
+    fetchDirectoryContent,
+    fetchRootFolders,
+    fetchElementsInfos,
+    fetchPath,
 } from '../../utils/rest-api';
 
 import { ContingencyListType, FilterType } from '../../utils/elementType';
@@ -778,11 +780,13 @@ const ContentContextualMenu = (props) => {
                                 activeElement.specificMetadata.equipmentType,
                         }}
                         activeDirectory={activeDirectory}
-                        createfilter={createFilter}
-                        saveFilter={saveFilter}
                         fetchAppsAndUrls={fetchAppsAndUrls}
                         elementExists={elementExists}
                         language={languageLocal}
+                        fetchDirectoryContent={fetchDirectoryContent}
+                        fetchRootFolders={fetchRootFolders}
+                        fetchElementsInfos={fetchElementsInfos}
+                        fetchPath={fetchPath}
                     />
                 );
             case DialogsId.ADD_NEW_STUDY_FROM_CASE:

src/components/directory-content.jsx

@@ -26,13 +26,11 @@ import DeleteDialog from '../dialogs/delete-dialog';
 import { DialogsId } from '../../utils/UIconstants';
 
 import {
-    createFilter,
     deleteElement,
     duplicateElement,
     insertDirectory,
     insertRootDirectory,
     renameElement,
-    saveFilter,
     updateAccessRights,
     fetchDirectoryContent,
     fetchRootFolders,
@@ -429,8 +427,6 @@ const DirectoryTreeContextualMenu = (props) => {
                         open={true}
                         onClose={handleCloseDialog}
                         activeDirectory={activeDirectory}
-                        createFilter={createFilter}
-                        saveFilter={saveFilter}
                         fetchAppsAndUrls={fetchAppsAndUrls}
                         elementExists={elementExists}
                         language={languageLocal}

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

@@ -6,8 +6,10 @@
  */
 import { legacy_createStore as createStore } from 'redux';
 import { reducer } from './reducer';
+import { setCommonStore } from '@gridsuite/commons-ui';
 
 export const store = createStore(reducer);
+setCommonStore(store);
 
 // to avoid to reset the state with HMR
 // https://redux.js.org/usage/configuring-your-store#hot-reloading

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

@@ -788,32 +788,6 @@ export function connectNotificationsWsUpdateDirectories() {
     return reconnectingWebSocket;
 }
 
-/**
- * Create Filter
- * @returns {Promise<Response>}
- */
-export function createFilter(
-    newFilter,
-    name,
-    description,
-    parentDirectoryUuid
-) {
-    let urlSearchParams = new URLSearchParams();
-    urlSearchParams.append('name', name);
-    urlSearchParams.append('description', description);
-    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),
-        }
-    );
-}
-
 /**
  * Get all filters (name & type)
  * @returns {Promise<Response>}
@@ -875,28 +849,6 @@ export function newScriptFromFilter(id, newName, parentDirectoryUuid) {
     });
 }
 
-/**
- * Save Filter
- */
-export function saveFilter(filter, name) {
-    let urlSearchParams = new URLSearchParams();
-    urlSearchParams.append('name', name);
-    const body = JSON.stringify(filter);
-
-    return backendFetch(
-        PREFIX_EXPLORE_SERVER_QUERIES +
-            '/v1/explore/filters/' +
-            filter.id +
-            '?' +
-            urlSearchParams.toString(),
-        {
-            method: 'put',
-            headers: { 'Content-Type': 'application/json' },
-            body,
-        }
-    );
-}
-
 /**
  * Fetch element and all its parents info
  */
@@ -992,18 +944,6 @@ export function getServersInfos() {
     });
 }
 
-export function exportFilter(studyUuid, filterUuid) {
-    console.info('get filter export on study root node');
-    return backendFetchJson(
-        PREFIX_STUDY_QUERIES +
-            '/v1/studies/' +
-            studyUuid +
-            '/filters/' +
-            filterUuid +
-            '/elements'
-    );
-}
-
 export const getExportFormats = () => {
     console.info('get export formats');
     const url = PREFIX_NETWORK_CONVERSION_SERVER_QUERIES + '/v1/export/formats';