Issues/618 htl server #624

cmrockwell · 2020-10-22T17:23:39Z

Notable changes presented by this PR

added Maven module pagerender/server to parent pom.xml. This will allow the server side HTL module to compile as a reactor module. Without a theme installed, users cannot create new sites. It allows the work to be safely merged to develop-sling12 without impacting rendering styles
Updated PageMerge.java adding a new method that will return a list of merged resources for htl rendering
Updated pagerender/server pom.xml such that the project builds successfully
Updated pagerender/server example/test content
Added 3 Content Merge Scenarios to AdaptionJTest
Updated Container.java under pagerender/server project such as that container content merges properly
Refactored the Sling Junit Tests such that they are separated by runmodes
Allows per:Site to have site settings
~~Introduces a concept of components allowed by templates~~ (this change is coming in a separate pr)

This PR relates to issues #618 #624 #621 #620

…h common-lang dependency. Also frontend-maven-plugin (node) was failing, but not sure what it does for server/ui.apps. Commenting out for now, also the module to build, install and deploy to Sling

Fix NPE due to incorrect the init method local variable 'resource' overriding instance property

…mple vue site can have new page without errors. Added TODO comments about nav and footer for these sites

…nderserver/components. Adjusted PageRenderServerConstants.java and /content/pagerenderserver/ paths accordingly

…ferences

…tion (AdaptTo) for per:Page and per:Asset types; and their ability to get the correct per:Site resource as implemented in PerBaseImpl.java

…. Refactored Helper.java to allow siteCSS to exist under per:Site/jcr:content

…e pagerenderer/server module, it may be useful to continue support the npm build processes. this commit updates a few deps to keep updated with the other modules. may be necessary to mvn clean -PcleanNodeModules or reinstall via npm i.

…rning a list of resources coming either from the template or the page content.

…g merged resources as htl

…elpers alike. Refactored PageHelper Use class to extend BaseHelper

…ed PageHelper to use getters instead of direct access

…tent ValueMap

cmrockwell · 2020-11-02T15:11:52Z

Please merge this part to develop-sling12. I plan to move attention to the authoring side tickets for SSR. This PR adds solutions to the bullet points listed in the description. I don't like building for weeks & months on one branch only to face nasty merge conflicts in the end.

reusr1 · 2020-11-02T15:27:24Z

@cmrockwell since you are changing the page merger here - does this have any impact on the overall vue js renderer? Can you explain what is changing in the data.json output due to the change of the merger?

cmrockwell · 2020-11-02T17:11:29Z

There's no impact to Vue JS (data.json) rendering. The changes I'm making to PageMerge.java are to support a new method getMergedResources The new method uses the same map used for Vue rendering, and the method returns a flattened ordered List of Sling Resource for HTL rendering

…riptHelper is null, then it will try to get the modelFactory from the bindings, which is added by the Adaption Jtest adds it. Use classes have bindings such as resource. Getting the resource from the request was problematic for testing, it is easier to test if PageMaerg.java uses the resource reference from the bindings, and not the reference attached to the request

…d to use resource from the bindings and not a reference through the request

…st whether getMergedResources properly merges template content with page content for HTL rendering

…the serverSide property. if it exists and is true, then load the page. Otherwise proceed with clientside rendering.

cmrockwell · 2021-04-13T22:50:27Z

Based on the discussion in the water cooler meeting, I reviewed and tested the changes again.
I stand by the changes. I think there is limited exposure to vue stuff, but I have tested that and don't there are any new bugs. Some of the changes were because Ruben asked to move stuff from pagerenderserver/structure to pagerenderserver/components. Or asked to have junit tests under different runmodes. The XML content is there for testing. But now after hearing the team's concerns, I'm doubting if this is better left on a fork.

reusr1 · 2021-04-14T12:03:03Z

@cmrockwell I think this is a very valuable addition to peregrine and should be merged and in my opinion it should not be kept on a fork.

…ingjunit.core pom.xml files

…n the parents

….html

reusr1 · 2021-04-19T11:42:54Z

@cmrockwell was testing peregrine a bit with the server side rendered PR in it - looks nice :-) got a couple of questions:

I am trying to understand the /apps/nt/unstructured addition to understand how it is used and if it has a side effect
copy/paste of components seems to not refresh the page at the moment

I also took the liberty to

change the elements in the pom's to be in line with the vue renderer: 3cf2125
added server side rendering to the docker image build as a supported renderer out of the box

