Fix the missing link between AdminWeb2 and AdminWeb1

cloud-barista · Sep 30, 2024 · a9d500e · a9d500e
1 parent 32ef8ff
commit a9d500e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/api-runtime/rest-runtime/CBSpiderRuntime.go b/api-runtime/rest-runtime/CBSpiderRuntime.go
@@ -476,17 +476,17 @@ func RunServer() {
 
 		{"GET", "/adminweb/dashboard", aw.Dashboard},
 
-		{"GET", "/adminweb/driver", aw.Driver},
-		{"GET", "/adminweb2/driver", aw.DriverManagement},
+		{"GET", "/adminweb/driver1", aw.Driver},
+		{"GET", "/adminweb/driver", aw.DriverManagement},
 
-		{"GET", "/adminweb/credential", aw.Credential},
-		{"GET", "/adminweb2/credential", aw.CredentialManagement},
+		{"GET", "/adminweb/credential1", aw.Credential},
+		{"GET", "/adminweb/credential", aw.CredentialManagement},
 
-		{"GET", "/adminweb/region", aw.Region},
-		{"GET", "/adminweb2/region", aw.RegionManagement},
+		{"GET", "/adminweb/region1", aw.Region},
+		{"GET", "/adminweb/region", aw.RegionManagement},
 
-		{"GET", "/adminweb/connectionconfig", aw.Connectionconfig},
-		{"GET", "/adminweb2/connectionconfig", aw.ConnectionManagement},
+		{"GET", "/adminweb/connectionconfig1", aw.Connectionconfig},
+		{"GET", "/adminweb/connectionconfig", aw.ConnectionManagement},
 
 		{"GET", "/adminweb/dashboard", aw.Dashboard},
 

diff --git a/api-runtime/rest-runtime/admin-web/AdminWeb-Frame.go b/api-runtime/rest-runtime/admin-web/AdminWeb-Frame.go
@@ -112,7 +112,7 @@ func Top(c echo.Context) error {
             <tr bgcolor="#FFFFFF" align="left">
                 <td rowspan="2" width="70" bgcolor="#FFFFFF" align="center">
                     <!-- CB-Spider Logo -->
-                    <a href="../adminweb" target="_top">
+                    <a href="../adminweb1" target="_top">
                         <img height="45" width="45" src="./images/logo.png" border='0' hspace='0' vspace='1' align="middle">
                     </a>
                     <font size=1>$$TIME$$</font>
@@ -125,25 +125,25 @@ func Top(c echo.Context) error {
             
             <td width="150"> 
                 <!-- Drivers Management --> 
-                <a href="driver" target="main_frame" id="menuDriver" onclick="selectMenu('menuDriver')">
+                <a href="driver1" target="main_frame" id="menuDriver" onclick="selectMenu('menuDriver')">
                     <font size=2>1.Driver</font>
                 </a>
             </td>
             <td width="190">       
                 <!-- Credential Management -->
-                <a href="credential" target="main_frame" id="menuCredential" onclick="selectMenu('menuCredential')">
+                <a href="credential1" target="main_frame" id="menuCredential" onclick="selectMenu('menuCredential')">
                     <font size=2>1.Credential</font>
                 </a>
             </td>
             <td width="130">
                 <!-- Regions Management -->
-                <a href="region" target="main_frame" id="menuRegion" onclick="selectMenu('menuRegion')"> 
+                <a href="region1" target="main_frame" id="menuRegion" onclick="selectMenu('menuRegion')"> 
                     <font size=2>1.Region</font>
                 </a>
             </td>
             <td width="300">
                 <!-- Connection Management -->
-                <a href="connectionconfig" target="main_frame" id="menuConnection" onclick="selectMenu('menuConnection')">
+                <a href="connectionconfig1" target="main_frame" id="menuConnection" onclick="selectMenu('menuConnection')">
                     <font size=2>2.CONNECTION</font>
                 </a>
             </td>

diff --git a/api-runtime/rest-runtime/admin-web/html/connection.html b/api-runtime/rest-runtime/admin-web/html/connection.html
@@ -527,19 +527,19 @@ <h2>{{$provider}}</h2>
                 <th>Connection Name</th>
                 <th>
                     Driver Name : Driver Library
-                    <a href="/spider/adminweb2/driver" class="mgmt-link">
+                    <a href="/spider/adminweb/driver" class="mgmt-link">
                         <img src="/spider/adminweb/images/mgmt.png" alt="Manage Driver">
                     </a>
                 </th>
                 <th>
                     Credential Name
-                    <a href="/spider/adminweb2/credential" class="mgmt-link">
+                    <a href="/spider/adminweb/credential" class="mgmt-link">
                         <img src="/spider/adminweb/images/mgmt.png" alt="Manage Credential">
                     </a>
                 </th>
                 <th>
                     Region Name : Region / Zone
-                    <a href="/spider/adminweb2/region" class="mgmt-link">
+                    <a href="/spider/adminweb/region" class="mgmt-link">
                         <img src="/spider/adminweb/images/mgmt.png" alt="Manage Region">
                     </a>
                 </th>

diff --git a/api-runtime/rest-runtime/admin-web/html/left_menu.html b/api-runtime/rest-runtime/admin-web/html/left_menu.html
@@ -89,7 +89,7 @@
             changeSelectedImage(menu);
             const menuUrlMap = {
                 dashboard: "/spider/adminweb/dashboard?showEmpty=true",
-                connection: "/spider/adminweb2/connectionconfig"
+                connection: "/spider/adminweb/connectionconfig"
             };
 
             const targetUrl = menuUrlMap[menu];
@@ -140,7 +140,7 @@
     </script>
 </head>
 <body>
-    <a href="/spider/adminweb2" target="_top" class="menu-item logo">
+    <a href="/spider/adminweb" target="_top" class="menu-item logo">
         <img src="./images/logo.png" border="0">
     </a>
     <div class="divider"></div> <!-- Divider after logo -->