Refactor imports to use common UI fetch functions (#3395)

achour94 · web-flow · commit d7a2f76e4056 · 2025-10-20T15:09:34.000+02:00
Signed-off-by: achour94 &lt;berrahmaachour@gmail.com&gt;
diff --git a/src/services/directory.ts b/src/services/directory.ts
@@ -5,8 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetchJson, getRequestParamFromList } from './utils';
-import { ElementAttributes } from '@gridsuite/commons-ui';
+import { getRequestParamFromList } from './utils';
+import { backendFetchJson, ElementAttributes } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 
 const PREFIX_DIRECTORY_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/directory';
diff --git a/src/services/dynamic-security-analysis.ts b/src/services/dynamic-security-analysis.ts
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetch, backendFetchJson } from './utils';
+import { backendFetch, backendFetchJson } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 
 const PREFIX_DYNAMIC_SECURITY_ANALYSIS_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/dynamic-security-analysis';
diff --git a/src/services/dynamic-simulation.ts b/src/services/dynamic-simulation.ts
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetch, backendFetchJson } from './utils';
+import { backendFetch, backendFetchJson } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 
 const PREFIX_DYNAMIC_SIMULATION_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/dynamic-simulation';
diff --git a/src/services/explore.ts b/src/services/explore.ts
@@ -6,9 +6,8 @@
  */
 
 import { ContingencyList } from './study/contingency-list';
-import { backendFetch } from './utils';
 import type { UUID } from 'node:crypto';
-import { ElementType } from '@gridsuite/commons-ui';
+import { backendFetch, ElementType } from '@gridsuite/commons-ui';
 import { SpreadsheetCollection, SpreadsheetConfig } from 'components/spreadsheet-view/types/spreadsheet.type';
 
 const PREFIX_EXPLORE_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/explore';
diff --git a/src/services/loadflow.ts b/src/services/loadflow.ts
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetchJson } from './utils';
+import { backendFetchJson } from '@gridsuite/commons-ui';
 
 const PREFIX_LOADFLOW_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/loadflow';
 
diff --git a/src/services/network-conversion.ts b/src/services/network-conversion.ts
@@ -6,7 +6,7 @@
  */
 
 import type { UUID } from 'node:crypto';
-import { backendFetchJson } from './utils';
+import { backendFetchJson } from '@gridsuite/commons-ui';
 
 const PREFIX_NETWORK_CONVERSION_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/network-conversion';
 
diff --git a/src/services/network-modification.ts b/src/services/network-modification.ts
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetch, backendFetchJson } from './utils';
+import { backendFetch, backendFetchJson } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { LineTypeInfo } from '../components/dialogs/line-types-catalog/line-catalog.type';
 
diff --git a/src/services/root-network.ts b/src/services/root-network.ts
@@ -7,7 +7,7 @@
 
 import { RootNetworkInfos } from 'components/graph/menus/network-modifications/network-modification-menu.type';
 import { PREFIX_STUDY_QUERIES, getStudyUrl } from './study';
-import { backendFetch, backendFetchJson } from './utils';
+import { backendFetch, backendFetchJson } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 
 export function fetchRootNetworks(studyUuid: UUID) {
diff --git a/src/services/sensitivity-analysis.ts b/src/services/sensitivity-analysis.ts
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetchJson } from './utils';
+import { backendFetchJson } from '@gridsuite/commons-ui';
 
 const PREFIX_SENSITIVITY_ANALYSIS_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/sensitivity-analysis';
 
diff --git a/src/services/short-circuit-analysis.ts b/src/services/short-circuit-analysis.ts
@@ -6,7 +6,7 @@
  */
 
 import type { UUID } from 'node:crypto';
-import { backendFetch } from './utils';
+import { backendFetch } from '@gridsuite/commons-ui';
 
 const PREFIX_SHORT_CIRCUIT_ANALYSIS_SERVER_QUERIES = import.meta.env.VITE_API_GATEWAY + '/shortcircuit';
 