cmrockwell · 2021-04-19T16:50:03Z

I am trying to understand the /apps/nt/unstructured addition to understand how it is used and if it has a side effect

Here's a refresher about the /apps/nt/unstructured addition. It helps render the container that came from template, to which an editor added components.

This page is an example
http://localhost:8080/content/pagerenderserver/pages/non-empty-container.html

It uses template
http://localhost:8080/bin/browser.html/content/pagerenderserver/templates/empty-container

This template has the container but no other content
http://localhost:8080/bin/browser.html/content/pagerenderserver/templates/empty-container/_jcr_content/content

When an editor creates and edits a page using this template (like a text component)
http://localhost:8080/bin/browser.html/content/pagerenderserver/pages/non-empty-container/_jcr_content/content/text1

Then the intermediate paths for the container become nt:unstructured within the page's content
http://localhost:8080/bin/browser.html/content/pagerenderserver/pages/non-empty-container/_jcr_content/content
jcr:primaryType = "nt:unstructured"

And since there is currently no html rendering for nt:unstructured, we decided to implement that instead of adding resourceTypes for the intermediate containers.

….apps rider Helper.java (replaced with models), added image logo, updated base.html

…ine-cms into issues/618-htl-server

reusr1

approving this - we can deal with issues that may come up because of this PR later

flx-sta

Some small changes requested 🚀

pagerenderer/server/core/src/main/java/com/peregrine/pagerender/server/models/NavModel.java

pagerenderer/server/ui.apps/src/main/content/jcr_root/content/pagerenderserver/.content.xml

pagerenderer/vue/ui.apps/src/main/js/peregrineApp.js

samples/example-vue-site/core/src/main/java/com/example/site/models/NavModel.java

...gjunit.parent/core.remote/src/main/java/com/peregrine/slingjunit/author/PermissionJTest.java

…data property in peregrineApp.js, remove commented and unused lines from NavModel.java, use the common pattern for public static final String" "

flx-sta · 2021-04-26T20:08:19Z

pagerenderer/vue/ui.apps/src/main/js/peregrineApp.js

