From e4ce91639a613cce2bd8e54265c6419c7e14ae5d Mon Sep 17 00:00:00 2001
From: hyunjuna <hyunjun.choi@cshs.org>
Date: Fri, 3 Feb 2023 14:52:20 -0800
Subject: [PATCH] Update error message to show aliro user guide

---
 data/.DS_Store                                | Bin 8196 -> 8196 bytes
 lab/pyutils/validateDataset.py                |  10 ++++++----
 lab/webapp/src/components/FileUpload/index.js |   6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/data/.DS_Store b/data/.DS_Store
index 865d0a87d6307e2de80f0cd6059be6714fb61827..48c0ce4761637549dad05feb8edc898dd7415c8f 100644
GIT binary patch
delta 105
zcmZp1XmQw}Ex@>QvW`HZhh%lNnW?dkg07)~VXclrwWWoLj)H}`VQnoZhp4i?bx?eE
pPHtX)Hv<?jGD2tuUMLNtdL|nPifsNNz{kFsUE&+d=076r%m4!x7C8U_

delta 78
zcmZp1XmQw}Ex@>AvW`HZx<qxgrK!1&f}yEtt&T#qrICe>f|-SJZ7nB<sItCwP<(by
iZeD)Z<f8)ejNOwB1w}Uh6yRgu%qH=jW%EA~c4h#9sTXqq

diff --git a/lab/pyutils/validateDataset.py b/lab/pyutils/validateDataset.py
index 12ef19a66..bc1bc2602 100644
--- 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
index b4eeb8e48..2ce44dbff 100644
--- 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>;
           }