disable sidecar datatables upload options & organize upload page

Author: artoonie

static/datatable/src/model/candidate.ts

@@ -166,11 +166,12 @@ export default class Candidate {
             null, candidate.candidateName, editorParams.sidecarOnly,
             placeholder);
         candidateName.classList.add("candidate-name-input");
-        const moreInfoButton = Candidate.getMoreInfoButton(editor, candidate,
-            cell, candidateName, success, cancel,
-            onRendered, editorParams);
-        editor.appendChild(document.createElement("br"));
-        editor.appendChild(moreInfoButton);
+        // TODO - reinstate "More Info" button when working
+        // const moreInfoButton = Candidate.getMoreInfoButton(editor, candidate,
+        //     cell, candidateName, success, cancel,
+        //     onRendered, editorParams);
+        // editor.appendChild(document.createElement("br"));
+        // editor.appendChild(moreInfoButton);
 
         return editor;
     };

static/settings/src/upload.ts

@@ -54,17 +54,19 @@ function hideManualEntryShowError() {
 }
 
 function hideManualEntryErrorShowMainButton() {
-    getManuallyEditSidecarButton().style.display = "inline";
-    getManuallyEditSidecarErrorButton().style.display = "none";
+    // DISABLED TEMPORARILY
+    // getManuallyEditSidecarButton().style.display = "inline";
+    // getManuallyEditSidecarErrorButton().style.display = "none";
 }
 
 function showManualOptionsHideTable(redraw = true) {
-    getOptionsForManualSidecarEntry().style.display = 'block';
-    getDatatableOuterWrapper().style.display = 'none';
-    document.removeEventListener('formdata', formListener);
-    if (redraw) {
-        redrawOptions();
-    }
+    // DISABLED TEMPORARILY
+    // getOptionsForManualSidecarEntry().style.display = 'block';
+    // getDatatableOuterWrapper().style.display = 'none';
+    // document.removeEventListener('formdata', formListener);
+    // if (redraw) {
+    //     redrawOptions();
+    // }
 }
 
 export function uploadSidecarInstead(e: MouseEvent) {

templates/settings/base.html

@@ -86,6 +86,4 @@
 
 {% block afterOptions %}
 {% endblock %}
-
-     {% include "settings/settings-candidate-modal.html" %}
 </body>

templates/settings/settings-upload.html

@@ -47,15 +47,6 @@ <h1 class="page-section-heading text-center narrowbox">Customization Options</h1
 {% endblock %}
 
 {% block additionalOptions %}
-    <button class="collapsible">▶ Text Options</button>
-
-    <div class="optionscontent" id="globalOptions">
-      <div class="container mt-3 mb-3">
-        <label for="customText" class="d-block">Custom text to display with visualization title:</label>
-        <textarea id="customText" name="customText" maxlength="256" placeholder="The results of a ranked choice voting election"></textarea>
-      </div>
-    </div>
-
     <button class="collapsible">▶ Data Options</button>
 
     <div class="optionscontent" id="data-options">
@@ -96,6 +87,7 @@ <h1 class="page-section-heading text-center narrowbox">Customization Options</h1
 
       </p>
     </div>
+  <!--
   <button class="collapsible">▶ Candidate Details</button>
   <div class="optionscontent" id="candidate-options">
     <div class="container">
@@ -160,20 +152,25 @@ <h3>Modify data from uploaded file</h3>
       </div>
     </div>
   </div>
+  -->
 
-  <button class="collapsible">▶ Global visualization options</button>
-
-  <div class="optionscontent" id="globalOptions">
-    <p class="mt-3">
-      <input type="hidden" name="hideDecimals"/><!-- To be sent in GET/POST if unchecked -->
-      <label>
-        <input type="checkbox" name="hideDecimals"/> Hide decimal places
-      </label>
-      <br/>
-      <small>By default, we'll show up to two decimal places.</small></label>
-      <br/><br/>
-    </p>
-  </div>
+    <button class="collapsible">▶ Global visualization options</button>
+    <div class="optionscontent" id="globalOptions">
+      <div class="container mt-3 mb-3">
+          <label for="customText" class="d-block">Custom text to display with visualization title:</label>
+          <textarea id="customText" name="customText" maxlength="256" placeholder="The results of a ranked choice voting election"></textarea>
+      </div>
+
+      <p class="mt-3">
+        <input type="hidden" name="hideDecimals"/><!-- To be sent in GET/POST if unchecked -->
+        <label>
+          <input type="checkbox" name="hideDecimals"/> Hide decimal places
+        </label>
+        <br/>
+        <small>By default, we'll show up to two decimal places.</small></label>
+        <br/><br/>
+      </p>
+    </div>
 
 {% endblock %}
 

visualizer/tests/testLiveBrowserWithHead.py

@@ -146,15 +146,15 @@ def test_settings_tab(self):
         # Check the box (the second one, which isn't hidden)
         self.browser.find_elements(By.NAME, "hideSankey")[1].click()
         self.browser.find_elements(By.ID, "updateSettings")[0].click()  # Hit submit
-        assert self._is_visible("sankey-tab")
+        self._ensure_eventually_asserts(lambda: self._is_visible("sankey-tab"))
 
         # Finally, toggle it back off
         self._go_to_tab("settings-tab")
         self.browser.find_elements(By.ID, "sankeyOptions")[0].click()  # Open the dropdown
         # Check the box (the second one, which isn't hidden)
         self.browser.find_elements(By.NAME, "hideSankey")[1].click()
         self.browser.find_elements(By.ID, "updateSettings")[0].click()  # Hit submit
-        assert not self._is_visible("sankey-tab")
+        self._ensure_eventually_asserts(lambda: not self._is_visible("sankey-tab"))
 
         self._assert_log_len(0)