feat: Add Space Widgets Portlet Instance Images - MEED-7557 - Meeds-i…

…o/MIPs#151
Meeds-io · Oct 2, 2024 · fba5281 · fba5281
1 parent 50bf0f7
commit fba5281
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/...service/src/main/java/io/meeds/layout/service/injection/PortletInstanceImportService.java b/...service/src/main/java/io/meeds/layout/service/injection/PortletInstanceImportService.java
@@ -114,7 +114,7 @@ public class PortletInstanceImportService {
   @Value("${meeds.portlets.import.override:false}")
   private boolean                        forceReimport;
 
-  @Value("${meeds.portlets.import.version:2}")
+  @Value("${meeds.portlets.import.version:4}")
   private long                           portletInstanceImportVersion;
 
   @PostConstruct
@@ -124,11 +124,10 @@ public void init() {
 
   @ContainerTransactional
   public void importPortletInstances() {
-    LOG.info("Importing Portlet instances");
-    if (!forceReimport
-        && getSettingValue(PORTLET_INSTANCE_VERSION) != portletInstanceImportVersion) {
+    if (!forceReimport && getSettingValue(PORTLET_INSTANCE_VERSION) != portletInstanceImportVersion) {
       forceReimport = true;
     }
+    LOG.info("Importing Portlet instances with version {}, force reimport = {}", portletInstanceImportVersion, forceReimport);
 
     ConversationState.setCurrent(layoutAclService.getSuperUserConversationState());
     try {

diff --git a/layout-service/src/main/resources/portlet-instances.json b/layout-service/src/main/resources/portlet-instances.json
@@ -220,6 +220,7 @@
       "descriptions":{
         "en":"layout.portletInstance.SpaceWidgetDescription.description"
       },
+      "illustrationPath":"war:/../images/portlets/spaceWidgetDescription.webp",
       "permissions":["Everyone"],
       "system":true
     },
@@ -233,6 +234,7 @@
       "descriptions":{
         "en":"layout.portletInstance.SpaceWidgetManagers.description"
       },
+      "illustrationPath":"war:/../images/portlets/spaceWidgetManagers.webp",
       "permissions":["Everyone"],
       "system":true
     },
@@ -246,6 +248,7 @@
       "descriptions":{
         "en":"layout.portletInstance.SpaceWidgetMembers.description"
       },
+      "illustrationPath":"war:/../images/portlets/spaceWidgetMembers.webp",
       "permissions":["Everyone"],
       "system":true
     },

diff --git a/layout-webapp/src/main/resources/layout.properties b/layout-webapp/src/main/resources/layout.properties
@@ -18,4 +18,3 @@
 #  Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 spring.liquibase.change-log=classpath:changelog/layout-rdbms.db.changelog-master.xml
-meeds.portlets.import.version=3
diff --git a/layout-webapp/src/main/webapp/images/portlets/spaceWidgetDescription.webp b/layout-webapp/src/main/webapp/images/portlets/spaceWidgetDescription.webp
diff --git a/layout-webapp/src/main/webapp/images/portlets/spaceWidgetManagers.webp b/layout-webapp/src/main/webapp/images/portlets/spaceWidgetManagers.webp
diff --git a/layout-webapp/src/main/webapp/images/portlets/spaceWidgetMembers.webp b/layout-webapp/src/main/webapp/images/portlets/spaceWidgetMembers.webp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,3 @@
		# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

		spring.liquibase.change-log=classpath:changelog/layout-rdbms.db.changelog-master.xml
		meeds.portlets.import.version=3