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

George dev #280

Merged
merged 2 commits into from
Feb 8, 2024
Merged

George dev #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31982e
Improve redirectModal message flexibility
Gcolon021 Feb 6, 2024
a8e2b32
[ALS-5883] Allow optional override of download modal message
Gcolon021 Feb 6, 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
12 changes: 4 additions & 8 deletions biodatacatalyst-ui/src/main/webapp/picsureui/common/redirect-modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ define([
return BB.View.extend({
initialize: function (opts) {
this.data = opts || {};
this.headerMessage = this.data.headerMessage ? this.data.headerMessage : "Leaving BDC-PIC-SURE";
this.message = this.data.message && Array.isArray(this.data.message) ? this.data.message : ["This external website will be opened as a new tab in your browser.", "Are you sure you want to leave BDC-PIC-SURE?"];
},
render: function (sourceEvent, url = undefined) {
let closeModal = function (e) {
Expand Down Expand Up @@ -59,17 +61,11 @@ define([
}
];

const modalMessage = [
"This external website will be opened as a new tab in your browser.",
"Are you sure you want to leave BDC-PIC-SURE?"
];


const modalContainerId = "modal-redirect";

const dialogView = new dialog({
options: dialogOption,
messages: modalMessage,
messages: this.message,
modalContainerId: modalContainerId,
});

Expand All @@ -78,7 +74,7 @@ define([

modal.displayModal(
dialogView
, "Leaving BDC-PIC-SURE"
, this.headerMessage
, () => {
sourceEvent.target.focus();
}
Expand Down
2 changes: 1 addition & 1 deletion biodatacatalyst-ui/src/main/webapp/picsureui/search-interface/package-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ define([
$('.close')?.get(0).click();
}, classes: "btn btn-primary"}
];
const message = 'You are transferring data through the BioData Catalyst security boundary which may or may not be supported by your Data Use Agreement(s), Limitation(s), or your Institutional Review Board policies and guidelines. As a BioData Catalyst user, you are solely responsible for adhering to the terms of these policies.';
let message = settings?.downloadConfirmationMessage ?? 'You are transferring data through the BioData Catalyst security boundary which may or may not be supported by your Data Use Agreement(s), Limitation(s), or your Institutional Review Board policies and guidelines. As a BioData Catalyst user, you are solely responsible for adhering to the terms of these policies.';
const dialogView = new dialog({options: dialogOptions, messages: [message], previousView: {view: this, title: 'Review and Package Data', model: this.model}});
modal.displayModal(dialogView, 'Are you sure you want to download data?', function(){
$('#package-download-button').focus();
Expand Down
Loading