Merge pull request #577 from HyunjunA/master

Update error message to show aliro user guide
EpistasisLab · Feb 3, 2023 · e645d16 · e645d16
2 parents f3a1565 + e4ce916
commit e645d16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/data/.DS_Store b/data/.DS_Store
diff --git a/lab/pyutils/validateDataset.py b/lab/pyutils/validateDataset.py
@@ -98,6 +98,8 @@ def check_dataframe(df, target_column):
             str(str_cols)+" "
 
     if error_message != "":
+        # https://epistasislab.github.io/Aliro/userguide.html#adding-datasets
+        error_message += "* Please refer to https://epistasislab.github.io/Aliro/userguide.html#adding-datasets for more information."
         raise ValueError(error_message)
 
     return True
@@ -197,10 +199,10 @@ def validate_data_origin(df, prediction_type="classification", target_column=Non
     # check that cat columns can be encoded
     if categories or ordinals:
         try:
-            encode_data(df, target_column, categories,
-                        ordinals, "OneHotEncoder")
-            encode_data(df, target_column, categories,
-                        ordinals, "OrdinalEncoder")
+            df = encode_data(df, target_column, categories,
+                             ordinals, "OneHotEncoder")
+            df = encode_data(df, target_column, categories,
+                             ordinals, "OrdinalEncoder")
         except Exception as e:
             logger.warn("encode_data() failed, " + str(e))
             return False, "encode_data() failed, " + str(e)

diff --git a/lab/webapp/src/components/FileUpload/index.js b/lab/webapp/src/components/FileUpload/index.js
@@ -2439,7 +2439,10 @@ handleCatFeaturesUserTextCancel() {
     // of the pseudo-modal windows just below.
 
     if(this.state.showErrorModal){
+
       var errorModalContent = this.state.errorModalContent.split("*");
+      // length of errorModalContent 
+      var errorModalContentLength = errorModalContent.length;
 
       return(
       <Modal style={{ marginTop:'0' }} open={this.state.showErrorModal} onClose={this.handleErrorModalClose} closeIcon id="error_modal_dialog"> 
@@ -2453,6 +2456,9 @@ handleCatFeaturesUserTextCancel() {
           {
             return <p key={index}>{item}</p>;
           }
+          else if(index==errorModalContentLength-1){
+            return <p key={index}>{item}</p>;
+          }
           else{
             return <p key={index}>{index}: {item}</p>;
           }