Merge exip layout builder enhancement mips

layout-service/src/main/java/io/meeds/layout/model/LayoutModel.java

@@ -160,6 +160,70 @@ public class LayoutModel {
 
   private String                          textSubtitleFontStyle;
 
+  private String                          textTitleBackgroundColor;
+
+  private String                          textTitleBackgroundImage;
+
+  private String                          textTitleBackgroundEffect;
+
+  private String                          textTitleBackgroundPosition;
+
+  private String                          textTitleBackgroundSize;
+
+  private String                          textTitleBackgroundRepeat;
+
+  private String                          textTitleBackgroundPadding;
+
+  private String                          textTitleBackgroundRadius;
+
+  private String                          textHeaderBackgroundColor;
+
+  private String                          textHeaderBackgroundImage;
+
+  private String                          textHeaderBackgroundEffect;
+
+  private String                          textHeaderBackgroundPosition;
+
+  private String                          textHeaderBackgroundSize;
+
+  private String                          textHeaderBackgroundRepeat;
+
+  private String                          textHeaderBackgroundPadding;
+
+  private String                          textHeaderBackgroundRadius;
+
+  private String                          textBackgroundColor;
+
+  private String                          textBackgroundImage;
+
+  private String                          textBackgroundEffect;
+
+  private String                          textBackgroundPosition;
+
+  private String                          textBackgroundSize;
+
+  private String                          textBackgroundRepeat;
+
+  private String                          textBackgroundPadding;
+
+  private String                          textBackgroundRadius;
+
+  private String                          textSubtitleBackgroundColor;
+
+  private String                          textSubtitleBackgroundImage;
+
+  private String                          textSubtitleBackgroundEffect;
+
+  private String                          textSubtitleBackgroundPosition;
+
+  private String                          textSubtitleBackgroundSize;
+
+  private String                          textSubtitleBackgroundRepeat;
+
+  private String                          textSubtitleBackgroundPadding;
+
+  private String                          textSubtitleBackgroundRadius;
+
   private String[]                        accessPermissions;
 
   // Specific to container
@@ -243,6 +307,38 @@ private void init(ModelObject model, PortletInstanceService portletInstanceServi
       this.textSubtitleFontSize = cssStyle.getTextSubtitleFontSize();
       this.textSubtitleFontWeight = cssStyle.getTextSubtitleFontWeight();
       this.textSubtitleFontStyle = cssStyle.getTextSubtitleFontStyle();
+      this.textTitleBackgroundColor = cssStyle.getTextTitleBackgroundColor();
+      this.textTitleBackgroundImage = cssStyle.getTextTitleBackgroundImage();
+      this.textTitleBackgroundEffect = cssStyle.getTextTitleBackgroundEffect();
+      this.textTitleBackgroundPosition = cssStyle.getTextTitleBackgroundPosition();
+      this.textTitleBackgroundSize = cssStyle.getTextTitleBackgroundSize();
+      this.textTitleBackgroundRepeat = cssStyle.getTextTitleBackgroundRepeat();
+      this.textTitleBackgroundPadding = cssStyle.getTextTitleBackgroundPadding();
+      this.textTitleBackgroundRadius = cssStyle.getTextTitleBackgroundRadius();
+      this.textHeaderBackgroundColor = cssStyle.getTextHeaderBackgroundColor();
+      this.textHeaderBackgroundImage = cssStyle.getTextHeaderBackgroundImage();
+      this.textHeaderBackgroundEffect = cssStyle.getTextHeaderBackgroundEffect();
+      this.textHeaderBackgroundPosition = cssStyle.getTextHeaderBackgroundPosition();
+      this.textHeaderBackgroundSize = cssStyle.getTextHeaderBackgroundSize();
+      this.textHeaderBackgroundRepeat = cssStyle.getTextHeaderBackgroundRepeat();
+      this.textHeaderBackgroundPadding = cssStyle.getTextHeaderBackgroundPadding();
+      this.textHeaderBackgroundRadius = cssStyle.getTextHeaderBackgroundRadius();
+      this.textBackgroundColor = cssStyle.getTextBackgroundColor();
+      this.textBackgroundImage = cssStyle.getTextBackgroundImage();
+      this.textBackgroundEffect = cssStyle.getTextBackgroundEffect();
+      this.textBackgroundPosition = cssStyle.getTextBackgroundPosition();
+      this.textBackgroundSize = cssStyle.getTextBackgroundSize();
+      this.textBackgroundRepeat = cssStyle.getTextBackgroundRepeat();
+      this.textBackgroundPadding = cssStyle.getTextBackgroundPadding();
+      this.textBackgroundRadius = cssStyle.getTextBackgroundRadius();
+      this.textSubtitleBackgroundColor = cssStyle.getTextSubtitleBackgroundColor();
+      this.textSubtitleBackgroundImage = cssStyle.getTextSubtitleBackgroundImage();
+      this.textSubtitleBackgroundEffect = cssStyle.getTextSubtitleBackgroundEffect();
+      this.textSubtitleBackgroundPosition = cssStyle.getTextSubtitleBackgroundPosition();
+      this.textSubtitleBackgroundSize = cssStyle.getTextSubtitleBackgroundSize();
+      this.textSubtitleBackgroundRepeat = cssStyle.getTextSubtitleBackgroundRepeat();
+      this.textSubtitleBackgroundPadding = cssStyle.getTextSubtitleBackgroundPadding();
+      this.textSubtitleBackgroundRadius = cssStyle.getTextSubtitleBackgroundRadius();
     }
 
     if (model instanceof PageBody pageBody) {

layout-service/src/main/java/io/meeds/layout/plugin/attachment/AbstractLayoutAttachmentPlugin.java

@@ -0,0 +1,131 @@
+/**
+ * This file is part of the Meeds project (https://meeds.io/).
+ *
+ * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package io.meeds.layout.plugin.attachment;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.exoplatform.commons.exception.ObjectNotFoundException;
+import org.exoplatform.portal.config.model.Page;
+import org.exoplatform.portal.config.model.PortalConfig;
+import org.exoplatform.portal.mop.SiteKey;
+import org.exoplatform.portal.mop.SiteType;
+import org.exoplatform.portal.mop.page.PageKey;
+import org.exoplatform.portal.mop.service.LayoutService;
+import org.exoplatform.services.security.Identity;
+import org.exoplatform.social.attachment.AttachmentPlugin;
+import org.exoplatform.social.attachment.AttachmentService;
+
+import io.meeds.layout.service.LayoutAclService;
+
+import jakarta.annotation.PostConstruct;
+
+/**
+ * Common logic shared by every container/section background attachment
+ * plugin (the whole app/section background, and each per-text-type
+ * background). Subclasses only declare their own {@code OBJECT_TYPE}.
+ */
+public abstract class AbstractLayoutAttachmentPlugin extends AttachmentPlugin {
+
+  private static final String PAGE_PREFIX = "page_";
+
+  private static final String SITE_PREFIX = "site_";
+
+  @Autowired
+  private LayoutAclService    layoutAclService;
+
+  @Autowired
+  private LayoutService       layoutService;
+
+  @Autowired
+  private AttachmentService   attachmentService;
+
+  @PostConstruct
+  public void init() {
+    attachmentService.addPlugin(this);
+  }
+
+  @Override
+  public boolean hasEditPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException {
+    if (StringUtils.contains(entityId, SITE_PREFIX)) {
+      SiteKey siteKey = getSiteKey(entityId);
+      return layoutAclService.canEditSite(siteKey, getUsername(userIdentity));
+    } else {
+      PageKey pageKey = getPageKey(entityId);
+      return pageKey != null && layoutAclService.canEditPage(pageKey, getUsername(userIdentity));
+    }
+  }
+
+  @Override
+  public boolean hasAccessPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException {
+    if (StringUtils.contains(entityId, SITE_PREFIX)) {
+      SiteKey siteKey = getSiteKey(entityId);
+      return siteKey.getType() == SiteType.GROUP_TEMPLATE
+             || siteKey.getType() == SiteType.PORTAL_TEMPLATE
+             || layoutAclService.canViewSite(siteKey, getUsername(userIdentity));
+    } else {
+      PageKey pageKey = getPageKey(entityId);
+      if (pageKey == null) {
+        return false;
+      } else {
+        SiteKey siteKey = pageKey.getSite();
+        return siteKey.getType() == SiteType.GROUP_TEMPLATE
+               || siteKey.getType() == SiteType.PORTAL_TEMPLATE
+               || layoutAclService.canViewPage(pageKey, getUsername(userIdentity));
+      }
+    }
+  }
+
+  @Override
+  public long getAudienceId(String objectId) throws ObjectNotFoundException {
+    return 0;
+  }
+
+  @Override
+  public long getSpaceId(String objectId) throws ObjectNotFoundException {
+    return 0;
+  }
+
+  private PageKey getPageKey(String entityId) {
+    String pageUuid = entityId.split("_")[0].replace(PAGE_PREFIX, "");
+    long pageId = StringUtils.isNumeric(pageUuid) ? Long.parseLong(pageUuid) : 0;
+    if (pageId == 0) {
+      pageUuid = entityId.replace(PAGE_PREFIX, "").split("_")[0];
+      pageId = StringUtils.isNumeric(pageUuid) ? Long.parseLong(pageUuid) : 0;
+    }
+    if (pageId == 0) {
+      return null;
+    } else {
+      Page page = layoutService.getPage(pageId);
+      return page == null ? null : page.getPageKey();
+    }
+  }
+
+  private SiteKey getSiteKey(String entityId) {
+    String siteUuid = entityId.replace(SITE_PREFIX, "").split("_")[0];
+    long siteId = StringUtils.isNumeric(siteUuid) ? Long.parseLong(siteUuid) : 0;
+    PortalConfig site = layoutService.getPortalConfig(siteId);
+    return new SiteKey(site.getType(), site.getName());
+  }
+
+  private String getUsername(Identity userIdentity) {
+    return userIdentity == null ? null : userIdentity.getUserId();
+  }
+
+}

layout-service/src/main/java/io/meeds/layout/plugin/attachment/LayoutBackgroundAttachmentPlugin.java

@@ -18,121 +18,19 @@
  */
 package io.meeds.layout.plugin.attachment;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
-import org.exoplatform.commons.exception.ObjectNotFoundException;
-import org.exoplatform.portal.config.model.Page;
-import org.exoplatform.portal.config.model.PortalConfig;
-import org.exoplatform.portal.mop.SiteKey;
-import org.exoplatform.portal.mop.SiteType;
-import org.exoplatform.portal.mop.page.PageKey;
-import org.exoplatform.portal.mop.service.LayoutService;
-import org.exoplatform.services.security.Identity;
-import org.exoplatform.social.attachment.AttachmentPlugin;
-import org.exoplatform.social.attachment.AttachmentService;
-
-import io.meeds.layout.service.LayoutAclService;
-
-import jakarta.annotation.PostConstruct;
-
 @Component
 @Order(Ordered.HIGHEST_PRECEDENCE)
-public class LayoutBackgroundAttachmentPlugin extends AttachmentPlugin {
-
-  public static final String  OBJECT_TYPE = "containerBackground";
-
-  private static final String PAGE_PREFIX = "page_";
-
-  private static final String SITE_PREFIX = "site_";
-
-  @Autowired
-  private LayoutAclService    layoutAclService;
+public class LayoutBackgroundAttachmentPlugin extends AbstractLayoutAttachmentPlugin {
 
-  @Autowired
-  private LayoutService       layoutService;
-
-  @Autowired
-  private AttachmentService   attachmentService;
-
-  @PostConstruct
-  public void init() {
-    attachmentService.addPlugin(this);
-  }
+  public static final String OBJECT_TYPE = "containerBackground";
 
   @Override
   public String getObjectType() {
     return OBJECT_TYPE;
   }
 
-  @Override
-  public boolean hasEditPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException {
-    if (StringUtils.contains(entityId, SITE_PREFIX)) {
-      SiteKey siteKey = getSiteKey(entityId);
-      return layoutAclService.canEditSite(siteKey, getUsername(userIdentity));
-    } else {
-      PageKey pageKey = getPageKey(entityId);
-      return pageKey != null && layoutAclService.canEditPage(pageKey, getUsername(userIdentity));
-    }
-  }
-
-  @Override
-  public boolean hasAccessPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException {
-    if (StringUtils.contains(entityId, SITE_PREFIX)) {
-      SiteKey siteKey = getSiteKey(entityId);
-      return siteKey.getType() == SiteType.GROUP_TEMPLATE
-             || siteKey.getType() == SiteType.PORTAL_TEMPLATE
-             || layoutAclService.canViewSite(siteKey, getUsername(userIdentity));
-    } else {
-      PageKey pageKey = getPageKey(entityId);
-      if (pageKey == null) {
-        return false;
-      } else {
-        SiteKey siteKey = pageKey.getSite();
-        return siteKey.getType() == SiteType.GROUP_TEMPLATE
-               || siteKey.getType() == SiteType.PORTAL_TEMPLATE
-               || layoutAclService.canViewPage(pageKey, getUsername(userIdentity));
-      }
-    }
-  }
-
-  @Override
-  public long getAudienceId(String objectId) throws ObjectNotFoundException {
-    return 0;
-  }
-
-  @Override
-  public long getSpaceId(String objectId) throws ObjectNotFoundException {
-    return 0;
-  }
-
-  private PageKey getPageKey(String entityId) {
-    String pageUuid = entityId.split("_")[0].replace(PAGE_PREFIX, "");
-    long pageId = StringUtils.isNumeric(pageUuid) ? Long.parseLong(pageUuid) : 0;
-    if (pageId == 0) {
-      pageUuid = entityId.replace(PAGE_PREFIX, "").split("_")[0];
-      pageId = StringUtils.isNumeric(pageUuid) ? Long.parseLong(pageUuid) : 0;
-    }
-    if (pageId == 0) {
-      return null;
-    } else {
-      Page page = layoutService.getPage(pageId);
-      return page == null ? null : page.getPageKey();
-    }
-  }
-
-  private SiteKey getSiteKey(String entityId) {
-    String siteUuid = entityId.replace(SITE_PREFIX, "").split("_")[0];
-    long siteId = StringUtils.isNumeric(siteUuid) ? Long.parseLong(siteUuid) : 0;
-    PortalConfig site = layoutService.getPortalConfig(siteId);
-    return new SiteKey(site.getType(), site.getName());
-  }
-
-  private String getUsername(Identity userIdentity) {
-    return userIdentity == null ? null : userIdentity.getUserId();
-  }
-
 }