Skip to content

feat!: Refactor <Area> and <ContentArea> components #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baptistegrimaud merged 2 commits into from
Mar 25, 2025
Merged

feat!: Refactor <Area> and <ContentArea> components #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d424f3c
feat!: Refactor <Area> and <ContentArea> components
baptistegrimaud Mar 21, 2025
1be421f
typo
baptistegrimaud Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 27 additions & 25 deletions jahia-test-module/src/react/server/views/testAbsoluteAreas/TestAbsoluteAreas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,79 +7,81 @@ jahiaComponent(
displayName: "Test Absolute Areas (react)",
componentType: "view",
},
() => (
(_, { currentNode, renderContext }) => (
<>
<h2>React JAbsoluteArea test component</h2>

<h2>Basic Area</h2>
<div data-testid="basicArea">
<AbsoluteArea name={"basicArea"} level={1} />
<AbsoluteArea name={"basicArea"} parent={currentNode} />
</div>

<h2>Area with allowed types</h2>
<div data-testid="allowedTypesArea">
<AbsoluteArea
name={"allowedTypesArea"}
allowedTypes={["jnt:event", "jnt:bigText"]}
level={1}
parent={currentNode}
allowedNodeTypes={["jnt:event", "jnt:bigText"]}
/>
</div>

<h2>Area with number of items</h2>
<div data-testid="numberOfItemsArea">
<AbsoluteArea name={"numberOfItemsArea"} numberOfItems={2} level={1} />
<AbsoluteArea name={"numberOfItemsArea"} parent={currentNode} numberOfItems={2} />
</div>

<h2>Area with areaView</h2>
<div data-testid="areaViewArea">
<AbsoluteArea name={"areaViewArea"} areaView={"dropdown"} level={1} />
<AbsoluteArea name={"areaViewArea"} parent={currentNode} view={"dropdown"} />
</div>

<h2>Area with subNodesView</h2>
<div data-testid="subNodesViewArea">
<AbsoluteArea name={"subNodesViewArea"} subNodesView={"link"} level={1} />
<h2>Area with parent</h2>
<div data-testid="parentArea">
<AbsoluteArea name="subLevel" parent={currentNode.getNode("basicArea")} />
</div>

<h2>Area with path</h2>
<div data-testid="pathArea">
<AbsoluteArea path={"basicArea/subLevel"} level={1} />
<h2>Absolute Area with home page</h2>
<div data-testid="absoluteAreaHomePage">
<AbsoluteArea name="pagecontent" parent={renderContext.getSite().getHome()} />
</div>

<h2>Absolute Area with home page content</h2>
<div data-testid="absoluteArea">
<AbsoluteArea name="pagecontent" />
<h2>Absolute Area with custom page (sub-level)</h2>
<div data-testid="absoluteAreaCustomPage">
<AbsoluteArea
name="pagecontent"
parent={renderContext.getSite().getNode("custom/sub-level")}
/>
</div>

<h2>Non editable area </h2>
<div data-testid="nonEditableArea">
<AbsoluteArea name="nonEditable" readOnly level={1} />
</div>

<h2>Absolute area level </h2>
<div data-testid="absoluteAreaLevel">
<AbsoluteArea name="pagecontent" level={0} />
<AbsoluteArea name="nonEditable" parent={currentNode} readOnly />
</div>

<h2>Area type</h2>
<div data-testid="areaType">
<AbsoluteArea name="areaType" areaType="javascriptExample:testAreaColumns" level={1} />
<AbsoluteArea
name="areaType"
parent={currentNode}
nodeType="javascriptExample:testAreaColumns"
/>
</div>

<h2>Limited absolute area editing</h2>
<div data-testid="limitedAbsoluteAreaEdit">
<AbsoluteArea name="pagecontent" readOnly="children" />
<AbsoluteArea name="pagecontent" parent={currentNode} readOnly="children" />
</div>

<h2>Absolute Area parameters</h2>
<div data-testid="absoluteAreaParameters">
<AbsoluteArea
name="absoluteAreaParameters"
areaView="parameters"
parent={currentNode}
view="parameters"
parameters={{
stringParam1: "stringValue1",
stringParam2: "stringValue2",
}}
level={1}
/>
</div>
</>
Expand Down
4 changes: 2 additions & 2 deletions jahia-test-module/src/react/server/views/testAreaColumns/TestAreaColumns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jahiaComponent(
return (
<div data-testid={`row-${currentNode.getName()}`}>
<div data-testid={`${currentNode.getName()}-col-1`}>
<Area name={`${currentNode.getName()}-col-1`} areaAsSubNode={true} />
<Area name={`${currentNode.getName()}-col-1`} />
</div>
<div data-testid={`${currentNode.getName()}-col-2`}>
<Area name={`${currentNode.getName()}-col-2`} areaAsSubNode={true} />
<Area name={`${currentNode.getName()}-col-2`} />
Comment thread
baptistegrimaud marked this conversation as resolved.
</div>
</div>
);
Expand Down
22 changes: 6 additions & 16 deletions jahia-test-module/src/react/server/views/testAreas/TestAreas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jahiaComponent(

<h2>Area with allowed types</h2>
<div data-testid="allowedTypesArea">
<Area name={"allowedTypesArea"} allowedTypes={["jnt:event", "jnt:bigText"]} />
<Area name={"allowedTypesArea"} allowedNodeTypes={["jnt:event", "jnt:bigText"]} />
</div>

<h2>Area with number of items</h2>
Expand All @@ -28,39 +28,29 @@ jahiaComponent(

<h2>Area with areaView</h2>
<div data-testid="areaViewArea">
<Area name={"areaViewArea"} areaView={"dropdown"} />
</div>

<h2>Area with subNodesView</h2>
<div data-testid="subNodesViewArea">
<Area name={"subNodesViewArea"} subNodesView={"link"} />
<Area name={"areaViewArea"} view={"dropdown"} />
</div>

<h2>Area with path</h2>
<div data-testid="pathArea">
<Area path={"basicArea/subLevel"} />
<div data-testid="parentArea">
<Area name={"basicArea/subLevel"} />
</div>

<h2>Non editable area </h2>
<div data-testid="nonEditableArea">
<Area name="nonEditable" readOnly />
</div>

<h2>Area as sub node </h2>
<div data-testid="areaAsSubNode">
<Area name="areaAsSubNode" areaAsSubNode={true} />
</div>

<h2>Area type</h2>
<div data-testid="areaType">
<Area name="areaType" areaType="javascriptExample:testAreaColumns" />
<Area name="areaType" nodeType="javascriptExample:testAreaColumns" />
</div>

<h2>Area parameters</h2>
<div data-testid="areaParameters">
<Area
name="areaParameters"
areaView="parameters"
view="parameters"
parameters={{
stringParam1: "stringValue1",
stringParam2: "stringValue2",
Expand Down
1 change: 1 addition & 0 deletions javascript-modules-engine-java/.java-ts-bind/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
"org.jahia.modules.javascript.modules.engine.js.server.OSGiHelper.*",
"org.jahia.modules.javascript.modules.engine.js.server.RegistryHelper.*",
"org.jahia.modules.javascript.modules.engine.js.server.RenderHelper.*",
"org.jahia.services.content.decorator.JCRNodeDecorator.getNode.*",
"org.jahia.services.content.JCRCallback.*",
"org.jahia.services.content.JCRItemWrapper.get.*",
"org.jahia.services.content.JCRItemWrapper.is.*",
Expand Down
6 changes: 6 additions & 0 deletions javascript-modules-engine-java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading
Loading