-            // } else {
-            processLoadedContent(response.data, path, firstTime, fromPopState)
-            // }
+            if (response.hasOwnProperty('data') && response.data.serverSide === true) {


👍
could have just used response.data && ... but doesn't really matter

cmrockwell added 5 commits October 21, 2020 12:14

pagerenderer/server won't deploy to my develop-sling12. Has to do wit…

579b7eb

…h common-lang dependency. Also frontend-maven-plugin (node) was failing, but not sure what it does for server/ui.apps. Commenting out for now, also the module to build, install and deploy to Sling

Add missing base template for /content/pagerenderserver/templates

2a2c757

Fix NPE due to incorrect the init method local variable 'resource' overriding instance property

flag pagerenderserver site as internal

2df4737

added base template to /content/pagerenderserver/templates so the exa…

3a12a67

…mple vue site can have new page without errors. Added TODO comments about nav and footer for these sites

refactored by moving /apps/pagerenderserver/structure to /apps/pagere…

df1049d

…nderserver/components. Adjusted PageRenderServerConstants.java and /content/pagerenderserver/ paths accordingly

cmrockwell added the htl Sling HTL Rendering label Oct 22, 2020

cmrockwell requested a review from reusr1 October 22, 2020 17:23

cmrockwell added 11 commits October 22, 2020 14:30

finished moving page from structure to omponents by updating these re…

5e093fd

…ferences

To addtess issue #636, Sling JUnit Tests were added for resource adap…

2019764

…tion (AdaptTo) for per:Page and per:Asset types; and their ability to get the correct per:Site resource as implemented in PerBaseImpl.java

#618 Moved Helper.java to core, and updated data-sly-use in page.html…

51469da

…. Refactored Helper.java to allow siteCSS to exist under per:Site/jcr:content

add pagerender/server to list of maven compile modules

80cb826

#618 Updated PageMerge.java adding a method (getMergedResources) retu…

0a057d2

…rning a list of resources coming either from the template or the page content.

#618 Updated page.html to use PageMerge.java for getting and iteratin…

750a23b

…g merged resources as htl

#618 updated predifned page and template content

1befe34

Created BaseHelper Use, which can be extended by page and component h…

7b3c31f

…elpers alike. Refactored PageHelper Use class to extend BaseHelper

#618 Added getters for all HTL Java Use binding for BaseHelper, updat…

49e5a7d

…ed PageHelper to use getters instead of direct access

#618 Added convenience method to PerBase for getting per:Site/jcr:con…

5d4b073

…tent ValueMap

reusr1 marked this pull request as draft November 3, 2020 15:37

cmrockwell added 5 commits November 6, 2020 09:49

organized slingjunit pom.xml deps

3276e59

618 to make testing easier and possible, NavModel Use pojo was update…

817c997

…d to use resource from the bindings and not a reference through the request

618 added ssrPageMergeScenario1 for PageMerge::getMergedResources. Te…

ccc3a5d

…st whether getMergedResources properly merges template content with page content for HTL rendering

started example sub-template for PageMerge junit tests

16d9457

cmrockwell removed request for GastonGonzalez and reggie7 April 13, 2021 20:01

When a site uses both server-side templates and vue templates, check …

fd8413d

…the serverSide property. if it exists and is true, then load the page. Otherwise proceed with clientside rendering.

cmrockwell requested review from reusr1, GastonGonzalez and reggie7 April 13, 2021 22:35

cmrockwell and others added 4 commits April 14, 2021 17:36

updated Sling Junit Core to version 1.1.2, and removed unused deps sl…

6024826

…ingjunit.core pom.xml files

getSiteResource should return null if there is no per:Site resource i…

884ae81

…n the parents

started basic footer htl component; removed debug path output in page…

d95c8b3

….html

updated names in pom to match the vue page renderer

3cf2125

reusr1 added 2 commits April 19, 2021 04:52

add server side rendering to docker build

c243a26

Merge branch 'develop-sling12' into issues/618-htl-server

9c024f3

cmrockwell added 5 commits April 19, 2021 18:00

updated bootstrap

c540c78

added nav component for server side rendering internal site

3224334

updated footer component adding model

e3908a4

added basic footer nav template for pagerenderserver site, removed ui…

386c069

….apps rider Helper.java (replaced with models), added image logo, updated base.html

Merge branch 'issues/618-htl-server' of github.com:headwirecom/peregr…

8e118a4

…ine-cms into issues/618-htl-server

cmrockwell requested a review from flx-sta April 20, 2021 14:57

reusr1 approved these changes Apr 20, 2021

View reviewed changes

flx-sta requested changes Apr 23, 2021

View reviewed changes

updates to resolve PR suggestions: add check for response object for …

6088a74

…data property in peregrineApp.js, remove commented and unused lines from NavModel.java, use the common pattern for public static final String" "

cmrockwell requested a review from flx-sta April 24, 2021 19:11

Merge branch 'develop-sling12' into issues/618-htl-server

5901bee

flx-sta approved these changes Apr 26, 2021

View reviewed changes

cmrockwell merged commit f5bce05 into develop-sling12 Apr 26, 2021

cmrockwell deleted the issues/618-htl-server branch April 26, 2021 20:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issues/618 htl server #624

Issues/618 htl server #624

cmrockwell commented Oct 22, 2020 •

edited

Loading

cmrockwell commented Nov 2, 2020

reusr1 commented Nov 2, 2020

cmrockwell commented Nov 2, 2020 •

edited

Loading

cmrockwell commented Apr 13, 2021

reusr1 commented Apr 14, 2021

reusr1 commented Apr 19, 2021 •

edited

Loading

cmrockwell commented Apr 19, 2021

reusr1 left a comment

flx-sta left a comment

flx-sta Apr 26, 2021

Issues/618 htl server #624

Issues/618 htl server #624

Conversation

cmrockwell commented Oct 22, 2020 • edited Loading

cmrockwell commented Nov 2, 2020

reusr1 commented Nov 2, 2020

cmrockwell commented Nov 2, 2020 • edited Loading

cmrockwell commented Apr 13, 2021

reusr1 commented Apr 14, 2021

reusr1 commented Apr 19, 2021 • edited Loading

cmrockwell commented Apr 19, 2021

reusr1 left a comment

Choose a reason for hiding this comment

flx-sta left a comment

Choose a reason for hiding this comment

flx-sta Apr 26, 2021

Choose a reason for hiding this comment

cmrockwell commented Oct 22, 2020 •

edited

Loading

cmrockwell commented Nov 2, 2020 •

edited

Loading

reusr1 commented Apr 19, 2021 •

edited

Loading