Merge pull request #49 from KPMP/develop

merge for dlu release 3.0

.gitignore

@@ -1,5 +1,4 @@
 *.idea
-package-lock.json
 .DS_Store
 build
 build/*

package.json

@@ -3,16 +3,16 @@
   "version": "1.3.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
-    "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/react-fontawesome": "^0.1.16",
-    "axios": "^0.24.0",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
+    "@fortawesome/react-fontawesome": "0.1.16",
+    "axios": "0.24.0",
     "babel-eslint": "10.1.0",
     "babel-polyfill": "6.26.0",
     "bootstrap-css-only": "4.4.1",
     "history": "5.1.0",
-    "moment": "2.29.1",
-    "node-sass-chokidar": "1.5.0",
+    "moment": "2.29.4",
+    "node-sass-chokidar": "2.0.0",
     "npm-run-all": "4.1.5",
     "prop-types": "15.7.2",
     "react": "16.9.0",
@@ -21,15 +21,15 @@
     "react-ga": "2.6.0",
     "react-redux": "7.2.6",
     "react-router-dom": "5.0.1",
-    "react-scripts": "4.0.3",
+    "react-scripts": "5.0.1",
     "react-table": "6.10.3",
     "reactstrap": "8.0.1",
     "redux": "4.1.2",
     "redux-thunk": "2.4.0"
   },
   "devDependencies": {
     "acorn": "^8.6.0",
-    "node-sass-chokidar": "^1.5.0",
+    "node-sass-chokidar": "2.0.0",
     "npm-run-all": "4.1.5"
   },
   "scripts": {

src/common-values.scss

@@ -3,4 +3,5 @@ $kpmp-blue: rgba(40, 60, 94, 1);
 $footer-color: #283C5E;
 $header-height-padded: 59px;
 $footer-height-padded: 32px;
-$kpmp-gray: #FAFBFC;
+$kpmp-gray: #FAFBFC;
+$kpmp-button: #1c7cd5;

src/components/Nav/NavBar.js

@@ -9,7 +9,7 @@ class NavBar extends Component {
         <Col xs={6}>
           <Link to="/" className="navbar-header">
             <NavbarBrand tag="span" className="d-flex align-items-center">
-              <img src="img/logo.png" alt="Data Manager" className="logo" />
+              <img src="/img/logo.png" alt="Data Manager" className="logo" />
               <span id="title-text" className="ml-2 text-dark">Data Manager</span>
             </NavbarBrand>
           </Link>

src/components/Validation/FilenameValidationPage.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Container, Row, Col, Button } from 'reactstrap';
+import { Container, Row, Col, Button, Alert } from 'reactstrap';
 import ValidationResult from './ValidationResult';
 
 class FilenameValidationPage extends Component {
@@ -31,7 +31,7 @@ class FilenameValidationPage extends Component {
 	render() {
 		const { packageId, filenames } = this.state;
 		const isEnabled = packageId.length > 0 && filenames.length > 0;
-		if (Object.keys(this.props.validationResult).length !== 0 && this.props.validationResult.constructor === Object) {
+		if (Object.keys(this.props.validationResult).length !== 0 && this.props.validationResult.constructor === Object && this.props.validationResult.directoryExists) {
 			let filesNotInGlobus = this.props.validationResult.metadataFilesNotFoundInGlobus;
 			let filesNotInMetadata = this.props.validationResult.globusFilesNotFoundInMetadata;
 			let isSuccess = !filesNotInGlobus && !filesNotInMetadata;
@@ -47,6 +47,13 @@ class FilenameValidationPage extends Component {
 		} else {
 			return (
 				<Container>
+					{Object.keys(this.props.validationResult).length !== 0 && this.props.validationResult.constructor === Object && !this.props.validationResult.directoryExists &&
+
+						<Alert color="danger">
+							The package directory doesn't exist in Globus!
+						</Alert>
+
+					}
 					<form onSubmit={this.handleSubmit}>
 						<Row className='mt-3'>
 							<Col sm={3}>