ada-discovery · sherzinger · Jan 23, 2020 · Jan 23, 2020 · Jan 23, 2020 · Jan 28, 2020
diff --git a/app/views/category/categorySelectionModal.scala.html b/app/views/category/categorySelectionModal.scala.html
@@ -34,12 +34,12 @@
             var typeaheadData = data.map( function(item, index) {
                 return {name: item._id.$oid, label: item.name};
             });
-            populateFieldTypeahed(
-                $('#categoryTypeahead'),
-                $('#categoryId'),
-                typeaheadData,
-                @FilterShowFieldStyle.LabelsOnly.id
-            );
+            populateFieldTypeahead({
+              typeaheadElement: $('#categoryTypeahead'),
+              fieldNameElement: $('#categoryId'),
+              fieldNameAndLabels: typeaheadData,
+              showOption: @FilterShowFieldStyle.LabelsOnly.id
+            });
         },
         error: function(data){
             showErrorResponse(data)

diff --git a/app/views/category/edit.scala.html b/app/views/category/edit.scala.html
@@ -41,12 +41,12 @@
 
     <script type="text/javascript">
         $(function () {
-            populateFieldTypeahedFromUrl(
-                 $('#add_fieldModal #fieldTypeahead'),
-                 $('#add_fieldModal #fieldName'),
-                '@Html(dataSetRouter.allFields.url)',
-                @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id
-            );
+            populateFieldTypeaheadFromUrl({
+                typeaheadElement: $('#add_fieldModal #fieldTypeahead'),
+                fieldNameElement: $('#add_fieldModal #fieldName'),
+                url: '@Html(dataSetRouter.allFields.url)',
+                showOption: @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id
+            });
         })
     </script>
 }

diff --git a/app/views/category/treeChart.scala.html b/app/views/category/treeChart.scala.html
@@ -8,10 +8,10 @@
     implicit request: Request[_], webJarAssets: WebJarAssets
 )
 
-<link rel="stylesheet" type="text/css" media="screen" href="@CustomDirAssets.versioned("stylesheets/tree.min.css")">
+<link rel="stylesheet" type="text/css" media="screen" href="@CustomDirAssets.versioned("stylesheets/tree.css")">
 <script src="@routes.WebJarAssets.at(webJarAssets.locate("d3.min.js"))"></script>
 <script src="@routes.WebJarAssets.at(webJarAssets.locate("jquery-ui.min.js"))"></script>
-<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/tree.min.js")"></script>
+<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/tree.js")"></script>
 
 <div id="treeDiv" name="treeDiv" class="treeDiv"></div>
 <script>

diff --git a/app/views/chart/highcharts/highchartsJsImport.scala.html b/app/views/chart/highcharts/highchartsJsImport.scala.html
@@ -10,5 +10,5 @@
     <script src="@routes.WebJarAssets.at(webJarAssets.fullPath("highcharts", "/modules/boost-canvas.js"))"></script>
 }
 <script src="@routes.WebJarAssets.at(webJarAssets.fullPath("highcharts", "/highcharts-more.js"))"></script>
-<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-highcharts.min.js")"></script>
-<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-widgets.min.js")"></script>
+<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-highcharts.js")"></script>
+<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-widgets.js")"></script>
diff --git a/app/views/chart/highcharts/highchartsJsImportForBulkExport.scala.html b/app/views/chart/highcharts/highchartsJsImportForBulkExport.scala.html
@@ -3,4 +3,4 @@
 @()(implicit webJarAssets: WebJarAssets)
 
 <script src="@routes.WebJarAssets.at(webJarAssets.fullPath("highcharts", "/modules/offline-exporting.js"))"></script>
-<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-highcharts-export.min.js")"></script>
+<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-highcharts-export.js")"></script>
diff --git a/app/views/dataset/cluster.scala.html b/app/views/dataset/cluster.scala.html
@@ -38,12 +38,12 @@
                     var typeaheadData = data.map(function (item, index) {
                         return {name: item._id.$oid, label: item.name};
                     });
