more bug fixes

jay-hodgson · Dec 7, 2023 · eaa62d8 · eaa62d8
1 parent d922b94
commit eaa62d8
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 25 deletions.
diff --git a/src/main/java/org/sagebionetworks/web/client/jsinterop/EntityHeaderTableProps.java b/src/main/java/org/sagebionetworks/web/client/jsinterop/EntityHeaderTableProps.java
@@ -55,10 +55,10 @@ public static EntityHeaderTableProps create(
         for (ReferenceJsObject refJsObject : referenceListJsObject) {
           Reference ref = new Reference();
           ref.setTargetId(refJsObject.targetId);
-          ref.setTargetVersionNumber(refJsObject.targetVersionNumber);
           referenceList.add(ref);
         }
         newList.setReferences(referenceList);
+        onUpdate.invoke(newList);
       };
 
     return props;

diff --git a/...n/java/org/sagebionetworks/web/client/widget/accessrequirements/EntitySubjectsWidget.java b/...n/java/org/sagebionetworks/web/client/widget/accessrequirements/EntitySubjectsWidget.java
@@ -30,6 +30,7 @@ public EntitySubjectsWidget(
     this.view = view;
     this.isACTMemberAsyncHandler = isACTMemberAsyncHandler;
     view.setVisible(false);
+    view.setPresenter(this);
   }
 
   @Override

diff --git a/...lient/widget/accessrequirements/createaccessrequirement/CreateAccessRequirementStep1.java b/...lient/widget/accessrequirements/createaccessrequirement/CreateAccessRequirementStep1.java
@@ -160,7 +160,6 @@ public void onPrimary() {
     accessRequirement.setAccessType(currentAccessType);
     accessRequirement.setSubjectIds(subjects);
     accessRequirement.setName(view.getName());
-
     modalPresenter.setLoading(true);
     synapseClient.createOrUpdateAccessRequirement(
       accessRequirement,

diff --git a/...dget/accessrequirements/createaccessrequirement/CreateAccessRequirementStep1ViewImpl.java b/...dget/accessrequirements/createaccessrequirement/CreateAccessRequirementStep1ViewImpl.java
@@ -11,7 +11,6 @@
 import org.gwtbootstrap3.client.ui.FormGroup;
 import org.gwtbootstrap3.client.ui.InputGroup;
 import org.gwtbootstrap3.client.ui.Radio;
-import org.gwtbootstrap3.client.ui.TextArea;
 import org.gwtbootstrap3.client.ui.TextBox;
 import org.gwtbootstrap3.client.ui.html.Div;
 

diff --git a/...ionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.ui.xml b/...ionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.ui.xml
@@ -61,6 +61,10 @@
 					and Compliance Team (ACT) to discuss at [email protected]
         </bh:Text>
       </bh:Div>
+      <bh:Div
+        ui:field="entitySubjectsWidgetContainer"
+        addStyleNames="margin-left-5 margin-right-5"
+      />
       <bh:ClearFix />
       <bh:Div>
         <bh:Div
@@ -70,10 +74,6 @@
         />
       </bh:Div>
       <bh:ClearFix />
-      <bh:Div
-        ui:field="entitySubjectsWidgetContainer"
-        addStyleNames="margin-left-5 margin-right-5"
-      />
 
       <bh:Div addStyleNames="margin-top-5" ui:field="controlsContainer">
         <bh:Div

diff --git a/...onetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.ui.xml b/...onetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.ui.xml
@@ -26,12 +26,12 @@
           text="Access restricted pending review by Synapse Access and Compliance Team."
         />
       </bh:Div>
+      <bh:Div
+        ui:field="entitySubjectsWidgetContainer"
+        addStyleNames="margin-left-5 margin-right-5"
+      />
       <bh:ClearFix />
       <bh:Div>
-        <bh:Div
-          ui:field="entitySubjectsWidgetContainer"
-          addStyleNames="margin-left-5 margin-right-5"
-        />
         <bh:Div
           ui:field="teamSubjectsWidgetContainer"
           pull="LEFT"

diff --git a/...rks/web/client/widget/accessrequirements/ManagedACTAccessRequirementWidgetViewImpl.ui.xml b/...rks/web/client/widget/accessrequirements/ManagedACTAccessRequirementWidgetViewImpl.ui.xml
@@ -63,6 +63,10 @@
 					and Compliance Team (ACT) to discuss at [email protected]
         </bh:Text>
       </bh:Div>
+      <bh:Div
+        ui:field="entitySubjectsWidgetContainer"
+        addStyleNames="margin-left-5 margin-right-5"
+      />
       <bh:ClearFix />
       <bh:Div>
         <bh:Div
@@ -72,11 +76,6 @@
         />
       </bh:Div>
       <bh:ClearFix />
-      <bh:Div
-        ui:field="entitySubjectsWidgetContainer"
-        pull="LEFT"
-        addStyleNames="margin-left-5 margin-right-5"
-      />
       <bh:Div addStyleNames="margin-top-5" ui:field="controlsContainer">
         <bh:Div
           ui:field="reviewAccessRequestsContainer"

diff --git a/...works/web/client/widget/accessrequirements/SelfSignAccessRequirementWidgetViewImpl.ui.xml b/...works/web/client/widget/accessrequirements/SelfSignAccessRequirementWidgetViewImpl.ui.xml
@@ -33,6 +33,10 @@
       <b:BlockQuote>
         <g:SimplePanel ui:field="wikiContainer" />
       </b:BlockQuote>
+      <bh:Div
+        ui:field="entitySubjectsWidgetContainer"
+        addStyleNames="margin-left-5 margin-right-5"
+      />
       <bh:ClearFix />
       <bh:Div addStyleNames="margin-top-5" ui:field="controlsContainer">
         <bh:Div
@@ -88,11 +92,6 @@
           visible="false"
           addStyleNames="small-alert margin-right-2"
         />
-        <bh:Div
-          ui:field="entitySubjectsWidgetContainer"
-          addStyleNames="margin-left-5 margin-right-5"
-        />
-
         <bh:Div
           ui:field="teamSubjectsWidgetContainer"
           pull="LEFT"

diff --git a/...rks/web/client/widget/accessrequirements/TermsOfUseAccessRequirementWidgetViewImpl.ui.xml b/...rks/web/client/widget/accessrequirements/TermsOfUseAccessRequirementWidgetViewImpl.ui.xml
@@ -39,6 +39,11 @@
           <g:HTML ui:field="terms" styleName="font-size-14" />
         </bh:Paragraph>
       </b:BlockQuote>
+      <bh:Div
+        ui:field="entitySubjectsWidgetContainer"
+        addStyleNames="margin-left-5 margin-right-5"
+      />
+
       <bh:ClearFix />
       <bh:Div addStyleNames="margin-top-5" ui:field="controlsContainer">
         <bh:Div
@@ -62,10 +67,6 @@
           visible="false"
           addStyleNames="margin-right-5"
         />
-        <bh:Div
-          ui:field="entitySubjectsWidgetContainer"
-          addStyleNames="margin-left-5 margin-right-5"
-        />
         <bh:Div
           ui:field="teamSubjectsWidgetContainer"
           pull="LEFT"