From 33da46167903af7fb2bc5edb3ee8818a7e7da8c1 Mon Sep 17 00:00:00 2001
From: Fanna Lautenbach <lautenbach@astron.nl>
Date: Mon, 12 Jun 2023 09:31:04 +0000
Subject: [PATCH] Upgrade axios
---
SAS/TMSS/frontend/tmss_webapp/package.json | 16 ++++++++++++++--
.../tmss_webapp/src/authenticate/auth.js | 2 +-
.../tmss_webapp/src/services/auth.service.js | 2 +-
.../tmss_webapp/src/services/cycle.service.js | 2 +-
.../src/services/data.product.service.js | 2 +-
.../tmss_webapp/src/services/project.service.js | 2 +-
.../src/services/reservation.service.js | 2 +-
.../src/services/system.event.service.js | 2 +-
.../tmss_webapp/src/services/task.service.js | 3 +--
.../tmss_webapp/src/services/util.service.js | 2 +-
.../tmss_webapp/src/services/workflow.service.js | 2 +-
11 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/SAS/TMSS/frontend/tmss_webapp/package.json b/SAS/TMSS/frontend/tmss_webapp/package.json
index 6872d3d059e..7fbe88927c0 100644
--- a/SAS/TMSS/frontend/tmss_webapp/package.json
+++ b/SAS/TMSS/frontend/tmss_webapp/package.json
@@ -13,7 +13,8 @@
"@testing-library/user-event": "^7.1.2",
"ag-grid-community": "^24.1.0",
"ag-grid-react": "^24.1.1",
- "axios": "^0.21.4",
+ "axios": "^1.4.0",
+ "use-axios": "^1.0.0",
"bootstrap": "^4.5.0",
"chart.js": "^3.2.1",
"cleave.js": "^1.6.0",
@@ -108,7 +109,9 @@
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
"babel-polyfill": "^6.26.0",
"customize-cra": "^0.9.1",
- "react-app-rewired": "^1.6.2"
+ "react-app-rewired": "^1.6.2",
+ "@babel/preset-env": "^7.22.4",
+ "babel-jest": "^29.5.0"
},
"resolutions": {
"immer": "^9.0.12",
@@ -122,6 +125,15 @@
"nth-check": "^2.0.1",
"scss-tokenizer": "0.4.3"
},
+ "jest": {
+ "transform": {
+ "^.+\\.[t|j]sx?$": "babel-jest"
+ },
+ "transformIgnorePatterns": ["node_modules/(?!axios)/"]
+ },
+ "babel": {
+ "presets": ["@babel/preset-env"]
+ },
"description": "This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).",
"main": "index.js",
"author": "",
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.js b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.js
index 69e8224ac3d..e1a1116a410 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/authenticate/auth.js
@@ -1,7 +1,7 @@
import AuthService from "../services/auth.service";
import AuthStore from "./auth.store";
import PermissionStackUtil from './permission.stack.handler';
-const axios = require('axios');
+import axios from "axios"
/**
* Global functions to authenticate user and get user details from browser local storage.
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/auth.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/auth.service.js
index aca25070951..b38f37c54b9 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/auth.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/auth.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const AuthService = {
authenticate: async(user, pass) => {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
index 82f5a480f1a..5977d508938 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/cycle.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const CycleService = {
getAllCycles: async function () {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/data.product.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/data.product.service.js
index 63b114b0e34..5122185eca2 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/data.product.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/data.product.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const DataProductService = {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
index 27ed059cba9..c4bbaf1811b 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/project.service.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import UnitConverter from './../utils/unit.converter'
-const axios = require('axios');
+import axios from "axios"
const ProjectService = {
getProjectCategories: async function() {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
index a0115217fc6..6bb99ea7443 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/reservation.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const ReservationService = {
getReservationTemplates: async function () {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/system.event.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/system.event.service.js
index fd4fff4f714..16c466591fb 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/system.event.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/system.event.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const SystemEventService = {
getSEAffectedHardwareTemplates: async function () {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
index ef1ae9e05b4..0bb67c3e5af 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/task.service.js
@@ -1,7 +1,6 @@
+import axios from "axios"
import {parseTemplatesToCorrectJSONFormat} from "./service.helper";
-const axios = require('axios');
-
const TaskService = {
getTaskDetails: async function (taskType, taskId, fetchSubtask) {
try {
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
index b71091deeca..82378d337a1 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/util.service.js
@@ -2,7 +2,7 @@ import $RefParser from 'json-schema-ref-parser';
import _ from 'lodash';
import Auth from '../authenticate/auth';
-const axios = require('axios');
+import axios from "axios"
const refParser = new $RefParser();
const fs = require('fs');
const path = require('path');
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js b/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
index 3e9b0c50a01..294cfc79690 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/services/workflow.service.js
@@ -1,4 +1,4 @@
-const axios = require('axios');
+import axios from "axios"
const WorkflowService = {
getWorkflowProcesses: async function (){
--
GitLab