-                    populateFieldTypeahed(
-                        $('#mlModelTypeahead'),
-                        $('#mlModelId'),
-                        typeaheadData,
-                        @FilterShowFieldStyle.LabelsOnly.id
-                    );
+                    populateFieldTypeahead({
+                      typeaheadElement: $('#mlModelTypeahead'),
+                      fieldNameElement: $('#mlModelId'),
+                      fieldNameAndLabels: typeaheadData,
+                      showOption: @FilterShowFieldStyle.LabelsOnly.id
+                    });
                 }
             });
 

diff --git a/app/views/dataset/cumulativeCount.scala.html b/app/views/dataset/cumulativeCount.scala.html
@@ -50,8 +50,8 @@
 
             $('#inputDiv #groupFieldTypeahead').keypress(function (e) {
                 if (e.which == 13) {
-                    var groupFieldTypeahedVal = $('#inputDiv #groupFieldTypeahead').val();
-                    if (!groupFieldTypeahedVal)
+                    var groupFieldTypeaheadVal = $('#inputDiv #groupFieldTypeahead').val();
+                    if (!groupFieldTypeaheadVal)
                         $('#inputDiv #groupFieldName').val("");
 
                     calcCumulativeCount();

diff --git a/app/views/dataset/dataSetExportDropdown.scala.html b/app/views/dataset/dataSetExportDropdown.scala.html
@@ -131,8 +131,20 @@
             success: function (fieldNameAndLabels) {
                 var fieldNamesAndLabelsWithNone = fieldNameAndLabels.concat([["", "[None]"]])
 
-                populateFieldTypeahed($('#exportTranSMARTDataModal #visitFieldTypeahead'), $('#exportTranSMARTDataModal #visitFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
-                populateFieldTypeahed($('#exportTranSMARTMappingModal #visitFieldTypeahead'), $('#exportTranSMARTMappingModal #visitFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
+                populateFieldTypeahead({
+                  typeaheadElement: $('#exportTranSMARTDataModal #visitFieldTypeahead'),
+                  fieldNameElement: $('#exportTranSMARTDataModal #visitFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                  showOption,
+                  initSelectByNameElement: true
+                });
+                populateFieldTypeahead({
+                  typeaheadElement: $('#exportTranSMARTMappingModal #visitFieldTypeahead'),
+                  fieldNameElement: $('#exportTranSMARTMappingModal #visitFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                  showOption,
+                  initSelectByNameElement: true
+                });
             },
             error: showErrorResponse
          });

diff --git a/app/views/dataset/datasetJsImport.scala.html b/app/views/dataset/datasetJsImport.scala.html
@@ -1,3 +1,3 @@
 @import org.incal.play.routes.CustomDirAssets
 
-<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/dataset.min.js")"></script>
+<script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/dataset.js")"></script>
diff --git a/app/views/dataset/distribution.scala.html b/app/views/dataset/distribution.scala.html
@@ -77,8 +77,8 @@
 
             $('#inputDiv #groupFieldTypeahead').keypress(function (e) {
                 if (e.which == 13) {
-                    var groupFieldTypeahedVal = $('#inputDiv #groupFieldTypeahead').val();
-                    if (!groupFieldTypeahedVal)
+                    var groupFieldTypeaheadVal = $('#inputDiv #groupFieldTypeahead').val();
+                    if (!groupFieldTypeaheadVal)
                         $('#inputDiv #groupFieldName').val("")
                     calcDistribution();
                     return false;

diff --git a/app/views/dataset/heatmap.scala.html b/app/views/dataset/heatmap.scala.html
@@ -29,8 +29,8 @@
 
 @bottomResources = {
 
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.min.js")"></script>
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.min.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.js")"></script>
 
     @helper.javascriptRouter("dataSetJsRoutes")(
         dataSetJsRouter.calcHeatmap,
@@ -64,8 +64,8 @@
 
             $('#inputDiv #valueFieldTypeahead').keypress(function (e) {
                 if (e.which == 13) {
-                    var valueFieldTypeahedVal = $('#inputDiv #valueFieldTypeahead').val();
-                    if (!valueFieldTypeahedVal)
+                    var valueFieldTypeaheadVal = $('#inputDiv #valueFieldTypeahead').val();
+                    if (!valueFieldTypeaheadVal)
                         $('#inputDiv #valueFieldName').val("")
 
                     calcHeatmap();

diff --git a/app/views/dataset/matthewsCorrelation.scala.html b/app/views/dataset/matthewsCorrelation.scala.html
@@ -34,8 +34,8 @@
 
 @bottomResources = {
 
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.min.js")"></script>
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.min.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.js")"></script>
 
     @helper.javascriptRouter("dataSetJsRoutes")(
         dataSetJsRouter.calcMatthewsCorrelations,

diff --git a/app/views/dataset/pearsonCorrelation.scala.html b/app/views/dataset/pearsonCorrelation.scala.html
@@ -30,8 +30,8 @@
 
 @bottomResources = {
 
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.min.js")"></script>
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.min.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.js")"></script>
 
     @helper.javascriptRouter("dataSetJsRoutes")(
         dataSetJsRouter.calcPearsonCorrelations,

diff --git a/app/views/dataset/processSeries.scala.html b/app/views/dataset/processSeries.scala.html
@@ -55,12 +55,12 @@
 
     <script type="text/javascript">
         $(function () {
-            populateFieldTypeahedFromUrl(
-                $('#preserveFieldNameDiv #fieldTypeahead'),
-                $('#preserveFieldNameDiv #fieldName'),
-                '@Html(dataSetRouter.allFields.url)',
-                @setting.filterShowFieldStyle.getOrElse(NamesAndLabels).id
-            )
+            populateFieldTypeaheadFromUrl({
+                typeaheadElement: $('#preserveFieldNameDiv #fieldTypeahead'),
+                fieldNameElement: $('#preserveFieldNameDiv #fieldName'),
+                url: '@Html(dataSetRouter.allFields.url)',
+                showOption: @setting.filterShowFieldStyle.getOrElse(NamesAndLabels).id
+            })
         })
 
         function addAllFields() {

diff --git a/app/views/dataset/scatter.scala.html b/app/views/dataset/scatter.scala.html
@@ -31,8 +31,8 @@
 
 @bottomResources = {
 
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.min.js")"></script>
-    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.min.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-62349a9.js")"></script>
+    <script type="text/javascript" src="@CustomDirAssets.versioned("javascripts/ada-charts-wrapper.js")"></script>
 
     @helper.javascriptRouter("dataSetJsRoutes")(
         dataSetJsRouter.calcScatter,
@@ -66,8 +66,8 @@
 
             $('#inputDiv #groupOrValueFieldTypeahead').keypress(function (e) {
                 if (e.which == 13) {
-                    var groupOrValueFieldTypeahedVal = $('#inputDiv #groupOrValueFieldTypeahead').val();
-                    if (!groupOrValueFieldTypeahedVal)
+                    var groupOrValueFieldTypeaheadVal = $('#inputDiv #groupOrValueFieldTypeahead').val();
+                    if (!groupOrValueFieldTypeaheadVal)
                         $('#inputDiv #groupOrValueFieldName').val("")
 
                     calcScatter();

diff --git a/app/views/dataset/transformSeries.scala.html b/app/views/dataset/transformSeries.scala.html
@@ -54,12 +54,12 @@
 
     <script type="text/javascript">
         $(function () {
-            populateFieldTypeahedFromUrl(
-                $('#preserveFieldNameDiv #fieldTypeahead'),
-                $('#preserveFieldNameDiv #fieldName'),
-                '@Html(dataSetRouter.allFields.url)',
-                @setting.filterShowFieldStyle.getOrElse(NamesAndLabels).id
-            )
+            populateFieldTypeaheadFromUrl({
+                typeaheadElement: $('#preserveFieldNameDiv #fieldTypeahead'),
+                fieldNameElement: $('#preserveFieldNameDiv #fieldName'),
+                url: '@Html(dataSetRouter.allFields.url)',
+                showOption: @setting.filterShowFieldStyle.getOrElse(NamesAndLabels).id
+            })
         })
 
         function addAllFields() {

diff --git a/app/views/dataset/widgetsScreen.scala.html b/app/views/dataset/widgetsScreen.scala.html
@@ -114,13 +114,14 @@
             var nameElement = $('#inputDiv #' + fieldPrefix + 'Name');
             var focusFun = (isFocus) ? function() {setTimeout(function(){ $(typeaheadElement).focus();}, 250)} : null
 
-            populateFieldTypeahedFromUrl(
+            populateFieldTypeaheadFromUrl({
                 typeaheadElement,
-                nameElement,
+                fieldNameElement: nameElement,
                 url,
-                @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id,
-                focusFun
-            )
+                showOption: @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id,
+                postFunction: focusFun,
+                minLength: 2
+            })
         }
 
         function populateMultiFieldTypeaheadFromUrlAux(fieldPrefixes, url, isFocus) {
@@ -131,12 +132,12 @@
                         var typeaheadElement = $('#inputDiv #' + fieldPrefix + 'Typeahead');
                         var nameElement = $('#inputDiv #' + fieldPrefix + 'Name');
 
-                        populateFieldTypeahed(
-                            typeaheadElement,
-                            nameElement,
-                            data,
-                            @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id
-                        );
+                        populateFieldTypeahead({
+                            typeaheadElement: typeaheadElement,
+                            fieldNameElement: nameElement,
+                            fieldNameAndLabels: data,
+                            showOption: @setting.filterShowFieldStyle.getOrElse(FilterShowFieldStyle.NamesAndLabels).id
+                        });
                         if (index == 0 && isFocus) {
                             setTimeout(function(){ $(typeaheadElement).focus();}, 250);
                         }

diff --git a/app/views/datasetsetting/fieldTypeaheadsActivationJs.scala.html b/app/views/datasetsetting/fieldTypeaheadsActivationJs.scala.html
@@ -15,7 +15,12 @@
     $(function () {
         var showOption = @form.value.flatMap(_.filterShowFieldStyle).getOrElse(FilterShowFieldStyle.NamesAndLabels).id
 
-        populateIdNameTypeahedFromUrl($('#ownerTypeahead'), $('#ownerId'), '@Html(routes.UserController.idAndNames.url)', true)
+        populateIdNameTypeaheadFromUrl({
+            typeaheadElement: $('#ownerTypeahead'),
+            idElement: $('#ownerId'),
+            url: '@Html(routes.UserController.idAndNames.url)',
+            initSelectByNameElement: true
+        })
 
         $.ajax({
             url: '@Html(dataSetRouter.allFieldNamesAndLabels.url)',
@@ -24,10 +29,34 @@
                 var fieldNamesAndLabelsWithNone = fieldNameAndLabels.concat([["", "[None]"]])
                 var fieldNamesAndLabelsWithIdAndNone = fieldNamesAndLabelsWithId.concat([["", "[None]"]])
 
-                populateFieldTypeahed($('#keyFieldTypeahead'), $('#keyFieldName'), fieldNamesAndLabelsWithId, showOption, true);
-                populateFieldTypeahed($('#exportOrderByFieldTypeahead'), $('#exportOrderByFieldName'), fieldNamesAndLabelsWithIdAndNone, showOption, true);
-                populateFieldTypeahed($('#defaultDistributionFieldTypeahead'), $('#defaultDistributionFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
-                populateFieldTypeahed($('#defaultCumulativeCountFieldTypeahead'), $('#defaultCumulativeCountFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
+                populateFieldTypeahead({
+                  typeaheadElement: $('#keyFieldTypeahead'),
+                  fieldNameElement: $('#keyFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithId,
+                  showOption,
+                  initSelectByNameElement: true
+                });
+                populateFieldTypeahead({
+                  typeaheadElement: $('#exportOrderByFieldTypeahead'),
+                  fieldNameElement: $('#exportOrderByFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithIdAndNone,
+                  showOption,
+                  initSelectByNameElement: true
+                });
+                populateFieldTypeahead({
+                  typeaheadElement: $('#defaultDistributionFieldTypeahead'),
+                  fieldNameElement: $('#defaultDistributionFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                  showOption,
+                  initSelectByNameElement: true
+                });
+                populateFieldTypeahead({
+                  typeaheadElement: $('#defaultCumulativeCountFieldTypeahead'),
+                  fieldNameElement: $('#defaultCumulativeCountFieldName'),
+                  fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                  showOption,
+                  initSelectByNameElement: true
+                });
             },
             error: showErrorResponse
         });
@@ -37,8 +66,20 @@
             success: function (fieldNameAndLabels) {
                 var fieldNamesAndLabelsWithNone = fieldNameAndLabels.concat([["", "[None]"]])
 
-                populateFieldTypeahed($('#defaultScatterXFieldTypeahead'), $('#defaultScatterXFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
-                populateFieldTypeahed($('#defaultScatterYFieldTypeahead'), $('#defaultScatterYFieldName'), fieldNamesAndLabelsWithNone, showOption, true);
+                populateFieldTypeahead({
+                    typeaheadElement: $('#defaultScatterXFieldTypeahead'),
+                    fieldNameElement: $('#defaultScatterXFieldName'),
+                    fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                    showOption,
+                    initSelectByNameElement: true
+                });
+                populateFieldTypeahead({
+                    typeaheadElement: $('#defaultScatterYFieldTypeahead'),
+                    fieldNameElement: $('#defaultScatterYFieldName'),
+                    fieldNameAndLabels: fieldNamesAndLabelsWithNone,
+                    showOption,
+                    initSelectByNameElement: true
+                });
             },
             error: showErrorResponse
         });

diff --git a/app/views/datasettrans/dataSetTypeahead.scala.html b/app/views/datasettrans/dataSetTypeahead.scala.html
@@ -56,13 +56,13 @@
             }, 250)
         }
 
-        populateFieldTypeahedFromUrl(
-            $('#@{fieldName}Typeahead'),
-            $('#@{fieldName}'),
-            '@Html(org.ada.web.controllers.routes.AdminController.dataSetIds().url)',
-            @FilterShowFieldStyle.LabelsOnly.id,
-            addSelectedListener,
-            true
-        )
+        populateFieldTypeaheadFromUrl({
+            typeaheadElement: $('#@{fieldName}Typeahead'),
+            fieldNameElement: $('#@{fieldName}'),
+            url: '@Html(org.ada.web.controllers.routes.AdminController.dataSetIds().url)',
+            showOption: @FilterShowFieldStyle.LabelsOnly.id,
+            postFunction: addSelectedListener,
+            initSelectByNameElement: true
+        })
     })
 </script>
diff --git a/app/views/datasettrans/filterDataSetElements.scala.html b/app/views/datasettrans/filterDataSetElements.scala.html
@@ -56,7 +56,12 @@
 
             dataSetTransformationJsRoutes2.org.ada.web.controllers.dataset.datatrans.DataSetTransformationController.filterIdAndNames(dataSetId).ajax({
                 success: function (data) {
-                    populateIdNameTypeahed($('#filterTypeahead'), $('#filterId'), data, true)
+                    populateIdNameTypeahead({
+                        typeaheadElement: $('#filterTypeahead'),
+                        idElement: $('#filterId'),
+                        idNames: data,
+                        initSelectByNameElement: true
+                    })
                 },
                 error: showErrorResponse
             })