diff --git a/src/services/study/dynamic-security-analysis.ts b/src/services/study/dynamic-security-analysis.ts
@@ -7,7 +7,7 @@
 
 import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES } from './index';
 
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
+import { backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import {
     DynamicSecurityAnalysisParametersFetchReturn,
@@ -20,7 +20,7 @@ export function startDynamicSecurityAnalysis(
     currentNodeUuid: UUID,
     currentRootNetworkUuid: UUID,
     debug: boolean
-): Promise<void> {
+): Promise<Response> {
     console.info(
         `Running dynamic security analysis on study '${studyUuid}', on root network '${currentRootNetworkUuid}'  and node '${currentNodeUuid}' ...`
     );
@@ -135,7 +135,7 @@ export function fetchDynamicSecurityAnalysisParameters(
 export function updateDynamicSecurityAnalysisParameters(
     studyUuid: UUID,
     newParams: DynamicSecurityAnalysisParametersFetchReturn | null
-): Promise<void> {
+): Promise<Response> {
     console.info(`Setting dynamic security analysis parameters on study '${studyUuid}' ...`);
     const url = getStudyUrl(studyUuid) + '/dynamic-security-analysis/parameters';
     console.debug(url);
diff --git a/src/services/study/dynamic-simulation.ts b/src/services/study/dynamic-simulation.ts
@@ -12,7 +12,8 @@ import {
     PREFIX_STUDY_QUERIES,
 } from './index';
 
-import { backendFetch, backendFetchJson, backendFetchText, getRequestParamFromList } from '../utils';
+import { getRequestParamFromList } from '../utils';
+import { backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { DynamicSimulationParametersFetchReturn, DynamicSimulationParametersInfos } from './dynamic-simulation.type';
 import {
@@ -41,7 +42,7 @@ export function startDynamicSimulation({
     currentRootNetworkUuid: UUID;
     dynamicSimulationConfiguration?: DynamicSimulationParametersInfos;
     debug: boolean;
-}): Promise<void> {
+}): Promise<Response> {
     console.info(
         `Running dynamic simulation on study '${studyUuid}', on root network '${currentRootNetworkUuid}' and node '${currentNodeUuid}' ...`
     );
diff --git a/src/services/study/filter.ts b/src/services/study/filter.ts
@@ -5,7 +5,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetchJson, getRequestParamFromList } from '../utils';
+import { getRequestParamFromList } from '../utils';
+import { backendFetchJson } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
 import { RuleGroupTypeExport } from '../../components/dialogs/filter/expert/expert-filter.type';
diff --git a/src/services/study/geo-data.ts b/src/services/study/geo-data.ts
@@ -7,7 +7,7 @@
 
 import type { UUID } from 'node:crypto';
 import type { GeoDataLine, GeoDataSubstation } from '@powsybl/network-viewer';
-import { backendFetchJson } from '../utils';
+import { backendFetchJson } from '@gridsuite/commons-ui';
 import { getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
 
 export function fetchSubstationPositions(
diff --git a/src/services/study/index.ts b/src/services/study/index.ts
@@ -5,10 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { backendFetch, backendFetchJson, backendFetchText, getRequestParamFromList } from '../utils';
+import { getRequestParamFromList } from '../utils';
 import type { UUID } from 'node:crypto';
 import { COMPUTING_AND_NETWORK_MODIFICATION_TYPE } from '../../utils/report/report.constant';
-import { EquipmentType, ExtendedEquipmentType, Parameter, ComputingType } from '@gridsuite/commons-ui';
+import {
+    backendFetch,
+    backendFetchJson,
+    backendFetchText,
+    EquipmentType,
+    ExtendedEquipmentType,
+    Parameter,
+    ComputingType,
+} from '@gridsuite/commons-ui';
 import { NetworkModificationCopyInfo } from 'components/graph/menus/network-modifications/network-modification-menu.type';
 import type { Svg } from 'components/grid-layout/cards/diagrams/diagram.type';
 
diff --git a/src/services/study/loadflow.ts b/src/services/study/loadflow.ts
@@ -6,7 +6,7 @@
  */
 
 import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES } from './index';
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
+import { backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { ResultsQueryParams } from '../../components/results/common/global-filter/global-filter-types';
 
@@ -74,7 +74,7 @@ export function startLoadFlow(
     currentNodeUuid: UUID,
     currentRootNetworkUuid: UUID,
     withRatioTapChangers: boolean
-): Promise<void> {
+): Promise<Response> {
     console.info(
         'Running loadflow on study ' +
             studyUuid +
diff --git a/src/services/study/network-map.ts b/src/services/study/network-map.ts
@@ -6,9 +6,11 @@
  */
 
 import { getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
-import { backendFetchJson, backendFetchText, getQueryParamsList } from '../utils';
+import { getQueryParamsList } from '../utils';
 import { EQUIPMENT_INFOS_TYPES } from '../../components/utils/equipment-types';
 import {
+    backendFetchJson,
+    backendFetchText,
     createFilter,
     EquipmentInfos,
     EquipmentType,
diff --git a/src/services/study/network-modifications.ts b/src/services/study/network-modifications.ts
@@ -6,14 +6,16 @@
  */
 
 import {
+    backendFetch,
+    backendFetchJson,
+    backendFetchText,
     EquipmentInfos,
     EquipmentType,
     MODIFICATION_TYPES,
     ModificationType,
     NetworkModificationMetadata,
 } from '@gridsuite/commons-ui';
 import { toModificationOperation } from '../../components/utils/utils';
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
 import { getStudyUrlWithNodeUuid, getStudyUrlWithNodeUuidAndRootNetworkUuid, safeEncodeURIComponent } from './index';
 import { EQUIPMENT_TYPES } from '../../components/utils/equipment-types';
 import { BRANCH_SIDE, OPERATING_STATUS_ACTION } from '../../components/network/constants';
diff --git a/src/services/study/network.ts b/src/services/study/network.ts
@@ -6,11 +6,19 @@
  */
 
 import type { UUID } from 'node:crypto';
-import { EquipmentType, ExtendedEquipmentType, type GsLang, type Identifiable } from '@gridsuite/commons-ui';
+import {
+    backendFetch,
+    backendFetchJson,
+    backendFetchText,
+    EquipmentType,
+    ExtendedEquipmentType,
+    type GsLang,
+    type Identifiable,
+} from '@gridsuite/commons-ui';
 import type { MapHvdcLine, MapLine, MapSubstation, MapTieLine } from '@powsybl/network-viewer';
 import { getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES, safeEncodeURIComponent } from './index';
 import { EQUIPMENT_INFOS_TYPES, EQUIPMENT_TYPES, type VoltageLevel } from '../../components/utils/equipment-types';
-import { backendFetch, backendFetchJson, backendFetchText, getQueryParamsList, getUrlWithToken } from '../utils';
+import { getQueryParamsList, getUrlWithToken } from '../utils';
 import { SwitchInfos } from './network-map.type';
 import type { SpreadsheetEquipmentType } from '../../components/spreadsheet-view/types/spreadsheet.type';
 import { JSONSchema4 } from 'json-schema';
diff --git a/src/services/study/node-alias.ts b/src/services/study/node-alias.ts
@@ -5,15 +5,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 import type { UUID } from 'node:crypto';
-import { backendFetch, backendFetchJson } from '../utils';
+import { backendFetch, backendFetchJson } from '@gridsuite/commons-ui';
 import { getStudyUrl } from './index';
 import { NodeAlias } from '../../components/spreadsheet-view/types/node-alias.type';
 
 function getNodeAliasUrl(studyUuid: UUID) {
     return getStudyUrl(studyUuid) + '/node-aliases';
 }
 
-export function updateNodeAliases(studyUuid: UUID, nodeAliases: NodeAlias[]): Promise<void> {
+export function updateNodeAliases(studyUuid: UUID, nodeAliases: NodeAlias[]): Promise<Response> {
     console.info(`Update node aliases from study ${studyUuid}`);
     const changeUrl = getNodeAliasUrl(studyUuid);
     console.debug(changeUrl);
diff --git a/src/services/study/security-analysis.ts b/src/services/study/security-analysis.ts
@@ -6,17 +6,17 @@
  */
 
 import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES } from './index';
-import { backendFetch, backendFetchFile, backendFetchJson, backendFetchText, getRequestParamFromList } from '../utils';
+import { getRequestParamFromList } from '../utils';
 import type { UUID } from 'node:crypto';
 import { RESULT_TYPE } from '../../components/results/securityanalysis/security-analysis-result-utils';
-import { GsLang } from '@gridsuite/commons-ui';
+import { backendFetch, backendFetchFile, backendFetchJson, backendFetchText, GsLang } from '@gridsuite/commons-ui';
 
 export function startSecurityAnalysis(
     studyUuid: UUID,
     currentNodeUuid: UUID,
     currentRootNetworkUuid: UUID,
     contingencyListUuids: UUID[]
-): Promise<void> {
+): Promise<Response> {
     console.info(
         `Running security analysis on ${studyUuid} on root network ${currentRootNetworkUuid} and node ${currentNodeUuid} ...`
     );
diff --git a/src/services/study/sensitivity-analysis.ts b/src/services/study/sensitivity-analysis.ts
@@ -6,7 +6,7 @@
  */
 
 import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid, PREFIX_STUDY_QUERIES } from './index';
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
+import { backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import {
     CsvConfig,
@@ -25,7 +25,7 @@ export function startSensitivityAnalysis(
     studyUuid: UUID,
     currentNodeUuid: UUID,
     currentRootNetworkUuid: UUID
-): Promise<void> {
+): Promise<Response> {
     console.info(
         `Running sensi on ${studyUuid} for root network ${currentRootNetworkUuid} and node ${currentNodeUuid} ...`
     );
diff --git a/src/services/study/short-circuit-analysis.ts b/src/services/study/short-circuit-analysis.ts
@@ -10,11 +10,10 @@ import {
     getShortCircuitAnalysisTypeFromEnum,
     ShortCircuitAnalysisType,
 } from '../../components/results/shortcircuit/shortcircuit-analysis-result.type';
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
+import { GsLang, backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { FilterConfig, SortConfig } from '../../types/custom-aggrid-types';
 import { GlobalFilters } from '../../components/results/common/global-filter/global-filter-types';
-import { GsLang } from '@gridsuite/commons-ui';
 
 interface ShortCircuitAnalysisResult {
     studyUuid: UUID | null;
@@ -39,7 +38,7 @@ export function startShortCircuitAnalysis(
     currentRootNetworkUuid: UUID | null,
     busId: string,
     debug?: boolean
-): Promise<void> {
+): Promise<Response> {
     console.info(
         `Running short circuit analysis on '${studyUuid}' on root network '${currentRootNetworkUuid}' and node '${currentNodeUuid}' ...`
     );
diff --git a/src/services/study/spreadsheet.ts b/src/services/study/spreadsheet.ts
@@ -6,7 +6,7 @@
  */
 
 import type { UUID } from 'node:crypto';
-import { backendFetchJson, backendFetch } from '../utils';
+import { backendFetchJson, backendFetch } from '@gridsuite/commons-ui';
 import { getStudyUrl } from './index';
 import type { SpreadsheetOptionalLoadingParameters } from '../../components/spreadsheet-view/types/spreadsheet.type';
 
@@ -17,7 +17,7 @@ export function fetchSpreadsheetParameters(studyUuid: UUID): Promise<Spreadsheet
 export function updateSpreadsheetParameters(
     studyUuid: UUID,
     parameters: SpreadsheetOptionalLoadingParameters
-): Promise<void> {
+): Promise<Response> {
     return backendFetch(`${getStudyUrl(studyUuid)}/spreadsheet/parameters`, {
         method: 'PUT',
         body: JSON.stringify(parameters),
diff --git a/src/services/study/state-estimation.ts b/src/services/study/state-estimation.ts
@@ -6,15 +6,15 @@
  */
 
 import { getStudyUrl, getStudyUrlWithNodeUuidAndRootNetworkUuid } from './index';
-import { backendFetch, backendFetchJson, backendFetchText } from '../utils';
+import { backendFetch, backendFetchJson, backendFetchText } from '@gridsuite/commons-ui';
 import type { UUID } from 'node:crypto';
 import { StateEstimationParameters } from '../../components/dialogs/parameters/state-estimation/state-estimation-parameters-utils';
 
 export function startStateEstimation(
     studyUuid: UUID,
     currentNodeUuid: UUID,
     currentRootNetworkUuid: UUID
-): Promise<void> {
+): Promise<Response> {
     console.info(
         `Running state estimation on ${studyUuid}  on root network '${currentRootNetworkUuid}' and node ${currentNodeUuid} ...`
     );
diff --git a/src/services/study/study-config.ts b/src/services/study/study-config.ts
@@ -6,9 +6,8 @@
  */
 
 import { getStudyUrl } from './index';
-import { backendFetch, backendFetchJson } from '../utils';
 import type { UUID } from 'node:crypto';
-import { NetworkVisualizationParameters } from '@gridsuite/commons-ui';
+import { backendFetch, backendFetchJson, NetworkVisualizationParameters } from '@gridsuite/commons-ui';
 import {
     ColumnStateDto,
     SpreadsheetCollectionDto,
diff --git a/src/services/study/study.ts b/src/services/study/study.ts
diff --git a/src/services/study/tree-subtree.ts b/src/services/study/tree-subtree.ts
diff --git a/src/services/study/voltage-init.ts b/src/services/study/voltage-init.ts
diff --git a/src/services/utils.ts b/src/services/utils.ts
diff --git a/src/services/voltage-init.ts b/src/services/voltage-init.ts
