Merge branch 'develop' into new-ic-data-model

2025-03-09 00:00:01 +01:00 · 2020-10-30 15:42:41 +01:00 · 2020-10-30 15:42:41 +01:00 · 7404ce491e
commit 7404ce491e
parent 0deec45383 95680ca5b7
6 changed files with 6781 additions and 3344 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -3,19 +3,19 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.30",
-    "@fortawesome/free-solid-svg-icons": "^5.14.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.32",
+    "@fortawesome/free-solid-svg-icons": "^5.15.1",
    "@fortawesome/react-fontawesome": "^0.1.11",
    "babel-runtime": "^6.26.0",
-    "bootstrap": "^4.5.2",
+    "bootstrap": "^4.5.3",
    "classnames": "^2.2.6",
-    "d3-array": "^2.6.0",
-    "d3-axis": "^1.0.12",
-    "d3-scale": "^3.2.2",
-    "d3-scale-chromatic": "^1.5.0",
-    "d3-selection": "^1.4.2",
-    "d3-shape": "^1.3.7",
-    "d3-time-format": "^2.3.0",
+    "d3-array": "^2.8.0",
+    "d3-axis": "^2.0.0",
+    "d3-scale": "^3.2.3",
+    "d3-scale-chromatic": "^2.0.0",
+    "d3-selection": "^2.0.0",
+    "d3-shape": "^2.0.0",
+    "d3-time-format": "^3.0.0",
    "es6-promise": "^4.2.8",
    "file-saver": "^2.0.2",
    "flux": "^3.1.3",
@ -25,14 +25,14 @@
    "jszip": "^3.5.0",
    "libcimsvg": "git+https://git.rwth-aachen.de/acs/public/cim/pintura-npm-package.git",
    "lodash": "^4.17.20",
-    "moment": "^2.27.0",
-    "multiselect-react-dropdown": "^1.5.7",
+    "moment": "^2.29.1",
+    "multiselect-react-dropdown": "^1.6.1",
    "node-sass": "^4.14.1",
    "popper.js": "^1.16.1",
    "prop-types": "^15.7.2",
-    "rc-slider": "^9.3.1",
-    "react": "^16.13.1",
-    "react-bootstrap": "^1.3.0",
+    "rc-slider": "^9.5.4",
+    "react": "^16.14.0",
+    "react-bootstrap": "^1.4.0",
    "react-bootstrap-time-picker": "^2.0.1",
    "react-collapse": "^5.0.1",
    "react-color": "^2.18.1",
@ -40,20 +40,20 @@
    "react-d3": "^0.4.0",
    "react-dnd": "^10.0.2",
    "react-dnd-html5-backend": "^10.0.2",
-    "react-dom": "^16.13.1",
+    "react-dom": "^16.14.0",
    "react-fullscreenable": "^2.5.1-0",
-    "react-grid-system": "^6.4.2",
+    "react-grid-system": "^7.1.1",
    "react-json-view": "^1.19.1",
-    "react-notification-system": "^0.3.0",
-    "react-rnd": "^10.2.2",
+    "react-notification-system": "^0.4.0",
+    "react-rnd": "^10.2.3",
    "react-router": "^5.2.0",
    "react-router-dom": "^5.2.0",
