public inbox for [email protected]
help / color / mirror / Atom feedFrom: Akshay Joshi <[email protected]>
To: pgadmin-hackers <[email protected]>
Subject: [pgAdmin4][Patch]: RM 4360 Debugger buttons should be disabled until it is completely started
Date: Tue, 18 Jun 2019 14:22:13 +0530
Message-ID: <CANxoLDc=C1L7gVZTRohku-fX2+6Z3ojUrpwHLb3_BRYP1MJRpA@mail.gmail.com> (raw)
Hi Hackers,
Attached is the patch to fix RM #4360 Debugger buttons should be disabled
until it is completely started. Patch contains following fix apart from the
actual RM:
- Fixed issue when restart the execution of debugger, it is a regression
of #4329
- Fixed issue while change in preference dialog for debugger but that
will not reflect real time.
Please review it.
--
*Thanks & Regards*
*Akshay Joshi*
*Sr. Software Architect*
*EnterpriseDB Software India Private Limited*
*Mobile: +91 976-788-8246*
Attachments:
[application/octet-stream] RM_4360.patch (11.6K, 3-RM_4360.patch)
download | inline diff:
diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py
index 9a01ac32..d4365dcd 100644
--- a/web/pgadmin/tools/debugger/__init__.py
+++ b/web/pgadmin/tools/debugger/__init__.py
@@ -839,7 +839,7 @@ def restart_debugging(trans_id):
de_inst.debugger_data['restart_debug'] = 1
de_inst.update_session()
- de_inst.function_data = {
+ de_inst.function_data.update({
'server_id': de_inst.debugger_data['server_id'],
'database_id': de_inst.debugger_data['database_id'],
'schema_id': de_inst.debugger_data['schema_id'],
@@ -851,7 +851,7 @@ def restart_debugging(trans_id):
'proargdefaults': de_inst.function_data['default_value'],
'proargnames': de_inst.function_data['args_name'],
'require_input': de_inst.function_data['require_input']
- }
+ })
return make_json_response(
data={
diff --git a/web/pgadmin/tools/debugger/static/js/direct.js b/web/pgadmin/tools/debugger/static/js/direct.js
index 77ee45ea..fab16604 100644
--- a/web/pgadmin/tools/debugger/static/js/direct.js
+++ b/web/pgadmin/tools/debugger/static/js/direct.js
@@ -39,6 +39,26 @@ define([
this.trigger('pgDebugger:button:state:' + btn, enable);
},
+ enable_toolbar_buttons: function() {
+ var self = this;
+ self.enable('stop', true);
+ self.enable('step_over', true);
+ self.enable('step_into', true);
+ self.enable('toggle_breakpoint', true);
+ self.enable('clear_all_breakpoints', true);
+ self.enable('continue', true);
+ },
+
+ disable_toolbar_buttons: function() {
+ var self = this;
+ self.enable('stop', false);
+ self.enable('step_over', false);
+ self.enable('step_into', false);
+ self.enable('toggle_breakpoint', false);
+ self.enable('clear_all_breakpoints', false);
+ self.enable('continue', false);
+ },
+
/*
Function to set the breakpoint and send the line no. which is set to server
trans_id :- Unique Transaction ID, line_no - line no. to set the breakpoint,
@@ -405,12 +425,7 @@ define([
// Enable all the buttons as we got the results
// TODO: Fix this properly so a timeout isn't required.
setTimeout(function() {
- self.enable('stop', true);
- self.enable('step_over', true);
- self.enable('step_into', true);
- self.enable('continue', true);
- self.enable('toggle_breakpoint', true);
- self.enable('clear_all_breakpoints', true);
+ self.enable_toolbar_buttons();
}, 500);
}
} else if (res.data.status === 'Busy') {
@@ -422,12 +437,7 @@ define([
);
// As we are waiting for another session to invoke the target,disable all the buttons
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('continue', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
+ self.disable_toolbar_buttons();
pgTools.DirectDebug.first_time_indirect_debug = false;
self.poll_result(trans_id);
} else {
@@ -648,12 +658,7 @@ define([
var self = this,
baseUrl = url_for('debugger.restart', {'trans_id': trans_id});
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
// Clear msg tab
pgTools.DirectDebug
@@ -725,12 +730,7 @@ define([
// Continue the execution until the next breakpoint
Continue: function(trans_id) {
var self = this;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
//Check first if previous execution was completed or not
if (pgTools.DirectDebug.direct_execution_completed &&
@@ -767,12 +767,7 @@ define([
Step_over: function(trans_id) {
var self = this;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
// Make ajax call to listen the database message
var baseUrl = url_for('debugger.execute_query', {
@@ -803,12 +798,7 @@ define([
Step_into: function(trans_id) {
var self = this;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
// Make ajax call to listen the database message
var baseUrl = url_for('debugger.execute_query', {
@@ -839,12 +829,7 @@ define([
Stop: function(trans_id) {
var self = this;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
// Make ajax call to listen the database message
var baseUrl = url_for(
@@ -890,12 +875,7 @@ define([
toggle_breakpoint: function(trans_id) {
var self = this;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
@@ -936,12 +916,8 @@ define([
return marker;
}());
}
- self.enable('stop', true);
- self.enable('step_over', true);
- self.enable('step_into', true);
- self.enable('toggle_breakpoint', true);
- self.enable('clear_all_breakpoints', true);
- self.enable('continue', true);
+
+ self.enable_toolbar_buttons();
} else if (res.data.status === 'NotConnected') {
Alertify.alert(
gettext('Debugger Error'),
@@ -965,12 +941,7 @@ define([
if ((br_list.length == 1) && (br_list[0].linenumber == -1))
return;
- self.enable('stop', false);
- self.enable('step_over', false);
- self.enable('step_into', false);
- self.enable('toggle_breakpoint', false);
- self.enable('clear_all_breakpoints', false);
- self.enable('continue', false);
+ self.disable_toolbar_buttons();
var breakpoint_list = new Array();
@@ -1004,12 +975,7 @@ define([
}
}
}
- self.enable('stop', true);
- self.enable('step_over', true);
- self.enable('step_into', true);
- self.enable('toggle_breakpoint', true);
- self.enable('clear_all_breakpoints', true);
- self.enable('continue', true);
+ self.enable_toolbar_buttons();
})
.fail(function() {
Alertify.alert(
@@ -1561,7 +1527,7 @@ define([
let browser = window.opener ?
window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
- this.preferences = browser.get_preferences_for_module('sqleditor');
+ this.preferences = browser.get_preferences_for_module('debugger');
this.docker = new wcDocker(
'#container', {
@@ -1592,6 +1558,7 @@ define([
.done(function(res) {
if (res.data.status) {
self.intializePanels();
+ controller.enable_toolbar_buttons();
controller.poll_result(trans_id);
}
})
@@ -1656,6 +1623,7 @@ define([
.done(function(res) {
if (res.data.status === 'Success') {
self.intializePanels();
+ controller.enable_toolbar_buttons();
// If status is Success then find the port number to attach the executer.
controller.start_execution(trans_id, res.data.result);
} else if (res.data.status === 'Busy') {
diff --git a/web/pgadmin/tools/debugger/templates/debugger/direct.html b/web/pgadmin/tools/debugger/templates/debugger/direct.html
index f4965c4f..1dc1cbe7 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/direct.html
+++ b/web/pgadmin/tools/debugger/templates/debugger/direct.html
@@ -54,19 +54,23 @@ try {
<button type="button" class="btn btn-sm btn-secondary btn-step-into" id="btn-step-into"
title=""
accesskey=""
- tabindex="0" autofocus="autofocus">
+ tabindex="0"
+ autofocus="autofocus"
+ disabled>
<i class="fa fa-indent sql-icon-lg"></i>
</button>
<button type="button" class="btn btn-sm btn-secondary btn-step-over" id="btn-step-over"
title=""
accesskey=""
- tabindex="0">
+ tabindex="0"
+ disabled>
<i class="fa fa-outdent sql-icon-lg"></i>
</button>
<button type="button" class="btn btn-sm btn-secondary btn-continue" id="btn-continue"
title=""
accesskey=""
- tabindex="0">
+ tabindex="0"
+ disabled>
<i class="fa fa-play-circle sql-icon-lg"></i>
</button>
</div>
@@ -74,13 +78,15 @@ try {
<button type="button" class="btn btn-sm btn-secondary btn-toggle-breakpoint" id="btn-toggle-breakpoint"
title=""
accesskey=""
- tabindex="0">
+ tabindex="0"
+ disabled>
<i class="fa fa-circle sql-icon-lg"></i>
</button>
<button type="button" class="btn btn-sm btn-secondary btn-clear-breakpoint" id="btn-clear-breakpoint"
title=""
accesskey=""
- tabindex="0">
+ tabindex="0"
+ disabled>
<i class="fa fa-ban sql-icon-lg"></i>
</button>
</div>
@@ -88,7 +94,8 @@ try {
<button type="button" class="btn btn-sm btn-secondary btn-stop" id="btn-stop"
accesskey=""
title=""
- tabindex="0">
+ tabindex="0"
+ disabled>
<i class="fa fa-stop-circle sql-icon-lg"></i>
</button>
</div>
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: [pgAdmin4][Patch]: RM 4360 Debugger buttons should be disabled until it is completely started
In-Reply-To: <CANxoLDc=C1L7gVZTRohku-fX2+6Z3ojUrpwHLb3_BRYP1MJRpA@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