Merge branch 'master' of git.rwth-aachen.de:acs/public/villas/web

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: normal
-  DOCKER_TAG: ${CI_COMMIT_SHORT_SHA}
+  DOCKER_TAG: ${CI_COMMIT_BRANCH}
   DOCKER_IMAGE: ${CI_REGISTRY_IMAGE}
 
 cache:
@@ -42,8 +42,5 @@ deploy:
       --dockerfile ${CI_PROJECT_DIR}/Dockerfile
       --destination ${DOCKER_IMAGE}:${DOCKER_TAG}
       --snapshotMode=redo
-      --cache=true
-      --cache-ttl=12h
-  only:
-   refs:
-     - master
+  dependencies:
+    - build

src/file/edit-files.js

@@ -40,7 +40,7 @@ class EditFilesDialog extends React.Component {
   }
 
   onClose() {
-    
+
     this.props.onClose();
   }
 
@@ -66,7 +66,12 @@ class EditFilesDialog extends React.Component {
   };
 
   updateUploadProgress = (event) => {
-    this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
+    if (event.hasOwnProperty("percent")){
+      this.setState({ uploadProgress: parseInt(event.percent.toFixed(), 10) });
+    } else {
+      this.setState({ uploadProgress: 0 });
+    }
+
   };
 
   clearProgress = (newFileID) => {
@@ -83,7 +88,7 @@ class EditFilesDialog extends React.Component {
   };
 
   closeEditModal(){
-   
+
   this.setState({editModal: false});
   }
 
@@ -167,7 +172,7 @@ class EditFilesDialog extends React.Component {
          </div>
       </Dialog>
 
-      
+
     );
   }
 }