You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/30 05:47:34 UTC
[isis] branch master updated: ISIS-3032: null-reference rendering fixes (blob/clob/obj-ref)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 0cd1c4a8e7 ISIS-3032: null-reference rendering fixes (blob/clob/obj-ref)
0cd1c4a8e7 is described below
commit 0cd1c4a8e7f9bb9e763d9931ab16c73beb0301e0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Apr 30 07:47:28 2022 +0200
ISIS-3032: null-reference rendering fixes (blob/clob/obj-ref)
---
.../value/semantics/ValueSemanticsAbstract.java | 4 +--
.../components/scalars/ScalarPanelAbstract2.java | 3 +--
.../blobclob/IsisBlobOrClobPanelAbstract.java | 31 +++++++++++-----------
.../components/scalars/markup/MarkupComponent.java | 5 ++++
.../scalars/reference/ReferencePanel.java | 2 +-
.../entitysimplelink/EntityLinkSimplePanel.css | 6 -----
.../entitysimplelink/EntityLinkSimplePanel.java | 8 +++---
.../org/apache/isis/viewer/wicket/ui/util/Wkt.java | 15 +++++++++++
8 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
index d5acf6425b..61346307bc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsAbstract.java
@@ -67,8 +67,8 @@ implements
@Getter
@RequiredArgsConstructor
public static enum PlaceholderLiteral {
- NULL_REPRESENTATION("(none)", "badge bg-light placeholder-literal-null"),
- SUPPRESSED("(suppressed)", "badge bg-light placeholder-literal-suppressed");
+ NULL_REPRESENTATION("(none)", "badge bg-light placeholder-literal-null"),
+ SUPPRESSED( "(suppressed)", "badge bg-light placeholder-literal-suppressed");
private final String literal;
private final String cssClass;
public String asText(final UnaryOperator<String> translator) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
index a09b9048bf..efb7dbae14 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
@@ -36,7 +36,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FieldFragement;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FieldFrame;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.PromptFragment;
-import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.isis.viewer.wicket.ui.panels.FormExecutorDefault;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.WktTooltips;
@@ -139,7 +138,7 @@ extends ScalarPanelAbstract {
}
return CompactFragment.LABEL
.createFragment(id, this, scalarValueId->
- new MarkupComponent(scalarValueId, this::obtainOutputFormat));
+ Wkt.markup(scalarValueId, this::obtainOutputFormat));
}
/**
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index baf879cd81..4b4f1338f1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -40,8 +40,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelFormFieldA
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.WktTooltips;
-import static org.apache.isis.commons.internal.functions._Functions.peek;
-
import lombok.val;
public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType>
@@ -90,7 +88,7 @@ extends ScalarPanelFormFieldAbstract<T> {
return getBlobOrClobFromModel()
.map(NamedWithMimeType::getName)
.orElseGet(()->
- PlaceholderLiteral.NULL_REPRESENTATION.asHtml(this::translate));
+ PlaceholderLiteral.NULL_REPRESENTATION.asText(this::translate));
}
@Override
@@ -112,18 +110,21 @@ extends ScalarPanelFormFieldAbstract<T> {
}
private Component createDownloadLink(final String id, final IModel<String> labelModel) {
- val linkContainer = getBlobOrClobFromModel()
- .map(this::newResource)
- .map(resource->(MarkupContainer)Wkt.downloadLinkNoCache(id, resource))
- .map(peek(downloadLink->{
- WktTooltips.addTooltip(downloadLink, translate("Download file"));
- }))
- .orElseGet(()->{
- // fallback to an inactive (no link) container, with secondary color
- return Wkt.cssAppend(Wkt.container(id), "link-secondary");
- });
- Wkt.labelAdd(linkContainer, CompactFragment.ID_LINK_LABEL, labelModel);
- return linkContainer;
+ return getBlobOrClobFromModel()
+ .map(this::newResource)
+ .map(resource->(MarkupContainer)Wkt.downloadLinkNoCache(id, resource))
+ .<Component>map(linkContainer->{
+ WktTooltips.addTooltip(linkContainer, translate("Download file"));
+ Wkt.labelAdd(linkContainer, CompactFragment.ID_LINK_LABEL, labelModel);
+ return linkContainer;
+ })
+ .orElseGet(()->{
+ // represent null reference by a simple markup displaying '(none)'
+ val linkContainer = Wkt.container(id);
+ Wkt.markupAdd(linkContainer, CompactFragment.ID_LINK_LABEL,
+ PlaceholderLiteral.NULL_REPRESENTATION.asHtml(this::translate));
+ return linkContainer;
+ });
}
// -- LEGACY
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
index b7069f85c8..c4384267b6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupComponent.java
@@ -25,6 +25,7 @@ import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.parser.XmlTag.TagType;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.spec.ManagedObject;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
@@ -51,6 +52,10 @@ public class MarkupComponent extends WebComponent {
super(id, model);
}
+ public MarkupComponent(final String id, final String html){
+ super(id, Model.of(html));
+ }
+
@Override
public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag){
val htmlContent = extractHtmlOrElse(getDefaultModelObject(), "" /*fallback*/);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index f72e228e68..0f8c326857 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -206,7 +206,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
|| isInlinePrompt) {
WktComponents.permanentlyHide(container, ID_ENTITY_TITLE_IF_NULL);
} else {
- Wkt.labelAdd(container, ID_ENTITY_TITLE_IF_NULL,
+ Wkt.markupAdd(container, ID_ENTITY_TITLE_IF_NULL,
PlaceholderLiteral.NULL_REPRESENTATION.asHtml(this::translate));
}
});
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
index 65d62c0ff6..af751d6b4f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.css
@@ -28,9 +28,3 @@ div.entitySimpleLinkPanel > div {
width: 16px;
height: 16px;
}
-
-.null-representation {
- opacity: 0.5;
-}
-
-
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
index 22c2ce17bd..4a28a4799f 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitysimplelink/EntityLinkSimplePanel.java
@@ -66,11 +66,9 @@ implements CancelHintRequired {
val isEmpty = ManagedObjects.isNullOrUnspecifiedOrEmpty(getModel().getObject());
if(isEmpty) {
- // represent no object by a simple label displaying '(none)'
- val nullRepresentation =
- Wkt.labelAdd(this, ID_ENTITY_TITLE_NULL,
- PlaceholderLiteral.NULL_REPRESENTATION.asHtml(this::translate));
- Wkt.cssAppend(nullRepresentation, "null-representation");
+ // represent null reference by a simple markup displaying '(none)'
+ Wkt.markupAdd(this, ID_ENTITY_TITLE_NULL,
+ PlaceholderLiteral.NULL_REPRESENTATION.asHtml(this::translate));
permanentlyHide(ID_ENTITY_ICON_AND_TITLE);
} else {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
index b0ff4dfd09..7518ec8a56 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/Wkt.java
@@ -83,6 +83,7 @@ import org.apache.isis.core.metamodel.interactions.managed.nonscalar.DataTableMo
import org.apache.isis.viewer.wicket.model.hints.IsisActionCompletedEvent;
import org.apache.isis.viewer.wicket.model.hints.IsisEnvelopeEvent;
import org.apache.isis.viewer.wicket.model.isis.WicketViewerSettings;
+import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
import org.apache.isis.viewer.wicket.ui.components.widgets.links.AjaxLinkNoPropagate;
import org.apache.isis.viewer.wicket.ui.panels.PanelUtil;
@@ -768,6 +769,20 @@ public class Wkt {
return add(container, listView(id, listModel, itemPopulator));
}
+ // -- MARKUP
+
+ public MarkupComponent markup(final String id, final IModel<String> htmlModel) {
+ return new MarkupComponent(id, htmlModel);
+ }
+
+ public MarkupComponent markup(final String id, final String html) {
+ return new MarkupComponent(id, html);
+ }
+
+ public MarkupComponent markupAdd(final MarkupContainer container, final String id, final String html) {
+ return add(container, markup(id, html));
+ }
+
// -- REPEATING VIEW
public RepeatingView repeatingView(final String id) {