Merge pull request #25 from KPMP/develop

DMD Release 1.2

.gitignore

@@ -6,3 +6,4 @@ build/*
 node_modules
 node_modules/*
 .project
+*.css

.travis.yml

@@ -14,5 +14,4 @@ notifications:
   email:
     - [email protected]
     - [email protected]
-    - [email protected]
     - [email protected]

README.md

@@ -1,4 +1,9 @@
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/812f2e5d255f453e8021519d2a4c7056)](https://www.codacy.com/manual/rlreamy/libra-web?utm_source=github.com&utm_medium=referral&utm_content=KPMP/libra-web&utm_campaign=Badge_Grade)
+[![Build Status](https://travis-ci.org/KPMP/libra-web.svg?branch=develop)](https://travis-ci.org/KPMP/libra-web)
+
 # libra-web
 The web-layer of the KPMP curation tools. 
 
-
+## Hosted at:
+dev-datamanager.kpmp.org
+datamanager.kpmp.org

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libra-web",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
     "axios": "0.19.0",
@@ -21,7 +21,7 @@
     "redux-thunk": "2.3.0"
   },
   "devDependencies": {
-    "node-sass-chokidar": "1.3.5",
+    "node-sass-chokidar": "^1.5.0",
     "npm-run-all": "4.1.5"
   },
   "scripts": {

src/App.js

@@ -13,67 +13,69 @@ import { Route, Switch, Router } from 'react-router-dom';
 import ErrorBoundaryContainer from './components/Error/ErrorBoundaryContainer';
 import Oops from './components/Error/Oops';
 import PackageDashboardPageContainer from './components/PackageDashboard/PackageDashboardPageContainer';
+import FilenameValidationPageContainer from './components/Validation/FilenameValidationPageContainer';
 import PermissionDenied from './components/Error/PermissionDenied';
 import NotRegistered from './components/Error/NotRegistered';
 
 const cacheStore = window.sessionStorage.getItem('redux-store');
 const initialState = cacheStore ? JSON.parse(cacheStore) : loadedState;
 const store = applyMiddleware(thunk)(createStore)(
-  rootReducer,
-  initialState,
-  window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
+	rootReducer,
+	initialState,
+	window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
 );
 const saveState = () => {
-  window.sessionStorage.setItem(
-    'redux-store',
-    JSON.stringify(store.getState())
-  );
+	window.sessionStorage.setItem(
+		'redux-store',
+		JSON.stringify(store.getState())
+	);
 };
 
 const GA_TRACKING_ID = 'UA-124331187-8';
 
 if(process.env.NODE_ENV === 'production') {
-  ReactGA.initialize(GA_TRACKING_ID);
+	ReactGA.initialize(GA_TRACKING_ID);
 }
 
 function logPageView(location, action) {
-  ReactGA.set({ page: location.pathname + location.search });
-  ReactGA.pageview(location.pathname + location.search);
+	ReactGA.set({ page: location.pathname + location.search });
+	ReactGA.pageview(location.pathname + location.search);
 }
 const history = createBrowserHistory();
 history.listen((location, action) => {
-  logPageView(location, action);
+	logPageView(location, action);
 });
 
 store.subscribe(function() {
-  console.log(store.getState());
+	console.log(store.getState());
 });
 
 store.subscribe(saveState);
 
 class App extends Component {
-  componentWillMount() {
-    logPageView(window.location, '');
-  }
+	componentWillMount() {
+		logPageView(window.location, '');
+	}
 
-  render() {
-    return (
-      <Provider store={store}>
-        <Router history={history}>
-          <ErrorBoundaryContainer>
-            <NavBar />
-            <Switch>
-            	<Route exact path="/" component={PackageDashboardPageContainer} store={store} />
-            	<Route exact path="/oops" component={Oops} />
-            	<Route exact path="/permissionDenied" component={PermissionDenied} />
-            	<Route exact path="/notRegistered" component={NotRegistered} />
-            </Switch>
-            <NavFooter />
-          </ErrorBoundaryContainer>
-        </Router>
-      </Provider>
-    );
-  }
+	render() {
+		return (
+			<Provider store={store}>
+				<Router history={history}>
+					<ErrorBoundaryContainer>
+					<NavBar />
+						<Switch>
+							<Route exact path='/' component={PackageDashboardPageContainer} store={store} />
+							<Route exact path='/filenameValidation' component={FilenameValidationPageContainer} store={store}/>
+							<Route exact path='/oops' component={Oops} />
+							<Route exact path='/permissionDenied' component={PermissionDenied} />
+							<Route exact path='/notRegistered' component={NotRegistered} />
+						</Switch>
+					<NavFooter />
+					</ErrorBoundaryContainer>
+				</Router>
+			</Provider>
+		);
+	}
 }
 
 export default App;

src/actions/Packages/packageActions.js

@@ -16,6 +16,18 @@ export const getPackages = () => {
     };
 }
 
+export const movePackageFiles = (packageId) => {
+    return (dispatch) => {
+        api.post('/api/v1/packages/' + packageId + '/files/move')
+            .then(res => {
+                alert(res.data);
+            })
+            .catch(err => {
+                alert("There was a problem moving the files.");
+            });
+    }
+}
+
 export const setPackages = (packages) => {
     return {
         type: actionNames.SET_PACKAGES,

src/actions/Validation/validationActions.js

@@ -0,0 +1,30 @@
+import actionNames from '../actionNames';
+import Api from '../../helpers/Api';
+import { sendMessageToBackend } from '../Error/errorActions';
+
+const api = Api.getInstance();
+
+export const setValidationResult = (result) => {
+	return {
+		type: actionNames.SET_VALIDATION_RESULT,
+		payload: result
+	};
+}
+
+export const validateFilenames = (formData) => {
+	return (dispatch) => {
+		api.post('/api//v1/package/files/validation', formData)
+			.then((res) => {
+				dispatch(setValidationResult(res.data));
+			})
+			.catch((error) => {
+				dispatch(sendMessageToBackend(error));
+			});
+	}
+}
+
+export const clearValidationResult = () => {
+	return {
+		type: actionNames.CLEAR_VALIDATION_RESULT
+	};
+}

src/actions/Validation/validationActions.test.js

@@ -0,0 +1,26 @@
+import actionNames from '../actionNames';
+import { setValidationResult, clearValidationResult } from './validationActions';
+
+describe('setValidationResult', () => {
+	it('should return the result in the correct structure', () => {
+		let expectedResult = {
+			type: actionNames.SET_VALIDATION_RESULT,
+			payload: { 'key': 'value' }
+		};
+
+		let result = setValidationResult({ 'key': 'value' });
+
+		expect(result).toEqual(expectedResult);
+	});
+});
+describe('clearValidationResult', () => {
+	it('should return the result in the correct structure', () => {
+		let expectedResult = {
+			type: actionNames.CLEAR_VALIDATION_RESULT
+		};
+
+		let result = clearValidationResult();
+
+		expect(result).toEqual(expectedResult);
+	});
+});

src/actions/actionNames.js

@@ -1,7 +1,9 @@
 const actionNames = {
-  RESET_STATE: 'RESET_STATE',
-  SET_PACKAGES: 'SET_PACKAGES',
-  GET_PACKAGES: 'GET_PACKAGES'
+	CLEAR_VALIDATION_RESULT: 'CLEAR_VALIDATION_RESULT',
+	GET_PACKAGES: 'GET_PACKAGES',
+	RESET_STATE: 'RESET_STATE',
+	SET_PACKAGES: 'SET_PACKAGES',
+	SET_VALIDATION_RESULT: 'SET_VALIDATION_RESULT'
 };
 
 export default actionNames;

src/components/PackageDashboard/PackageDashboardPage.js

@@ -1,24 +1,34 @@
 import React, { Component } from 'react';
-import { Container, Row, Col } from 'reactstrap';
+import { Container, Row, Col, Button } from 'reactstrap';
+import { Link } from 'react-router-dom';
 import PackageTable from './PackageTable';
 
 class PackageDashboardPage extends Component {
 
-    componentDidMount() {
-        this.props.getPackages();
-    }
+	componentDidMount() {
+		this.props.getPackages();
+	}
 
-    render() {
-        return <Container id="package-dashboard-page">
-            <Row>
-                <Col sm={12}>
-                    <PackageTable
-                        packages={this.props.packages}
-                    />
-                </Col>
-            </Row>
-        </Container>;
-    }
+	render() {
+		return ( 
+			<Container id='package-dashboard-page'>
+				<Row className='mt-3'>
+					<Col sm={12}>
+						<Link className='float-right' to='/filenameValidation'>
+							<Button color="primary">Validate Filenames</Button>
+						</Link>
+					</Col>
+				</Row>
+				<Row className='mt-3'>
+					<Col sm={12}>
+					<PackageTable
+					packages={this.props.packages} movePackageFiles={this.props.movePackageFiles}
+					/>
+					</Col>
+				</Row>
+			</Container>
+		);
+	}
 }
 
 export default PackageDashboardPage;

src/components/PackageDashboard/PackageDashboardPageContainer.js

@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { getPackages } from "../../actions/Packages/packageActions";
+import { getPackages, movePackageFiles } from "../../actions/Packages/packageActions";
 import PackageDashboardPage from './PackageDashboardPage';
 
 const mapStateToProps = (state, props) => ({
@@ -9,6 +9,9 @@ const mapStateToProps = (state, props) => ({
 const mapDispatchToProps = (dispatch, props) => ({
     getPackages() {
         dispatch(getPackages());
+    },
+    movePackageFiles(packageId) {
+        dispatch(movePackageFiles(packageId));
     }
 });