Return the root domain name for instances without data domain support…

… to let the combo box show it.
dqops · Sep 25, 2024 · 52434f1 · 52434f1
1 parent 2e9e97a
commit 52434f1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/dqops/src/main/java/com/dqops/core/domains/LocalDataDomainRegistryImpl.java b/dqops/src/main/java/com/dqops/core/domains/LocalDataDomainRegistryImpl.java
@@ -182,7 +182,7 @@ public Collection<LocalDataDomainSpec> getAllLocalDataDomains() {
         ArrayList<LocalDataDomainSpec> allDomains = new ArrayList<>();
         allDomains.add(new LocalDataDomainSpec() {{
             setDataDomainName(UserDomainIdentity.ROOT_DOMAIN_ALTERNATE_NAME);
-            setDisplayName("Root data domain");
+            setDisplayName(UserDomainIdentity.ROOT_DOMAIN_DISPLAY_NAME);
         }});
 
         allDomains.addAll(nestedDataDomains);

diff --git a/dqops/src/main/java/com/dqops/core/principal/UserDomainIdentity.java b/dqops/src/main/java/com/dqops/core/principal/UserDomainIdentity.java
@@ -40,6 +40,11 @@ public class UserDomainIdentity {
      */
     public static final String ROOT_DOMAIN_ALTERNATE_NAME = "(default)";
 
+    /**
+     * The display name shown for the root data domain.
+     */
+    public static final String ROOT_DOMAIN_DISPLAY_NAME = "Root data domain";
+
     /**
      * The default identity of the local instance, a user who manages the root data domain on this DQOps instance.
      */

diff --git a/dqops/src/main/java/com/dqops/rest/controllers/DataDomainsController.java b/dqops/src/main/java/com/dqops/rest/controllers/DataDomainsController.java
@@ -17,6 +17,7 @@
 package com.dqops.rest.controllers;
 
 import com.dqops.core.configuration.DqoInstanceConfigurationProperties;
+import com.dqops.core.configuration.DqoUserConfigurationProperties;
 import com.dqops.core.domains.DataDomainsService;
 import com.dqops.core.domains.DqoDataDomainException;
 import com.dqops.core.domains.LocalDataDomainModel;
@@ -49,6 +50,7 @@
 import reactor.core.publisher.Mono;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
@@ -66,6 +68,7 @@ public class DataDomainsController {
     private final UserHomeContextFactory userHomeContextFactory;
     private final LocalDataDomainRegistry localDataDomainRegistry;
     private final DqoInstanceConfigurationProperties dqoInstanceConfigurationProperties;
+    private final DqoUserConfigurationProperties dqoUserConfigurationProperties;
     private final InstanceCloudLoginService instanceCloudLoginService;
 
 
@@ -76,18 +79,21 @@ public class DataDomainsController {
      * @param userHomeContextFactory User home context factory.
      * @param localDataDomainRegistry Local data domain registry.
      * @param dqoInstanceConfigurationProperties DQOps instance configuration - the cookie expiration time.
+     * @param dqoUserConfigurationProperties DQO User Home configuration - to identify the default data domain.
      * @param instanceCloudLoginService Cloud login controller.
      */
     @Autowired
     public DataDomainsController(DataDomainsService dataDomainsService,
                                  UserHomeContextFactory userHomeContextFactory,
                                  LocalDataDomainRegistry localDataDomainRegistry,
                                  DqoInstanceConfigurationProperties dqoInstanceConfigurationProperties,
+                                 DqoUserConfigurationProperties dqoUserConfigurationProperties,
                                  InstanceCloudLoginService instanceCloudLoginService) {
         this.dataDomainsService = dataDomainsService;
         this.userHomeContextFactory = userHomeContextFactory;
         this.localDataDomainRegistry = localDataDomainRegistry;
         this.dqoInstanceConfigurationProperties = dqoInstanceConfigurationProperties;
+        this.dqoUserConfigurationProperties = dqoUserConfigurationProperties;
         this.instanceCloudLoginService = instanceCloudLoginService;
     }
 
@@ -113,7 +119,13 @@ public Mono<ResponseEntity<Flux<LocalDataDomainModel>>> getLocalDataDomains(
             List<LocalDataDomainModel> allDataDomains = this.dataDomainsService.getAllDataDomains();
             LinkedHashMap<String, DqoUserRole> domainRoles = principal.getDomainRoles();
             if (domainRoles == null) {
-                return new ResponseEntity<>(Flux.empty(), HttpStatus.OK);
+                ArrayList<LocalDataDomainModel> rootDomainList = new ArrayList<>();
+                boolean isRootDomain = Objects.equals(dqoUserConfigurationProperties.getDefaultDataDomain(), UserDomainIdentity.ROOT_DATA_DOMAIN);
+                rootDomainList.add(new LocalDataDomainModel() {{
+                    setDomainName(isRootDomain ? UserDomainIdentity.ROOT_DOMAIN_ALTERNATE_NAME : dqoUserConfigurationProperties.getDefaultDataDomain());
+                    setDisplayName(isRootDomain ? UserDomainIdentity.ROOT_DOMAIN_DISPLAY_NAME : dqoUserConfigurationProperties.getDefaultDataDomain());
+                }});
+                return new ResponseEntity<>(Flux.fromStream(rootDomainList.stream()), HttpStatus.OK);
             }
 
             if (principal.getAccountRole() == DqoUserRole.NONE) {