-    "react-scripts": "^3.4.3",
-    "react-svg-pan-zoom": "^3.8.0",
-    "sass": "^1.26.10",
-    "superagent": "^5.3.1",
-    "typescript": "^3.9.7",
-    "validator": "^12.2.0"
+    "react-scripts": "^4.0.0",
+    "react-svg-pan-zoom": "^3.8.1",
+    "sass": "^1.27.0",
+    "superagent": "^6.1.0",
+    "typescript": "^4.0.3",
+    "validator": "^13.1.17"
  },
  "devDependencies": {
    "chai": "^4.2.0"
--- a/src/app.js
+++ b/src/app.js
@ -92,7 +92,7 @@ class App extends React.Component {
          {/*
          <Col style={{ width: this.state.showSidebarMenu ? '280px' : '0px' }} smHidden mdHidden lgHidden className="sidenav">
          */}
-          <Hidden sm md lg xl>
+          <Hidden sm md lg xl xxl>
            <Col style={{ width: this.state.showSidebarMenu ? '280px' : '0px' }} className="sidenav">
                <HeaderMenu onClose={this.hideSidebarMenu} currentRole={currentUser.role} />
            </Col>
--- a/src/common/home.js
+++ b/src/common/home.js
@ -58,7 +58,7 @@ class Home extends React.Component {

    return (
      <div className="home-container">
-        <img style={{height: 120, float: 'right'}} src={require('../img/villas_web.svg')} alt="Logo VILLASweb" />
+        <img style={{height: 120, float: 'right'}} src={require('../img/villas_web.svg').default} alt="Logo VILLASweb" />
        <h1>Home</h1>
        <p>
          Welcome to <b>{config.instance}</b> hosted by  <a href={"mailto:" + config.admin.mail}>{config.admin.name}</a>!<br />
@ -73,7 +73,7 @@ class Home extends React.Component {


        <h3>Data Model</h3>
-        <img height={400} src={require('../img/datamodel.png')} alt="Datamodel VILLASweb" />
+        <img height={400} src={require('../img/datamodel.png').default} alt="Datamodel VILLASweb" />

        <h3>Terminology </h3>

@ -124,13 +124,13 @@ class Home extends React.Component {
          <li><a href="http://www.re-serve.eu">RESERVE</a> a European Union’s Horizon 2020 research and innovation programme under grant agreement No 727481</li>
          <li><a href="http://www.jara.org/en/research/energy">JARA-ENERGY</a>. Jülich-Aachen Research Alliance (JARA) is an initiative of RWTH Aachen University and Forschungszentrum Jülich.</li>
        </ul>
-        <img height={100} src={require('../img/european_commission.svg')} alt="Logo EU" />
-        <img height={70} src={require('../img/reserve.svg')} alt="Logo EU" />
-        <img height={70} src={require('../img/uel_efre.jpeg')} alt="Logo UEL OP EFRE NRW" />
-        <img height={70} src={require('../img/uel.png')} alt="Logo UEL" />
-        <img height={60} src={require('../img/eonerc_rwth.svg')} alt="Logo ACS" />
+        <img height={100} src={require('../img/european_commission.svg').default} alt="Logo EU" />
+        <img height={70} src={require('../img/reserve.svg').default} alt="Logo EU" />
+        <img height={70} src={require('../img/uel_efre.jpeg').default} alt="Logo UEL OP EFRE NRW" />
+        <img height={70} src={require('../img/uel.png').default} alt="Logo UEL" />
+        <img height={60} src={require('../img/eonerc_rwth.svg').default} alt="Logo ACS" />
        {
-          //<img height={70} src={require('../img/jara.svg')} alt="Logo JARA" />
+          //<img height={70} src={require('../img/jara.svg').default} alt="Logo JARA" />
        }
      </div>
    );
--- a/src/widget/edit-widget/edit-widget.js
+++ b/src/widget/edit-widget/edit-widget.js
@ -27,7 +27,7 @@ class EditWidgetDialog extends React.Component {
    super(props);

    this.state = {
-      temporal: {},
+      temporal: props.widget,
    };
  }

@ -38,12 +38,9 @@ class EditWidgetDialog extends React.Component {
  }


-
  onClose(canceled) {
    if (canceled === false) {
-      if (this.validChanges()) {
-        this.props.onClose(this.state.temporal);
-      }
+      this.props.onClose(this.state.temporal);
    } else {
      this.props.onClose();
    }
@ -117,23 +114,26 @@ class EditWidgetDialog extends React.Component {
        changeObject = this.assignAspectRatio(changeObject, this.state.temporal.customProperties.file);
      }
    } else if (e.target.id.includes('file')) {
-
-      customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value;
+      if (e.target.value === "Select file")
+      {
+        customProperty ? changeObject[parts[0]][parts[1]] = -1 : changeObject[e.target.id] = -1;
+      } else {
+        customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value;
+      }

      // get file and update size (if it's an image)
-      if ((changeObject.customProperties.file !== -1)&&('lockAspect' in this.state.temporal && this.state.temporal.lockAspect)) {
+      /*if ((changeObject.customProperties.file !== -1)&&('lockAspect' in this.state.temporal && this.state.temporal.lockAspect)) {
        // TODO this if condition requires changes to work!!!
        changeObject = this.assignAspectRatio(changeObject, e.target.value);
-      }
-    }else if (parts[1] === 'textSize'){
+      }*/
+    } else if (parts[1] === 'textSize'){
      changeObject[parts[0]][parts[1]] = Number(e.target.value);
      changeObject = this.setMaxWidth(changeObject);

-    }else if(parts[1] === 'orientation'){
+    } else if(parts[1] === 'orientation'){
      customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
      changeObject = this.setNewLockRestrictions(changeObject);
-    }
-    else if (e.target.type === 'number') {
+    } else if (e.target.type === 'number') {
      customProperty ?  changeObject[parts[0]][parts[1]] = Number(e.target.value) : changeObject[e.target.id] = Number(e.target.value);
    } else if(e.target.id === 'name'){
      if(customProperty ? (changeObject[parts[0]][parts[1]] != null) : (changeObject[e.target.id] != null)){
@ -145,7 +145,7 @@ class EditWidgetDialog extends React.Component {
    } else {
      customProperty ? changeObject[parts[0]][parts[1]] = e.target.value : changeObject[e.target.id] = e.target.value ;
    }
-    this.validChanges();
+
    this.setState({ temporal: changeObject});

  }
@ -155,18 +155,6 @@ class EditWidgetDialog extends React.Component {
    this.setState({ temporal: widget_data });
  }

-  validChanges() {
-    // check that widget has a name
-    var name = true;
-
-    if (this.state.temporal[name] === '') {
-      name = false;
-    }
-
-    this.valid = name;
-    return name;
-  }
-
  render() {

    let controls = null;
--- a/src/widget/widgets/image.js
+++ b/src/widget/widgets/image.js
@ -44,6 +44,7 @@ class WidgetImage extends React.Component {

  componentDidUpdate(prevProps: Readonly<P>, prevState: Readonly<S>, snapshot: SS) {

+
    let file = this.props.files.find(file => file.id === parseInt(this.props.widget.customProperties.file, 10));


@ -55,9 +56,12 @@ class WidgetImage extends React.Component {
          data: file.id,
          token: this.props.token
        });
-        
+
        this.setState({ file: file, fileDate: file.date });
      }
+    } else if (this.setState.file !== undefined) {
+      console.log("file undefined", file)
+      this.setState({file:undefined})
    }

  }