Merge pull request #185 from ncsa/184-import-is-not-working-properly

184 import is not working properly
ncsa · Aug 29, 2024 · 5172848 · 5172848
2 parents 7ab6db9 + 170eef1
commit 5172848
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Fixed
+- Import data is not working properly [#184](https://github.com/ncsa/standalone-smm-smile/issues/184)
+
 ## [0.4.2] - 2024-07-17
 ### Added
 - Provide google api key to authorize YouTube Data API [#179](https://github.com/ncsa/standalone-smm-smile/issues/179)

diff --git a/www/public/bootstrap/js/customized/analyses/view.js b/www/public/bootstrap/js/customized/analyses/view.js
@@ -110,7 +110,7 @@ $.getScript("bootstrap/js/customized/view_helperFunc.js", function(){
 
                                 // add preview and column
                                 $previewContent.append(arrayToTable(text_data.slice(0, 11), '#selectFileTable'));
-                                $columnContent.append(extractHeader2(text_data));
+                                $columnContent.append(extractHeaderRadio(text_data));
                                 $preview.show();
                                 $column.show();
 

diff --git a/www/public/bootstrap/js/customized/view_helperFunc.js b/www/public/bootstrap/js/customized/view_helperFunc.js
@@ -102,19 +102,38 @@ function escapeHtml(str) {
     .replace(/'/g, '&#039;');
 }
 
-function extractHeader2(array) {
+
+function extractHeaderRadio(array) {
+    var headerContent = '';
+    var column_header = array[0];
+    $.each(column_header, function (i, val) {
+        // Check the first item
+        if (i === 0) {
+            headerContent += `<label class="radio-inline">
+                <input type="radio" class="customized-radio" name="selectFileColumn" id="` + val
+                + `" value="` + val + `" checked>` + val + `</label>`;
+        } else {
+            headerContent += `<label class="radio-inline">
+                <input type="radio" class="customized-radio" name="selectFileColumn" id="` + val
+                + `" value="` + val + `">` + val + `</label>`;
+        }
+    });
+    return headerContent;
+}
+
+function extractHeaderCheckBox(array) {
     var headerContent = '';
-    column_header = array[0];
+    var column_header = array[0];
     $.each(column_header, function (i, val) {
-        //check the first item
+        // Check the first item
         if (i === 0) {
-            headerContent += `<label class=radio-inline>
-			<input type="radio"  class="customized-radio" name="selectFileColumn",id=`
-                + val + ` value=` + val + ` checked></div>` + val + ` </label>`;
+            headerContent += `<label class="checkbox-inline">
+                <input type="checkbox" class="customized-checkbox" name="selectFileColumn" id="` + val
+                + `" value="` + val + `" checked>` + val + `</label>`;
         } else {
-            headerContent += `<label class=radio-inline>
-				<input type="radio" class="customized-radio" name="selectFileColumn",id=`
-                + val + ` value=` + val + `></div>` + val + ` </label>`;
+            headerContent += `<label class="checkbox-inline">
+                <input type="checkbox" class="customized-checkbox" name="selectFileColumn" id="` + val
+                + `" value="` + val + `">` + val + `</label>`;
         }
     });
     return headerContent;
@@ -174,6 +193,10 @@ function processData(csv) {
         $("#datasrc-criteria-hint").html("<p>Based on the column of your imported file, it is likely that you uploaded a " +
             "<u>Reddit Comment</u> dataset.</p>")
     }
+    else if (previewLinesWords[0].indexOf('snippet.title') > 0 || previewLinesWords[0].indexOf('snippet.description') > 0){
+        $("#datasrc-criteria-hint").html("<p>Based on the column of your imported file, it is likely that you uploaded a " +
+            "<u>YouTube video/channel/playlist search collection</u> dataset.</p>")
+    }
     else{
         $("#datasrc-criteria-hint").html("<p>We cannot detect the file category, make sure you choose <u>Others</u> in the category.</p>")
     }
@@ -183,7 +206,7 @@ function processData(csv) {
 
     // set column headers for userspec-Others-metadata
     $("#column-header-selection").empty();
-    $("#column-header-selection").append(extractHeader1(previewLinesWords));
+    $("#column-header-selection").append(extractHeaderCheckBox(previewLinesWords));
 
 }
 

diff --git a/www/public/bootstrap/js/customized/view_import.js b/www/public/bootstrap/js/customized/view_import.js
@@ -16,7 +16,8 @@ $("#datasrc-category").on("change", function(){
         $("#datasrc-criteria").html("<p>Make sure your file has column <u>body</u>.</p>")
     }
     else if (selectedItem === 'youtube-Search-Video' || selectedItem === 'youtube-Search-Channel'|| selectedItem === 'youtube-Search-Playlist') {
-        $("#datasrc-criteria").html("<p>Make sure your file has column <u>snippet.title</u> or <u>snippet.description</u>.</p>")
+        $("#datasrc-criteria").html("<p>Make sure your file has column <u>title</u>, <u>description</u>, " +
+            "<u>snippet.title</u>, or <u>snippet.description</u>.</p>")
     }
     else if (selectedItem === 'userspec-Others') {
         $("#datasrc-criteria").html("<p>You provide the <u>column headers</u> that you would like to analyze, as well as select " +
@@ -167,6 +168,19 @@ function importFormValidate(){
             return false;
         }
     }
+    else if (category === 'youtube-Search-Video' || category === 'youtube-Search-Channel'|| category === 'youtube-Search-Playlist') {
+        if (importedColumnHeaders.indexOf('title') === -1
+            && importedColumnHeaders.indexOf('description') === -1
+            && importedColumnHeaders.indexOf('snippet.description') === -1
+            && importedColumnHeaders.indexOf('snippet.description') === -1
+        ){
+            $("#modal-message").append("<h4>Your file must have <u>title</u> and/or <u>description</u> " +
+                "and/or <u>snippet.title</u> and/or <u>snippet.description</u> column to be " +
+                "categorized as YouTube video/channel/playlist search collection.</h4>");
+            $("#alert").modal('show');
+            return false;
+        }
+    }
 
     return true;
 }