Issue 49544: Remove the ability to select specific objects to import and apply import to multiple folders under the advanced import options issues

data/suites/windowsPg.txt

@@ -1,4 +1,3 @@
-AdvancedImportOptionsTest
 AssayExportImportTest
 AssayTransformWarningTest
 AssayTransformImportUpdateTest

modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java

@@ -88,7 +88,7 @@ public boolean start()
             }
             catch (IOException ignored) {}
         }
-        
+
         Properties props = new Properties();
         props.setProperty("mail.smtp.host", "localhost");
         props.setProperty("mail.smtp.user", "Anonymous");
@@ -98,7 +98,7 @@ public boolean start()
         _log.info("Switching MailHelper to use port " + port);
         MailHelper.setSession(session);
 
-        _log.info("Connecting mail recorder to port " + port);        
+        _log.info("Connecting mail recorder to port " + port);
         _server = SimpleSmtpServer.start(port);
         if (_server.isStopped())
         {

src/org/labkey/test/pages/StartImportPage.java

@@ -17,20 +17,13 @@
 
 import org.labkey.test.BaseWebDriverTest;
 import org.labkey.test.Locator;
-import org.labkey.test.components.ext4.Checkbox.CheckboxFinder;
-import org.labkey.test.components.ext4.Checkbox.CheckboxType;
 import org.labkey.test.components.ext4.Window;
 import org.labkey.test.components.html.Checkbox;
 import org.labkey.test.util.FileBrowserHelper;
-import org.labkey.test.util.LabKeyExpectedConditions;
-import org.labkey.test.util.LogMethod;
 import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -50,7 +43,6 @@ public static StartImportPage startImportFromFile(BaseWebDriverTest test, File z
 
         StartImportPage sip = new StartImportPage(test.getDriver());
         sip.setValidateQueriesCheckBox(validateQueries);
-        sip.setAdvancedImportOptionsCheckBox(true);
 
         test.clickButtonContainingText("Import Folder");
         test.waitForText("Select specific objects to import");
@@ -74,7 +66,6 @@ public static StartImportPage startImportFromPipeline(BaseWebDriverTest test, Fi
 
         StartImportPage sip = new StartImportPage(test.getDriver());
         sip.setValidateQueriesCheckBox(validateQueries);
-        sip.setSelectSpecificImportOptions(selectSpecificImportOptions);
 
         return sip;
     }
@@ -89,43 +80,6 @@ public void setFailForUndefinedVisitsCheckBox(boolean check)
         elementCache().failForUndefinedVisitsCheckbox.set(check);
     }
 
-    public void setAdvancedImportOptionsCheckBox(boolean check)
-    {
-        elementCache().advancedImportOptionsCheckbox.set(check);
-    }
-
-    public void setSelectSpecificImportOptions(boolean check)
-    {
-        elementCache().specificImportOptionsCheckbox.set(check);
-        shortWait().until(LabKeyExpectedConditions.visibilityOf(elementCache().advancedOptionsPanel, check));
-    }
-
-    public void setApplyToMultipleFoldersCheckBox(boolean check)
-    {
-        elementCache().applyToMultipleFoldersCheckbox.set(check);
-        shortWait().until(LabKeyExpectedConditions.visibilityOf(elementCache().applyMultiplePanel, check));
-    }
-
-    public void checkTargetFolders(String... folders)
-    {
-        for (String folder : folders)
-        {
-            WebElement rowEl = Locator.tagWithClass("tr", "x4-grid-row")
-                    .withDescendant(Locator.tagWithClass("span", "x4-tree-node-text").withText(folder))
-                    .findElement(elementCache().applyMultiplePanel);
-            shortWait().until(LabKeyExpectedConditions.animationIsDone(rowEl));
-            Locator.tag("span").findElement(rowEl).click(); // get row into view
-            Checkbox checkbox = new CheckboxFinder(CheckboxType.TREE).refindWhenNeeded(rowEl); // Checkbox goes stale sometimes
-            checkbox.check();
-            shortWait().until(ignored -> checkbox.isChecked());
-        }
-    }
-
-    public boolean isMultipleFolderImportAvailable()
-    {
-        return elementCache().applyToMultipleFoldersCheckbox.isDisplayed();
-    }
-
     public void clickStartImport()
     {
         clickButton("Start Import");
@@ -140,35 +94,6 @@ public void clickStartImport(String confirmationText)
         confirmation.clickButton("Yes");
     }
 
-    public boolean isSelectSpecificImportOptionsVisible()
-    {
-        return isElementVisible(Locator.css("div.advanced-options-panel"));
-    }
-
-    public void setAdvancedOptionCheckBoxes(AdvancedOptionsCheckBoxes checkBox, boolean check)
-    {
-        Map<AdvancedOptionsCheckBoxes, Boolean> list = new HashMap<>();
-        list.put(checkBox, check);
-        setAdvancedOptionCheckBoxes(list);
-    }
-
-    @LogMethod()
-    public void setAdvancedOptionCheckBoxes(Map<AdvancedOptionsCheckBoxes, Boolean> options)
-    {
-        for(Map.Entry<AdvancedOptionsCheckBoxes, Boolean> entry : options.entrySet())
-        {
-            log("Setting value for checkbox: " + entry.toString());
-            elementCache().dataTypesCheckbox(entry.getKey()).set(entry.getValue());
-        }
-    }
-
-    public void setAllAdvancedOptionCheckBoxes(boolean checked)
-    {
-        Checkbox.Checkbox(Locator.checkbox())
-                .findAll(elementCache().advancedOptionsPanel)
-                .forEach(cb -> cb.set(checked));
-    }
-
     @Override
     protected ElementCache newElementCache()
     {
@@ -178,13 +103,8 @@ protected ElementCache newElementCache()
     protected class ElementCache extends LabKeyPage<?>.ElementCache
     {
         protected final Checkbox validateQueriesCheckbox = initialCheckbox("validateQueries");
-        protected final Checkbox advancedImportOptionsCheckbox = initialCheckbox("advancedImportOptions");
-        protected final Checkbox specificImportOptionsCheckbox = initialCheckbox("specificImportOptions");
-        protected final Checkbox applyToMultipleFoldersCheckbox = initialCheckbox("applyToMultipleFolders");
         protected final Checkbox failForUndefinedVisitsCheckbox = initialCheckbox("failForUndefinedVisits");
 
-        protected final WebElement advancedOptionsPanel = Locator.byClass("advanced-options-panel").findWhenNeeded(this);
-        protected final WebElement applyMultiplePanel = Locator.byClass("apply-multiple-panel").findWhenNeeded(this);
 
         public ElementCache()
         {
@@ -195,64 +115,5 @@ public Checkbox initialCheckbox(String name)
         {
             return Checkbox.Checkbox(Locator.input(name)).findWhenNeeded(this);
         }
-
-        public Checkbox dataTypesCheckbox(AdvancedOptionsCheckBoxes value)
-        {
-            return Checkbox.Checkbox(Locator.tagWithAttribute("input", "value", value.getValue()))
-                    .findWhenNeeded(advancedOptionsPanel);
-        }
-    }
-
-    public enum AdvancedOptionsCheckBoxes
-    {
-        AssaySchedule("Assay Schedule"),
-        Categories("Categories"),
-        CohortSettings("Cohort Settings"),
-        ContainerSpecificModuleProperties("Container specific module properties"),
-        CustomParticipantView("Custom Participant View"),
-        CustomViews("Custom Views"),
-        DatasetData("Dataset Data"),
-        DatasetDefinitions("Dataset Definitions"),
-        ExperimentsAndRuns("Experiments, Protocols, and Runs"),
-        ExternalSchemaDefinitions("External schema definitions"),
-        FolderTypeAndActiveModules("Folder type and active modules"),
-        FullTextSearchSettings("Full-text search settings"),
-        Lists("Lists"),
-        MissingValueIndicators("Missing value indicators"),
-        NotificationSettings("Notification settings"),
-        ParticipantCommentSettings("Participant Comment Settings"),
-        ParticipantGroups("Participant Groups"),
-        ProjectLevelGroupsAndMembers("Project-level groups and members"),
-        ProtocolDocuments("Protocol Documents"),
-        QCStateSettings("QC State Settings"),
-        Queries("Queries"),
-        Reports("Reports"),
-        RoleAssignmentsForUsersAndGroups("Role assignments for users and groups"),
-//        Study("Study"),  // Study is there but currently not visible.
-        SpecimenSettings("Specimens"),
-        Specimens("Specimen Settings"),
-        TopLevelStudyProperties("Top-level Study Properties"),
-        TreatmentData("Treatment Data"),
-        VisitMap("Visit Map"),
-        WebpartPropertiesAndLayout("Webpart properties and layout"),
-        WikisAndTheirAttachments("Wikis and their attachments");
-
-        private final String value;
-
-        AdvancedOptionsCheckBoxes(String value)
-        {
-            this.value = value;
-        }
-
-        public String getValue()
-        {
-            return value;
-        }
-
-        @Override
-        public String toString()
-        {
-            return value;
-        }
     }
 }

src/org/labkey/test/pages/admin/ImportFolderPage.java

@@ -126,7 +126,6 @@ protected class ElementCache extends LabKeyPage<?>.ElementCache
         RadioButton localZipRadio = new RadioButton.RadioButtonFinder().withLabel("Local zip archive").findWhenNeeded(this);
         RadioButton existingFolderRadio = new RadioButton.RadioButtonFinder().withLabel("Existing folder").findWhenNeeded(this);
         Checkbox validateQueriesCheckbox = Checkbox.Checkbox(Locator.input("validateQueries")).findWhenNeeded(this);
-        Checkbox advancedOptionsCheckbox = Checkbox.Checkbox(Locator.input("advancedImportOptions")).findWhenNeeded(this);
         Checkbox createSharedDatasetsCheckbox = Checkbox.Checkbox(Locator.input("createSharedDatasets")).findWhenNeeded(this);
         ComboBox sourceFolderCombo = new ComboBox.ComboBoxFinder(getDriver()).withInputNamed("sourceTemplateFolder").findWhenNeeded(this);