Skip to content

Commit e718bab

Browse files
salimkanounsalimkanoun
authored
Merge pull request #802 from salimkanoun/Salim
Salim
2 parents babf93c + db0e01d commit e718bab

File tree

17 files changed

+270
-146
lines changed

17 files changed

+270
-146
lines changed

‎BackEnd/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"sequelize-cli": "^6.6.0",
5151
"ssh2-sftp-client": "^6.0.1",
5252
"tmp-promise": "^3.0.3",
53-
"uuid": "^8.3.2",
53+
"uuid": "^9.0.0",
5454
"webdav": "^4.6.0"
5555
},
5656
"engines": {

‎BackEnd/yarn.lock

+7
Original file line numberDiff line numberDiff line change
@@ -5298,6 +5298,7 @@ string-length@^4.0.1:
52985298
strip-ansi "^6.0.0"
52995299

53005300
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.2.3:
5301+
name string-width-cjs
53015302
version "4.2.3"
53025303
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
53035304
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5346,6 +5347,7 @@ string_decoder@~0.10.x:
53465347
integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
53475348

53485349
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
5350+
name strip-ansi-cjs
53495351
version "6.0.1"
53505352
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
53515353
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5750,6 +5752,11 @@ uuid@^8.3.0, uuid@^8.3.2:
57505752
resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
57515753
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
57525754

5755+
uuid@^9.0.0:
5756+
version "9.0.0"
5757+
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
5758+
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
5759+
57535760
v8-to-istanbul@^9.0.1:
57545761
version "9.1.0"
57555762
resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.1.0.tgz#1b83ed4e397f58c85c266a570fc2558b5feb9265"

‎FrontEnd/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"version": "0.7.0",
44
"private": true,
55
"dependencies": {
6-
"@emotion/react": "^11.10.6",
7-
"@emotion/styled": "^11.10.6",
6+
"@emotion/react": "^11.11.0",
7+
"@emotion/styled": "^11.11.0",
88
"@mui/icons-material": "^5.11.16",
9-
"@mui/lab": "^5.0.0-alpha.127",
10-
"@mui/material": "^5.12.1",
11-
"@tanstack/react-query": "^4.29.3",
12-
"@tanstack/react-query-devtools": "^4.29.3",
13-
"@tanstack/react-table": "^8.8.5",
14-
"axios": "^0.26.1",
9+
"@mui/lab": "^5.0.0-alpha.130",
10+
"@mui/material": "^5.13.1",
11+
"@tanstack/react-query": "^4.29.7",
12+
"@tanstack/react-query-devtools": "^4.29.7",
13+
"@tanstack/react-table": "^8.9.1",
14+
"axios": "^1.4.0",
1515
"bootstrap": "^5.2.3",
1616
"jwt-decode": "^3.1.2",
1717
"moment": "^2.29.4",
@@ -27,9 +27,9 @@
2727
"react-redux": "^8.0.5",
2828
"react-router-dom": "^5.2.0",
2929
"react-scripts": "^5.0.1",
30-
"react-select": "^5.7.2",
30+
"react-select": "^5.7.3",
3131
"react-spinners": "^0.13.8",
32-
"react-toastify": "^9.1.2",
32+
"react-toastify": "^9.1.3",
3333
"react-toggle": "^4.1.3",
3434
"redux": "^4.2.1",
3535
"redux-thunk": "^2.4.2"
@@ -59,6 +59,6 @@
5959
"@babel/plugin-transform-react-jsx-self": "^7.21.0",
6060
"@babel/plugin-transform-react-jsx-source": "^7.19.6",
6161
"http-proxy-middleware": "^2.0.6",
62-
"sass": "^1.62.0"
62+
"sass": "^1.62.1"
6363
}
6464
}

‎FrontEnd/src/components/CommonComponents/RessourcesDisplay/ReactTableV8/CommonTableV8.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ export default ({
2828
canExpand = false,
2929
paginated = false,
3030
selectedRowsIds = undefined,
31-
customRowProps = (row) => { },
31+
customRowProps = () => { },
3232
sortBy = [],
33-
renderSubComponent = (row) => { },
33+
renderSubComponent = () => { },
3434
onRowClick = () => { },
3535
rowStyle = () => { },
36-
onSelectRow = (state) => { },
37-
onCellEdit = (rowIndex, columnId, value) => { },
36+
onSelectRow = () => { },
37+
onCellEdit = () => { },
3838
}) => {
3939

4040
const [sorting, setSorting] = useState(sortBy);

‎FrontEnd/src/components/Content/ContentTableSeries.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState } from "react"
2-
import { Button, Modal } from "react-bootstrap";
2+
import { Modal } from "react-bootstrap";
33

44
import TableSeries from "../CommonComponents/RessourcesDisplay/ReactTableV8/TableSeries"
55
import Metadata from "../Metadata/Metadata";

‎FrontEnd/src/components/Main/AnonTool.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Button } from 'react-bootstrap'
55
import Overlay from 'react-bootstrap/Overlay'
66
import Popover from 'react-bootstrap/Popover'
77

8-
import { emptyAnonymizeList, removePatientFromAnonList, removeStudyFromAnonList } from '../../actions/AnonList'
8+
import { emptyAnonymizeList, removePatientFromAnonList } from '../../actions/AnonList'
99
import { studyArrayToPatientArray } from '../../tools/processResponse'
1010
import { patientColumns } from '../CommonComponents/RessourcesDisplay/ReactTableV8/ColomnFactories'
1111
import TablePatientWithNestedStudies from '../CommonComponents/RessourcesDisplay/ReactTableV8/TablePatientWithNestedStudies'

