From d1b66c62421a58486e11693cf43dc44dedd79574 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Fri, 14 Feb 2025 11:45:44 +0100 Subject: [PATCH 1/2] fix(ui): update domain configuration logic for internal AD schema --- core/ui/src/views/DomainConfiguration.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/ui/src/views/DomainConfiguration.vue b/core/ui/src/views/DomainConfiguration.vue index 32137a0e1..277f87443 100644 --- a/core/ui/src/views/DomainConfiguration.vue +++ b/core/ui/src/views/DomainConfiguration.vue @@ -1049,7 +1049,7 @@ export default { } this.currentProvider = provider; - if (this.domain.schema === "ad") { + if (this.domain.schema === "ad" && this.domain.location == "internal") { this.isShownDeleteSambaProviderModal = true; } else { this.isShownDeleteLdapProviderModal = true; From 377fb659269ef0d2ada6d604655062ab79674ca5 Mon Sep 17 00:00:00 2001 From: Stephane de Labrusse Date: Fri, 14 Feb 2025 11:46:08 +0100 Subject: [PATCH 2/2] feat(ui): emit reloadDomains event after adding external provider --- core/ui/src/components/domains/AddExternalProviderModal.vue | 1 + core/ui/src/views/DomainConfiguration.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/core/ui/src/components/domains/AddExternalProviderModal.vue b/core/ui/src/components/domains/AddExternalProviderModal.vue index 3b328e1c4..94bcbd431 100644 --- a/core/ui/src/components/domains/AddExternalProviderModal.vue +++ b/core/ui/src/components/domains/AddExternalProviderModal.vue @@ -176,6 +176,7 @@ export default { addExternalProviderCompleted() { // hide modal after validation this.$emit("hide"); + this.$emit("reloadDomains"); }, }, }; diff --git a/core/ui/src/views/DomainConfiguration.vue b/core/ui/src/views/DomainConfiguration.vue index 277f87443..ec8b9cace 100644 --- a/core/ui/src/views/DomainConfiguration.vue +++ b/core/ui/src/views/DomainConfiguration.vue @@ -520,6 +520,7 @@ :isShown="isShownAddExternalProviderModal" :domain="domain" @hide="hideAddExternalProviderModal" + @reloadDomains="listUserDomains" />