SWC-5787 - Refactor EntityMetadata to simplify experimental/non-experimental logic and pull logic out of view #5315
Conversation
…imental logic and pull logic out of view
| @@ -19,23 +19,23 @@ public interface BooleanCallback { | |||
| void run(boolean value); | |||
| } | |||
|
|
|||
| String entityId; | |||
| boolean show; | |||
| public String entityId; | |||
There was a problem hiding this comment.
Exposed to validate in test
|
|
||
| @JsNullable | ||
| Double versionNumber; | ||
| public Long versionNumber; |
There was a problem hiding this comment.
I have no idea why this was ever Double. Long works and is more correct.
There was a problem hiding this comment.
Long has required special consideration in GWT. Maybe the dev read this in the compatibility notes: "Additionally, long primitives cannot be used in JSNI code because they are not a native JavaScript numeric type."
| private EntityActionMenu actionMenu; | ||
| private final EntityModalWidget entityModalWidget; | ||
|
|
||
| private boolean annotationsAreVisible = false; |
There was a problem hiding this comment.
Store visibility state in the widget/presenter instead of the view
| @@ -58,7 +61,8 @@ public EntityMetadata( | |||
| SynapseJSNIUtils jsni, | |||
| RestrictionWidget restrictionWidgetV2, | |||
| ContainerItemCountWidget containerItemCountWidget, | |||
| PortalGinInjector ginInjector | |||
| PortalGinInjector ginInjector, | |||
| EntityModalWidget entityModalWidget | |||
There was a problem hiding this comment.
Instead of this widget and its view directly rendering the React component, refactor so that the React component is wrapped in and abstracted by this EntityModalWidget.
| @Override | ||
| public void setAnnotationsVisible(boolean visible) { |
There was a problem hiding this comment.
Any change to annotation visibility should go through presenter, since it needs to store current visibility in a local instance variable
| if (DisplayUtils.isInTestWebsite(ginInjector.getCookieProvider())) { | ||
| view.setAnnotationsModalVisible(visible); | ||
| entityModalWidget.setOpen(visible); | ||
| view.setAnnotationsVisible(false); | ||
| } else { | ||
| view.setAnnotationsVisible(visible); | ||
| entityModalWidget.setOpen(false); |
There was a problem hiding this comment.
In addition to showing the correct annotation viewer based on experimental mode, hide the other one
| } | ||
|
|
||
| public void setPresenter(Presenter presenter); | ||
|
|
||
| public void setDetailedMetadataVisible(boolean visible); | ||
|
|
||
| void setAnnotationsModalVisible(boolean visible); | ||
|
|
||
| boolean getAnnotationsVisible(); |
There was a problem hiding this comment.
View should not store state
| } | ||
|
|
||
| public void setPresenter(Presenter presenter); | ||
|
|
||
| public void setDetailedMetadataVisible(boolean visible); | ||
|
|
||
| void setAnnotationsModalVisible(boolean visible); |
There was a problem hiding this comment.
Modal visibility state now managed by EntityModalWidget
No description provided.