From b761e1f41995e9e7f5a8143eca1133bf873b2153 Mon Sep 17 00:00:00 2001 From: Merkle OSS CI Date: Fri, 2 Feb 2024 11:10:46 +0000 Subject: [PATCH 1/3] Release 0.0.12: set develop to next development version 0.0.13-SNAPSHOT --- blossom-reference-generator/pom.xml | 2 +- blossom/pom.xml | 2 +- light-development/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blossom-reference-generator/pom.xml b/blossom-reference-generator/pom.xml index eac04d7..f9fe0c8 100644 --- a/blossom-reference-generator/pom.xml +++ b/blossom-reference-generator/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.magnolia magnolia-handlebars-renderer-parent - 0.0.12 + 0.0.13-SNAPSHOT magnolia-handlebars-blossom-reference-generator diff --git a/blossom/pom.xml b/blossom/pom.xml index 4273d75..d6aa4ca 100644 --- a/blossom/pom.xml +++ b/blossom/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.magnolia magnolia-handlebars-renderer-parent - 0.0.12 + 0.0.13-SNAPSHOT magnolia-handlebars-renderer-blossom diff --git a/light-development/pom.xml b/light-development/pom.xml index b859dca..397a0ab 100644 --- a/light-development/pom.xml +++ b/light-development/pom.xml @@ -6,7 +6,7 @@ com.namics.oss.magnolia magnolia-handlebars-renderer-parent - 0.0.12 + 0.0.13-SNAPSHOT magnolia-handlebars-renderer diff --git a/pom.xml b/pom.xml index b656369..8279db0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.namics.oss.magnolia magnolia-handlebars-renderer-parent - 0.0.12 + 0.0.13-SNAPSHOT pom ${project.artifactId} From 41d019caf019e238a0f5e9b00653d075f6bc2d0b Mon Sep 17 00:00:00 2001 From: eschleb Date: Wed, 7 Feb 2024 10:06:40 +0100 Subject: [PATCH 2/3] Fix release step --- .github/workflows/release-and-deploy-release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release-and-deploy-release.yml b/.github/workflows/release-and-deploy-release.yml index 574ab68..dcdec71 100644 --- a/.github/workflows/release-and-deploy-release.yml +++ b/.github/workflows/release-and-deploy-release.yml @@ -21,6 +21,11 @@ jobs: uses: actions/setup-java@v1 with: java-version: 11 + - name: Maven setup + uses: ./.github/actions/mvn-setup + with: + mgnl_nexus_user: ${{secrets.MGNL_NEXUS_USER}} + mgnl_nexus_pass: ${{secrets.MGNL_NEXUS_PASS}} # Install xmllint - name: Install dependencies run: sudo apt-get update && sudo apt-get install libxml2-utils From 993fb9e0048ddc2a1200c4d8d2fb43da9891b03b Mon Sep 17 00:00:00 2001 From: eschleb Date: Fri, 9 Feb 2024 08:13:50 +0100 Subject: [PATCH 3/3] Fix unnecessary error logs when no write permissions to create areaNode --- .../magnolia/CmsAreaTemplateHelper.java | 54 ++++++++++--------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/light-development/src/main/java/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java b/light-development/src/main/java/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java index a911598..81c4376 100755 --- a/light-development/src/main/java/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java +++ b/light-development/src/main/java/com/merkle/oss/magnolia/renderer/handlebars/helpers/magnolia/CmsAreaTemplateHelper.java @@ -27,6 +27,7 @@ import info.magnolia.templating.module.TemplatingModule; import org.apache.commons.lang3.StringUtils; +import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; import javax.jcr.*; @@ -67,27 +68,32 @@ public Optional applySafe(final Object ignored, final Options opti final Node templateNode = Optional.ofNullable((Node)options.hash("templateNode")).orElseGet(model::getNode); final AreaDefinition areaDefinition = getAreaDefinition(area, templateNode); - final Node areaNode = getOrCreateAreaNode(area, templateNode, areaDefinition); - final String workspace = areaNode.getSession().getWorkspace().getName(); - final String nodeIdentifier = areaNode.getIdentifier(); - final String path = areaNode.getPath(); - - //Magnolia's AreaElement.begin calls render with empty HashMap --> use ContextObjectsRenderingEngineWrapper - final AreaElement areaElement = Components.getComponentProvider().newInstance( - CustomAvailableComponentsAreaElement.class, - new ContextObjectsRenderingEngineWrapper(renderingEngine, options.hash) - ); - areaElement.setContent(areaNode); - areaElement.setWorkspace(workspace); - areaElement.setNodeIdentifier(nodeIdentifier); - areaElement.setPath(path); - areaElement.setArea(areaDefinition); - areaElement.setName(name); - areaElement.setContextAttributes(options.hash); - areaElement.setEditable(editable); + @Nullable + final Node areaNode = getOrCreateAreaNode(area, templateNode, areaDefinition).orElse(null); + if(areaNode != null) { + final String workspace = areaNode.getSession().getWorkspace().getName(); + final String nodeIdentifier = areaNode.getIdentifier(); + final String path = areaNode.getPath(); + + //Magnolia's AreaElement.begin calls render with empty HashMap --> use ContextObjectsRenderingEngineWrapper + final AreaElement areaElement = Components.getComponentProvider().newInstance( + CustomAvailableComponentsAreaElement.class, + new ContextObjectsRenderingEngineWrapper(renderingEngine, options.hash) + ); + areaElement.setContent(areaNode); + areaElement.setWorkspace(workspace); + areaElement.setNodeIdentifier(nodeIdentifier); + areaElement.setPath(path); + areaElement.setArea(areaDefinition); + areaElement.setName(name); + areaElement.setContextAttributes(options.hash); + + areaElement.setEditable(editable); - return Optional.of(render(areaElement)); + return Optional.of(render(areaElement)); + } + return Optional.empty(); } @SuppressWarnings("rawtypes") @@ -136,16 +142,14 @@ private Optional getAreaDefinition(final String name, final Map< .findFirst(); } - private Node getOrCreateAreaNode(final String name, final Node node, final AreaDefinition areaDefinition) throws RenderException { + private Optional getOrCreateAreaNode(final String name, final Node node, final AreaDefinition areaDefinition) throws RenderException { try { if(Boolean.FALSE.equals(areaDefinition.getCreateAreaNode())) { - return node; + return Optional.of(node); } - return node.getNode(name); + return Optional.of(node.getNode(name)); } catch (PathNotFoundException e) { - return createAreaNode(name, node, areaDefinition).orElseThrow(() -> - new RenderException("Couldn't create area node " + name + " " + NodeUtil.getPathIfPossible(node)) - ); + return createAreaNode(name, node, areaDefinition); } catch (RepositoryException e) { throw Exceptions.sneak().handle(e); }