Fix URL replace

eclipse-aaspe · Jun 6, 2024 · 48b30a5 · 48b30a5
1 parent 18619a2
commit 48b30a5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/AasxServerBlazor/Pages/Pcf2.razor b/src/AasxServerBlazor/Pages/Pcf2.razor
@@ -353,7 +353,8 @@
                                             var registry = AasRegistryService.GetRegistryList();
                                             if (registry.Count != 0)
                                             {
-                                                string registryURL = "";
+                                                string registryURL = registry[0];
+
                                                 // check for buffered shell descriptors from getregistry() for basyx
                                                 var aasDescriptors = AasRegistryService.GetAasDescriptorsForSubmodelView();
                                                 if (aasDescriptors != null && aasDescriptors.Count != 0)
@@ -362,10 +363,6 @@
                                                     registryURL = registryURL.Substring(0, registryURL.Length - "/pcf".Length);
                                                     Console.WriteLine("registryURL " + registryURL);
                                                 }
-                                                else
-                                                {
-                                                    registryURL = registry[0];
-                                                }
 
                                                 if (AasxCredentials.get(cs.credentials, registryURL, out queryPara, out userPW, out urlEdcWrapper, out replace, true))
                                                 {
@@ -376,7 +373,6 @@
                                                 link += "&registryURL=" + registryURL;
                                             }
 
-                                            // JUIJUI
                                             queryPara = "";
                                             userPW = "";
                                             urlEdcWrapper = "";

diff --git a/src/AasxServerBlazor/Shared/MainLayout.razor b/src/AasxServerBlazor/Shared/MainLayout.razor
@@ -301,25 +301,34 @@
         {
             if (env != null)
             {
+                var queryPara = "";
+                var userPW = "";
+                var urlEdcWrapper = "";
+                string replace = "";
+
                 var aas = env.AasEnv.AssetAdministrationShells[0];
                 if (aas.IdShort != "ZveiControlCabinetAas - EXTERNAL")
                     continue;
 
                 link = getAasLink(aas);
 
-                // var registry = IO.Swagger.Registry.Controllers.RegistryAndDiscoveryInterfaceApiController.getRegistry;
-                // JUIJUI
                 var registry = AasRegistryService.GetRegistryList();
                 if (registry != null && registry.Count != 0)
                 {
-                    link += "&registryURL=" + registry[0];
+                    string registryURL = registry[0];
+
+                    if (AasxCredentials.get(cs.credentials, registryURL, out queryPara, out userPW, out urlEdcWrapper, out replace, true))
+                    {
+                        if (replace != "")
+                            registryURL = replace;
+                    }
+                    link += registryURL;
                 }
-                // JUIJUI
 
-                var queryPara = "";
-                var userPW = "";
-                var urlEdcWrapper = "";
-                string replace = "";
+                queryPara = "";
+                userPW = "";
+                urlEdcWrapper = "";
+                replace = "";
                 if (AasxCredentials.get(cs.credentials, link, out queryPara, out userPW, out urlEdcWrapper, out replace, true))
                 {
                     if (replace != "")