Skip to content

GitHub Issue 1446: Scope delete-data confirmation to current folder #3210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cnathe merged 2 commits into from
Sep 25, 2026
Merged

GitHub Issue 1446: Scope delete-data confirmation to current folder #3210

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e1c51
GitHub Issue 1446: test case for cross folder delete confirmation mes…
cnathe Sep 24, 2026
d8536c4
Merge remote-tracking branch 'origin/develop' into fb_deleteData1446
cnathe Sep 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions src/org/labkey/test/tests/DataClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.labkey.remoteapi.CommandException;
import org.labkey.test.BaseWebDriverTest;
import org.labkey.test.Locator;
import org.labkey.test.TestFileUtils;
Expand All @@ -34,11 +35,14 @@
import org.labkey.test.pages.experiment.CreateDataClassPage;
import org.labkey.test.pages.query.UpdateQueryRowPage;
import org.labkey.test.params.FieldDefinition;
import org.labkey.test.params.experiment.DataClassDefinition;
import org.labkey.test.util.DataClassHelper;
import org.labkey.test.util.DataRegionTable;
import org.labkey.test.util.PortalHelper;
import org.labkey.test.util.TestDataGenerator;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -426,6 +430,46 @@ public void testDateAndTimeFields()

}

// GitHub Issue #1446
@Test
public void testDeleteConfirmationCrossFolder() throws IOException, CommandException
{
final String folderA = "DeleteConfirmFolderA";
final String folderB = "DeleteConfirmFolderB";
final String pathA = getProjectName() + "/" + folderA;
final String pathB = getProjectName() + "/" + folderB;
final String markerA = "DeleteConfirmMarkerA";
final String markerB = "DeleteConfirmMarkerB";
final String unresolvedMsg = "1 of the selected items could not be found in this folder.";

_containerHelper.createSubfolder(getProjectName(), folderA);
_containerHelper.createSubfolder(getProjectName(), folderB);
long rowIdA = insertDataClassRow(pathA, "DeleteConfirmClassA", markerA);
long rowIdB = insertDataClassRow(pathB, "DeleteConfirmClassB", markerB);

log("Request delete confirmation in folder A for rows from both folders");
beginAt(WebTestHelper.buildURL("experiment", pathA, "deleteSelectedData", Map.of("rowIds", rowIdA)) + "&rowIds=" + rowIdB);
assertTextPresent(markerA, unresolvedMsg);
assertTextNotPresent(markerB);

log("Request delete confirmation in folder B for its own row");
beginAt(WebTestHelper.buildURL("experiment", pathB, "deleteSelectedData", Map.of("rowIds", rowIdB)));
assertTextPresent(markerB);
assertTextNotPresent(unresolvedMsg);
}

private long insertDataClassRow(String containerPath, String dataClassName, String rowName) throws IOException, CommandException
{
TestDataGenerator dgen = new DataClassDefinition(dataClassName).create(createDefaultConnection(), containerPath);
dgen.addCustomRow(Map.of("Name", rowName));
Map<String, Object> row = dgen.insertRows(createDefaultConnection(), dgen.getRows()).getRows().getFirst();
return row.entrySet().stream()
.filter(e -> "rowId".equalsIgnoreCase(e.getKey()))
.map(e -> ((Number) e.getValue()).longValue())
.findFirst()
.orElseThrow(() -> new AssertionError("No RowId returned for inserted row " + rowName));
}

private void viewRawTableMetadata(String dataClassName)
{
beginAt(WebTestHelper.buildURL("query", getProjectName(), "rawTableMetaData", Map.of("schemaName", "exp.data", "query.queryName", dataClassName)));
Expand Down
Loading