Merge pull request #5255 from jay-hodgson/SWC-6653

SWC-6653
Sage-Bionetworks · Jan 11, 2024 · 196eac6 · 196eac6
2 parents 3a48e1c + cb46b20
commit 196eac6
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 10 deletions.
diff --git a/.../org/sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidget.java b/.../org/sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidget.java
@@ -23,6 +23,7 @@
 import org.sagebionetworks.web.client.SynapseJavascriptClient;
 import org.sagebionetworks.web.client.security.AuthenticationController;
 import org.sagebionetworks.web.client.utils.Callback;
+import org.sagebionetworks.web.client.widget.asynch.IsACTMemberAsyncHandler;
 import org.sagebionetworks.web.client.widget.entity.WikiPageWidget;
 import org.sagebionetworks.web.client.widget.entity.controller.SynapseAlert;
 import org.sagebionetworks.web.client.widget.lazyload.LazyLoadHelper;
@@ -67,7 +68,8 @@ public ACTAccessRequirementWidget(
     AuthenticationController authController,
     ReviewAccessorsButton manageAccessButton,
     ConvertACTAccessRequirementButton convertACTAccessRequirementButton,
-    SynapseJSNIUtils jsniUtils
+    SynapseJSNIUtils jsniUtils,
+    IsACTMemberAsyncHandler isACTMemberAsyncHandler
   ) {
     this.view = view;
     this.jsClient = jsClient;
@@ -107,6 +109,10 @@ public void invoke() {
         refreshApprovalState();
       }
     };
+    isACTMemberAsyncHandler.isACTActionAvailable(isACT -> {
+      view.setAccessRequirementIDVisible(isACT);
+      view.setCoveredEntitiesHeadingVisible(isACT);
+    });
 
     lazyLoadHelper.configure(loadDataCallback, view);
   }
@@ -147,7 +153,7 @@ public void onSuccess(String rootWikiId) {
     manageAccessButton.configure(ar);
     convertACTAccessRequirementButton.configure(ar, refreshCallback);
     view.setAccessRequirementName(ar.getName());
-
+    view.setAccessRequirementID(ar.getId().toString());
     lazyLoadHelper.setIsConfigured();
   }
 

diff --git a/.../sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetView.java b/.../sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetView.java
@@ -63,4 +63,10 @@ void setAccessRequirementRelatedProjectsList(
   public interface Presenter {
     void onRequestAccess();
   }
+
+  void setCoveredEntitiesHeadingVisible(boolean visible);
+
+  void setAccessRequirementIDVisible(boolean visible);
+
+  void setAccessRequirementID(String arID);
 }
diff --git a/...ebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.java b/...ebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.java
@@ -3,6 +3,7 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.InlineLabel;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.Widget;
@@ -82,6 +83,15 @@ public class ACTAccessRequirementWidgetViewImpl
   @UiField
   Span accessRequirementDescription;
 
+  @UiField
+  Div coveredEntitiesHeadingUI;
+
+  @UiField
+  Div accessRequirementIDUI;
+
+  @UiField
+  InlineLabel accessRequirementIDField;
+
   public interface Binder
     extends UiBinder<Widget, ACTAccessRequirementWidgetViewImpl> {}
 
@@ -263,4 +273,19 @@ public void setAccessRequirementName(String description) {
       accessRequirementDescription.removeStyleName("boldText");
     }
   }
+
+  @Override
+  public void setCoveredEntitiesHeadingVisible(boolean visible) {
+    coveredEntitiesHeadingUI.setVisible(visible);
+  }
+
+  @Override
+  public void setAccessRequirementID(String arID) {
+    accessRequirementIDField.setText(arID);
+  }
+
+  @Override
+  public void setAccessRequirementIDVisible(boolean visible) {
+    accessRequirementIDUI.setVisible(visible);
+  }
 }
diff --git a/...ionetworks/web/client/widget/accessrequirements/AccessRequirementRelatedProjectsList.java b/...ionetworks/web/client/widget/accessrequirements/AccessRequirementRelatedProjectsList.java
@@ -3,6 +3,7 @@
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
+import org.sagebionetworks.web.client.context.SynapseReactClientFullContextPropsProvider;
 import org.sagebionetworks.web.client.jsinterop.AccessRequirementRelatedProjectsListProps;
 import org.sagebionetworks.web.client.jsinterop.React;
 import org.sagebionetworks.web.client.jsinterop.ReactNode;
