Skip to content
Snippets Groups Projects
Commit a4a03ec5 authored by Antoine Detailleur's avatar Antoine Detailleur
Browse files

Merged development into NRRPLT-8136

parents d4b7dc6d 51788375
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 99 additions and 49 deletions
.gitignore
+ 1
− 1
View file @ a4a03ec5
package-lock.json
+ 30
− 21
View file @ a4a03ec5
......@@ -1896,9 +1896,9 @@
}
},
"@popperjs/core": {
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.6.0.tgz",
"integrity": "sha512-cPqjjzuFWNK3BSKLm0abspP0sp/IGOli4p5I5fKFAzdS8fvjdOwDCfZqAaIiXd9lPkOWi3SUUfZof3hEb7J/uw=="
"version": "2.9.2",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz",
"integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q=="
},
"@restart/context": {
"version": "2.1.4",
......@@ -2334,9 +2334,12 @@
}
},
"@types/classnames": {
"version": "2.2.11",
"resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.11.tgz",
"integrity": "sha512-2koNhpWm3DgWRp5tpkiJ8JGc1xTn2q0l+jUNUE7oMKXUf5NpI9AIdC4kbjGNFBdHtcxBD18LAksoudAVhFKCjw=="
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.3.1.tgz",
"integrity": "sha512-zeOWb0JGBoVmlQoznvqXbE0tEC/HONsnoUNH19Hc96NFsTAwTXbTqb8FMYkru1F/iqp7a18Ws3nWJvtA1sHD1A==",
"requires": {
"classnames": "*"
}
},
"@types/cookie": {
"version": "0.4.0",
......@@ -2462,18 +2465,19 @@
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="
},
"@types/react": {
"version": "16.14.3",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.3.tgz",
"integrity": "sha512-zPrXn03hmPYqh9DznqSFQsoRtrQ4aHgnZDO+hMGvsE/PORvDTdJCHQ6XvJV31ic+0LzF73huPFXUb++W6Kri0Q==",
"version": "16.14.5",
"resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.5.tgz",
"integrity": "sha512-YRRv9DNZhaVTVRh9Wmmit7Y0UFhEVqXqCSw3uazRWMxa2x85hWQZ5BN24i7GXZbaclaLXEcodEeIHsjBA8eAMw==",
"requires": {
"@types/prop-types": "*",
"@types/scheduler": "*",
"csstype": "^3.0.2"
}
},
"@types/react-transition-group": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz",
"integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==",
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.1.tgz",
"integrity": "sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ==",
"requires": {
"@types/react": "*"
}
......@@ -2486,6 +2490,11 @@
"@types/node": "*"
}
},
"@types/scheduler": {
"version": "0.16.1",
"resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.1.tgz",
"integrity": "sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA=="
},
"@types/source-list-map": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
......@@ -4258,9 +4267,9 @@
}
},
"classnames": {
"version": "2.2.6",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
"integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
"integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
},
"clean-css": {
"version": "4.2.3",
......@@ -5055,9 +5064,9 @@
}
},
"csstype": {
"version": "3.0.6",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.6.tgz",
"integrity": "sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw=="
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz",
"integrity": "sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="
},
"cyclist": {
"version": "1.0.1",
......@@ -10496,9 +10505,9 @@
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
},
"lodash-es": {
"version": "4.17.20",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.20.tgz",
"integrity": "sha512-JD1COMZsq8maT6mnuz1UMV0jvYD0E0aUsSOdrr1/nAG3dhqQXwRRgeW0cSqH1U43INKcqxaiVIQNOUDld7gRDA=="
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
},
"lodash._reinterpolate": {
"version": "3.0.0",
......
public/index.html
+ 1
− 0
View file @ a4a03ec5
......@@ -3,6 +3,7 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
......
src/components/experiment-list/import-experiment-buttons.css
+ 3
− 3
View file @ a4a03ec5
......@@ -12,7 +12,7 @@
z-index: 10001;
}
#import-buttons {
vertical-align: middle;
margin: auto 0;
.import-button {
cursor: pointer;
height: 50%;
}
\ No newline at end of file
src/components/experiment-list/import-experiment-buttons.js
+ 18
− 17
View file @ a4a03ec5
import React from 'react';
import { FaFolder, FaFileArchive, FaAudible } from 'react-icons/fa';
import { ButtonGroup, Button } from 'react-bootstrap';
import ImportExperimentService from '../../services/experiments/files/import-experiment-service.js';
import ExperimentStorageService from '../../services/experiments/files/experiment-storage-service.js';
......@@ -94,14 +93,14 @@ export default class ImportExperimentButtons extends React.Component {
{/* Import folder pop-up */}
{this.state.importFolderResponse
? <div className="import-popup">
<div variant="success">
<div className="alert alert-success" role="alert">
<p>The experiment folder
<b>{' ' + this.state.importFolderResponse.zipBaseFolderName}</b> has been succesfully imported as
<b>{' ' + this.state.importFolderResponse.destFolderName}</b>.
</p>
</div>
<div className="text-right">
<Button variant="success" onClick={() => this.importFolderPopupClick()}>Got it!</Button>
<button className="btn btn-success" onClick={() => this.importFolderPopupClick()}>Got it!</button>
</div>
</div>
: null
......@@ -110,7 +109,7 @@ export default class ImportExperimentButtons extends React.Component {
{/* Import zip pop-up */}
{this.state.importZipResponses
? <div className="import-popup">
<div>
<div className="alert alert-success" role="alert">
<p>{this.state.importZipResponses.numberOfZips} successfully imported zip files.</p>
</div>
<p>The following experiments folders</p>
......@@ -118,7 +117,7 @@ export default class ImportExperimentButtons extends React.Component {
<p>have been successfully imported as:</p>
<p><b>{this.state.importZipResponses.destFolderName.join(', ')}.</b></p>
<div className="text-right">
<Button variant="success" onClick={() => this.importZipPopupClick()}>Got it!</Button>
<button className="btn btn-success" onClick={() => this.importZipPopupClick()}>Got it!</button>
</div>
</div>
: null
......@@ -127,7 +126,7 @@ export default class ImportExperimentButtons extends React.Component {
{/* Scan pop-up */}
{this.state.scanStorageResponse
? <div className="import-popup">
<div>
<div className="alert alert-success" role="alert">
<p>{this.state.scanStorageResponse.addedFoldersNumber} added folders,
{' ' + this.state.scanStorageResponse.deletedFoldersNumber} deleted folders.</p>
</div>
......@@ -141,7 +140,7 @@ export default class ImportExperimentButtons extends React.Component {
? this.state.scanStorageResponse.deletedFolders
: 'none' }</b></p>
<div className="text-right">
<Button variant="success" onClick={() => this.scanStoragePopupClick()}>Got it!</Button>
<button className="btn btn-success" onClick={() => this.scanStoragePopupClick()}>Got it!</button>
</div>
</div>
: null
......@@ -156,17 +155,19 @@ export default class ImportExperimentButtons extends React.Component {
multiple accept='.zip'
onChange={(event) => this.importZippedExperimentChange(event)}/>
{!this.state.isImporting
? <ButtonGroup role="group">
<Button variant="outline-dark">
<label htmlFor="folder"><FaFolder/> Import folder</label>
</Button>
<Button variant="outline-dark">
<label htmlFor="zip"><FaFileArchive/> Import zip</label>
</Button >
<Button variant="outline-dark" onClick={() => this.scanStorageClick()}>
? <div className="btn-group" role="group">
<button type="button" className="btn btn-outline-dark">
<label htmlFor="folder" className="import-button">
<FaFolder/> Import folder
</label>
</button>
<button type="button" className="btn btn-outline-dark">
<label htmlFor="zip" className="import-button"><FaFileArchive/> Import zip</label>
</button >
<button type="button" className="btn btn-outline-dark" onClick={() => this.scanStorageClick()}>
<FaAudible/> Scan Storage
</Button>
</ButtonGroup>
</button>
</div>
: null}
</div>
</div>
......
src/components/user-menu/user-menu.js
+ 2
− 1
View file @ a4a03ec5
......@@ -60,6 +60,7 @@ export default class UserMenu extends React.Component {
</Dropdown.Item>
</Dropdown.Menu>
</Dropdown>
</div>
);
}
......
src/index.js
+ 0
− 1
View file @ a4a03ec5
import React from 'react';
import ReactDOM from 'react-dom';
import './index.css';
import 'bootstrap/dist/css/bootstrap.min.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
......
src/mocks/handlers.js
+ 10
− 1
View file @ a4a03ec5
......@@ -9,6 +9,7 @@ import MockServerConfig from './mock_server-config.json';
import MockUsers from './mock_users.json';
import MockSimulations from './mock_simulations.json';
import MockUserGroups from './mock_user-groups.json';
import MockGDPR from './mock_gdpr.json';
import ImageAI from '../assets/images/Artificial_Intelligence_2.jpg';
......@@ -48,7 +49,15 @@ export const handlers = [
rest.get(`${config.api.proxy.url}${endpoints.proxy.identity.me.groups.url}`, (req, res, ctx) => {
return res(ctx.json(MockUserGroups));
}),
rest.get(`${config.api.proxy.url}${endpoints.proxy.identity.url}${endpoints.proxy.identity.gdpr.url}`,
(req, res, ctx) => {
return res(ctx.json(MockGDPR));
}),
rest.get(`${config.api.proxy.url}${endpoints.proxy.identity.url}/:userID`, (req, res, ctx) => {
return res(ctx.json(MockUsers[1]));
}),
rest.post(`${config.api.proxy.url}${endpoints.proxy.identity.url}${endpoints.proxy.identity.gdpr.url}`,
(req, res, ctx) => {
return res(ctx.json({'status':'success'}));
})
];
\ No newline at end of file
src/mocks/mock_gdpr.json 0 → 100644
+ 3
− 0
View file @ a4a03ec5
{
"gdpr": false
}
\ No newline at end of file
src/services/proxy/__tests__/nrp-user-service.test.js
+ 8
− 0
View file @ a4a03ec5
......@@ -72,3 +72,11 @@ test('can determine group membership for administrators', async () => {
test('can retrieve cluster reservations', async () => {
expect(await NrpUserService.instance.getReservation()).toBe(undefined);
});
test('can retrieve false gdpr status', async () => {
expect(await NrpUserService.instance.getGdpr()).toEqual({'gdpr': false});
});
test('can set gdpr status', async () => {
expect(await NrpUserService.instance.setGdpr()).toEqual({'status':'success'});
});
\ No newline at end of file
src/services/proxy/data/endpoints.json
+ 6
− 3
View file @ a4a03ec5
......@@ -16,6 +16,9 @@
"groups": {
"url": "/identity/me/groups"
}
},
"gdpr": {
"url": "/gdpr"
}
},
"server": {
......
src/services/proxy/nrp-user-service.js
+ 17
− 1
View file @ a4a03ec5
......@@ -14,7 +14,7 @@ const PROXY_URL = config.api.proxy.url;
const IDENTITY_BASE_URL = `${PROXY_URL}${endpoints.proxy.identity.url}`;
const IDENTITY_ME_URL = `${PROXY_URL}${endpoints.proxy.identity.me.url}`;
const IDENTITY_ME_GROUPS_URL = `${PROXY_URL}${endpoints.proxy.identity.me.groups.url}`;
const GDPR_URL = `${IDENTITY_BASE_URL}${endpoints.proxy.identity.gdpr.url}`;
/**
* Service managing all data related to NRP users.
*/
......@@ -112,6 +112,22 @@ class NrpUserService extends HttpService {
getReservation() {
return window.sessionStorage.getItem('clusterReservation');
}
/**
* Get the GDPR status for current user.
* @returns {promise} Contains the GDPR status for the current user
*/
async getGdpr() {
return await (await this.httpRequestGET(GDPR_URL)).json();
}
/**
* Set the accepted GDPR status for current user.
* @returns {promise} Response for the current user
*/
async setGdpr() {
return await (await this.httpRequestPOST(GDPR_URL)).json();
}
}
export default NrpUserService;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment