public inbox for [email protected]  

help / color / mirror / Atom feed

From: Aditya Toshniwal <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin][RM5815] Generate script is not working in new window
Date: Wed, 9 Sep 2020 15:18:27 +0530
Message-ID: <CAM9w-_knay-688=uCiM7C=C+79H2-t9kBgFnVekohm75878JOg@mail.gmail.com> (raw)

Hi Hackers,

If schema diff is opened in a new tab and "Generate script" is clicked
(with query tool setting "open in new tab" set to true) then it shows a
forever spinner because of pop up blocks.

Attached patch will show an alert message in that case so that the user can
allow pop up and generate the script again.

Please review.

-- 
Thanks,
Aditya Toshniwal
pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*
<http://edbpostgres.com;
"Don't Complain about Heat, Plant a TREE"


Attachments:

  [application/octet-stream] RM5815.patch (3.3K, 3-RM5815.patch)
  download | inline diff:
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 640b325c4..bb4d333ca 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -234,8 +234,12 @@ define('pgadmin.datagrid', [
 
         if (self.preferences.new_browser_tab) {
           var newWin = window.open('', '_blank');
-          newWin.document.write(queryToolForm);
-          newWin.document.title = panel_title;
+          if(newWin) {
+            newWin.document.write(queryToolForm);
+            newWin.document.title = panel_title;
+          } else {
+            return false;
+          }
         } else {
           /* On successfully initialization find the dashboard panel,
            * create new panel and add it to the dashboard panel.
@@ -283,6 +287,7 @@ define('pgadmin.datagrid', [
 
           openQueryToolURL(queryToolPanel);
         }
+        return true;
       },
     },
     Backbone.Events);
diff --git a/web/pgadmin/tools/datagrid/static/js/show_query_tool.js b/web/pgadmin/tools/datagrid/static/js/show_query_tool.js
index 782bf78e3..0f3636e65 100644
--- a/web/pgadmin/tools/datagrid/static/js/show_query_tool.js
+++ b/web/pgadmin/tools/datagrid/static/js/show_query_tool.js
@@ -68,7 +68,7 @@ export function showQueryTool(datagrid, pgBrowser, alertify, url, aciTreeIdentif
   datagrid.launch_grid(transId, gridUrl, true, queryToolTitle, sURL);
 }
 
-export function generateScript(parentData, datagrid) {
+export function generateScript(parentData, datagrid, alertify) {
   const queryToolTitle = `${parentData.database}/${parentData.user}@${parentData.server}`;
   const transId = getRandomInt(1, 9999999);
 
@@ -82,6 +82,13 @@ export function generateScript(parentData, datagrid) {
     +`&server_type=${parentData.stype}`
     +`&did=${parentData.did}`;
 
-  datagrid.launch_grid(transId, url_endpoint, true, queryToolTitle, '');
-
+  let retVal = datagrid.launch_grid(transId, url_endpoint, true, queryToolTitle, '');
+  if(!retVal) {
+    alertify.alert(
+      gettext('Query tool launch error'),
+      gettext(
+        'Please allow the pop ups if they are blocked for pgAdmin. If the pgAdmin window is closed then close this window and open a new pgAdmin session.'
+      )
+    );
+  }
 }
diff --git a/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
index 228271518..2e037e47d 100644
--- a/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
+++ b/web/pgadmin/tools/schema_diff/static/js/schema_diff_ui.js
@@ -239,7 +239,7 @@ export default class SchemaDiffUI {
             }
 
             pgWindow.pgAdmin.ddl_diff = generated_script;
-            generateScript(server_data, pgWindow.pgAdmin.DataGrid);
+            generateScript(server_data, pgWindow.pgAdmin.DataGrid, Alertify);
           }
 
           $('#diff_fetching_data').find('.schema-diff-busy-text').text('');
@@ -485,7 +485,7 @@ export default class SchemaDiffUI {
       contentType: 'application/json',
     })
       .done(function (res) {
-        let msg = res.data.compare_msg;
+        let msg = _.escape(res.data.compare_msg);
         if (res.data.diff_percentage != 100) {
           msg = msg + gettext(' (this may take a few minutes)...');
         }

view thread (2+ messages)  latest in thread

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected]
  Subject: Re: [pgAdmin][RM5815] Generate script is not working in new window
  In-Reply-To: <CAM9w-_knay-688=uCiM7C=C+79H2-t9kBgFnVekohm75878JOg@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox