From d566856504676b23975953dfa2996d6406cb6ef7 Mon Sep 17 00:00:00 2001 From: Bryan Rumsey Date: Tue, 27 Jul 2021 17:22:31 -0400 Subject: [PATCH 1/2] Updates to presentation links. Fixed notebook presentations. --- client/app.js | 28 ++++++++++++++++++++++++- client/modals.js | 15 +++---------- client/pages/file-browser.js | 6 +++++- client/pages/loading-page.js | 9 ++++++-- client/templates/pages/loadingPage.pug | 6 +++++- client/views/file-browser-view.js | 6 +++++- client/views/model-state-buttons.js | 6 +++++- stochss/handlers/util/stochss_folder.py | 1 + 8 files changed, 58 insertions(+), 19 deletions(-) diff --git a/client/app.js b/client/app.js index c4db96216a..f2ef090d74 100644 --- a/client/app.js +++ b/client/app.js @@ -212,6 +212,31 @@ documentSetup = () => { }); } +copyToClipboard = (text) => { + if (window.clipboardData && window.clipboardData.setData) { + // Internet Explorer-specific code path to prevent textarea being shown while dialog is visible. + return window.clipboardData.setData("Text", text); + + } + else if (document.queryCommandSupported && document.queryCommandSupported("copy")) { + var textarea = document.createElement("textarea"); + textarea.textContent = text; + textarea.style.display = 'none'; // Prevent scrolling to bottom of page in Microsoft Edge. + document.body.appendChild(textarea); + textarea.select(); + try { + return document.execCommand("copy"); // Security exception may be thrown by some browsers. + } + catch (ex) { + console.warn("Copy to clipboard failed.", ex); + return false; + } + finally { + document.body.removeChild(textarea); + } + } +} + module.exports = { routePrefix: routePrefix, getApiPath: getApiPath, @@ -223,7 +248,8 @@ module.exports = { getXHR: getXHR, postXHR: postXHR, tooltipSetup: tooltipSetup, - documentSetup: documentSetup + documentSetup: documentSetup, + copyToClipboard: copyToClipboard }; diff --git a/client/modals.js b/client/modals.js index b9ccd2ff77..dcc8da5eac 100644 --- a/client/modals.js +++ b/client/modals.js @@ -236,19 +236,10 @@ let templates = {
-

${headers[0]}

+

${headers}

- View ${name} Presentation -
-
-

${headers[1]}

-
- Download ${name} Presentation -
-
-

${headers[2]}

-
- Open ${name} Presentation + View ${name} Presentation +
diff --git a/client/pages/file-browser.js b/client/pages/file-browser.js index 15d3d04d28..abf40274da 100644 --- a/client/pages/file-browser.js +++ b/client/pages/file-browser.js @@ -904,10 +904,14 @@ let FileBrowser = PageView.extend({ app.getXHR(endpoint, { success: function (err, response, body) { let title = body.message; - let linkHeaders = ["Presentation Link", "Download Link", "Open Link"]; + let linkHeaders = "Sharable Presentation Link"; let links = body.links; let name = o.original._path.split('/').pop().split('.ipynb')[0]; $(modals.presentationLinks(title, name, linkHeaders, links)).modal(); + let copyBtn = document.querySelector('#presentationLinksModal #copy-to-clipboard'); + copyBtn.addEventListener('click', function (e) { + app.copyToClipboard(links.presentation) + }); }, error: function (err, response, body) { $(modals.newProjectModelErrorHtml(body.Reason, body.Message)).modal(); diff --git a/client/pages/loading-page.js b/client/pages/loading-page.js index 5bfde943b7..69e573414b 100644 --- a/client/pages/loading-page.js +++ b/client/pages/loading-page.js @@ -35,14 +35,19 @@ let LoadingPage = PageView.extend({ let urlParams = new URLSearchParams(window.location.search) this.filePath = urlParams.get("path"); this.action = urlParams.get("action"); + this.homeLink = path.append(app.getBasePath(), 'stochss/home'); }, render: function (attrs, options) { PageView.prototype.render.apply(this, arguments); + let self = this; $(document.querySelector("div[data-hook=side-navbar]")).css("display", "none"); $(document.querySelector("main[data-hook=page-main]")).removeClass().addClass("col-md-12 body"); $(this.queryByHook("loading-spinner")).css("display", "block"); if(this.action === "open") { this.uploadFileFromLink(this.filePath); + setTimeout(function () { + $(self.queryByHook("loading-problem").css("display", "block")); + }, 30000); }else if(this.action === "update-workflow") { this.updateWorkflowFormat(this.filePath); }else if(this.action === "update-project") { @@ -58,7 +63,7 @@ let LoadingPage = PageView.extend({ $(self.queryByHook("loading-spinner")).css("display", "none"); let modal = $(modals.projectExportErrorHtml(body.reason, body.message)).modal(); modal.on('hidden.bs.modal', function (e) { - window.history.back(); + window.location.href = this.homeLink; }); } app.getXHR(endpoint, { @@ -125,7 +130,7 @@ let LoadingPage = PageView.extend({ }, uploadFileFromLink: function (filePath) { $(this.queryByHook("loading-header")).html("Uploading file"); - $(this.queryByHook("loading-target")).html(filePath.split('/').pop()); + $(this.queryByHook("loading-target")).css("display", "none") let message = `If the file is a Project, Workflow, Model, Domain, or Notebook it will be opened when the upload has completed.`; $(this.queryByHook("loading-message")).html(message); let self = this; diff --git a/client/templates/pages/loadingPage.pug b/client/templates/pages/loadingPage.pug index d7f4133a1b..2d6f277c37 100644 --- a/client/templates/pages/loadingPage.pug +++ b/client/templates/pages/loadingPage.pug @@ -10,4 +10,8 @@ section.page div.centered.mt-5 - p(data-hook="loading-message") Loading Page Message \ No newline at end of file + p(data-hook="loading-message") Loading Page Message + + div.centered.mt-3(data-hook="loading-problem" style="display: none;") + + p Something may have gone wrong click here to go back \ No newline at end of file diff --git a/client/views/file-browser-view.js b/client/views/file-browser-view.js index edb54b2307..850c47b03a 100644 --- a/client/views/file-browser-view.js +++ b/client/views/file-browser-view.js @@ -948,10 +948,14 @@ module.exports = View.extend({ app.getXHR(endpoint, { success: function (err, response, body) { let title = body.message; - let linkHeaders = ["Presentation Link", "Download Link", "Open Link"]; + let linkHeaders = "Sharable Presentation Link"; let links = body.links; let name = o.original._path.split('/').pop().split('.ipynb')[0]; $(modals.presentationLinks(title, name, linkHeaders, links)).modal(); + let copyBtn = document.querySelector('#presentationLinksModal #copy-to-clipboard'); + copyBtn.addEventListener('click', function (e) { + app.copyToClipboard(links.presentation) + }); }, error: function (err, response, body) { $(modals.newProjectModelErrorHtml(body.Reason, body.Message)).modal(); diff --git a/client/views/model-state-buttons.js b/client/views/model-state-buttons.js index 133903da50..4ccd502334 100644 --- a/client/views/model-state-buttons.js +++ b/client/views/model-state-buttons.js @@ -308,10 +308,14 @@ module.exports = View.extend({ success: function (err, response, body) { self.endAction("publish"); let title = body.message; - let linkHeaders = ["Presentation Link", "Download Link", "Open Link"]; + let linkHeaders = "Sharable Presentation Link"; let links = body.links; let name = self.model.name $(modals.presentationLinks(title, name, linkHeaders, links)).modal(); + let copyBtn = document.querySelector('#presentationLinksModal #copy-to-clipboard'); + copyBtn.addEventListener('click', function (e) { + app.copyToClipboard(links.presentation) + }); }, error: function (err, response, body) { self.errorAction(); diff --git a/stochss/handlers/util/stochss_folder.py b/stochss/handlers/util/stochss_folder.py index 6900da24ae..948d795886 100644 --- a/stochss/handlers/util/stochss_folder.py +++ b/stochss/handlers/util/stochss_folder.py @@ -450,6 +450,7 @@ def upload_from_link(self, remote_path): file = f"{json.loads(body)['name']}.{ext}" elif ext == "ipynb": file = json.loads(body)['file'] + body = json.dumps(json.loads(body)['notebook']) else: file = self.get_file(path=remote_path) path = self.get_new_path(dst_path=file) From 49f0107617cd04b6934b6af09368df6b12d3610d Mon Sep 17 00:00:00 2001 From: Bryan Rumsey Date: Tue, 27 Jul 2021 17:31:57 -0400 Subject: [PATCH 2/2] Fixed spelling errors. --- client/pages/file-browser.js | 2 +- client/views/file-browser-view.js | 2 +- client/views/model-state-buttons.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/pages/file-browser.js b/client/pages/file-browser.js index abf40274da..127789df0f 100644 --- a/client/pages/file-browser.js +++ b/client/pages/file-browser.js @@ -904,7 +904,7 @@ let FileBrowser = PageView.extend({ app.getXHR(endpoint, { success: function (err, response, body) { let title = body.message; - let linkHeaders = "Sharable Presentation Link"; + let linkHeaders = "Shareable Presentation Link"; let links = body.links; let name = o.original._path.split('/').pop().split('.ipynb')[0]; $(modals.presentationLinks(title, name, linkHeaders, links)).modal(); diff --git a/client/views/file-browser-view.js b/client/views/file-browser-view.js index 850c47b03a..ab5ed5e92e 100644 --- a/client/views/file-browser-view.js +++ b/client/views/file-browser-view.js @@ -948,7 +948,7 @@ module.exports = View.extend({ app.getXHR(endpoint, { success: function (err, response, body) { let title = body.message; - let linkHeaders = "Sharable Presentation Link"; + let linkHeaders = "Shareable Presentation Link"; let links = body.links; let name = o.original._path.split('/').pop().split('.ipynb')[0]; $(modals.presentationLinks(title, name, linkHeaders, links)).modal(); diff --git a/client/views/model-state-buttons.js b/client/views/model-state-buttons.js index 4ccd502334..676604139b 100644 --- a/client/views/model-state-buttons.js +++ b/client/views/model-state-buttons.js @@ -308,7 +308,7 @@ module.exports = View.extend({ success: function (err, response, body) { self.endAction("publish"); let title = body.message; - let linkHeaders = "Sharable Presentation Link"; + let linkHeaders = "Shareable Presentation Link"; let links = body.links; let name = self.model.name $(modals.presentationLinks(title, name, linkHeaders, links)).modal();