From 1db101a9c366fee7a7f8cd54668c4866f6b06310 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Fri, 1 Dec 2023 15:48:24 +0200
Subject: [PATCH] Call loadSystemImages on each upgrade

---
 .../thingsboard/server/install/ThingsboardInstallService.java | 3 ++-
 .../thingsboard/server/service/install/InstallScripts.java    | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
index 6143398b73..d206eaea69 100644
--- a/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
+++ b/application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java
@@ -282,6 +282,7 @@ public class ThingsboardInstallService {
                     dataUpdateService.upgradeRuleNodes();
                     systemDataLoaderService.loadSystemWidgets();
                     installScripts.loadSystemLwm2mResources();
+                    installScripts.loadSystemImages();
                 }
                 log.info("Upgrade finished successfully!");
 
@@ -324,7 +325,7 @@ public class ThingsboardInstallService {
 //                systemDataLoaderService.loadSystemPlugins();
 //                systemDataLoaderService.loadSystemRules();
                 installScripts.loadSystemLwm2mResources();
-                installScripts.createSystemImages();
+                installScripts.loadSystemImages();
 
                 if (loadDemo) {
                     log.info("Loading demo data...");
diff --git a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
index 295ceb8970..1866ad4738 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java
@@ -304,15 +304,13 @@ public class InstallScripts {
     public void updateImages() {
         imagesUpdater.updateWidgetsBundlesImages();
         imagesUpdater.updateWidgetTypesImages();
-        createSystemImages();
-
         imagesUpdater.updateDashboardsImages();
         imagesUpdater.updateDeviceProfilesImages();
         imagesUpdater.updateAssetProfilesImages();
     }
 
     @SneakyThrows
-    public void createSystemImages() {
+    public void loadSystemImages() {
         Stream<Path> dashboardsFiles = Files.list(Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR));
         try (dashboardsFiles) {
             dashboardsFiles.forEach(file -> {