Merge pull request #208 from o2r-project/issues

catch errors to resolve #207
o2r-project · Apr 23, 2021 · 419dc92 · 419dc92
2 parents a635fc9 + 40239bf
commit 419dc92
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/ui/bindings/Dockerfile b/ui/bindings/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocker/geospatial:3.6.2
+FROM rocker/geospatial:3.6.3
 
 SHELL ["/bin/bash", "-c"]
 
@@ -9,6 +9,10 @@ RUN R -e 'install.packages(c("rioja", "FME", "SoilR", "verification", "MASS", "s
 RUN R -e 'install.packages(c("caTools", "Cairo", "stats", "extrafont", "xts", "maps"))'
 RUN R -e 'install.packages("INLA", repos=c(getOption("repos"), INLA="https://inla.r-inla-download.org/R/stable"), dep=TRUE)'
 RUN R -e 'install.packages(c("truncnorm"))'
+#update of package raster needed to run specific bindings
+RUN R -e 'install.packages(c("raster"))' 
+
+
 # based on https://gist.github.com/remarkablemark/aacf14c29b3f01d6900d13137b21db3a
 RUN apt-get update \
     && apt-get install -y curl \

diff --git a/ui/src/components/erc/ERC.js b/ui/src/components/erc/ERC.js
@@ -205,8 +205,8 @@ class ERC extends React.Component {
                     }
                 }
             })
-            .catch(function (res) {
-                console.log(res)
+            .catch(function (response) {
+                console.log(response)
             })
     }
 

diff --git a/ui/src/components/uploadERC/Dropzone/Dropzone.js b/ui/src/components/uploadERC/Dropzone/Dropzone.js
@@ -42,9 +42,13 @@ class Dropzone extends Component {
         });
       })
       .catch((response) => {
-        if (response.response.status === 401) {
+        if(!response.response){
+          self.setUpperState({ title: "ERC Upload failed", errorMessage: "Something went wrong. Please try it again in a new window or different Browser." })
+        }
+        else if (response.response.status === 401) {
           self.setUpperState({ title: "ERC Upload failed", errorMessage: "You have to be logged in to upload a Workspace" })
-        } else if (response.response.status === 500) {
+        } 
+        else if (response.response.status === 500) {
           self.setUpperState({ title: "ERC Upload failed", errorMessage: "You must select an ERC to upload" })
         }
       })