From b2f443aa148ccc69b6804a19cc7eeebae7d7084e Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Wed, 2 Sep 2026 11:26:41 -0700 Subject: [PATCH 1/2] fix for AuthenticationProviderReorderTest.testReorderConfigurations --- .../AuthenticationConfiguration.tsx | 3 ++- .../devtools/AuthenticationProviderReorderTest.java | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx index 36eb0b962d3..358b6326a48 100644 --- a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx +++ b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx @@ -212,7 +212,8 @@ class AuthenticationConfiguration extends PureComponent<{}, Partial> { const oldOrdering = state.dirtinessData[configType]; return !isEquivalent(newOrdering, oldOrdering); }); - const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData); + // const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData); + const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData.globalSettings); return { ...newState, dirty }; }); diff --git a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java index c80d8d92888..9d396181944 100644 --- a/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java +++ b/devtools/test/src/org/labkey/test/tests/devtools/AuthenticationProviderReorderTest.java @@ -70,12 +70,11 @@ public void testReorderConfigurations() assertSsoLinkOrder(config_uncool, config_cool); simpleSignIn(); - configurePage = LoginConfigurePage.beginAt(this); - WebElement uncoolRow = Locator.byClass("domain-row-handle").findElement(configurePage.getPrimaryConfigurationRow(config_uncool)); - WebElement coolRow = Locator.byClass("domain-row-handle").findElement(configurePage.getPrimaryConfigurationRow(config_cool)); - dragAndDrop(uncoolRow, coolRow); - BootstrapLocators.infoBanner.waitForElement(getDriver(), 2_000); - configurePage.clickSaveAndFinish(); + LoginConfigurePage reorderPage = LoginConfigurePage.beginAt(this); + keyboardDragAndDrop(reorderPage.getPrimaryConfigurationRow(config_uncool).getDragHandle(), + reorderPage.getPrimaryConfigurationRow(config_cool).getDragHandle()); + waitFor(() -> BootstrapLocators.infoBanner.existsIn(getDriver()), "Configurations were not reordered", 2_000); + reorderPage.clickSaveAndFinish(); signOut(); assertSsoLinkOrder(config_cool, config_uncool); From 74d962085deb974cc4d45e0958d20e26a81d7260 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Wed, 2 Sep 2026 11:28:39 -0700 Subject: [PATCH 2/2] delete comment --- .../AuthenticationConfiguration/AuthenticationConfiguration.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx index 358b6326a48..4219594f2ff 100644 --- a/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx +++ b/core/src/client/AuthenticationConfiguration/AuthenticationConfiguration.tsx @@ -212,7 +212,6 @@ class AuthenticationConfiguration extends PureComponent<{}, Partial> { const oldOrdering = state.dirtinessData[configType]; return !isEquivalent(newOrdering, oldOrdering); }); - // const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData); const dirty = dirtyStateAreas.length > 0 || !isEquivalent({ ...globalSettings }, dirtinessData.globalSettings); return { ...newState, dirty };