@@ -15,22 +16,26 @@ public class AccessRequirementRelatedProjectsList implements IsWidget {
 
   ReactComponentDiv container;
   public IsACTMemberAsyncHandler isACTMemberAsyncHandler;
+  public SynapseReactClientFullContextPropsProvider propsProvider;
 
   @Inject
   public AccessRequirementRelatedProjectsList(
-    IsACTMemberAsyncHandler isACTMemberAsyncHandler
+    IsACTMemberAsyncHandler isACTMemberAsyncHandler,
+    SynapseReactClientFullContextPropsProvider propsProvider
   ) {
     container = new ReactComponentDiv();
     this.isACTMemberAsyncHandler = isACTMemberAsyncHandler;
+    this.propsProvider = propsProvider;
     container.setVisible(false);
   }
 
   public void configure(String accessRequirementId) {
     AccessRequirementRelatedProjectsListProps props =
       AccessRequirementRelatedProjectsListProps.create(accessRequirementId);
-    ReactNode component = React.createElementWithThemeContext(
+    ReactNode component = React.createElementWithSynapseContext(
       SRC.SynapseComponents.AccessRequirementRelatedProjectsList,
-      props
+      props,
+      propsProvider.getJsInteropContextProps()
     );
     container.render(component);
     showIfACTMember();

diff --git a/...org/sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidget.java b/...org/sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidget.java
@@ -5,6 +5,7 @@
 import com.google.inject.Inject;
 import org.sagebionetworks.repo.model.LockAccessRequirement;
 import org.sagebionetworks.web.client.utils.Callback;
+import org.sagebionetworks.web.client.widget.asynch.IsACTMemberAsyncHandler;
 
 public class LockAccessRequirementWidget implements IsWidget {
 
@@ -21,18 +22,25 @@ public LockAccessRequirementWidget(
     TeamSubjectsWidget teamSubjectsWidget,
     EntitySubjectsWidget entitySubjectsWidget,
     AccessRequirementRelatedProjectsList accessRequirementRelatedProjectsList,
-    DeleteAccessRequirementButton deleteAccessRequirementButton
+    DeleteAccessRequirementButton deleteAccessRequirementButton,
+    IsACTMemberAsyncHandler isACTMemberAsyncHandler
   ) {
     this.view = view;
     this.teamSubjectsWidget = teamSubjectsWidget;
     this.entitySubjectsWidget = entitySubjectsWidget;
     this.deleteAccessRequirementButton = deleteAccessRequirementButton;
+    this.accessRequirementRelatedProjectsList =
+      accessRequirementRelatedProjectsList;
     view.setDeleteAccessRequirementWidget(deleteAccessRequirementButton);
     view.setTeamSubjectsWidget(teamSubjectsWidget);
     view.setEntitySubjectsWidget(entitySubjectsWidget);
     view.setAccessRequirementRelatedProjectsList(
       accessRequirementRelatedProjectsList
     );
+    isACTMemberAsyncHandler.isACTActionAvailable(isACT -> {
+      view.setAccessRequirementIDVisible(isACT);
+      view.setCoveredEntitiesHeadingVisible(isACT);
+    });
   }
 
   public void setRequirement(
@@ -44,6 +52,7 @@ public void setRequirement(
     teamSubjectsWidget.configure(ar.getSubjectIds());
     entitySubjectsWidget.configure(ar.getSubjectIds());
     accessRequirementRelatedProjectsList.configure(ar.getId().toString());
+    view.setAccessRequirementID(ar.getId().toString());
   }
 
   public void addStyleNames(String styleNames) {

diff --git a/...sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetView.java b/...sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetView.java
@@ -14,4 +14,10 @@ public interface LockAccessRequirementWidgetView extends IsWidget {
   void setAccessRequirementRelatedProjectsList(
     IsWidget accessRequirementRelatedProjectsList
   );
+
+  void setCoveredEntitiesHeadingVisible(boolean visible);
+
+  void setAccessRequirementIDVisible(boolean visible);
+
+  void setAccessRequirementID(String arID);
 }
diff --git a/...bionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.java b/...bionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.java
@@ -2,6 +2,7 @@
 
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.user.client.ui.InlineLabel;
 import com.google.gwt.user.client.ui.IsWidget;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Inject;
@@ -22,6 +23,15 @@ public class LockAccessRequirementWidgetViewImpl
   @UiField
   Div accessRequirementRelatedProjectsListContainer;
 
+  @UiField
+  Div coveredEntitiesHeadingUI;
+
+  @UiField
+  Div accessRequirementIDUI;
+
+  @UiField
+  InlineLabel accessRequirementIDField;
+
   public interface Binder
     extends UiBinder<Widget, LockAccessRequirementWidgetViewImpl> {}
 
@@ -55,7 +65,7 @@ public void setTeamSubjectsWidget(IsWidget w) {
   }
 
   @Override
-  public void setEntitySubjectsWidget(IsWidget entitySubjectsWidget) {
+  public void setEntitySubjectsWidget(IsWidget w) {
     entitySubjectsWidgetContainer.clear();
     entitySubjectsWidgetContainer.add(w);
   }
@@ -65,4 +75,19 @@ public void setAccessRequirementRelatedProjectsList(IsWidget w) {
     accessRequirementRelatedProjectsListContainer.clear();
     accessRequirementRelatedProjectsListContainer.add(w);
   }
+
+  @Override
+  public void setCoveredEntitiesHeadingVisible(boolean visible) {
+    coveredEntitiesHeadingUI.setVisible(visible);
+  }
+
+  @Override
+  public void setAccessRequirementID(String arID) {
+    accessRequirementIDField.setText(arID);
+  }
+
+  @Override
+  public void setAccessRequirementIDVisible(boolean visible) {
+    accessRequirementIDUI.setVisible(visible);
+  }
 }
diff --git a/...ionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.ui.xml b/...ionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.ui.xml
@@ -61,7 +61,14 @@
 					and Compliance Team (ACT) to discuss at [email protected]
         </bh:Text>
       </bh:Div>
-      <bh:Div styleName="margin-top-10">
+      <bh:Div ui:field="accessRequirementIDUI" visible="false">
+        <g:InlineLabel
+          addStyleNames="boldText margin-right-5"
+          text="Access Requirement ID:"
+        />
+        <g:InlineLabel ui:field="accessRequirementIDField" />
+      </bh:Div>
+      <bh:Div ui:field="coveredEntitiesHeadingUI" styleName="margin-top-10">
         <g:InlineLabel styleName="boldText" text="Entities Covered" />
         <bh:Hr addStyleNames="margin-top-5 margin-bottom-5" />
       </bh:Div>

diff --git a/...onetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.ui.xml b/...onetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.ui.xml
@@ -26,7 +26,14 @@
           text="Access restricted pending review by Synapse Access and Compliance Team."
         />
       </bh:Div>
-      <bh:Div styleName="margin-top-10">
+      <bh:Div ui:field="accessRequirementIDUI" visible="false">
+        <g:InlineLabel
+          addStyleNames="boldText margin-right-5"
+          text="Access Requirement ID:"
+        />
+        <g:InlineLabel ui:field="accessRequirementIDField" />
+      </bh:Div>
+      <bh:Div ui:field="coveredEntitiesHeadingUI" styleName="margin-top-10">
         <g:InlineLabel styleName="boldText" text="Entities Covered" />
         <bh:Hr addStyleNames="margin-top-5 margin-bottom-5" />
       </bh:Div>

diff --git a/...ebionetworks/web/unitclient/widget/accessrequirements/ACTAccessRequirementWidgetTest.java b/...ebionetworks/web/unitclient/widget/accessrequirements/ACTAccessRequirementWidgetTest.java
@@ -45,6 +45,7 @@
 import org.sagebionetworks.web.client.widget.accessrequirements.EntitySubjectsWidget;
 import org.sagebionetworks.web.client.widget.accessrequirements.ReviewAccessorsButton;
 import org.sagebionetworks.web.client.widget.accessrequirements.TeamSubjectsWidget;
+import org.sagebionetworks.web.client.widget.asynch.IsACTMemberAsyncHandler;
 import org.sagebionetworks.web.client.widget.entity.WikiPageWidget;
 import org.sagebionetworks.web.client.widget.entity.controller.SynapseAlert;
 import org.sagebionetworks.web.client.widget.lazyload.LazyLoadHelper;
@@ -142,6 +143,9 @@ public class ACTAccessRequirementWidgetTest {
   @Mock
   SynapseJSNIUtils mockJsniUtils;
 
+  @Mock
+  IsACTMemberAsyncHandler mockIsACTMemberAsyncHandler;
+
   Callback lazyLoadDataCallback;
 
   public static final String ROOT_WIKI_ID = "777";
@@ -165,7 +169,8 @@ public void setUp() throws Exception {
         mockAuthController,
         mockManageAccessButton,
         mockConvertACTAccessRequirementButton,
-        mockJsniUtils
+        mockJsniUtils,
+        mockIsACTMemberAsyncHandler
       );
     when(mockACTAccessRequirement.getSubjectIds()).thenReturn(mockSubjectIds);
     AsyncMockStubber