‎FrontEnd/src/components/Main/ExportTool.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useEffect, useState } from 'react'
1+
import React from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { Popover, Col, Row, Overlay, Button } from 'react-bootstrap'
44

‎FrontEnd/src/services/User.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ const user = {
2020
superAdmin: isSuperAdmin
2121
}
2222

23-
return axios.put('/api/users/' + username, payload).then((answer) => {
23+
return axios.put('/api/users/' + username, payload).then(() => {
2424
}).catch(async error => {
2525
throw error
2626
})
2727
},
2828

2929
deleteUser(username) {
30-
return axios.delete('/api/users/' + username).then((answer) => {
30+
return axios.delete('/api/users/' + username).then(() => {
3131
})
3232
},
3333

@@ -43,7 +43,7 @@ const user = {
4343
superAdmin: isSuperAdmin
4444
}
4545

46-
return axios.post('/api/users', payload).then((answer) => {
46+
return axios.post('/api/users', payload).then(() => {
4747
}).catch(error => {
4848
throw error
4949
})

‎FrontEnd/src/services/anon.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const anonymize = {
1515

1616
flush(){
1717

18-
return axios.delete('/api/tasks/type/anonymize/flush').then(answer => true
18+
return axios.delete('/api/tasks/type/anonymize/flush').then(() => true
1919
).catch(error => {
2020
throw error
2121
})

‎FrontEnd/src/services/cdBurner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const cdBurner = {
1212

1313
stopCdBurnerService() {
1414

15-
return axios.delete('/api/monitoring/burner/').then((answer) => true
15+
return axios.delete('/api/monitoring/burner/').then(() => true
1616
).catch((error) => { throw error })
1717

1818
},

‎FrontEnd/src/services/certificates.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const certificates = {
1313

1414
deleteCertificate(id) {
1515
return axios.delete('api/certificates/' + id)
16-
.then((answer) => true
16+
.then(() => true
1717
).catch((error) => {
1818
throw error
1919
})

‎FrontEnd/src/services/deleteRobot.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const deleteRobot = {
1313

1414
flush() {
1515

16-
return axios.delete('/api/tasks/type/delete/flush').then(answer => true
16+
return axios.delete('/api/tasks/type/delete/flush').then(() => true
1717
).catch(error => {
1818
throw error
1919
})

‎FrontEnd/src/services/endpoints.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const endpoints = {
1212

1313
deleteEndpoints(id) {
1414
return axios.delete('api/endpoints/', { id: id })
15-
.then((answer) => true
15+
.then(() => true
1616
).catch((error) => {
1717
throw error
1818
})
@@ -21,7 +21,7 @@ const endpoints = {
2121
createEndpoint(postData) {
2222

2323
return axios.post('api/endpoints/', postData)
24-
.then((answer) => true
24+
.then(() => true
2525
).catch((error) => {
2626
throw error
2727
})

‎FrontEnd/src/services/jobs.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const jobs = {
2121

2222
cancelJob(jobId) {
2323

24-
return axios.post('/api/jobs/' + jobId + '/cancel', {}).then((answer) => true )
24+
return axios.post('/api/jobs/' + jobId + '/cancel', {}).then(() => true )
2525
.catch(error => {
2626
throw error
2727
})
@@ -30,23 +30,23 @@ const jobs = {
3030

3131
pauseJob(jobId) {
3232

33-
return axios.post('/api/jobs/' + jobId + '/pause', {}).then((answer) => true )
33+
return axios.post('/api/jobs/' + jobId + '/pause', {}).then(() => true )
3434
.catch(error => {
3535
throw error
3636
})
3737
},
3838

3939
resumbitJob(jobId) {
4040

41-
return axios.post('/api/jobs/' + jobId + '/resubmit', {}).then((answer) => true )
41+
return axios.post('/api/jobs/' + jobId + '/resubmit', {}).then(() => true )
4242
.catch(error => {
4343
throw error
4444
})
4545
},
4646

4747
resumeJob(jobId) {
4848

49-
return axios.post('/api/jobs/' + jobId + '/resume', {}).then((answer) => true )
49+
return axios.post('/api/jobs/' + jobId + '/resume', {}).then(() => true )
5050
.catch(error => {
5151
throw error
5252
})

‎FrontEnd/src/services/label.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const label = {
2020
*/
2121
createLabels(name) {
2222

23-
return axios.post('/api/labels/' + name).then((answer) => true
23+
return axios.post('/api/labels/' + name).then(() => true
2424
)
2525
},
2626

@@ -32,7 +32,7 @@ const label = {
3232
*/
3333
modifyLabels(name, payload) {
3434

35-
return axios.put('/api/labels/' + name, payload).then((answer) => true
35+
return axios.put('/api/labels/' + name, payload).then(() => true
3636
)
3737
},
3838

@@ -43,7 +43,7 @@ const label = {
4343
*/
4444
deleteLabels(name) {
4545

46-
return axios.delete('/api/labels/' + name).then((answer) => true
46+
return axios.delete('/api/labels/' + name).then(() => true
4747
).catch(error => {
4848
throw error
4949
})

‎FrontEnd/src/services/options.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const options = {
44

55
setRobotScheduleHour(hour_start, min_start, hour_stop, min_stop) {
66

7-
return axios.put('/api/options', { hour_start, min_start, hour_stop, min_stop }).then((answer) =>
7+
return axios.put('/api/options', { hour_start, min_start, hour_stop, min_stop }).then(() =>
88
true
99
)
1010
},

0 commit comments

Comments
 (0)