fix: Use a better way to determine whether we have a built-in dashboa…

…rd (#394)
higress-group · Jan 2, 2025 · c14e12f · c14e12f
1 parent a783f45
commit c14e12f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/backend/console/pom.xml b/backend/console/pom.xml
@@ -15,6 +15,9 @@
 
 	<properties>
 		<nodejs.version>16.19.0</nodejs.version>
+
+		<app.build.version>2.0.0</app.build.version>
+		<app.build.dev>true</app.build.dev>
 	</properties>
 
 	<dependencies>

diff --git a/backend/console/src/main/java/com/alibaba/higress/console/controller/SystemController.java b/backend/console/src/main/java/com/alibaba/higress/console/controller/SystemController.java
@@ -32,8 +32,6 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.higress.console.constant.UserConfigKey;
-import com.alibaba.higress.console.controller.dto.DashboardInfo;
-import com.alibaba.higress.console.controller.dto.DashboardType;
 import com.alibaba.higress.console.controller.dto.Response;
 import com.alibaba.higress.console.controller.dto.SystemInfo;
 import com.alibaba.higress.console.controller.dto.SystemInitRequest;
@@ -81,9 +79,7 @@ public void setSystemService(SystemService systemService) {
     @PostConstruct
     public void syncSystemState() {
         configService.setConfig(UserConfigKey.SYSTEM_INITIALIZED, sessionService.isAdminInitialized());
-        DashboardInfo dashboardInfo = dashboardService.getDashboardInfo(DashboardType.MAIN);
-        configService.setConfig(UserConfigKey.DASHBOARD_BUILTIN,
-            dashboardInfo != null && Boolean.TRUE.equals(dashboardInfo.getBuiltIn()));
+        configService.setConfig(UserConfigKey.DASHBOARD_BUILTIN, dashboardService.isBuiltIn());
     }
 
     @PostMapping("/init")

diff --git a/backend/console/src/main/java/com/alibaba/higress/console/service/DashboardService.java b/backend/console/src/main/java/com/alibaba/higress/console/service/DashboardService.java
@@ -25,6 +25,8 @@
  */
 public interface DashboardService {
 
+    boolean isBuiltIn();
+
     @Deprecated
     DashboardInfo getDashboardInfo();
 

diff --git a/backend/console/src/main/java/com/alibaba/higress/console/service/DashboardServiceImpl.java b/backend/console/src/main/java/com/alibaba/higress/console/service/DashboardServiceImpl.java
@@ -175,6 +175,10 @@ public void initialize() {
         }
     }
 
+    public boolean isBuiltIn() {
+        return StringUtils.isNoneBlank(apiBaseUrl, promDatasourceUrl, lokiDatasourceUrl);
+    }
+
     @Override
     public DashboardInfo getDashboardInfo() {
         return getDashboardInfo(DashboardType.MAIN);
@@ -377,10 +381,6 @@ private DashboardInfo getConfiguredDashboardInfo(DashboardType type) {
         return new DashboardInfo(false, null, url);
     }
 
-    private boolean isBuiltIn() {
-        return StringUtils.isNoneBlank(apiBaseUrl, promDatasourceUrl, lokiDatasourceUrl);
-    }
-
     private String buildConfigData(String dashboardConfiguration, String datasourceUid) {
         return dashboardConfiguration.replace(DATASOURCE_UID_PLACEHOLDER, datasourceUid);
     }

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -75,9 +75,6 @@
 		<plugin.inputEncoding>${project.build.sourceEncoding}</plugin.inputEncoding>
 		<plugin.outputEncoding>${project.build.sourceEncoding}</plugin.outputEncoding>
 
-		<app.build.version>1.2.1</app.build.version>
-		<app.build.dev>true</app.build.dev>
-
 		<delombok.output>${project.basedir}/target/delombok-sources</delombok.output>
 	</properties>