Skip to content
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

Jump to bottom

Merge release 483 into develop #5257

Merged
merged 5 commits into from
Jan 11, 2024
Merged

Merge release 483 into develop #5257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8151306
SWC-6647
jay-hodgson Jan 8, 2024
062ade8
Merge pull request #5254 from jay-hodgson/release-482
xschildw Jan 11, 2024
cb46b20
SWC-6653
jay-hodgson Jan 11, 2024
196eac6
Merge pull request #5255 from jay-hodgson/SWC-6653
jay-hodgson Jan 11, 2024
6c40560
Merge pull request #5256 from Sage-Bionetworks/release-482
jay-hodgson Jan 11, 2024
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
10 changes: 8 additions & 2 deletions .../org/sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -67,7 +68,8 @@ public ACTAccessRequirementWidget(
AuthenticationController authController,
ReviewAccessorsButton manageAccessButton,
ConvertACTAccessRequirementButton convertACTAccessRequirementButton,
SynapseJSNIUtils jsniUtils
SynapseJSNIUtils jsniUtils,
IsACTMemberAsyncHandler isACTMemberAsyncHandler
) {
this.view = view;
this.jsClient = jsClient;
Expand Down Expand Up @@ -107,6 +109,10 @@ public void invoke() {
refreshApprovalState();
}
};
isACTMemberAsyncHandler.isACTActionAvailable(isACT -> {
view.setAccessRequirementIDVisible(isACT);
view.setCoveredEntitiesHeadingVisible(isACT);
});

lazyLoadHelper.configure(loadDataCallback, view);
}
Expand Down Expand Up @@ -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();
}

Expand Down
6 changes: 6 additions & 0 deletions .../sagebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,10 @@ void setAccessRequirementRelatedProjectsList(
public interface Presenter {
void onRequestAccess();
}

void setCoveredEntitiesHeadingVisible(boolean visible);

void setAccessRequirementIDVisible(boolean visible);

void setAccessRequirementID(String arID);
}
25 changes: 25 additions & 0 deletions ...ebionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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> {}

Expand Down Expand Up @@ -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);
}
}
11 changes: 8 additions & 3 deletions ...ionetworks/web/client/widget/accessrequirements/AccessRequirementRelatedProjectsList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
11 changes: 10 additions & 1 deletion ...org/sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -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(
Expand All @@ -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) {
Expand Down
6 changes: 6 additions & 0 deletions ...sagebionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
27 changes: 26 additions & 1 deletion ...bionetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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> {}

Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
}
9 changes: 8 additions & 1 deletion ...ionetworks/web/client/widget/accessrequirements/ACTAccessRequirementWidgetViewImpl.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 8 additions & 1 deletion ...onetworks/web/client/widget/accessrequirements/LockAccessRequirementWidgetViewImpl.ui.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion ...ebionetworks/web/unitclient/widget/accessrequirements/ACTAccessRequirementWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -142,6 +143,9 @@ public class ACTAccessRequirementWidgetTest {
@Mock
SynapseJSNIUtils mockJsniUtils;

@Mock
IsACTMemberAsyncHandler mockIsACTMemberAsyncHandler;

Callback lazyLoadDataCallback;

public static final String ROOT_WIKI_ID = "777";
Expand All @@ -165,7 +169,8 @@ public void setUp() throws Exception {
mockAuthController,
mockManageAccessButton,
mockConvertACTAccessRequirementButton,
mockJsniUtils
mockJsniUtils,
mockIsACTMemberAsyncHandler
);
when(mockACTAccessRequirement.getSubjectIds()).thenReturn(mockSubjectIds);
AsyncMockStubber
Expand Down
Loading