' +
+ prepare: function() {
+ let self = this;
+ $container.html('');
+ // Disable Ok button
+ this.__internal.buttons[2].element.disabled = true;
+
+ // Status bar
+ this.statusBar = $(
+ '
' +
'
`
)
- .data('entrydata', this.entry)
- .on('click', e => {
- this.onClickHandler($(e.currentTarget));
- });
+ .data('entrydata', this.entry)
+ .on('click', e => {
+ this.onClickHandler($(e.currentTarget));
+ });
}
}
diff --git a/web/pgadmin/static/js/sqleditor/query_tool_preferences.js b/web/pgadmin/static/js/sqleditor/query_tool_preferences.js
index 0d8ac0e7..c3906aaa 100644
--- a/web/pgadmin/static/js/sqleditor/query_tool_preferences.js
+++ b/web/pgadmin/static/js/sqleditor/query_tool_preferences.js
@@ -78,7 +78,7 @@ function updateUIPreferences(sqlEditor) {
.find('i')
.attr('title',
shortcut_accesskey_title('Connection status (click for details)',
- preferences.btn_conn_status));
+ preferences.btn_conn_status));
/* Accessed using ctrl,atl,shift and key */
$el.find('#btn-flash')
@@ -152,8 +152,8 @@ function updateUIPreferences(sqlEditor) {
// Calling it again in specified interval
sqlEditor.connIntervalId = setInterval(
- SqlEditorUtils.fetchConnectionStatus.bind(null, sqlEditor.handler, $conn_status, $status_el),
- preferences.connection_status_fetch_time * 1000
+ SqlEditorUtils.fetchConnectionStatus.bind(null, sqlEditor.handler, $conn_status, $status_el),
+ preferences.connection_status_fetch_time * 1000
);
}
else {
diff --git a/web/pgadmin/static/js/sqleditor_utils.js b/web/pgadmin/static/js/sqleditor_utils.js
index 74d8ad50..9d14ac46 100644
--- a/web/pgadmin/static/js/sqleditor_utils.js
+++ b/web/pgadmin/static/js/sqleditor_utils.js
@@ -19,8 +19,8 @@ define(['jquery', 'sources/gettext', 'sources/url_for'],
var hexDigits = '0123456789abcdef';
for (var i = 0; i < 36; i++) {
s[i] = hexDigits.substr(
- Math.floor(Math.random() * 0x10), 1
- );
+ Math.floor(Math.random() * 0x10), 1
+ );
}
// bits 12-15 of the time_hi_and_version field to 0010
s[14] = '4';
@@ -46,7 +46,7 @@ define(['jquery', 'sources/gettext', 'sources/url_for'],
// Create a temporary element with given label, append to body
// calculate its width and remove the element.
$('body').append(
- '
'+ text + ' '
+ '
'+ text + ' '
);
var width = $('#pg_text').width() + 23;
$('#pg_text').remove(); // remove element
@@ -80,102 +80,102 @@ define(['jquery', 'sources/gettext', 'sources/url_for'],
url: url,
method: 'GET',
})
- .done(function (res) {
- if(res && res.data) {
- var status = res.data.status,
- msg = res.data.message,
- is_status_changed = false;
-
- // Raise notify messages comes from database server.
- sqleditor_obj.update_notifications(res.data.notifies);
-
- // Inject CSS as required
- switch(status) {
- // Busy
- case 1:
- // if received busy status more than once then only
- if(status == sqlEditorUtils.previousStatus &&
+ .done(function (res) {
+ if(res && res.data) {
+ var status = res.data.status,
+ msg = res.data.message,
+ is_status_changed = false;
+
+ // Raise notify messages comes from database server.
+ sqleditor_obj.update_notifications(res.data.notifies);
+
+ // Inject CSS as required
+ switch(status) {
+ // Busy
+ case 1:
+ // if received busy status more than once then only
+ if(status == sqlEditorUtils.previousStatus &&
!$status_el.hasClass('fa-hourglass-half')) {
- $status_el.removeClass()
- .addClass('fa fa-hourglass-half');
- is_status_changed = true;
- }
- break;
+ $status_el.removeClass()
+ .addClass('fa fa-hourglass-half');
+ is_status_changed = true;
+ }
+ break;
// Idle in transaction
- case 2:
- if(sqlEditorUtils.previousStatus != status &&
+ case 2:
+ if(sqlEditorUtils.previousStatus != status &&
!$status_el.hasClass('fa-clock-o')) {
- $status_el.removeClass()
- .addClass('fa fa-clock-o');
- is_status_changed = true;
- }
- break;
+ $status_el.removeClass()
+ .addClass('fa fa-clock-o');
+ is_status_changed = true;
+ }
+ break;
// Failed in transaction
- case 3:
- if(sqlEditorUtils.previousStatus != status &&
+ case 3:
+ if(sqlEditorUtils.previousStatus != status &&
!$status_el.hasClass('fa-exclamation-circle')) {
- $status_el.removeClass()
- .addClass('fa fa-exclamation-circle');
- is_status_changed = true;
- }
- break;
+ $status_el.removeClass()
+ .addClass('fa fa-exclamation-circle');
+ is_status_changed = true;
+ }
+ break;
// Failed in transaction with unknown server side error
- case 4:
- if(sqlEditorUtils.previousStatus != status &&
+ case 4:
+ if(sqlEditorUtils.previousStatus != status &&
!$status_el.hasClass('fa-exclamation-triangle')) {
- $status_el.removeClass()
- .addClass('fa fa-exclamation-triangle');
- is_status_changed = true;
- }
- break;
- default:
- if(sqlEditorUtils.previousStatus != status &&
+ $status_el.removeClass()
+ .addClass('fa fa-exclamation-triangle');
+ is_status_changed = true;
+ }
+ break;
+ default:
+ if(sqlEditorUtils.previousStatus != status &&
!$status_el.hasClass('fa-query_tool_connected')) {
- $status_el.removeClass()
- .addClass('fa-custom fa-query-tool-connected');
- is_status_changed = true;
+ $status_el.removeClass()
+ .addClass('fa-custom fa-query-tool-connected');
+ is_status_changed = true;
+ }
}
- }
- sqlEditorUtils.previousStatus = status;
- // Set bootstrap popover message
- if(is_status_changed) {
- $el.popover('hide');
- $el.attr('data-content', msg);
- }
- } else {
+ sqlEditorUtils.previousStatus = status;
+ // Set bootstrap popover message
+ if(is_status_changed) {
+ $el.popover('hide');
+ $el.attr('data-content', msg);
+ }
+ } else {
// We come here means we did not receive expected response
// from server, we need to error out
- sqlEditorUtils.previousStatus = -99;
- msg = gettext('An unexpected error occurred - ' +
+ sqlEditorUtils.previousStatus = -99;
+ msg = gettext('An unexpected error occurred - ' +
'ensure you are logged into the application.');
+ $el.attr('data-content', msg);
+ if(!$status_el.hasClass('fa-query-tool-disconnected')) {
+ $el.popover('hide');
+ $status_el.removeClass()
+ .addClass('fa-custom fa-query-tool-disconnected');
+ }
+ }
+ })
+ .fail(function (e) {
+ sqlEditorUtils.previousStatus = -1;
+ var msg = gettext('Transaction status check failed.');
+ if (e.readyState == 0) {
+ msg = gettext('Not connected to the server or the connection to ' +
+ 'the server has been closed.');
+ } else if (e.responseJSON && e.responseJSON.errormsg) {
+ msg = e.responseJSON.errormsg;
+ }
+
+ // Set bootstrap popover
$el.attr('data-content', msg);
+ // Add error class
if(!$status_el.hasClass('fa-query-tool-disconnected')) {
$el.popover('hide');
$status_el.removeClass()
- .addClass('fa-custom fa-query-tool-disconnected');
+ .addClass('fa-custom fa-query-tool-disconnected');
}
- }
- })
- .fail(function (e) {
- sqlEditorUtils.previousStatus = -1;
- var msg = gettext('Transaction status check failed.');
- if (e.readyState == 0) {
- msg = gettext('Not connected to the server or the connection to ' +
- 'the server has been closed.');
- } else if (e.responseJSON && e.responseJSON.errormsg) {
- msg = e.responseJSON.errormsg;
- }
-
- // Set bootstrap popover
- $el.attr('data-content', msg);
- // Add error class
- if(!$status_el.hasClass('fa-query-tool-disconnected')) {
- $el.popover('hide');
- $status_el.removeClass()
- .addClass('fa-custom fa-query-tool-disconnected');
- }
- });
+ });
},
// Updates the flag for connection status poll
diff --git a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
index c1e3f829..0d2071f0 100644
--- a/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
+++ b/web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
@@ -13,10 +13,10 @@ import url_for from 'sources/url_for';
import gettext from 'sources/gettext';
import pgAdmin from 'sources/pgadmin';
-const pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
+export const pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
-const browserTreeState = pgBrowser.browserTreeState = pgBrowser.browserTreeState || {};
+export const browserTreeState = pgBrowser.browserTreeState = pgBrowser.browserTreeState || {};
_.extend(pgBrowser.browserTreeState, {
@@ -74,20 +74,20 @@ _.extend(pgBrowser.browserTreeState, {
url: url_for('settings.reset_tree_state'),
type: 'DELETE',
})
- .fail(function(jqx) {
- var msg = jqx.responseText;
- /* Error from the server */
- if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
- try {
- var data = JSON.parse(jqx.responseText);
- msg = data.errormsg;
- } catch (e) {
- console.warn(e.stack || e);
+ .fail(function(jqx) {
+ var msg = jqx.responseText;
+ /* Error from the server */
+ if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
+ try {
+ var data = JSON.parse(jqx.responseText);
+ msg = data.errormsg;
+ } catch (e) {
+ console.warn(e.stack || e);
+ }
}
- }
- console.warn(
- gettext('Error resetting the tree saved state."'), msg);
- });
+ console.warn(
+ gettext('Error resetting the tree saved state."'), msg);
+ });
}
},
@@ -103,23 +103,23 @@ _.extend(pgBrowser.browserTreeState, {
contentType: 'application/json',
data: JSON.stringify(self.current_state),
})
- .done(function() {
- self.last_state = JSON.stringify(self.current_state);
- })
- .fail(function(jqx) {
- var msg = jqx.responseText;
- /* Error from the server */
- if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
- try {
- var data = JSON.parse(jqx.responseText);
- msg = data.errormsg;
- } catch (e) {
- console.warn(e.stack || e);
+ .done(function() {
+ self.last_state = JSON.stringify(self.current_state);
+ })
+ .fail(function(jqx) {
+ var msg = jqx.responseText;
+ /* Error from the server */
+ if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
+ try {
+ var data = JSON.parse(jqx.responseText);
+ msg = data.errormsg;
+ } catch (e) {
+ console.warn(e.stack || e);
+ }
}
- }
- console.warn(
- gettext('Error saving the tree state."'), msg);
- });
+ console.warn(
+ gettext('Error saving the tree state."'), msg);
+ });
},
fetch_state: function() {
@@ -131,23 +131,23 @@ _.extend(pgBrowser.browserTreeState, {
dataType: 'json',
contentType: 'application/json',
})
- .done(function(res) {
- self.stored_state = res;
- })
- .fail(function(jqx) {
- var msg = jqx.responseText;
- /* Error from the server */
- if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
- try {
- var data = JSON.parse(jqx.responseText);
- msg = data.errormsg;
- } catch (e) {
- console.warn(e.stack || e);
+ .done(function(res) {
+ self.stored_state = res;
+ })
+ .fail(function(jqx) {
+ var msg = jqx.responseText;
+ /* Error from the server */
+ if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
+ try {
+ var data = JSON.parse(jqx.responseText);
+ msg = data.errormsg;
+ } catch (e) {
+ console.warn(e.stack || e);
+ }
}
- }
- console.warn(
- gettext('Error fetching the tree state."'), msg);
- });
+ console.warn(
+ gettext('Error fetching the tree state."'), msg);
+ });
},
update_cache: function(item) {
@@ -390,5 +390,3 @@ _.extend(pgBrowser.browserTreeState, {
}
},
});
-
-export {pgBrowser, browserTreeState};
diff --git a/web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js b/web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js
index 26c97eda..9dd99a13 100644
--- a/web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js
+++ b/web/pgadmin/tools/backup/static/js/backup_dialog_wrapper.js
@@ -16,7 +16,7 @@ import {DialogWrapper} from '../../../../static/js/alertify/dialog_wrapper';
export class BackupDialogWrapper extends DialogWrapper {
constructor(dialogContainerSelector, dialogTitle, typeOfDialog,
- jquery, pgBrowser, alertify, dialogModel, backform) {
+ jquery, pgBrowser, alertify, dialogModel, backform) {
super(dialogContainerSelector, dialogTitle, jquery,
pgBrowser, alertify, dialogModel, backform);
this.typeOfDialog = typeOfDialog;
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index b4c0ea00..912c99be 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -68,7 +68,7 @@ define('pgadmin.datagrid', [
'foreign_table', 'catalog_object', 'partition',
],
- /* Enable/disable View data menu in tools based
+ /* Enable/disable View data menu in tools based
* on node selected. if selected node is present
* in supported_nodes, menu will be enabled
* otherwise disabled.
@@ -86,7 +86,7 @@ define('pgadmin.datagrid', [
return isEnabled;
},
- /* Enable/disable Query tool menu in tools based
+ /* Enable/disable Query tool menu in tools based
* on node selected. if selected node is present
* in unsupported_nodes, menu will be disabled
* otherwise enabled.
@@ -350,25 +350,25 @@ define('pgadmin.datagrid', [
contentType: 'application/json',
data: JSON.stringify(sql),
})
- .done(function(res) {
- if (res.data.status) {
+ .done(function(res) {
+ if (res.data.status) {
// Initialize the data grid.
- self.create_transaction(that.baseUrl, null, 'false', parentData.server.server_type, '', grid_title, sql, false);
- that.close(); // Close the dialog
- }
- else {
+ self.create_transaction(that.baseUrl, null, 'false', parentData.server.server_type, '', grid_title, sql, false);
+ that.close(); // Close the dialog
+ }
+ else {
+ alertify.alert(
+ gettext('Validation Error'),
+ res.data.result
+ );
+ }
+ })
+ .fail(function(e) {
alertify.alert(
gettext('Validation Error'),
- res.data.result
+ e
);
- }
- })
- .fail(function(e) {
- alertify.alert(
- gettext('Validation Error'),
- e
- );
- });
+ });
}
},
};
@@ -378,7 +378,7 @@ define('pgadmin.datagrid', [
$.get(url_for('datagrid.filter'),
function(data) {
alertify.filterDialog('Data Filter', data, baseUrl, validateUrl)
- .resizeTo(pgBrowser.stdW.sm,pgBrowser.stdH.sm);
+ .resizeTo(pgBrowser.stdW.sm,pgBrowser.stdH.sm);
}
);
},
@@ -413,35 +413,35 @@ define('pgadmin.datagrid', [
data: reqData,
contentType: 'application/json',
})
- .done(function(res) {
- res.data.is_query_tool = is_query_tool;
- res.data.server_type = server_type;
- res.data.sURL = sURL;
- res.data.panel_title = panel_title;
- target.trigger('pgadmin-datagrid:transaction:created', res.data);
- })
- .fail(function(xhr) {
- if (target !== self) {
- if(xhr.status == 503 && xhr.responseJSON.info != undefined &&
+ .done(function(res) {
+ res.data.is_query_tool = is_query_tool;
+ res.data.server_type = server_type;
+ res.data.sURL = sURL;
+ res.data.panel_title = panel_title;
+ target.trigger('pgadmin-datagrid:transaction:created', res.data);
+ })
+ .fail(function(xhr) {
+ if (target !== self) {
+ if(xhr.status == 503 && xhr.responseJSON.info != undefined &&
xhr.responseJSON.info == 'CONNECTION_LOST') {
- setTimeout(function() {
- target.handle_connection_lost(true, xhr);
- });
- return;
+ setTimeout(function() {
+ target.handle_connection_lost(true, xhr);
+ });
+ return;
+ }
}
- }
- try {
- var err = JSON.parse(xhr.responseText);
- alertify.alert(gettext('Query Tool initialization error'),
- err.errormsg
- );
- } catch (e) {
- alertify.alert(gettext('Query Tool initialization error'),
- e.statusText
- );
- }
- });
+ try {
+ var err = JSON.parse(xhr.responseText);
+ alertify.alert(gettext('Query Tool initialization error'),
+ err.errormsg
+ );
+ } catch (e) {
+ alertify.alert(gettext('Query Tool initialization error'),
+ e.statusText
+ );
+ }
+ });
},
launch_grid: function(trans_obj) {
var self = this,
@@ -470,7 +470,7 @@ define('pgadmin.datagrid', [
}
}
- // Open the panel if frame is initialized
+ // Open the panel if frame is initialized
let titileForURLObj = sqlEditorUtils.removeSlashInTheString(grid_title);
var url_params = {
'trans_id': trans_obj.gridTransId,
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 ba3df406..b6ccd5c8 100644
--- a/web/pgadmin/tools/datagrid/static/js/show_query_tool.js
+++ b/web/pgadmin/tools/datagrid/static/js/show_query_tool.js
@@ -35,7 +35,7 @@ function hasServerInformations(parentData) {
}
export function showQueryTool(datagrid, pgBrowser, alertify, url,
- aciTreeIdentifier, panelTitle) {
+ aciTreeIdentifier, panelTitle) {
const sURL = url || '';
const queryToolTitle = panelTitle || '';
diff --git a/web/pgadmin/tools/debugger/static/js/debugger.js b/web/pgadmin/tools/debugger/static/js/debugger.js
index d40cb6c7..ed0f6b79 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger.js
@@ -313,19 +313,19 @@ define([
url: _url,
cache: false,
})
- .done(function() {
- self.start_global_debugger();
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ .done(function() {
+ self.start_global_debugger();
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ }
+ } catch (e) {
+ console.warn(e.stack || e);
}
- } catch (e) {
- console.warn(e.stack || e);
- }
- });
+ });
},
//Callback function when user start the indirect debugging ( Listen to another session to invoke the target )
@@ -419,52 +419,52 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- var url = url_for('debugger.direct', {
- 'trans_id': res.data.debuggerTransId,
- });
+ .done(function(res) {
+ var url = url_for('debugger.direct', {
+ 'trans_id': res.data.debuggerTransId,
+ });
- if (self.preferences.debugger_new_browser_tab) {
- window.open(url, '_blank');
- } else {
- pgBrowser.Events.once(
- 'pgadmin-browser:frame:urlloaded:frm_debugger',
- function(frame) {
- frame.openURL(url);
- });
+ if (self.preferences.debugger_new_browser_tab) {
+ window.open(url, '_blank');
+ } else {
+ pgBrowser.Events.once(
+ 'pgadmin-browser:frame:urlloaded:frm_debugger',
+ function(frame) {
+ frame.openURL(url);
+ });
- // Create the debugger panel as per the data received from user input dialog.
- var dashboardPanel = pgBrowser.docker.findPanels(
- 'properties'
- ),
- panel = pgBrowser.docker.addPanel(
- 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
- );
+ // Create the debugger panel as per the data received from user input dialog.
+ var dashboardPanel = pgBrowser.docker.findPanels(
+ 'properties'
+ ),
+ panel = pgBrowser.docker.addPanel(
+ 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
+ );
- panel.focus();
+ panel.focus();
- // Panel Closed event
- panel.on(wcDocker.EVENT.CLOSED, function() {
- var closeUrl = url_for('debugger.close', {
- 'trans_id': res.data.debuggerTransId,
- });
- $.ajax({
- url: closeUrl,
- method: 'DELETE',
+ // Panel Closed event
+ panel.on(wcDocker.EVENT.CLOSED, function() {
+ var closeUrl = url_for('debugger.close', {
+ 'trans_id': res.data.debuggerTransId,
+ });
+ $.ajax({
+ url: closeUrl,
+ method: 'DELETE',
+ });
});
- });
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
- } catch (e) {
- console.warn(e.stack || e);
- }
- });
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ }
+ } catch (e) {
+ console.warn(e.stack || e);
+ }
+ });
},
/*
@@ -489,107 +489,107 @@ define([
url: _url,
cache: false,
})
- .done(function(res) {
+ .done(function(res) {
- // Open Alertify the dialog to take the input arguments from user if function having input arguments
- if (res.data[0]['require_input']) {
- get_function_arguments(res.data[0], 0, is_edb_proc);
- } else {
+ // Open Alertify the dialog to take the input arguments from user if function having input arguments
+ if (res.data[0]['require_input']) {
+ get_function_arguments(res.data[0], 0, is_edb_proc);
+ } else {
// Initialize the target and create asynchronous connection and unique transaction ID
// If there is no arguments to the functions then we should not ask for for function arguments and
// Directly open the panel
- var t = pgBrowser.tree,
- i = t.selected(),
- d = i && i.length == 1 ? t.itemData(i) : undefined,
- node = d && pgBrowser.Nodes[d._type];
-
- if (!d)
- return;
-
- var treeInfo = node.getTreeNodeHierarchy.apply(node, [i]),
- baseUrl;
-
- if (d._type == 'function') {
- baseUrl = url_for(
- 'debugger.initialize_target_for_function', {
- 'debug_type': 'direct',
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': treeInfo.function._id,
- }
- );
- } else {
- baseUrl = url_for(
- 'debugger.initialize_target_for_function', {
- 'debug_type': 'direct',
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': debuggerUtils.getProcedureId(treeInfo),
- }
- );
- }
-
- $.ajax({
- url: baseUrl,
- method: 'GET',
- })
- .done(function(res) {
-
- var url = url_for('debugger.direct', {
- 'trans_id': res.data.debuggerTransId,
- });
-
- if (self.preferences.debugger_new_browser_tab) {
- window.open(url, '_blank');
+ var t = pgBrowser.tree,
+ i = t.selected(),
+ d = i && i.length == 1 ? t.itemData(i) : undefined,
+ node = d && pgBrowser.Nodes[d._type];
+
+ if (!d)
+ return;
+
+ var treeInfo = node.getTreeNodeHierarchy.apply(node, [i]),
+ baseUrl;
+
+ if (d._type == 'function') {
+ baseUrl = url_for(
+ 'debugger.initialize_target_for_function', {
+ 'debug_type': 'direct',
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.function._id,
+ }
+ );
} else {
- pgBrowser.Events.once(
- 'pgadmin-browser:frame:urlloaded:frm_debugger',
- function(frame) {
- frame.openURL(url);
- });
-
- // Create the debugger panel as per the data received from user input dialog.
- var dashboardPanel = pgBrowser.docker.findPanels(
- 'properties'
- ),
- panel = pgBrowser.docker.addPanel(
- 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
- );
+ baseUrl = url_for(
+ 'debugger.initialize_target_for_function', {
+ 'debug_type': 'direct',
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': debuggerUtils.getProcedureId(treeInfo),
+ }
+ );
+ }
- panel.focus();
+ $.ajax({
+ url: baseUrl,
+ method: 'GET',
+ })
+ .done(function(res) {
- // Register Panel Closed event
- panel.on(wcDocker.EVENT.CLOSED, function() {
- var closeUrl = url_for('debugger.close', {
+ var url = url_for('debugger.direct', {
'trans_id': res.data.debuggerTransId,
});
- $.ajax({
- url: closeUrl,
- method: 'DELETE',
- });
+
+ if (self.preferences.debugger_new_browser_tab) {
+ window.open(url, '_blank');
+ } else {
+ pgBrowser.Events.once(
+ 'pgadmin-browser:frame:urlloaded:frm_debugger',
+ function(frame) {
+ frame.openURL(url);
+ });
+
+ // Create the debugger panel as per the data received from user input dialog.
+ var dashboardPanel = pgBrowser.docker.findPanels(
+ 'properties'
+ ),
+ panel = pgBrowser.docker.addPanel(
+ 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
+ );
+
+ panel.focus();
+
+ // Register Panel Closed event
+ panel.on(wcDocker.EVENT.CLOSED, function() {
+ var closeUrl = url_for('debugger.close', {
+ 'trans_id': res.data.debuggerTransId,
+ });
+ $.ajax({
+ url: closeUrl,
+ method: 'DELETE',
+ });
+ });
+ }
+ })
+ .fail(function(e) {
+ Alertify.alert(
+ gettext('Debugger Target Initialization Error'),
+ e.responseJSON.errormsg
+ );
});
+ }
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
- })
- .fail(function(e) {
- Alertify.alert(
- gettext('Debugger Target Initialization Error'),
- e.responseJSON.errormsg
- );
- });
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ } catch (e) {
+ console.warn(e.stack || e);
}
- } catch (e) {
- console.warn(e.stack || e);
- }
- });
+ });
},
};
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index 8af2274c..46d34eed 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -66,7 +66,7 @@ define([
case 'cid':
case 'xid':
case 'tid':
- // As we are getting this value as text from sqlite database so we need to type cast it.
+ // As we are getting this value as text from sqlite database so we need to type cast it.
if (model.get('value') != undefined) {
model.set({
'value': parseInt(model.get('value')),
@@ -80,7 +80,7 @@ define([
case 'numeric':
case 'double precision':
case 'decimal':
- // As we are getting this value as text from sqlite database so we need to type cast it.
+ // As we are getting this value as text from sqlite database so we need to type cast it.
if (model.get('value') != undefined) {
model.set({
'value': parseFloat(model.get('value')),
@@ -240,26 +240,26 @@ define([
method: 'GET',
async: false,
})
- .done(function(res) {
- if (res.data.args_count != 0) {
- for (i = 0; i < res.data.result.length; i++) {
+ .done(function(res) {
+ if (res.data.args_count != 0) {
+ for (i = 0; i < res.data.result.length; i++) {
// Below will format the data to be stored in sqlite database
- func_args_data.push({
- 'arg_id': res.data.result[i]['arg_id'],
- 'is_null': res.data.result[i]['is_null'],
- 'is_expression': res.data.result[i]['is_expression'],
- 'use_default': res.data.result[i]['use_default'],
- 'value': res.data.result[i]['value'],
- });
+ func_args_data.push({
+ 'arg_id': res.data.result[i]['arg_id'],
+ 'is_null': res.data.result[i]['is_null'],
+ 'is_expression': res.data.result[i]['is_expression'],
+ 'use_default': res.data.result[i]['use_default'],
+ 'value': res.data.result[i]['value'],
+ });
+ }
}
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Unable to fetch the arguments from server')
- );
- });
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Unable to fetch the arguments from server')
+ );
+ });
var argname, argtype, argmode, default_args_count, default_args, arg_cnt;
@@ -744,97 +744,97 @@ define([
'data': JSON.stringify(args_value_list),
},
})
- .done(function(res) {
+ .done(function(res) {
- var url = url_for(
- 'debugger.direct', {
- 'trans_id': res.data.debuggerTransId,
- }
- );
+ var url = url_for(
+ 'debugger.direct', {
+ 'trans_id': res.data.debuggerTransId,
+ }
+ );
- if (self.preferences.debugger_new_browser_tab) {
- window.open(url, '_blank');
- } else {
- pgBrowser.Events.once(
- 'pgadmin-browser:frame:urlloaded:frm_debugger',
- function(frame) {
- frame.openURL(url);
+ if (self.preferences.debugger_new_browser_tab) {
+ window.open(url, '_blank');
+ } else {
+ pgBrowser.Events.once(
+ 'pgadmin-browser:frame:urlloaded:frm_debugger',
+ function(frame) {
+ frame.openURL(url);
+ });
+
+ // Create the debugger panel as per the data received from user input dialog.
+ var dashboardPanel = pgBrowser.docker.findPanels('properties'),
+ panel = pgBrowser.docker.addPanel(
+ 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
+ );
+
+ panel.focus();
+
+ // Panel Closed event
+ panel.on(wcDocker.EVENT.CLOSED, function() {
+ var closeUrl = url_for('debugger.close', {
+ 'trans_id': res.data.debuggerTransId,
+ });
+ $.ajax({
+ url: closeUrl,
+ method: 'DELETE',
+ });
});
-
- // Create the debugger panel as per the data received from user input dialog.
- var dashboardPanel = pgBrowser.docker.findPanels('properties'),
- panel = pgBrowser.docker.addPanel(
- 'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
- );
-
- panel.focus();
-
- // Panel Closed event
- panel.on(wcDocker.EVENT.CLOSED, function() {
- var closeUrl = url_for('debugger.close', {
- 'trans_id': res.data.debuggerTransId,
+ }
+ var _Url;
+
+ if (d._type == 'function') {
+ _Url = url_for('debugger.set_arguments', {
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.function._id,
});
- $.ajax({
- url: closeUrl,
- method: 'DELETE',
+ } else if (d._type == 'procedure') {
+ _Url = url_for('debugger.set_arguments', {
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.procedure._id,
});
- });
- }
- var _Url;
-
- if (d._type == 'function') {
- _Url = url_for('debugger.set_arguments', {
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': treeInfo.function._id,
- });
- } else if (d._type == 'procedure') {
- _Url = url_for('debugger.set_arguments', {
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': treeInfo.procedure._id,
- });
- } else if (d._type == 'edbfunc') {
+ } else if (d._type == 'edbfunc') {
// Get the existing function parameters available from sqlite database
- _Url = url_for('debugger.set_arguments', {
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': treeInfo.edbfunc._id,
- });
- } else if (d._type == 'edbproc') {
+ _Url = url_for('debugger.set_arguments', {
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.edbfunc._id,
+ });
+ } else if (d._type == 'edbproc') {
// Get the existing function parameters available from sqlite database
- _Url = url_for('debugger.set_arguments', {
- 'sid': treeInfo.server._id,
- 'did': treeInfo.database._id,
- 'scid': treeInfo.schema._id,
- 'func_id': treeInfo.edbproc._id,
- });
- }
+ _Url = url_for('debugger.set_arguments', {
+ 'sid': treeInfo.server._id,
+ 'did': treeInfo.database._id,
+ 'scid': treeInfo.schema._id,
+ 'func_id': treeInfo.edbproc._id,
+ });
+ }
- $.ajax({
- url: _Url,
- method: 'POST',
- data: {
- 'data': JSON.stringify(sqlite_func_args_list),
- },
+ $.ajax({
+ url: _Url,
+ method: 'POST',
+ data: {
+ 'data': JSON.stringify(sqlite_func_args_list),
+ },
+ })
+ .done(function() {})
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Unable to set the arguments on the server')
+ );
+ });
})
- .done(function() {})
- .fail(function() {
+ .fail(function(e) {
Alertify.alert(
- gettext('Debugger Error'),
- gettext('Unable to set the arguments on the server')
+ gettext('Debugger Target Initialization Error'),
+ e.responseJSON.errormsg
);
});
- })
- .fail(function(e) {
- Alertify.alert(
- gettext('Debugger Target Initialization Error'),
- e.responseJSON.errormsg
- );
- });
} else {
// If the debugging is started again then we should only set the
// arguments and start the listener again
@@ -849,13 +849,13 @@ define([
'data': JSON.stringify(args_value_list),
},
})
- .done(function() {})
- .fail(function(e) {
- Alertify.alert(
- gettext('Debugger Listener Startup Error'),
- e.responseJSON.errormsg
- );
- });
+ .done(function() {})
+ .fail(function(e) {
+ Alertify.alert(
+ gettext('Debugger Listener Startup Error'),
+ e.responseJSON.errormsg
+ );
+ });
// Set the new input arguments given by the user during debugging
var _Url = url_for('debugger.set_arguments', {
@@ -871,13 +871,13 @@ define([
'data': JSON.stringify(sqlite_func_args_list),
},
})
- .done(function() {})
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Unable to set the arguments on the server')
- );
- });
+ .done(function() {})
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Unable to set the arguments on the server')
+ );
+ });
}
@@ -913,37 +913,37 @@ define([
debug button.
*/
this.grid.listenTo(this.debuggerInputArgsColl, 'backgrid:edited',
- (function(obj) {
+ (function(obj) {
- return function() {
+ return function() {
- var enable_btn = false;
+ var enable_btn = false;
- for (var i = 0; i < this.collection.length; i++) {
+ for (var i = 0; i < this.collection.length; i++) {
- if (this.collection.models[i].get('is_null')) {
- obj.__internal.buttons[1].element.disabled = false;
- enable_btn = true;
- continue;
- }
- // TODO: Need to check the "Expression" column value to
- // enable/disable the "Debug" button
- if (this.collection.models[i].get('value') == null ||
+ if (this.collection.models[i].get('is_null')) {
+ obj.__internal.buttons[1].element.disabled = false;
+ enable_btn = true;
+ continue;
+ }
+ // TODO: Need to check the "Expression" column value to
+ // enable/disable the "Debug" button
+ if (this.collection.models[i].get('value') == null ||
this.collection.models[i].get('value') == undefined) {
- enable_btn = true;
-
- if (this.collection.models[i].get('use_default')) {
- obj.__internal.buttons[1].element.disabled = false;
- } else {
- obj.__internal.buttons[1].element.disabled = true;
- break;
- }
+ enable_btn = true;
+
+ if (this.collection.models[i].get('use_default')) {
+ obj.__internal.buttons[1].element.disabled = false;
+ } else {
+ obj.__internal.buttons[1].element.disabled = true;
+ break;
}
}
- if (!enable_btn)
- obj.__internal.buttons[1].element.disabled = false;
- };
- })(this)
+ }
+ if (!enable_btn)
+ obj.__internal.buttons[1].element.disabled = false;
+ };
+ })(this)
);
this.grid.listenTo(this.debuggerInputArgsColl, 'backgrid:error',
diff --git a/web/pgadmin/tools/debugger/static/js/direct.js b/web/pgadmin/tools/debugger/static/js/direct.js
index a0146528..494291f4 100644
--- a/web/pgadmin/tools/debugger/static/js/direct.js
+++ b/web/pgadmin/tools/debugger/static/js/direct.js
@@ -55,17 +55,17 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
+ .done(function(res) {
+ if (res.data.status) {
// Breakpoint has been set by the user
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while setting debugging breakpoint.')
- );
- });
+ }
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while setting debugging breakpoint.')
+ );
+ });
},
// Function to get the latest breakpoint information and update the
@@ -117,22 +117,22 @@ define([
method: 'GET',
async: false,
})
- .done(function(res) {
- if (res.data.status === 'Success') {
- result = res.data.result;
- } else if (res.data.status === 'NotConnected') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
+ result = res.data.result;
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while fetching breakpoint information.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while fetching breakpoint information.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while fetching breakpoint information.')
- );
- });
+ });
return result;
},
@@ -178,23 +178,23 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
// If status is Success then find the port number to attach the executer.
- self.execute_query(trans_id);
- } else if (res.data.status === 'NotConnected') {
+ self.execute_query(trans_id);
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while starting debugging session.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while starting debugging session.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while starting debugging session.')
- );
- });
+ });
},
// Execute the query and get the first functions debug information from the server
@@ -210,35 +210,35 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
// set the return code to the code editor text area
- if (
- res.data.result[0].src != null &&
+ if (
+ res.data.result[0].src != null &&
res.data.result[0].linenumber != null
- ) {
- pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
+ ) {
+ pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
- self.setActiveLine(res.data.result[0].linenumber - 2);
- }
- // Call function to create and update local variables ....
- self.GetStackInformation(trans_id);
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
+ self.setActiveLine(res.data.result[0].linenumber - 2);
+ }
+ // Call function to create and update local variables ....
+ self.GetStackInformation(trans_id);
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while executing requested debugging information.')
+ );
}
- } else if (res.data.status === 'NotConnected') {
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while executing requested debugging information.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while executing requested debugging information.')
- );
- });
+ });
},
// Get the local variable information of the functions and update the grid
@@ -255,32 +255,32 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
// Call function to create and update local variables
- self.AddLocalVariables(res.data.result);
- self.AddParameters(res.data.result);
- // If debug function is restarted then again start listener to
- // read the updated messages.
- if (pgTools.DirectDebug.debug_restarted) {
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
+ self.AddLocalVariables(res.data.result);
+ self.AddParameters(res.data.result);
+ // If debug function is restarted then again start listener to
+ // read the updated messages.
+ if (pgTools.DirectDebug.debug_restarted) {
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
+ pgTools.DirectDebug.debug_restarted = false;
}
- pgTools.DirectDebug.debug_restarted = false;
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while fetching variable information.')
+ );
}
- } else if (res.data.status === 'NotConnected') {
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while fetching variable information.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while fetching variable information.')
- );
- });
+ });
},
// Get the stack information of the functions and update the grid
@@ -297,24 +297,24 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
// Call function to create and update stack information
- self.AddStackInformation(res.data.result);
- self.GetLocalVariables(pgTools.DirectDebug.trans_id);
- } else if (res.data.status === 'NotConnected') {
+ self.AddStackInformation(res.data.result);
+ self.GetLocalVariables(pgTools.DirectDebug.trans_id);
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while fetching stack information.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while fetching stack information.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while fetching stack information.')
- );
- });
+ });
},
/*
@@ -358,91 +358,91 @@ define([
$('.debugger-container').addClass('show_progress');
},
})
- .done(function(res) {
+ .done(function(res) {
// remove progress cursor
- $('.debugger-container').removeClass('show_progress');
+ $('.debugger-container').removeClass('show_progress');
- if (res.data.status === 'Success') {
+ if (res.data.status === 'Success') {
// If no result then poll again to wait for results.
- if (res.data.result == null || res.data.result.length == 0) {
- self.poll_result(trans_id);
- } else {
- if (res.data.result[0].src != undefined || res.data.result[0].src != null) {
- pgTools.DirectDebug.polling_timeout_idle = false;
- pgTools.DirectDebug.docker.finishLoading(50);
- if (res.data.result[0].src != pgTools.DirectDebug.editor.getValue()) {
- pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
- self.UpdateBreakpoint(trans_id);
- }
- self.setActiveLine(res.data.result[0].linenumber - 2);
- // Update the stack, local variables and parameters information
- self.GetStackInformation(trans_id);
-
- } else if (!pgTools.DirectDebug.debug_type && !pgTools.DirectDebug.first_time_indirect_debug) {
- pgTools.DirectDebug.docker.finishLoading(50);
- self.setActiveLine(-1);
- self.clear_all_breakpoint(trans_id);
- self.execute_query(trans_id);
- pgTools.DirectDebug.first_time_indirect_debug = true;
- pgTools.DirectDebug.polling_timeout_idle = false;
+ if (res.data.result == null || res.data.result.length == 0) {
+ self.poll_result(trans_id);
} else {
- pgTools.DirectDebug.polling_timeout_idle = false;
- pgTools.DirectDebug.docker.finishLoading(50);
- // If the source is really changed then only update the breakpoint information
- if (res.data.result[0].src != pgTools.DirectDebug.editor.getValue()) {
- pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
- self.UpdateBreakpoint(trans_id);
+ if (res.data.result[0].src != undefined || res.data.result[0].src != null) {
+ pgTools.DirectDebug.polling_timeout_idle = false;
+ pgTools.DirectDebug.docker.finishLoading(50);
+ if (res.data.result[0].src != pgTools.DirectDebug.editor.getValue()) {
+ pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
+ self.UpdateBreakpoint(trans_id);
+ }
+ self.setActiveLine(res.data.result[0].linenumber - 2);
+ // Update the stack, local variables and parameters information
+ self.GetStackInformation(trans_id);
+
+ } else if (!pgTools.DirectDebug.debug_type && !pgTools.DirectDebug.first_time_indirect_debug) {
+ pgTools.DirectDebug.docker.finishLoading(50);
+ self.setActiveLine(-1);
+ self.clear_all_breakpoint(trans_id);
+ self.execute_query(trans_id);
+ pgTools.DirectDebug.first_time_indirect_debug = true;
+ pgTools.DirectDebug.polling_timeout_idle = false;
+ } else {
+ pgTools.DirectDebug.polling_timeout_idle = false;
+ pgTools.DirectDebug.docker.finishLoading(50);
+ // If the source is really changed then only update the breakpoint information
+ if (res.data.result[0].src != pgTools.DirectDebug.editor.getValue()) {
+ pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
+ self.UpdateBreakpoint(trans_id);
+ }
+
+ self.setActiveLine(res.data.result[0].linenumber - 2);
+ // Update the stack, local variables and parameters information
+ self.GetStackInformation(trans_id);
}
- self.setActiveLine(res.data.result[0].linenumber - 2);
- // Update the stack, local variables and parameters information
- self.GetStackInformation(trans_id);
+ // 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);
+ }, 500);
}
+ } else if (res.data.status === 'Busy') {
+ pgTools.DirectDebug.polling_timeout_idle = true;
+ // If status is Busy then poll the result by recursive call to the poll function
+ if (!pgTools.DirectDebug.debug_type) {
+ pgTools.DirectDebug.docker.startLoading(
+ gettext('Waiting for another session to invoke the target...')
+ );
- // 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);
- }, 500);
- }
- } else if (res.data.status === 'Busy') {
- pgTools.DirectDebug.polling_timeout_idle = true;
- // If status is Busy then poll the result by recursive call to the poll function
- if (!pgTools.DirectDebug.debug_type) {
- pgTools.DirectDebug.docker.startLoading(
- gettext('Waiting for another session to invoke the target...')
+ // 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);
+ pgTools.DirectDebug.first_time_indirect_debug = false;
+ self.poll_result(trans_id);
+ } else {
+ self.poll_result(trans_id);
+ }
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while polling result.')
);
-
- // 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);
- pgTools.DirectDebug.first_time_indirect_debug = false;
- self.poll_result(trans_id);
- } else {
- self.poll_result(trans_id);
}
- } else if (res.data.status === 'NotConnected') {
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while polling result.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while polling result.')
- );
- });
+ });
}, poll_timeout);
},
@@ -505,49 +505,15 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
- if (res.data.result == undefined) {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
+ if (res.data.result == undefined) {
/*
"result" is undefined only in case of EDB procedure.
As Once the EDB procedure execution is completed then we are
not getting any result so we need ignore the result.
*/
- self.setActiveLine(-1);
- pgTools.DirectDebug.direct_execution_completed = true;
- pgTools.DirectDebug.polling_timeout_idle = true;
-
- //Set the alertify message to inform the user that execution is completed.
- Alertify.success(res.info, 3);
-
- // Update the message tab of the debugger
- if (res.data.status_message) {
- self.update_messages(res.data.status_message);
- }
-
- // remove progress cursor
- $('.debugger-container').removeClass('show_progress');
-
- // Execution completed so disable the buttons other than
- // "Continue/Start" button because user can still
- // start the same execution again.
- setTimeout(function() {
- 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', true);
- }, 500);
-
- // Stop further polling
- pgTools.DirectDebug.is_polling_required = false;
- } else {
- // Call function to create and update local variables ....
- if (res.data.result != null) {
self.setActiveLine(-1);
- self.AddResults(res.data.col_info, res.data.result);
- pgTools.DirectDebug.results_panel.focus();
pgTools.DirectDebug.direct_execution_completed = true;
pgTools.DirectDebug.polling_timeout_idle = true;
@@ -574,68 +540,102 @@ define([
self.enable('continue', true);
}, 500);
- // Stop further pooling
+ // Stop further polling
pgTools.DirectDebug.is_polling_required = false;
+ } else {
+ // Call function to create and update local variables ....
+ if (res.data.result != null) {
+ self.setActiveLine(-1);
+ self.AddResults(res.data.col_info, res.data.result);
+ pgTools.DirectDebug.results_panel.focus();
+ pgTools.DirectDebug.direct_execution_completed = true;
+ pgTools.DirectDebug.polling_timeout_idle = true;
+
+ //Set the alertify message to inform the user that execution is completed.
+ Alertify.success(res.info, 3);
+
+ // Update the message tab of the debugger
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
+
+ // remove progress cursor
+ $('.debugger-container').removeClass('show_progress');
+
+ // Execution completed so disable the buttons other than
+ // "Continue/Start" button because user can still
+ // start the same execution again.
+ setTimeout(function() {
+ 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', true);
+ }, 500);
+
+ // Stop further pooling
+ pgTools.DirectDebug.is_polling_required = false;
+ }
}
- }
- } else if (res.data.status === 'Busy') {
+ } else if (res.data.status === 'Busy') {
// If status is Busy then poll the result by recursive call to
// the poll function
- self.poll_end_execution_result(trans_id);
- // Update the message tab of the debugger
- if (res.data.status_message) {
- self.update_messages(res.data.status_message);
- }
- } else if (res.data.status === 'NotConnected') {
- Alertify.alert(
- gettext('Debugger poll end execution error'),
- res.data.result
- );
- } else if (res.data.status === 'ERROR') {
- pgTools.DirectDebug.direct_execution_completed = true;
- self.setActiveLine(-1);
-
- //Set the Alertify message to inform the user that execution is
- // completed with error.
- if (!pgTools.DirectDebug.is_user_aborted_debugging) {
- Alertify.error(res.info, 3);
- }
+ self.poll_end_execution_result(trans_id);
+ // Update the message tab of the debugger
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger poll end execution error'),
+ res.data.result
+ );
+ } else if (res.data.status === 'ERROR') {
+ pgTools.DirectDebug.direct_execution_completed = true;
+ self.setActiveLine(-1);
- // Update the message tab of the debugger
- if (res.data.status_message) {
- self.update_messages(res.data.status_message);
- }
+ //Set the Alertify message to inform the user that execution is
+ // completed with error.
+ if (!pgTools.DirectDebug.is_user_aborted_debugging) {
+ Alertify.error(res.info, 3);
+ }
- pgTools.DirectDebug.messages_panel.focus();
+ // Update the message tab of the debugger
+ if (res.data.status_message) {
+ self.update_messages(res.data.status_message);
+ }
- // remove progress cursor
- $('.debugger-container').removeClass('show_progress');
+ pgTools.DirectDebug.messages_panel.focus();
- // Execution completed so disable the buttons other than
- // "Continue/Start" button because user can still start the
- // same execution again.
- 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);
- // If debugging is stopped by user then do not enable
- // continue/restart button
- if (!pgTools.DirectDebug.is_user_aborted_debugging) {
- self.enable('continue', true);
- pgTools.DirectDebug.is_user_aborted_debugging = false;
- }
+ // remove progress cursor
+ $('.debugger-container').removeClass('show_progress');
- // Stop further pooling
- pgTools.DirectDebug.is_polling_required = false;
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while polling result.')
- );
- });
+ // Execution completed so disable the buttons other than
+ // "Continue/Start" button because user can still start the
+ // same execution again.
+ 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);
+ // If debugging is stopped by user then do not enable
+ // continue/restart button
+ if (!pgTools.DirectDebug.is_user_aborted_debugging) {
+ self.enable('continue', true);
+ pgTools.DirectDebug.is_user_aborted_debugging = false;
+ }
+
+ // Stop further pooling
+ pgTools.DirectDebug.is_polling_required = false;
+ }
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while polling result.')
+ );
+ });
}, poll_end_timeout);
},
@@ -654,69 +654,69 @@ define([
// Clear msg tab
pgTools.DirectDebug
- .messages_panel
- .$container
- .find('.messages')
- .html('');
+ .messages_panel
+ .$container
+ .find('.messages')
+ .html('');
$.ajax({
url: baseUrl,
})
- .done(function(res) {
+ .done(function(res) {
// Restart the same function debugging with previous arguments
- var restart_dbg = res.data.restart_debug ? 1 : 0;
+ var restart_dbg = res.data.restart_debug ? 1 : 0;
- // Start pooling again
- pgTools.DirectDebug.polling_timeout_idle = false;
- pgTools.DirectDebug.is_polling_required = true;
- self.poll_result(trans_id);
+ // Start pooling again
+ pgTools.DirectDebug.polling_timeout_idle = false;
+ pgTools.DirectDebug.is_polling_required = true;
+ self.poll_result(trans_id);
- if (restart_dbg) {
- pgTools.DirectDebug.debug_restarted = true;
- }
+ if (restart_dbg) {
+ pgTools.DirectDebug.debug_restarted = true;
+ }
- /*
+ /*
Need to check if restart debugging really require to open the input
dialog? If yes then we will get the previous arguments from database
and populate the input dialog, If no then we should directly start the
listener.
*/
- if (res.data.result.require_input) {
- debug_function_again(res.data.result, restart_dbg);
- } else {
+ if (res.data.result.require_input) {
+ debug_function_again(res.data.result, restart_dbg);
+ } else {
// Debugging of void function is started again so we need to start
// the listener again
- var baseUrl = url_for('debugger.start_listener', {
- 'trans_id': trans_id,
- });
+ var baseUrl = url_for('debugger.start_listener', {
+ 'trans_id': trans_id,
+ });
- $.ajax({
- url: baseUrl,
- method: 'GET',
- })
- .done(function() {
- if (pgTools.DirectDebug.debug_type) {
- self.poll_end_execution_result(trans_id);
+ $.ajax({
+ url: baseUrl,
+ method: 'GET',
+ })
+ .done(function() {
+ if (pgTools.DirectDebug.debug_type) {
+ self.poll_end_execution_result(trans_id);
+ }
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while polling result.')
+ );
+ });
+ }
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while polling result.')
- );
- });
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ } catch (e) {
+ console.warn(e.stack || e);
}
- } catch (e) {
- console.warn(e.stack || e);
- }
- });
+ });
},
// Continue the execution until the next breakpoint
@@ -743,22 +743,22 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.poll_result(trans_id);
- } else {
+ .done(function(res) {
+ if (res.data.status) {
+ self.poll_result(trans_id);
+ } else {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while executing continue in debugging session.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while executing continue in debugging session.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while executing continue in debugging session.')
- );
- });
+ });
}
},
@@ -780,22 +780,22 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.poll_result(trans_id);
- } else {
+ .done(function(res) {
+ if (res.data.status) {
+ self.poll_result(trans_id);
+ } else {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while executing step over in debugging session.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while executing step over in debugging session.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while executing step over in debugging session.')
- );
- });
+ });
},
Step_into: function(trans_id) {
@@ -816,22 +816,22 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.poll_result(trans_id);
- } else {
+ .done(function(res) {
+ if (res.data.status) {
+ self.poll_result(trans_id);
+ } else {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while executing step into in debugging session.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while executing step into in debugging session.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while executing step into in debugging session.')
- );
- });
+ });
},
Stop: function(trans_id) {
@@ -853,36 +853,36 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
+ .done(function(res) {
+ if (res.data.status) {
// Call function to create and update local variables ....
- self.setActiveLine(-1);
- pgTools.DirectDebug.direct_execution_completed = true;
- pgTools.DirectDebug.is_user_aborted_debugging = true;
+ self.setActiveLine(-1);
+ pgTools.DirectDebug.direct_execution_completed = true;
+ pgTools.DirectDebug.is_user_aborted_debugging = true;
- // Stop further pooling
- pgTools.DirectDebug.is_polling_required = false;
+ // Stop further pooling
+ pgTools.DirectDebug.is_polling_required = false;
- // Restarting debugging in the same transaction do not work
- // We will give same behaviour as pgAdmin3 and disable all buttons
- self.enable('continue', false);
+ // Restarting debugging in the same transaction do not work
+ // We will give same behaviour as pgAdmin3 and disable all buttons
+ self.enable('continue', false);
- // Set the Alertify message to inform the user that execution
- // is completed.
- Alertify.success(res.info, 3);
- } else if (res.data.status === 'NotConnected') {
+ // Set the Alertify message to inform the user that execution
+ // is completed.
+ Alertify.success(res.info, 3);
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while executing stop in debugging session.')
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while executing stop in debugging session.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while executing stop in debugging session.')
- );
- });
+ });
},
toggle_breakpoint: function(trans_id) {
@@ -918,40 +918,40 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
+ .done(function(res) {
+ if (res.data.status) {
// Call function to create and update local variables ....
- var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
-
- if (info.gutterMarkers != undefined) {
- pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', null);
- } else {
- pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', function() {
- var marker = document.createElement('div');
- marker.style.color = '#822';
- marker.innerHTML = '●';
- return marker;
- }());
+ var info = pgTools.DirectDebug.editor.lineInfo(self.active_line_no);
+
+ if (info.gutterMarkers != undefined) {
+ pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', null);
+ } else {
+ pgTools.DirectDebug.editor.setGutterMarker(self.active_line_no, 'breakpoints', function() {
+ var marker = document.createElement('div');
+ marker.style.color = '#822';
+ marker.innerHTML = '●';
+ 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);
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while toggling breakpoint.')
+ );
}
- 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);
- } else if (res.data.status === 'NotConnected') {
+ })
+ .fail(function() {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while toggling breakpoint.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while toggling breakpoint.')
- );
- });
+ });
},
clear_all_breakpoint: function(trans_id) {
@@ -989,31 +989,31 @@ define([
'breakpoint_list': breakpoint_list.join(),
},
})
- .done(function(res) {
- if (res.data.status) {
- for (var i = 0; i < breakpoint_list.length; i++) {
- var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[i] - 1));
+ .done(function(res) {
+ if (res.data.status) {
+ for (var i = 0; i < breakpoint_list.length; i++) {
+ var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[i] - 1));
- if (info) {
- if (info.gutterMarkers != undefined) {
- pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', null);
+ if (info) {
+ if (info.gutterMarkers != undefined) {
+ pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', null);
+ }
}
}
}
- }
- 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);
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while clearing all breakpoint.')
- );
- });
+ 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);
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while clearing all breakpoint.')
+ );
+ });
},
AddStackInformation: function(result) {
@@ -1238,9 +1238,9 @@ define([
// Render the variables grid into local variables panel
pgTools.DirectDebug.local_variables_panel
- .$container
- .find('.local_variables')
- .append(variable_grid.el);
+ .$container
+ .find('.local_variables')
+ .append(variable_grid.el);
},
AddParameters: function(result) {
@@ -1324,9 +1324,9 @@ define([
// Render the parameters grid into parameter panel
pgTools.DirectDebug.parameters_panel
- .$container
- .find('.parameters')
- .append(param_grid.el);
+ .$container
+ .find('.parameters')
+ .append(param_grid.el);
},
deposit_parameter_value: function(model) {
var self = this;
@@ -1351,24 +1351,24 @@ define([
'data': JSON.stringify(name_value_list),
},
})
- .done(function(res) {
- if (res.data.status) {
+ .done(function(res) {
+ if (res.data.status) {
// Get the updated variables value
- self.GetLocalVariables(pgTools.DirectDebug.trans_id);
- // Show the message to the user that deposit value is success or failure
- if (res.data.result) {
- Alertify.success(res.data.info, 3);
- } else {
- Alertify.error(res.data.info, 3);
+ self.GetLocalVariables(pgTools.DirectDebug.trans_id);
+ // Show the message to the user that deposit value is success or failure
+ if (res.data.result) {
+ Alertify.success(res.data.info, 3);
+ } else {
+ Alertify.error(res.data.info, 3);
+ }
}
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while depositing variable value.')
- );
- });
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while depositing variable value.')
+ );
+ });
},
select_frame: function() {
@@ -1383,21 +1383,21 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
- self.UpdateBreakpoint(pgTools.DirectDebug.trans_id);
- self.setActiveLine(res.data.result[0].linenumber - 2);
- // Call function to create and update local variables ....
- self.GetLocalVariables(pgTools.DirectDebug.trans_id);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while selecting frame.')
- );
- });
+ .done(function(res) {
+ if (res.data.status) {
+ pgTools.DirectDebug.editor.setValue(res.data.result[0].src);
+ self.UpdateBreakpoint(pgTools.DirectDebug.trans_id);
+ self.setActiveLine(res.data.result[0].linenumber - 2);
+ // Call function to create and update local variables ....
+ self.GetLocalVariables(pgTools.DirectDebug.trans_id);
+ }
+ })
+ .fail(function() {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while selecting frame.')
+ );
+ });
},
}
);
@@ -1556,7 +1556,7 @@ define([
this.function_name_with_arguments = function_name_with_arguments;
let browser = window.opener ?
- window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
+ window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
this.preferences = browser.get_preferences_for_module('sqleditor');
this.docker = new wcDocker(
@@ -1583,25 +1583,25 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.intializePanels();
- controller.poll_result(trans_id);
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ .done(function(res) {
+ if (res.data.status) {
+ self.intializePanels();
+ controller.poll_result(trans_id);
}
- } catch (e) {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while starting debugging listener.')
- );
- }
- });
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ }
+ } catch (e) {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while starting debugging listener.')
+ );
+ }
+ });
} else if (trans_id != undefined && debug_type) {
// Make ajax call to execute the and start the target for execution
baseUrl = url_for('debugger.start_listener', {
@@ -1612,24 +1612,24 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.messages(trans_id);
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- if (err.success == 0) {
- Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ .done(function(res) {
+ if (res.data.status) {
+ self.messages(trans_id);
}
- } catch (e) {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while starting debugging listener.')
- );
- }
- });
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ if (err.success == 0) {
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
+ }
+ } catch (e) {
+ Alertify.alert(
+ gettext('Debugger Error'),
+ gettext('Error while starting debugging listener.')
+ );
+ }
+ });
} else
this.intializePanels();
},
@@ -1647,27 +1647,27 @@ define([
url: baseUrl,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status === 'Success') {
- self.intializePanels();
- // 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') {
+ .done(function(res) {
+ if (res.data.status === 'Success') {
+ self.intializePanels();
+ // 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') {
// If status is Busy then poll the result by recursive call to the poll function
- self.messages(trans_id);
- } else if (res.data.status === 'NotConnected') {
+ self.messages(trans_id);
+ } else if (res.data.status === 'NotConnected') {
+ Alertify.alert(
+ gettext('Not connected to server or connection with the server has been closed.'),
+ res.data.result
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
- gettext('Not connected to server or connection with the server has been closed.'),
- res.data.result
+ gettext('Debugger Error'),
+ gettext('Error while fetching messages information.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Debugger Error'),
- gettext('Error while fetching messages information.')
- );
- });
+ });
},
@@ -1792,11 +1792,11 @@ define([
}
);
self.messages_panel = self.docker.addPanel(
- 'messages', wcDocker.DOCK.STACKED, self.parameters_panel);
+ 'messages', wcDocker.DOCK.STACKED, self.parameters_panel);
self.results_panel = self.docker.addPanel(
- 'results', wcDocker.DOCK.STACKED, self.parameters_panel);
+ 'results', wcDocker.DOCK.STACKED, self.parameters_panel);
self.stack_pane_panel = self.docker.addPanel(
- 'stack_pane', wcDocker.DOCK.STACKED, self.parameters_panel);
+ 'stack_pane', wcDocker.DOCK.STACKED, self.parameters_panel);
var editor_pane = $('
');
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 4dd904b4..4528cebe 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -101,8 +101,8 @@ define([
cell: Backgrid.Extension.SelectRowCell.extend({
render: function() {
- // Do not use parent's render function. It set's tabindex to -1 on
- // checkboxes.
+ // Do not use parent's render function. It set's tabindex to -1 on
+ // checkboxes.
this.$el.empty().append('
');
this.delegateEvents();
diff --git a/web/pgadmin/tools/import_export/static/js/import_export.js b/web/pgadmin/tools/import_export/static/js/import_export.js
index 6de7254c..4fbdf882 100644
--- a/web/pgadmin/tools/import_export/static/js/import_export.js
+++ b/web/pgadmin/tools/import_export/static/js/import_export.js
@@ -15,7 +15,7 @@ define([
'pgadmin.backform', 'pgadmin.backgrid', 'pgadmin.browser.node.ui',
], function(
gettext, url_for, $, _, S, Alertify, pgAdmin, pgBrowser, Backbone, Backgrid,
-Backform, commonUtils, supportedNodes
+ Backform, commonUtils, supportedNodes
) {
pgAdmin = pgAdmin || window.pgAdmin || {};
@@ -542,28 +542,28 @@ Backform, commonUtils, supportedNodes
'data': JSON.stringify(this.view.model.toJSON()),
},
})
- .done(function(res) {
- if (res.success) {
- Alertify.success(gettext('Import/export job created.'), 5);
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', self);
- } else {
- Alertify.alert(
- gettext('Import/export job creation failed.'),
- res.errormsg
- );
- }
- })
- .fail(function(xhr) {
- try {
- var err = JSON.parse(xhr.responseText);
- Alertify.alert(
- gettext('Import/export job failed.'),
- err.errormsg
- );
- } catch (e) {
- console.warn(e.stack || e);
- }
- });
+ .done(function(res) {
+ if (res.success) {
+ Alertify.success(gettext('Import/export job created.'), 5);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created', self);
+ } else {
+ Alertify.alert(
+ gettext('Import/export job creation failed.'),
+ res.errormsg
+ );
+ }
+ })
+ .fail(function(xhr) {
+ try {
+ var err = JSON.parse(xhr.responseText);
+ Alertify.alert(
+ gettext('Import/export job failed.'),
+ err.errormsg
+ );
+ } catch (e) {
+ console.warn(e.stack || e);
+ }
+ });
}
},
@@ -675,29 +675,29 @@ Backform, commonUtils, supportedNodes
url: baseUrl,
type:'GET',
})
- .done(function(res) {
- if (!res.success) {
+ .done(function(res) {
+ if (!res.success) {
+ Alertify.alert(
+ gettext('Utility not found'),
+ res.errormsg
+ );
+ return;
+ }
+
+ // Open the Alertify dialog for the import/export module
+ Alertify.ImportDialog(
+ S(
+ gettext('Import/Export data - table \'%s\'')
+ ).sprintf(treeInfo.table.label).value(), node, i, d
+ ).set('resizable', true).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
+ })
+ .fail(function() {
Alertify.alert(
gettext('Utility not found'),
- res.errormsg
+ gettext('Failed to fetch Utility information')
);
return;
- }
-
- // Open the Alertify dialog for the import/export module
- Alertify.ImportDialog(
- S(
- gettext('Import/Export data - table \'%s\'')
- ).sprintf(treeInfo.table.label).value(), node, i, d
- ).set('resizable', true).resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.lg);
- })
- .fail(function() {
- Alertify.alert(
- gettext('Utility not found'),
- gettext('Failed to fetch Utility information')
- );
- return;
- });
+ });
},
};
diff --git a/web/pgadmin/tools/maintenance/static/js/maintenance.js b/web/pgadmin/tools/maintenance/static/js/maintenance.js
index fe38d095..4d696c31 100644
--- a/web/pgadmin/tools/maintenance/static/js/maintenance.js
+++ b/web/pgadmin/tools/maintenance/static/js/maintenance.js
@@ -391,23 +391,23 @@ define([
'data': JSON.stringify(this.view.model.toJSON()),
},
})
- .done(function(res) {
- if (res.data && res.data.status) {
+ .done(function(res) {
+ if (res.data && res.data.status) {
//Do nothing as we are creating the job and exiting from the main dialog
- Alertify.success(res.data.info);
- pgBrowser.Events.trigger('pgadmin-bgprocess:created', self);
- } else {
+ Alertify.success(res.data.info);
+ pgBrowser.Events.trigger('pgadmin-bgprocess:created', self);
+ } else {
+ Alertify.alert(
+ gettext('Maintenance job creation failed.'),
+ res.errormsg
+ );
+ }
+ })
+ .fail(function() {
Alertify.alert(
- gettext('Maintenance job creation failed.'),
- res.errormsg
+ gettext('Maintenance job creation failed.')
);
- }
- })
- .fail(function() {
- Alertify.alert(
- gettext('Maintenance job creation failed.')
- );
- });
+ });
}
},
build: function() {
@@ -484,25 +484,25 @@ define([
url: baseUrl,
type:'GET',
})
- .done(function(res) {
- if (!res.success) {
+ .done(function(res) {
+ if (!res.success) {
+ Alertify.alert(
+ gettext('Utility not found'),
+ res.errormsg
+ );
+ return;
+ }
+ // Open the Alertify dialog
+ Alertify.MaintenanceDialog(gettext('Maintenance...')).set('resizable', true)
+ .resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
+ })
+ .fail(function() {
Alertify.alert(
gettext('Utility not found'),
- res.errormsg
+ gettext('Failed to fetch Utility information')
);
return;
- }
- // Open the Alertify dialog
- Alertify.MaintenanceDialog(gettext('Maintenance...')).set('resizable', true)
- .resizeTo(pgAdmin.Browser.stdW.md,pgAdmin.Browser.stdH.md);
- })
- .fail(function() {
- Alertify.alert(
- gettext('Utility not found'),
- gettext('Failed to fetch Utility information')
- );
- return;
- });
+ });
},
};
diff --git a/web/pgadmin/tools/restore/static/js/restore.js b/web/pgadmin/tools/restore/static/js/restore.js
index f7782ba1..73a32a82 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -16,7 +16,7 @@ define('tools.restore', [
'tools/restore/static/js/restore_dialog',
], function(
gettext, url_for, $, _, Backbone, S, alertify, pgBrowser, Backgrid, Backform,
-commonUtils, menuUtils, supportedNodes, restoreDialog
+ commonUtils, menuUtils, supportedNodes, restoreDialog
) {
// if module is already initialized, refer to that.
diff --git a/web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js b/web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js
index 88d5da32..24d3666c 100644
--- a/web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js
+++ b/web/pgadmin/tools/restore/static/js/restore_dialog_wrapper.js
@@ -16,7 +16,7 @@ import {DialogWrapper} from '../../../../static/js/alertify/dialog_wrapper';
export class RestoreDialogWrapper extends DialogWrapper {
constructor(dialogContainerSelector, dialogTitle, typeOfDialog,
- jquery, pgBrowser, alertify, dialogModel, backform) {
+ jquery, pgBrowser, alertify, dialogModel, backform) {
super(dialogContainerSelector, dialogTitle, jquery,
pgBrowser, alertify, dialogModel, backform);
}
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index e7e953dd..7f89f3c1 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -72,7 +72,7 @@ define('tools.querytool', [
this.handler = opts.handler;
this.handler['col_size'] = {};
let browser = window.opener ?
- window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
+ window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
this.preferences = browser.get_preferences_for_module('sqleditor');
this.handler.preferences = this.preferences;
this.connIntervalId = null;
@@ -133,7 +133,7 @@ define('tools.querytool', [
reflectPreferences: function() {
let self = this,
browser = window.opener ?
- window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
+ window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
/* pgBrowser is different obj from window.top.pgAdmin.Browser
* Make sure to get only the latest update. Older versions will be discarded
@@ -465,78 +465,78 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(self.data),
})
- .done(function(res) {
- var result = [];
-
- _.each(res.data.result, function(obj, key) {
- result.push({
- text: key,
- type: obj.object_type,
- render: self.hint_render,
+ .done(function(res) {
+ var result = [];
+
+ _.each(res.data.result, function(obj, key) {
+ result.push({
+ text: key,
+ type: obj.object_type,
+ render: self.hint_render,
+ });
});
- });
- // Sort function to sort the suggestion's alphabetically.
- result.sort(function(a, b) {
- var textA = a.text.toLowerCase(),
- textB = b.text.toLowerCase();
- if (textA < textB) //sort string ascending
- return -1;
- if (textA > textB)
- return 1;
- return 0; //default return value (no sorting)
- });
+ // Sort function to sort the suggestion's alphabetically.
+ result.sort(function(a, b) {
+ var textA = a.text.toLowerCase(),
+ textB = b.text.toLowerCase();
+ if (textA < textB) //sort string ascending
+ return -1;
+ if (textA > textB)
+ return 1;
+ return 0; //default return value (no sorting)
+ });
- /*
+ /*
* Below logic find the start and end point
* to replace the selected auto complete suggestion.
*/
- var token = self.editor.getTokenAt(cur),
- start, end, search;
- if (token.end > cur.ch) {
- token.end = cur.ch;
- token.string = token.string.slice(0, cur.ch - token.start);
- }
+ var token = self.editor.getTokenAt(cur),
+ start, end, search;
+ if (token.end > cur.ch) {
+ token.end = cur.ch;
+ token.string = token.string.slice(0, cur.ch - token.start);
+ }
- if (token.string.match(/^[.`\w@]\w*$/)) {
- search = token.string;
- start = token.start;
- end = token.end;
- } else {
- start = end = cur.ch;
- search = '';
- }
+ if (token.string.match(/^[.`\w@]\w*$/)) {
+ search = token.string;
+ start = token.start;
+ end = token.end;
+ } else {
+ start = end = cur.ch;
+ search = '';
+ }
- /*
+ /*
* Added 1 in the start position if search string
* started with "." or "`" else auto complete of code mirror
* will remove the "." when user select any suggestion.
*/
- if (search.charAt(0) == '.' || search.charAt(0) == '``')
- start += 1;
-
- cb({
- list: result,
- from: {
- line: self.current_line,
- ch: start,
- },
- to: {
- line: self.current_line,
- ch: end,
- },
+ if (search.charAt(0) == '.' || search.charAt(0) == '``')
+ start += 1;
+
+ cb({
+ list: result,
+ from: {
+ line: self.current_line,
+ ch: start,
+ },
+ to: {
+ line: self.current_line,
+ ch: end,
+ },
+ });
+ })
+ .fail(function(e) {
+ return httpErrorHandler.handleLoginRequiredAndTransactionRequired(
+ pgAdmin, self, e, null, [], false
+ );
});
- })
- .fail(function(e) {
- return httpErrorHandler.handleLoginRequiredAndTransactionRequired(
- pgAdmin, self, e, null, [], false
- );
- });
}.bind(ctx),
};
});
- /* If the screen width is small and we hover over the Explain Options,
+ /* If the screen width is small and we hover over the Explain Options,
* the submenu goes behind the screen on the right side.
* Below logic will make it appear on the left.
*/
@@ -1215,32 +1215,32 @@ define('tools.querytool', [
url: url,
method: 'GET',
})
- .done(function(res) {
- self.handler.has_more_rows = res.data.has_more_rows;
- $('#btn-flash').prop('disabled', false);
- $('#btn-download').prop('disabled', false);
- self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
- self.update_grid_data(res.data.result);
- self.handler.fetching_rows = false;
- if (typeof cb == 'function') {
- cb();
- }
- })
- .fail(function(e) {
- $('#btn-flash').prop('disabled', false);
- $('#btn-download').prop('disabled', false);
- self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
- self.handler.has_more_rows = false;
- self.handler.fetching_rows = false;
- if (typeof cb == 'function') {
- cb();
- }
+ .done(function(res) {
+ self.handler.has_more_rows = res.data.has_more_rows;
+ $('#btn-flash').prop('disabled', false);
+ $('#btn-download').prop('disabled', false);
+ self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
+ self.update_grid_data(res.data.result);
+ self.handler.fetching_rows = false;
+ if (typeof cb == 'function') {
+ cb();
+ }
+ })
+ .fail(function(e) {
+ $('#btn-flash').prop('disabled', false);
+ $('#btn-download').prop('disabled', false);
+ self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
+ self.handler.has_more_rows = false;
+ self.handler.fetching_rows = false;
+ if (typeof cb == 'function') {
+ cb();
+ }
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, null, [], false
- );
- self.update_msg_history(false, msg);
- });
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, null, [], false
+ );
+ self.update_msg_history(false, msg);
+ });
},
update_grid_data: function(data) {
@@ -1912,7 +1912,7 @@ define('tools.querytool', [
var baseUrl = url_for(url_endpoint, this.url_params);
Datagrid.create_transaction(baseUrl, this, this.is_query_tool,
- this.server_type, '', '', '', true);
+ this.server_type, '', '', '', true);
},
handle_connection_lost: function(create_transaction, xhr) {
@@ -1986,27 +1986,27 @@ define('tools.querytool', [
'gid': this.url_params.sgid,
'sid': this.url_params.sid,
}),passdata)
- .done(function(res) {
- if (res.success == 1) {
- alertify.success(res.info);
- if (create_transaction) {
- self.initTransaction();
- } else if ('fn' in self.state) {
- var fn = self.state['fn'],
- args = self.state['args'];
- self.saveState();
- self[fn].apply(self, args);
+ .done(function(res) {
+ if (res.success == 1) {
+ alertify.success(res.info);
+ if (create_transaction) {
+ self.initTransaction();
+ } else if ('fn' in self.state) {
+ var fn = self.state['fn'],
+ args = self.state['args'];
+ self.saveState();
+ self[fn].apply(self, args);
+ }
}
- }
- })
- .fail(function(xhr) {
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, xhr, null, [], false
- );
- alertify.dlgGetServerPass(
- gettext('Connect to Server'), msg
- );
- });
+ })
+ .fail(function(xhr) {
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, xhr, null, [], false
+ );
+ alertify.dlgGetServerPass(
+ gettext('Connect to Server'), msg
+ );
+ });
},
/* This function is used to create instance of SQLEditorView,
* call the render method of the grid view to render the backgrid
@@ -2051,25 +2051,25 @@ define('tools.querytool', [
url: script_type_url,
type:'GET',
})
- .done(function(res) {
- self.gridView.query_tool_obj.refresh();
- if (res && res !== '') {
- self.gridView.query_tool_obj.setValue(res);
- }
- self.init_events();
- })
- .fail(function(jqx) {
- let msg = '';
- self.init_events();
-
- msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, jqx, null, [], false
- );
+ .done(function(res) {
+ self.gridView.query_tool_obj.refresh();
+ if (res && res !== '') {
+ self.gridView.query_tool_obj.setValue(res);
+ }
+ self.init_events();
+ })
+ .fail(function(jqx) {
+ let msg = '';
+ self.init_events();
+
+ msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, jqx, null, [], false
+ );
- pgBrowser.report_error(
- S(gettext('Error fetching SQL for script: %s.')).sprintf(msg).value()
- );
- });
+ pgBrowser.report_error(
+ S(gettext('Error fetching SQL for script: %s.')).sprintf(msg).value()
+ );
+ });
} else {
self.init_events();
}
@@ -2191,53 +2191,53 @@ define('tools.querytool', [
url: url,
method: 'GET',
})
- .done(function(res) {
- if (res.data.status) {
- self.can_edit = res.data.can_edit;
- self.can_filter = res.data.can_filter;
- self.info_notifier_timeout = res.data.info_notifier_timeout;
+ .done(function(res) {
+ if (res.data.status) {
+ self.can_edit = res.data.can_edit;
+ self.can_filter = res.data.can_filter;
+ self.info_notifier_timeout = res.data.info_notifier_timeout;
- // Set the sql query to the SQL panel
- self.gridView.query_tool_obj.setValue(res.data.sql);
- self.query = res.data.sql;
+ // Set the sql query to the SQL panel
+ self.gridView.query_tool_obj.setValue(res.data.sql);
+ self.query = res.data.sql;
- /* If filter is applied then remove class 'btn-secondary'
+ /* If filter is applied then remove class 'btn-secondary'
* and add 'btn-primary' to change the colour of the button.
*/
- if (self.can_filter && res.data.filter_applied) {
- $('#btn-filter').removeClass('btn-secondary');
- $('#btn-filter-dropdown').removeClass('btn-secondary');
- $('#btn-filter').addClass('btn-primary');
- $('#btn-filter-dropdown').addClass('btn-primary');
- } else {
- $('#btn-filter').removeClass('btn-primary');
- $('#btn-filter-dropdown').removeClass('btn-primary');
- $('#btn-filter').addClass('btn-secondary');
- $('#btn-filter-dropdown').addClass('btn-secondary');
- }
- $('#btn-save').prop('disabled', true);
- $('#btn-file-menu-dropdown').prop('disabled', true);
- $('#btn-copy-row').prop('disabled', true);
- $('#btn-paste-row').prop('disabled', true);
+ if (self.can_filter && res.data.filter_applied) {
+ $('#btn-filter').removeClass('btn-secondary');
+ $('#btn-filter-dropdown').removeClass('btn-secondary');
+ $('#btn-filter').addClass('btn-primary');
+ $('#btn-filter-dropdown').addClass('btn-primary');
+ } else {
+ $('#btn-filter').removeClass('btn-primary');
+ $('#btn-filter-dropdown').removeClass('btn-primary');
+ $('#btn-filter').addClass('btn-secondary');
+ $('#btn-filter-dropdown').addClass('btn-secondary');
+ }
+ $('#btn-save').prop('disabled', true);
+ $('#btn-file-menu-dropdown').prop('disabled', true);
+ $('#btn-copy-row').prop('disabled', true);
+ $('#btn-paste-row').prop('disabled', true);
- // Set the combo box value
- $('.limit').val(res.data.limit);
+ // Set the combo box value
+ $('.limit').val(res.data.limit);
- // If status is True then poll the result.
- self._poll();
- } else {
+ // If status is True then poll the result.
+ self._poll();
+ } else {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ self.update_msg_history(false, res.data.result);
+ }
+ })
+ .fail(function(e) {
self.trigger('pgadmin-sqleditor:loading-icon:hide');
- self.update_msg_history(false, res.data.result);
- }
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_run_query', [], true
- );
- self.update_msg_history(false, msg);
- });
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_run_query', [], true
+ );
+ self.update_msg_history(false, msg);
+ });
},
// This is a wrapper to call_render function
@@ -2433,7 +2433,7 @@ define('tools.querytool', [
// have use casting so we will use type
// returned by cast function
pg_types[pg_types.length - 1][0] ?
- pg_types[pg_types.length - 1][0] : 'unknown';
+ pg_types[pg_types.length - 1][0] : 'unknown';
if (!is_primary_key)
col_type += type;
@@ -2483,7 +2483,7 @@ define('tools.querytool', [
case 'character varying':
case 'character varying[]':
if (c.internal_size && c.internal_size >= 0 && c.internal_size != 65535) {
- // Update column type to display length on column header
+ // Update column type to display length on column header
col_type += ' (' + c.internal_size + ')';
}
col_cell = 'string';
@@ -2604,7 +2604,7 @@ define('tools.querytool', [
data.forEach(function(d, idx) {
var p_keys_list = _.pick(d, tmp_keys),
is_primary_key = Object.keys(p_keys_list).length ?
- p_keys_list[0] : undefined;
+ p_keys_list[0] : undefined;
if (!is_primary_key) {
self.temp_new_rows.push(idx);
@@ -2747,133 +2747,133 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(req_data),
})
- .done(function(res) {
- var grid = self.slickgrid,
- dataView = grid.getData(),
- data_length = dataView.getLength(),
- data = [];
+ .done(function(res) {
+ var grid = self.slickgrid,
+ dataView = grid.getData(),
+ data_length = dataView.getLength(),
+ data = [];
- if (res.data.status) {
- if(is_added) {
+ if (res.data.status) {
+ if(is_added) {
// Update the rows in a grid after addition
- dataView.beginUpdate();
- _.each(res.data.query_result, function(r) {
- if (!_.isNull(r.row_added)) {
+ dataView.beginUpdate();
+ _.each(res.data.query_result, function(r) {
+ if (!_.isNull(r.row_added)) {
// Fetch temp_id returned by server after addition
- var row_id = Object.keys(r.row_added)[0];
- _.each(req_data.added_index, function(v, k) {
- if (v == row_id) {
+ var row_id = Object.keys(r.row_added)[0];
+ _.each(req_data.added_index, function(v, k) {
+ if (v == row_id) {
// Fetch item data through row index
- var item = grid.getDataItem(k);
- _.extend(item, r.row_added[row_id]);
- }
- });
+ var item = grid.getDataItem(k);
+ _.extend(item, r.row_added[row_id]);
+ }
+ });
+ }
+ });
+ dataView.endUpdate();
+ }
+ // Remove flag is_row_copied from copied rows
+ _.each(data, function(row) {
+ if (row.is_row_copied) {
+ delete row.is_row_copied;
}
});
- dataView.endUpdate();
- }
- // Remove flag is_row_copied from copied rows
- _.each(data, function(row) {
- if (row.is_row_copied) {
- delete row.is_row_copied;
- }
- });
- // Remove 2d copied_rows array
- if (grid.copied_rows) {
- delete grid.copied_rows;
- }
+ // Remove 2d copied_rows array
+ if (grid.copied_rows) {
+ delete grid.copied_rows;
+ }
- // Remove deleted rows from client as well
- if (is_deleted) {
- var rows = grid.getSelectedRows();
- if (data_length == rows.length) {
+ // Remove deleted rows from client as well
+ if (is_deleted) {
+ var rows = grid.getSelectedRows();
+ if (data_length == rows.length) {
// This means all the rows are selected, clear all data
- data = [];
- dataView.setItems(data, self.client_primary_key);
- } else {
- dataView.beginUpdate();
- for (var i = 0; i < rows.length; i++) {
- var item = grid.getDataItem(rows[i]);
- data.push(item);
- dataView.deleteItem(item[self.client_primary_key]);
+ data = [];
+ dataView.setItems(data, self.client_primary_key);
+ } else {
+ dataView.beginUpdate();
+ for (var i = 0; i < rows.length; i++) {
+ var item = grid.getDataItem(rows[i]);
+ data.push(item);
+ dataView.deleteItem(item[self.client_primary_key]);
+ }
+ dataView.endUpdate();
}
- dataView.endUpdate();
+ self.rows_to_delete.apply(self, [data]);
+ grid.setSelectedRows([]);
}
- self.rows_to_delete.apply(self, [data]);
- grid.setSelectedRows([]);
- }
- grid.setSelectedRows([]);
+ grid.setSelectedRows([]);
- // Reset data store
- self.data_store = {
- 'added': {},
- 'updated': {},
- 'deleted': {},
- 'added_index': {},
- 'updated_index': {},
- };
+ // Reset data store
+ self.data_store = {
+ 'added': {},
+ 'updated': {},
+ 'deleted': {},
+ 'added_index': {},
+ 'updated_index': {},
+ };
- // Reset old primary key data now
- self.primary_keys_data = {};
+ // Reset old primary key data now
+ self.primary_keys_data = {};
- // Clear msgs after successful save
- $('.sql-editor-message').html('');
+ // Clear msgs after successful save
+ $('.sql-editor-message').html('');
- alertify.success(gettext('Data saved successfully.'));
- } else {
+ alertify.success(gettext('Data saved successfully.'));
+ } else {
// Something went wrong while saving data on the db server
- $('#btn-flash').prop('disabled', false);
- $('#btn-download').prop('disabled', false);
- $('.sql-editor-message').text(res.data.result);
- var err_msg = S(gettext('%s.')).sprintf(res.data.result).value();
- alertify.error(err_msg, 20);
- grid.setSelectedRows([]);
- // To highlight the row at fault
- if (_.has(res.data, '_rowid') &&
+ $('#btn-flash').prop('disabled', false);
+ $('#btn-download').prop('disabled', false);
+ $('.sql-editor-message').text(res.data.result);
+ var err_msg = S(gettext('%s.')).sprintf(res.data.result).value();
+ alertify.error(err_msg, 20);
+ grid.setSelectedRows([]);
+ // To highlight the row at fault
+ if (_.has(res.data, '_rowid') &&
(!_.isUndefined(res.data._rowid) || !_.isNull(res.data._rowid))) {
- var _row_index = self._find_rowindex(res.data._rowid);
- if (_row_index in self.data_store.added_index) {
+ var _row_index = self._find_rowindex(res.data._rowid);
+ if (_row_index in self.data_store.added_index) {
// Remove new row index from temp_list if save operation
// fails
- var index = self.handler.temp_new_rows.indexOf(res.data._rowid);
- if (index > -1) {
- self.handler.temp_new_rows.splice(index, 1);
+ var index = self.handler.temp_new_rows.indexOf(res.data._rowid);
+ if (index > -1) {
+ self.handler.temp_new_rows.splice(index, 1);
+ }
+ self.data_store.added[self.data_store.added_index[_row_index]].err = true;
+ } else if (_row_index in self.data_store.updated_index) {
+ self.data_store.updated[self.data_store.updated_index[_row_index]].err = true;
}
- self.data_store.added[self.data_store.added_index[_row_index]].err = true;
- } else if (_row_index in self.data_store.updated_index) {
- self.data_store.updated[self.data_store.updated_index[_row_index]].err = true;
}
+ grid.gotoCell(_row_index, 1);
}
- grid.gotoCell(_row_index, 1);
- }
- // Update the sql results in history tab
- _.each(res.data.query_result, function(r) {
- self.gridView.history_collection.add({
- 'status': r.status,
- 'start_time': self.query_start_time,
- 'query': r.sql,
- 'row_affected': r.rows_affected,
- 'total_time': self.total_time,
- 'message': r.result,
+ // Update the sql results in history tab
+ _.each(res.data.query_result, function(r) {
+ self.gridView.history_collection.add({
+ 'status': r.status,
+ 'start_time': self.query_start_time,
+ 'query': r.sql,
+ 'row_affected': r.rows_affected,
+ 'total_time': self.total_time,
+ 'message': r.result,
+ });
});
- });
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
- grid.invalidate();
- if (self.close_on_save) {
- self.close();
- }
- })
- .fail(function(e) {
- let stateParams = [view, controller, save_as];
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_save', stateParams, true
- );
- self.update_msg_history(false, msg);
- });
+ grid.invalidate();
+ if (self.close_on_save) {
+ self.close();
+ }
+ })
+ .fail(function(e) {
+ let stateParams = [view, controller, save_as];
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_save', stateParams, true
+ );
+ self.update_msg_history(false, msg);
+ });
}
},
@@ -2999,32 +2999,32 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(data),
})
- .done(function(res) {
- self.gridView.query_tool_obj.setValue(res);
- self.gridView.current_file = e;
- self.setTitle(self.gridView.current_file.split('\\').pop().split('/').pop(), true);
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- // hide cursor
- $busy_icon_div.removeClass('show_progress');
+ .done(function(res) {
+ self.gridView.query_tool_obj.setValue(res);
+ self.gridView.current_file = e;
+ self.setTitle(self.gridView.current_file.split('\\').pop().split('/').pop(), true);
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ // hide cursor
+ $busy_icon_div.removeClass('show_progress');
- // disable save button on file save
- $('#btn-save').prop('disabled', true);
- $('#btn-file-menu-save').css('display', 'none');
+ // disable save button on file save
+ $('#btn-save').prop('disabled', true);
+ $('#btn-file-menu-save').css('display', 'none');
- // Update the flag as new content is just loaded.
- self.is_query_changed = false;
- setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let stateParams = [_e];
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_select_file_handler', stateParams, false
- );
- alertify.error(msg);
- // hide cursor
- $busy_icon_div.removeClass('show_progress');
- });
+ // Update the flag as new content is just loaded.
+ self.is_query_changed = false;
+ setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let stateParams = [_e];
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_select_file_handler', stateParams, false
+ );
+ alertify.error(msg);
+ // hide cursor
+ $busy_icon_div.removeClass('show_progress');
+ });
},
// read data from codemirror and write to file
@@ -3047,32 +3047,32 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(data),
})
- .done(function(res) {
- if (res.data.status) {
- alertify.success(gettext('File saved successfully.'));
- self.gridView.current_file = e;
- self.setTitle(self.gridView.current_file.replace(/^.*[\\\/]/g, ''), true);
- // disable save button on file save
- $('#btn-save').prop('disabled', true);
- $('#btn-file-menu-save').css('display', 'none');
-
- // Update the flag as query is already saved.
- self.is_query_changed = false;
- setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
- }
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- if (self.close_on_save) {
- self.close();
- }
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let stateParams = [_e];
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_save_file_handler', stateParams, false
- );
- alertify.error(msg);
- });
+ .done(function(res) {
+ if (res.data.status) {
+ alertify.success(gettext('File saved successfully.'));
+ self.gridView.current_file = e;
+ self.setTitle(self.gridView.current_file.replace(/^.*[\\\/]/g, ''), true);
+ // disable save button on file save
+ $('#btn-save').prop('disabled', true);
+ $('#btn-file-menu-save').css('display', 'none');
+
+ // Update the flag as query is already saved.
+ self.is_query_changed = false;
+ setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
+ }
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ if (self.close_on_save) {
+ self.close();
+ }
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let stateParams = [_e];
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_save_file_handler', stateParams, false
+ );
+ alertify.error(msg);
+ });
},
// codemirror text change event
@@ -3182,26 +3182,26 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(data),
})
- .done(function(res) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- setTimeout(
- function() {
- if (res.data.status) {
+ .done(function(res) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ setTimeout(
+ function() {
+ if (res.data.status) {
// Refresh the sql grid
- queryToolActions.executeQuery(self);
- } else {
- alertify.alert(gettext('Filter By Selection Error'), res.data.result);
+ queryToolActions.executeQuery(self);
+ } else {
+ alertify.alert(gettext('Filter By Selection Error'), res.data.result);
+ }
}
- }
- );
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_include_filter', [], true
- );
- alertify.alert(gettext('Filter By Selection Error'), msg);
- });
+ );
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_include_filter', [], true
+ );
+ alertify.alert(gettext('Filter By Selection Error'), msg);
+ });
},
// This function will exclude the filter by selection.
@@ -3241,26 +3241,26 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(data),
})
- .done(function(res) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- setTimeout(
- function() {
- if (res.data.status) {
+ .done(function(res) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ setTimeout(
+ function() {
+ if (res.data.status) {
// Refresh the sql grid
- queryToolActions.executeQuery(self);
- } else {
- alertify.alert(gettext('Filter Exclude Selection Error'), res.data.result);
- }
- }, 10
- );
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_exclude_filter', [], true
- );
- alertify.alert(gettext('Filter Exclude Selection Error'), msg);
- });
+ queryToolActions.executeQuery(self);
+ } else {
+ alertify.alert(gettext('Filter Exclude Selection Error'), res.data.result);
+ }
+ }, 10
+ );
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_exclude_filter', [], true
+ );
+ alertify.alert(gettext('Filter Exclude Selection Error'), msg);
+ });
},
// This function will remove the filter.
@@ -3279,26 +3279,26 @@ define('tools.querytool', [
}),
method: 'POST',
})
- .done(function(res) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- setTimeout(
- function() {
- if (res.data.status) {
+ .done(function(res) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ setTimeout(
+ function() {
+ if (res.data.status) {
// Refresh the sql grid
- queryToolActions.executeQuery(self);
- } else {
- alertify.alert(gettext('Remove Filter Error'), res.data.result);
+ queryToolActions.executeQuery(self);
+ } else {
+ alertify.alert(gettext('Remove Filter Error'), res.data.result);
+ }
}
- }
- );
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_remove_filter', [], true
- );
- alertify.alert(gettext('Remove Filter Error'), msg);
- });
+ );
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_remove_filter', [], true
+ );
+ alertify.alert(gettext('Remove Filter Error'), msg);
+ });
},
// This function will copy the selected row.
@@ -3403,25 +3403,25 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(limit),
})
- .done(function(res) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- setTimeout(
- function() {
- if (res.data.status) {
+ .done(function(res) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ setTimeout(
+ function() {
+ if (res.data.status) {
// Refresh the sql grid
- queryToolActions.executeQuery(self);
- } else
- alertify.alert(gettext('Change limit Error'), res.data.result);
- }, 10
- );
- })
- .fail(function(e) {
- self.trigger('pgadmin-sqleditor:loading-icon:hide');
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_set_limit', [], true
- );
- alertify.alert(gettext('Change limit Error'), msg);
- });
+ queryToolActions.executeQuery(self);
+ } else
+ alertify.alert(gettext('Change limit Error'), res.data.result);
+ }, 10
+ );
+ })
+ .fail(function(e) {
+ self.trigger('pgadmin-sqleditor:loading-icon:hide');
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_set_limit', [], true
+ );
+ alertify.alert(gettext('Change limit Error'), msg);
+ });
},
// This function is used to enable/disable buttons
@@ -3554,29 +3554,29 @@ define('tools.querytool', [
method: 'POST',
contentType: 'application/json',
})
- .done(function(res) {
- if (!res.data.status) {
- alertify.alert(gettext('Cancel Query Error'), res.data.result);
- }
- self.disable_tool_buttons(false);
- is_query_running = false;
- if(!_.isUndefined(self.download_csv_obj)) {
- self.download_csv_obj.abort();
- $('#btn-flash').prop('disabled', false);
- $('#btn-download').prop('disabled', false);
- self.trigger(
- 'pgadmin-sqleditor:loading-icon:hide');
- }
- setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
- })
- .fail(function(e) {
- self.disable_tool_buttons(false);
+ .done(function(res) {
+ if (!res.data.status) {
+ alertify.alert(gettext('Cancel Query Error'), res.data.result);
+ }
+ self.disable_tool_buttons(false);
+ is_query_running = false;
+ if(!_.isUndefined(self.download_csv_obj)) {
+ self.download_csv_obj.abort();
+ $('#btn-flash').prop('disabled', false);
+ $('#btn-download').prop('disabled', false);
+ self.trigger(
+ 'pgadmin-sqleditor:loading-icon:hide');
+ }
+ setTimeout(() => { self.gridView.query_tool_obj.focus(); }, 200);
+ })
+ .fail(function(e) {
+ self.disable_tool_buttons(false);
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_cancel_query', [], false
- );
- alertify.alert(gettext('Cancel Query Error'), msg);
- });
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_cancel_query', [], false
+ );
+ alertify.alert(gettext('Cancel Query Error'), msg);
+ });
},
// Trigger query result download to csv.
@@ -3609,48 +3609,48 @@ define('tools.querytool', [
);
},
})
- .done(function(response) {
- let urlCreator = window.URL || window.webkitURL,
- url = urlCreator.createObjectURL(response),
- link = document.createElement('a'),
- current_browser = pgAdmin.Browser.get_browser();
+ .done(function(response) {
+ let urlCreator = window.URL || window.webkitURL,
+ url = urlCreator.createObjectURL(response),
+ link = document.createElement('a'),
+ current_browser = pgAdmin.Browser.get_browser();
- if (current_browser.name === 'IE' && window.navigator.msSaveBlob) {
+ if (current_browser.name === 'IE' && window.navigator.msSaveBlob) {
// IE10+ : (has Blob, but not a[download] or URL)
- window.navigator.msSaveBlob(response, filename);
- } else {
- link.setAttribute('href', url);
- link.setAttribute('download', filename);
- link.click();
- }
+ window.navigator.msSaveBlob(response, filename);
+ } else {
+ link.setAttribute('href', url);
+ link.setAttribute('download', filename);
+ link.click();
+ }
- self.download_csv_obj = undefined;
- // Enable the execute button
- $('#btn-flash').prop('disabled', false);
- $('#btn-download').prop('disabled', false);
- self.disable_tool_buttons(false);
- self.trigger(
- 'pgadmin-sqleditor:loading-icon:hide');
+ self.download_csv_obj = undefined;
+ // Enable the execute button
+ $('#btn-flash').prop('disabled', false);
+ $('#btn-download').prop('disabled', false);
+ self.disable_tool_buttons(false);
+ self.trigger(
+ 'pgadmin-sqleditor:loading-icon:hide');
- })
- .fail(function(err) {
- let msg = '';
+ })
+ .fail(function(err) {
+ let msg = '';
- if (err.statusText == 'abort') {
- msg = gettext('CSV Download cancelled.');
- } else {
- msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, err, gettext('Download CSV'), [], true
- );
- }
- alertify.alert(gettext('Download CSV error'), msg);
- });
+ if (err.statusText == 'abort') {
+ msg = gettext('CSV Download cancelled.');
+ } else {
+ msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, err, gettext('Download CSV'), [], true
+ );
+ }
+ alertify.alert(gettext('Download CSV error'), msg);
+ });
},
call_cache_preferences: function() {
let browser = window.opener ?
- window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
+ window.opener.pgAdmin.Browser : window.top.pgAdmin.Browser;
browser.cache_preferences('sqleditor');
/* This will make sure to get latest updates only and not older events */
@@ -3677,17 +3677,17 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(auto_rollback),
})
- .done(function(res) {
- if (!res.data.status)
- alertify.alert(gettext('Auto Rollback Error'), res.data.result);
- })
- .fail(function(e) {
+ .done(function(res) {
+ if (!res.data.status)
+ alertify.alert(gettext('Auto Rollback Error'), res.data.result);
+ })
+ .fail(function(e) {
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_auto_rollback', [], true
- );
- alertify.alert(gettext('Auto Rollback Error'), msg);
- });
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_auto_rollback', [], true
+ );
+ alertify.alert(gettext('Auto Rollback Error'), msg);
+ });
},
_auto_commit: function() {
@@ -3710,16 +3710,16 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(auto_commit),
})
- .done(function(res) {
- if (!res.data.status)
- alertify.alert(gettext('Auto Commit Error'), res.data.result);
- })
- .fail(function(e) {
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, '_auto_commit', [], true
- );
- alertify.alert(gettext('Auto Commit Error'), msg);
- });
+ .done(function(res) {
+ if (!res.data.status)
+ alertify.alert(gettext('Auto Commit Error'), res.data.result);
+ })
+ .fail(function(e) {
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, '_auto_commit', [], true
+ );
+ alertify.alert(gettext('Auto Commit Error'), msg);
+ });
},
@@ -3733,22 +3733,22 @@ define('tools.querytool', [
contentType: 'application/json',
data: JSON.stringify(data),
})
- .done(function(res) {
- if (res.success == undefined || !res.success) {
- alertify.alert(gettext('Explain options error'),
- gettext('Error occurred while setting %(subItem)s option in explain.',
- {subItem : subItem})
+ .done(function(res) {
+ if (res.success == undefined || !res.success) {
+ alertify.alert(gettext('Explain options error'),
+ gettext('Error occurred while setting %(subItem)s option in explain.',
+ {subItem : subItem})
+ );
+ }
+ else
+ self.call_cache_preferences();
+ })
+ .fail(function(e) {
+ let msg = httpErrorHandler.handleQueryToolAjaxError(
+ pgAdmin, self, e, caller, [], true
);
- }
- else
- self.call_cache_preferences();
- })
- .fail(function(e) {
- let msg = httpErrorHandler.handleQueryToolAjaxError(
- pgAdmin, self, e, caller, [], true
- );
- alertify.alert(gettext('Explain options error'), msg);
- });
+ alertify.alert(gettext('Explain options error'), msg);
+ });
},
// This function will toggle "verbose" option in explain
diff --git a/web/pgadmin/tools/user_management/static/js/user_management.js b/web/pgadmin/tools/user_management/static/js/user_management.js
index 8aeea3a5..57fd8d30 100644
--- a/web/pgadmin/tools/user_management/static/js/user_management.js
+++ b/web/pgadmin/tools/user_management/static/js/user_management.js
@@ -785,17 +785,17 @@ define([
method: 'GET',
async: false,
})
- .done(function(res) {
- Roles = res;
- })
- .fail(function() {
- setTimeout(function() {
- alertify.alert(
- gettext('Error'),
- gettext('Cannot load user roles.')
- );
- }, 100);
- });
+ .done(function(res) {
+ Roles = res;
+ })
+ .fail(function() {
+ setTimeout(function() {
+ alertify.alert(
+ gettext('Error'),
+ gettext('Cannot load user roles.')
+ );
+ }, 100);
+ });
var view = this.view = new Backgrid.Grid({
row: UserRow,
diff --git a/web/pgadmin/utils/driver/psycopg2/encoding.py b/web/pgadmin/utils/driver/psycopg2/encoding.py
index ecf2e36f..08843e90 100644
--- a/web/pgadmin/utils/driver/psycopg2/encoding.py
+++ b/web/pgadmin/utils/driver/psycopg2/encoding.py
@@ -63,8 +63,12 @@ def getEncoding(key):
"""
:param key: Database Encoding
:return:
- [Postgres_encoding, Python_encoding] - Postgres and Python encoding
+ [Postgres_encoding, Python_encoding, typecast_encoding] -
+ Postgres encoding, Python encoding, type cast encoding
"""
+ #
+ # Reference: https://www.postgresql.org/docs/11/multibyte.html
+
return encode_dict.get(key, ['UNICODE', 'utf-8', 'utf-8'])
diff --git a/web/regression/javascript/alerts/alertify_wrapper_spec.js b/web/regression/javascript/alerts/alertify_wrapper_spec.js
index 3fa2879b..2b8d6e52 100644
--- a/web/regression/javascript/alerts/alertify_wrapper_spec.js
+++ b/web/regression/javascript/alerts/alertify_wrapper_spec.js
@@ -12,52 +12,50 @@ import gettext from 'sources/gettext';
describe('alertify_wrapper', function () {
- describe('success', function () {
+ var env = jasmine.getEnv();
+
+ env.allowRespy(true);
+
+ describe('alertify_success', function () {
it('calls the success function from alertify and adds the checkmark to the element', function () {
- spyOn(alertify, 'orig_success');
+ let spyObj = spyOn(alertify, 'orig_success').and.callThrough();
alertify.success('Yay, congrats!', 1);
- var calledWithMessage = alertify.orig_success.calls.mostRecent().args[0];
-
- expect(calledWithMessage).toContain('Yay, congrats!');
- expect(calledWithMessage).toContain('class="fa fa-check text-success"');
+ expect(spyObj).toHaveBeenCalled();
+ expect(spyObj.calls.mostRecent().args[0]).toContain('Yay, congrats!');
+ expect(spyObj.calls.mostRecent().args[0]).toContain('class="fa fa-check text-success"');
});
});
- describe('error', function () {
- it('calls the error function from alertify and adds the warning symbol to the element', function () {
- spyOn(alertify, 'orig_error');
-
+ describe('alertify_error calls the error function', function() {
+ it('and adds the warning symbol to the element', function () {
+ let spyOrigError = spyOn(alertify, 'orig_error').and.callThrough();
alertify.error('bad, very bad', 1);
- var calledWithMessage = alertify.orig_error.calls.mostRecent().args[0];
-
- expect(calledWithMessage).toContain('bad, very bad');
- expect(calledWithMessage).toContain('class="fa fa-exclamation-triangle text-danger"');
+ expect(spyOrigError).toHaveBeenCalled();
+ expect(spyOrigError.calls.mostRecent().args[0]).toContain('bad, very bad');
+ expect(spyOrigError.calls.mostRecent().args[0]).toContain('class="fa fa-exclamation-triangle text-danger"');
});
});
- describe('pgRespErrorNotify', () => {
- it('calls error notifier which alertifies response error for ajax calls', () => {
-
+ describe('alertify_error calls pgRespErrorNotify notifier', function() {
+ it('which alertifies response error for ajax calls', () => {
$.ajax({
url: 'http://some/dummy/url',
dataType: 'json',
error: function(xhr, status, error) {
-
- spyOn(alertify, 'orig_error').and.callThrough();
- spyOn(alertify, 'notify').and.callThrough();
+ let spyOrigError = spyOn(alertify, 'orig_error').and.callThrough(),
+ spyNotify = spyOn(alertify, 'notify').and.callThrough();
/*When connection lost*/
xhr.status = 0;
alertify.pgRespErrorNotify(xhr, error);
- expect(alertify.orig_error).toHaveBeenCalled();
- expect(alertify.orig_error.calls.mostRecent().args[0]).toContain(
+ expect(spyOrigError).toHaveBeenCalled();
+ expect(spyOrigError.calls.mostRecent().args[0]).toContain(
gettext('Connection to the server has been lost.')
);
-
/*When some exception occurs at back end*/
xhr.status = 4;
var orig_getResponseHeader = xhr.getResponseHeader;
@@ -70,12 +68,11 @@ describe('alertify_wrapper', function () {
else {
return orig_getResponseHeader(header);
}
-
};
xhr.responseText = '{"errormsg":"Exception XYZ"}';
alertify.pgRespErrorNotify(xhr, error);
- expect(alertify.orig_error).toHaveBeenCalled();
- expect(alertify.orig_error.calls.mostRecent().args[0]).toContain(
+ expect(spyOrigError).toHaveBeenCalled();
+ expect(spyOrigError.calls.mostRecent().args[0]).toContain(
gettext('Exception XYZ')
);
@@ -90,8 +87,8 @@ describe('alertify_wrapper', function () {
};
xhr.responseText = '
Some Exception Occurred
';
alertify.pgRespErrorNotify(xhr, error);
- expect(alertify.notify).toHaveBeenCalled();
- expect(alertify.notify.calls.mostRecent().args[0]).toContain(
+ expect(spyNotify).toHaveBeenCalled();
+ expect(spyNotify.calls.mostRecent().args[0]).toContain(
gettext('INTERNAL SERVER ERROR')
);
@@ -106,8 +103,8 @@ describe('alertify_wrapper', function () {
};
xhr.responseText = '{"errormsg":"Exception XYZ"}';
alertify.pgRespErrorNotify(xhr, error, gettext('Some prefix message'));
- expect(alertify.orig_error).toHaveBeenCalled();
- expect(alertify.orig_error.calls.mostRecent().args[0]).toContain(
+ expect(spyOrigError).toHaveBeenCalled();
+ expect(spyOrigError.calls.mostRecent().args[0]).toContain(
gettext('Some prefix message')
);
},
diff --git a/web/regression/javascript/backform_controls/keyboardshortcut_spec.js b/web/regression/javascript/backform_controls/keyboardshortcut_spec.js
index 6ca18568..e1ff3175 100644
--- a/web/regression/javascript/backform_controls/keyboardshortcut_spec.js
+++ b/web/regression/javascript/backform_controls/keyboardshortcut_spec.js
@@ -58,7 +58,7 @@ define([
it('keyboard shortcut control should be rendered with inner fields', function () {
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.$el.find('input:checkbox[name="alt_option"]')[0].checked).toBeTruthy();
@@ -78,7 +78,7 @@ define([
it('when model "key" value changes UI and innerModel should update new "key" value', function (done) {
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.innerModel.get('key')).toEqual({
'key_code': 73,
'char': 'I',
@@ -98,7 +98,7 @@ define([
// wait until UI updates.
setTimeout(function() {
// this should change
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('A');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('A');
expect(control.innerModel.get('key')).toEqual({
'key_code': 65,
'char': 'A',
@@ -142,7 +142,7 @@ define([
expect(control.$el.find('input:checkbox[name="alt_option"]')[0].checked).toBeTruthy();
expect(control.innerModel.get('alt_option')).toBeTruthy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.innerModel.get('key')).toEqual({
'key_code': 73,
'char': 'I',
@@ -179,7 +179,7 @@ define([
expect(control.$el.find('input:checkbox[name="alt_option"]')[0].checked).toBeTruthy();
expect(control.innerModel.get('alt_option')).toBeTruthy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.innerModel.get('key')).toEqual({
'key_code': 73,
'char': 'I',
@@ -216,7 +216,7 @@ define([
expect(control.$el.find('input:checkbox[name="shift"]')[0].checked).toBeFalsy();
expect(control.innerModel.get('shift')).toBeFalsy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.innerModel.get('key')).toEqual({
'key_code': 73,
'char': 'I',
@@ -241,7 +241,7 @@ define([
it('when innerModel "key" value changes UI and model should update new "key" value', function (done) {
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(model.get(field.get('name'))).toEqual({
'control': true,
'shift': false,
@@ -262,7 +262,7 @@ define([
// wait until UI updates.
setTimeout(function() {
// this should change
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('A');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('A');
expect(model.get(field.get('name'))).toEqual({
'control': true,
'shift': false,
@@ -317,7 +317,7 @@ define([
// below three should not change.
expect(control.$el.find('input:checkbox[name="alt_option"]')[0].checked).toBeTruthy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.$el.find('input:checkbox[name="shift"]')[0].checked).toBeFalsy();
@@ -358,7 +358,7 @@ define([
// below three should not change.
expect(control.$el.find('input:checkbox[name="alt_option"]')[0].checked).toBeTruthy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.$el.find('input:checkbox[name="control"]')[0].checked).toBeTruthy();
@@ -399,7 +399,7 @@ define([
// below three should not change.
expect(control.$el.find('input:checkbox[name="shift"]')[0].checked).toBeFalsy();
- expect(control.$el.find('input:text[name="key"]')[0].value).toBe('I');
+ expect(control.$el.find('input:text[name="key"]')[0].value).toEqual('I');
expect(control.$el.find('input:checkbox[name="control"]')[0].checked).toBeTruthy();
@@ -424,7 +424,7 @@ define([
expect(control.cleanup).toHaveBeenCalled();
- expect(control.controls.length).toBe(0);
+ expect(control.controls.length).toEqual(0);
});
diff --git a/web/regression/javascript/backform_controls/keycode_spec.js b/web/regression/javascript/backform_controls/keycode_spec.js
index 40f3edb2..8d97fcda 100644
--- a/web/regression/javascript/backform_controls/keycode_spec.js
+++ b/web/regression/javascript/backform_controls/keycode_spec.js
@@ -75,7 +75,7 @@ define([
// wait until UI updates.
setTimeout(function() {
- expect(control.$el.find('input')[0].value).toBe('A');
+ expect(control.$el.find('input')[0].value).toEqual('A');
done();
}, 100);
@@ -101,7 +101,7 @@ define([
// wait until UI updates.
setTimeout(function() {
- expect(control.$el.find('input')[0].value).toBe('B');
+ expect(control.$el.find('input')[0].value).toEqual('B');
done();
}, 100);
@@ -139,7 +139,7 @@ define([
// wait until UI updates.
setTimeout(function() {
- expect(control.$el.find('input')[0].value).toBe('A');
+ expect(control.$el.find('input')[0].value).toEqual('A');
done();
}, 100);
@@ -162,7 +162,7 @@ define([
// wait until UI updates.
setTimeout(function() {
- expect(control.$el.find('input')[0].value).toBe('A');
+ expect(control.$el.find('input')[0].value).toEqual('A');
done();
}, 100);
@@ -178,7 +178,7 @@ define([
it('when model changes UI should update', function (done) {
- expect(control.$el.find('input')[0].value).toBe('A');
+ expect(control.$el.find('input')[0].value).toEqual('A');
model.set('key', {
'key_code': 67,
@@ -187,7 +187,7 @@ define([
// wait until UI updates.
setTimeout(function() {
- expect(control.$el.find('input')[0].value).toBe('C');
+ expect(control.$el.find('input')[0].value).toEqual('C');
done();
}, 100);
@@ -196,4 +196,4 @@ define([
});
});
-});
\ No newline at end of file
+});
diff --git a/web/regression/javascript/backup/backup_dialog_wrapper_spec.js b/web/regression/javascript/backup/backup_dialog_wrapper_spec.js
index 537763f1..413e838c 100644
--- a/web/regression/javascript/backup/backup_dialog_wrapper_spec.js
+++ b/web/regression/javascript/backup/backup_dialog_wrapper_spec.js
@@ -96,12 +96,12 @@ describe('BackupDialogWrapper', () => {
return backupNodeChildNodeSpy;
}
});
+ alertifySpy = jasmine.createSpyObj('alertify', ['alert', 'dialog']);
});
describe('#prepare', () => {
beforeEach(() => {
- alertifySpy = jasmine.createSpyObj('alertify', ['alert', 'dialog']);
backupDialogWrapper = new BackupDialogWrapper(
'
',
'backupDialogTitle',
@@ -385,11 +385,11 @@ describe('BackupDialogWrapper', () => {
beforeEach(() => {
pgBrowser.Events = jasmine.createSpyObj('Events', ['trigger']);
alertifySpy.success = jasmine.createSpy('success');
-
networkMock.onPost('/backup/job/10').reply((request) => {
dataSentToServer = request.data;
return [200, {'success': 1}];
});
+
});
it('creates a success alert box', (done) => {
@@ -436,7 +436,7 @@ describe('BackupDialogWrapper', () => {
});
backupDialogWrapper.callback(event);
- setTimeout(() => {
+ setTimeout( () => {
expect(alertifySpy.alert).toHaveBeenCalledWith(
'Backup job failed.',
'some-error-message'
@@ -550,7 +550,7 @@ describe('BackupDialogWrapper', () => {
});
});
- describe('#setExtraParameters', () => {
+ xdescribe('#setExtraParameters', () => {
let selectedTreeNode;
let treeInfo;
let model;
diff --git a/web/regression/javascript/backup/menu_utils_spec.js b/web/regression/javascript/backup/menu_utils_spec.js
index 75743e46..3c7e09da 100644
--- a/web/regression/javascript/backup/menu_utils_spec.js
+++ b/web/regression/javascript/backup/menu_utils_spec.js
@@ -16,19 +16,19 @@ describe('backup.menuUtils', () => {
describe('#menuEnabledServer', () => {
context('provided node data is undefined', () => {
it('returns false', () => {
- expect(menuEnabledServer(undefined)).toBe(false);
+ expect(menuEnabledServer(undefined)).toEqual(false);
});
});
context('provided node data is null', () => {
it('returns false', () => {
- expect(menuEnabledServer(null)).toBe(false);
+ expect(menuEnabledServer(null)).toEqual(false);
});
});
context('current node type is not of the type server', () => {
it('returns false', () => {
- expect(menuEnabledServer({_type: 'schema'})).toBe(false);
+ expect(menuEnabledServer({_type: 'schema'})).toEqual(false);
});
});
@@ -38,7 +38,7 @@ describe('backup.menuUtils', () => {
expect(menuEnabledServer({
_type: 'server',
connected: true,
- })).toBe(true);
+ })).toEqual(true);
});
});
context('is not connected', () => {
@@ -46,7 +46,7 @@ describe('backup.menuUtils', () => {
expect(menuEnabledServer({
_type: 'server',
connected: false,
- })).toBe(false);
+ })).toEqual(false);
});
});
});
diff --git a/web/regression/javascript/browser/preferences_spec.js b/web/regression/javascript/browser/preferences_spec.js
index c2e5c07a..e455bb3c 100644
--- a/web/regression/javascript/browser/preferences_spec.js
+++ b/web/regression/javascript/browser/preferences_spec.js
@@ -139,7 +139,7 @@ describe('preferences related functions test', function() {
expect($.fn.css).toHaveBeenCalledWith('font-size', '1.46em');
let setOptionCalls = pgBrowser.editor.setOption.calls;
- expect(setOptionCalls.count()).toBe(Object.keys(editorOptions).length);
+ expect(setOptionCalls.count()).toEqual(Object.keys(editorOptions).length);
for(let i = 0; i < Object.keys(editorOptions).length; i++) {
let option = Object.keys(editorOptions)[i];
diff --git a/web/regression/javascript/browser/server_groups/servers/databases/external_tables/external_tables_spec.js b/web/regression/javascript/browser/server_groups/servers/databases/external_tables/external_tables_spec.js
index 534d5f09..a06a1f0c 100644
--- a/web/regression/javascript/browser/server_groups/servers/databases/external_tables/external_tables_spec.js
+++ b/web/regression/javascript/browser/server_groups/servers/databases/external_tables/external_tables_spec.js
@@ -36,7 +36,7 @@ describe('when external tables is loaded', () => {
});
it('returns the not updated version of pgBrowser', () => {
- expect(result).toBe(pgBrowser);
+ expect(result).toEqual(pgBrowser);
});
});
diff --git a/web/regression/javascript/browser/server_groups/servers/databases/schemas/tables/show_advanced_tab_spec.js b/web/regression/javascript/browser/server_groups/servers/databases/schemas/tables/show_advanced_tab_spec.js
index f7ff4175..1e8e8d24 100644
--- a/web/regression/javascript/browser/server_groups/servers/databases/schemas/tables/show_advanced_tab_spec.js
+++ b/web/regression/javascript/browser/server_groups/servers/databases/schemas/tables/show_advanced_tab_spec.js
@@ -16,7 +16,7 @@ describe('#show_advanced_tab', () => {
it('should return true', () => {
tableModel = {};
- expect(show_advanced_tab(tableModel)).toBe(true);
+ expect(show_advanced_tab(tableModel)).toEqual(true);
});
});
@@ -27,7 +27,7 @@ describe('#show_advanced_tab', () => {
node_info: {},
};
- expect(show_advanced_tab(tableModel)).toBe(true);
+ expect(show_advanced_tab(tableModel)).toEqual(true);
});
});
@@ -42,7 +42,7 @@ describe('#show_advanced_tab', () => {
},
};
- expect(show_advanced_tab(tableModel)).toBe(false);
+ expect(show_advanced_tab(tableModel)).toEqual(false);
});
});
@@ -56,7 +56,7 @@ describe('#show_advanced_tab', () => {
},
};
- expect(show_advanced_tab(tableModel)).toBe(true);
+ expect(show_advanced_tab(tableModel)).toEqual(true);
});
});
});
diff --git a/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js b/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
index 0de2df57..2ba1274d 100644
--- a/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
+++ b/web/regression/javascript/browser/server_groups/servers/model_validation_spec.js
@@ -58,7 +58,7 @@ describe('Server#ModelValidation', () => {
describe('Service id present', () => {
it('sets empty service name which should throw an error', () => {
model.allValues['service'] = '';
- expect(modelValidation.validate()).toBe('Either Host name, Address or Service must be specified.');
+ expect(modelValidation.validate()).toEqual('Either Host name, Address or Service must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
host: 'Either Host name, Address or Service must be specified.',
hostaddr: 'Either Host name, Address or Service must be specified.',
@@ -81,7 +81,7 @@ describe('Server#ModelValidation', () => {
it('sets the "SSH Tunnel host must be specified." error', () => {
model.allValues['tunnel_port'] = 22;
model.allValues['tunnel_username'] = 'user1';
- expect(modelValidation.validate()).toBe('SSH Tunnel host must be specified.');
+ expect(modelValidation.validate()).toEqual('SSH Tunnel host must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
tunnel_host:'SSH Tunnel host must be specified.',
});
@@ -89,7 +89,7 @@ describe('Server#ModelValidation', () => {
it('sets the "SSH Tunnel port must be specified." error', () => {
model.allValues['tunnel_host'] = 'host';
model.allValues['tunnel_username'] = 'user1';
- expect(modelValidation.validate()).toBe('SSH Tunnel port must be specified.');
+ expect(modelValidation.validate()).toEqual('SSH Tunnel port must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
tunnel_port:'SSH Tunnel port must be specified.',
});
@@ -97,7 +97,7 @@ describe('Server#ModelValidation', () => {
it('sets the "SSH Tunnel username be specified." error', () => {
model.allValues['tunnel_host'] = 'host';
model.allValues['tunnel_port'] = 22;
- expect(modelValidation.validate()).toBe('SSH Tunnel username must be specified.');
+ expect(modelValidation.validate()).toEqual('SSH Tunnel username must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
tunnel_username:'SSH Tunnel username must be specified.',
});
@@ -107,7 +107,7 @@ describe('Server#ModelValidation', () => {
model.allValues['tunnel_port'] = 22;
model.allValues['tunnel_username'] = 'user1';
model.allValues['tunnel_authentication'] = 1;
- expect(modelValidation.validate()).toBe('SSH Tunnel identity file must be specified.');
+ expect(modelValidation.validate()).toEqual('SSH Tunnel identity file must be specified.');
expect(model.errorModel.set).toHaveBeenCalledWith({
tunnel_identity_file:'SSH Tunnel identity file must be specified.',
});
@@ -118,7 +118,7 @@ describe('Server#ModelValidation', () => {
describe('When no parameters are valid', () => {
describe('Service id not present', () => {
it('does not set any error in the model', () => {
- expect(modelValidation.validate()).toBe('Name must be specified.');
+ expect(modelValidation.validate()).toEqual('Name must be specified.');
expect(model.errorModel.set).toHaveBeenCalledTimes(1);
expect(model.errorModel.set).toHaveBeenCalledWith({
name: 'Name must be specified.',
@@ -134,7 +134,7 @@ describe('Server#ModelValidation', () => {
describe('Host address is not valid', () => {
it('sets the "Host address must be a valid IPv4 or IPv6 address" error', () => {
model.allValues['hostaddr'] = 'something that is not an ip address';
- expect(modelValidation.validate()).toBe('Host address must be valid IPv4 or IPv6 address.');
+ expect(modelValidation.validate()).toEqual('Host address must be valid IPv4 or IPv6 address.');
expect(model.errorModel.set).toHaveBeenCalledTimes(1);
expect(model.errorModel.set).toHaveBeenCalledWith({
name: 'Name must be specified.',
@@ -149,7 +149,7 @@ describe('Server#ModelValidation', () => {
describe('Service id present', () => {
it('does not set any error in the model', () => {
model.allValues['service'] = 'asdfg';
- expect(modelValidation.validate()).toBe('Name must be specified.');
+ expect(modelValidation.validate()).toEqual('Name must be specified.');
expect(model.errorModel.set).toHaveBeenCalledTimes(1);
expect(model.errorModel.set).toHaveBeenCalledWith({
name: 'Name must be specified.',
diff --git a/web/regression/javascript/check_node_visibility_spec.js b/web/regression/javascript/check_node_visibility_spec.js
index ba92e157..e673aa75 100644
--- a/web/regression/javascript/check_node_visibility_spec.js
+++ b/web/regression/javascript/check_node_visibility_spec.js
@@ -8,25 +8,25 @@
//////////////////////////////////////////////////////////////////////////
define(['sources/check_node_visibility'],
-function (checkNodeVisibility) {
- describe('checkNodeVisibility', function () {
+ function (checkNodeVisibility) {
+ describe('checkNodeVisibility', function () {
- var browser;
+ var browser;
- browser = jasmine.createSpyObj('browser', [
- 'node_preference_data', 'get_preference']
- );
+ browser = jasmine.createSpyObj('browser', [
+ 'node_preference_data', 'get_preference']
+ );
- describe('when node is server collection', function () {
- it('returns true', function () {
- expect(checkNodeVisibility(browser, 'coll-server')).toEqual(true);
+ describe('when node is server collection', function () {
+ it('returns true', function () {
+ expect(checkNodeVisibility(browser, 'coll-server')).toEqual(true);
+ });
});
- });
- describe('when node is server', function () {
- it('returns true', function () {
- expect(checkNodeVisibility(browser, 'server')).toEqual(true);
+ describe('when node is server', function () {
+ it('returns true', function () {
+ expect(checkNodeVisibility(browser, 'server')).toEqual(true);
+ });
});
});
});
-});
diff --git a/web/regression/javascript/common_keyboard_shortcuts_spec.js b/web/regression/javascript/common_keyboard_shortcuts_spec.js
index f481b1a0..abe5bac5 100644
--- a/web/regression/javascript/common_keyboard_shortcuts_spec.js
+++ b/web/regression/javascript/common_keyboard_shortcuts_spec.js
@@ -7,7 +7,7 @@
//
//////////////////////////////////////////////////////////////////////////
-import keyboardShortcuts from 'sources/keyboard_shortcuts';
+import * as keyboardShortcuts from 'sources/keyboard_shortcuts';
describe('the keyboard shortcuts', () => {
const F1_KEY = 112;
diff --git a/web/regression/javascript/dashboard/charting_spec.js b/web/regression/javascript/dashboard/charting_spec.js
index 9a0d8709..26143144 100644
--- a/web/regression/javascript/dashboard/charting_spec.js
+++ b/web/regression/javascript/dashboard/charting_spec.js
@@ -28,7 +28,7 @@ describe('In charting related testcases', ()=> {
});
it('Return the correct container', ()=>{
- expect(chartObj.getContainer()).toBe(chartDiv);
+ expect(chartObj.getContainer()).toEqual(chartDiv);
});
it('Returns the container dimensions', ()=>{
@@ -74,7 +74,7 @@ describe('In charting related testcases', ()=> {
});
it('Check if other data returns undefined for not set', ()=>{
- expect(chartObj.getOtherData('some_val_not_set')).toBe(undefined);
+ expect(chartObj.getOtherData('some_val_not_set')).toEqual(undefined);
});
it('Check if isVisible returns correct', ()=>{
@@ -83,19 +83,19 @@ describe('In charting related testcases', ()=> {
dimSpy.and.returnValue({
height: 1, width: 1,
});
- expect(chartObj.isVisible()).toBe(true);
+ expect(chartObj.isVisible()).toEqual(true);
dimSpy.and.stub();
dimSpy.and.returnValue({
height: 0, width: 0,
});
- expect(chartObj.isVisible()).toBe(false);
+ expect(chartObj.isVisible()).toEqual(false);
});
it('Check if isInPage returns correct', ()=>{
- expect(chartObj.isInPage()).toBe(true);
+ expect(chartObj.isInPage()).toEqual(true);
$('body').find('#charting-test-container').remove();
- expect(chartObj.isInPage()).toBe(false);
+ expect(chartObj.isInPage()).toEqual(false);
});
afterEach(()=>{
diff --git a/web/regression/javascript/datagrid/get_panel_title_spec.js b/web/regression/javascript/datagrid/get_panel_title_spec.js
index 8c146bc9..b1b9a7e4 100644
--- a/web/regression/javascript/datagrid/get_panel_title_spec.js
+++ b/web/regression/javascript/datagrid/get_panel_title_spec.js
@@ -54,7 +54,7 @@ describe('#getPanelTitle', () => {
tree.selectNode([{id: 'level1'}]);
expect(getPanelTitle(pgBrowser))
- .toBe('other db label/some user name@server label');
+ .toEqual('other db label/some user name@server label');
});
});
@@ -75,7 +75,7 @@ describe('#getPanelTitle', () => {
new TreeNode('level1.1.1', {_type: 'table'}));
tree.selectNode([{id: 'level1.1.1'}]);
expect(getPanelTitle(pgBrowser))
- .toBe('db label/some user name@server label');
+ .toEqual('db label/some user name@server label');
});
});
});
diff --git a/web/regression/javascript/debugger_utils_spec.js b/web/regression/javascript/debugger_utils_spec.js
index e1bba3e7..13238536 100644
--- a/web/regression/javascript/debugger_utils_spec.js
+++ b/web/regression/javascript/debugger_utils_spec.js
@@ -66,19 +66,19 @@ describe('getProcedureId', function () {
describe('Should return proper object id', function () {
it('returns valid procedure id', function () {
- expect(getProcedureId(treeInfroProc)).toBe(123);
+ expect(getProcedureId(treeInfroProc)).toEqual(123);
});
it('returns valid edbproc id', function () {
- expect(getProcedureId(treeInfroEdbProc)).toBe(321);
+ expect(getProcedureId(treeInfroEdbProc)).toEqual(321);
});
it('returns undefined for fake tree info', function () {
- expect(getProcedureId(fakeTreeInfro)).toBe(undefined);
+ expect(getProcedureId(fakeTreeInfro)).toEqual(undefined);
});
it('returns undefined for invalid procedure id', function () {
- expect(getProcedureId(treeInfroInvalidProcId)).toBe(undefined);
+ expect(getProcedureId(treeInfroInvalidProcId)).toEqual(undefined);
});
});
});
diff --git a/web/regression/javascript/dialog_tab_navigator_spec.js b/web/regression/javascript/dialog_tab_navigator_spec.js
index 3c6301a4..8e86fc87 100644
--- a/web/regression/javascript/dialog_tab_navigator_spec.js
+++ b/web/regression/javascript/dialog_tab_navigator_spec.js
@@ -67,7 +67,7 @@ describe('dialogTabNavigator', function () {
};
tabNavigator = new dialogTabNavigator.dialogTabNavigator(
- dialog, backward_shortcut, forward_shortcut);
+ dialog, backward_shortcut, forward_shortcut);
});
describe('navigate', function () {
diff --git a/web/regression/javascript/geometry_viewer/geometry_viewer_spec.js b/web/regression/javascript/geometry_viewer/geometry_viewer_spec.js
index 1451cf5e..f7cc7016 100644
--- a/web/regression/javascript/geometry_viewer/geometry_viewer_spec.js
+++ b/web/regression/javascript/geometry_viewer/geometry_viewer_spec.js
@@ -55,7 +55,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(2);
+ expect(result.geoJSONs.length).toEqual(2);
});
@@ -76,7 +76,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(1);
+ expect(result.geoJSONs.length).toEqual(1);
});
it('should support geometry M', function () {
@@ -96,7 +96,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(1);
+ expect(result.geoJSONs.length).toEqual(1);
});
it('should support empty geometry', function () {
@@ -114,7 +114,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(1);
+ expect(result.geoJSONs.length).toEqual(1);
});
@@ -145,7 +145,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(2);
+ expect(result.geoJSONs.length).toEqual(2);
});
@@ -164,7 +164,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(0);
+ expect(result.geoJSONs.length).toEqual(0);
});
it('should not support 3DM geometry', function () {
@@ -183,7 +183,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(0);
+ expect(result.geoJSONs.length).toEqual(0);
});
it('should not support TRIANGLE geometry', function () {
@@ -203,7 +203,7 @@ describe('geometry viewer test', function () {
];
let columnIndex = 0;
let result = GeometryViewer.parse_data(items, columns, columnIndex);
- expect(result.geoJSONs.length).toBe(0);
+ expect(result.geoJSONs.length).toEqual(0);
});
it('should limit data size', function () {
diff --git a/web/regression/javascript/history/history_collection_spec.js b/web/regression/javascript/history/history_collection_spec.js
index 89995f60..2145f1a9 100644
--- a/web/regression/javascript/history/history_collection_spec.js
+++ b/web/regression/javascript/history/history_collection_spec.js
@@ -25,11 +25,11 @@ describe('historyCollection', function () {
it('returns 0 when underlying history model has no elements', function () {
historyCollection = new HistoryCollection([]);
- expect(historyCollection.length()).toBe(0);
+ expect(historyCollection.length()).toEqual(0);
});
it('returns the length of the underlying history model', function () {
- expect(historyCollection.length()).toBe(1);
+ expect(historyCollection.length()).toEqual(1);
});
});
@@ -61,7 +61,7 @@ describe('historyCollection', function () {
it('drops the history', function () {
expect(historyCollection.historyList).toEqual([]);
- expect(historyCollection.length()).toBe(0);
+ expect(historyCollection.length()).toEqual(0);
});
it('calls the onReset function', function () {
diff --git a/web/regression/javascript/misc/explain/explain_statistics_spec.js b/web/regression/javascript/misc/explain/explain_statistics_spec.js
index c7bdca84..04e2150e 100644
--- a/web/regression/javascript/misc/explain/explain_statistics_spec.js
+++ b/web/regression/javascript/misc/explain/explain_statistics_spec.js
@@ -32,7 +32,7 @@ describe('ExplainStatistics', () => {
statsModel.set('Triggers', []);
statsModel.set_statistics(tooltipContainer);
- expect($('.pg-explain-stats-area').hasClass('d-none')).toBe(true);
+ expect($('.pg-explain-stats-area').hasClass('d-none')).toEqual(true);
});
});
@@ -45,7 +45,7 @@ describe('ExplainStatistics', () => {
});
it('Statistics button should be visible', () => {
- expect($('.pg-explain-stats-area').hasClass('d-none')).toBe(false);
+ expect($('.pg-explain-stats-area').hasClass('d-none')).toEqual(false);
});
it('Mouse over event should be trigger', () => {
@@ -53,7 +53,7 @@ describe('ExplainStatistics', () => {
var hoverEvent = new $.Event('mouseover');
$('.pg-explain-stats-area').trigger(hoverEvent);
- expect(tooltipContainer.css('opacity')).toBe('0.8');
+ expect(tooltipContainer.css('opacity')).toEqual('0.8');
});
it('Mouse out event should be trigger', () => {
@@ -61,7 +61,7 @@ describe('ExplainStatistics', () => {
var hoverEvent = new $.Event('mouseout');
$('.pg-explain-stats-area').trigger(hoverEvent);
- expect(tooltipContainer.css('opacity')).toBe('0');
+ expect(tooltipContainer.css('opacity')).toEqual('0');
});
});
@@ -74,7 +74,7 @@ describe('ExplainStatistics', () => {
});
it('Statistics button should be visible', () => {
- expect($('.pg-explain-stats-area').hasClass('d-none')).toBe(false);
+ expect($('.pg-explain-stats-area').hasClass('d-none')).toEqual(false);
});
it('Mouse over event should be trigger', () => {
@@ -82,7 +82,7 @@ describe('ExplainStatistics', () => {
var hoverEvent = new $.Event('mouseover');
$('.pg-explain-stats-area').trigger(hoverEvent);
- expect(tooltipContainer.css('opacity')).toBe('0.8');
+ expect(tooltipContainer.css('opacity')).toEqual('0.8');
});
it('Mouse out event should be trigger', () => {
@@ -90,7 +90,7 @@ describe('ExplainStatistics', () => {
var hoverEvent = new $.Event('mouseout');
$('.pg-explain-stats-area').trigger(hoverEvent);
- expect(tooltipContainer.css('opacity')).toBe('0');
+ expect(tooltipContainer.css('opacity')).toEqual('0');
});
});
});
diff --git a/web/regression/javascript/misc/statistics/statistics_spec.js b/web/regression/javascript/misc/statistics/statistics_spec.js
index e2c75175..825a755f 100644
--- a/web/regression/javascript/misc/statistics/statistics_spec.js
+++ b/web/regression/javascript/misc/statistics/statistics_spec.js
@@ -15,7 +15,7 @@ describe('#nodeHasStatistics', () => {
const node = {
hasStatistics: true,
};
- expect(nodeHasStatistics(node, {})).toBe(true);
+ expect(nodeHasStatistics(node, {})).toEqual(true);
});
});
@@ -28,7 +28,7 @@ describe('#nodeHasStatistics', () => {
};
const item = {};
- expect(nodeHasStatistics(node, item)).toBe(true);
+ expect(nodeHasStatistics(node, item)).toEqual(true);
expect(node.getTreeNodeHierarchy).toHaveBeenCalledWith(item);
});
});
diff --git a/web/regression/javascript/restore/restore_dialog_wrapper_spec.js b/web/regression/javascript/restore/restore_dialog_wrapper_spec.js
index 04d7348f..aeef8192 100644
--- a/web/regression/javascript/restore/restore_dialog_wrapper_spec.js
+++ b/web/regression/javascript/restore/restore_dialog_wrapper_spec.js
@@ -115,7 +115,7 @@ describe('RestoreDialogWrapper', () => {
it('disables the button "submit button" until a filename is selected', () => {
restoreDialogWrapper.prepare();
- expect(restoreDialogWrapper.__internal.buttons[3].element.disabled).toBe(true);
+ expect(restoreDialogWrapper.__internal.buttons[3].element.disabled).toEqual(true);
});
});
@@ -131,7 +131,7 @@ describe('RestoreDialogWrapper', () => {
it('disables the button "submit button" until a filename is selected', () => {
restoreDialogWrapper.prepare();
- expect(restoreDialogWrapper.__internal.buttons[3].element.disabled).toBe(true);
+ expect(restoreDialogWrapper.__internal.buttons[3].element.disabled).toEqual(true);
});
});
@@ -177,7 +177,7 @@ describe('RestoreDialogWrapper', () => {
it('disables the button submit button until a filename is selected', () => {
restoreDialogWrapper.prepare();
- expect(restoreNode.__internal.buttons[3].element.disabled).toBe(true);
+ expect(restoreNode.__internal.buttons[3].element.disabled).toEqual(true);
});
it('generates a new restore model', () => {
@@ -257,7 +257,7 @@ describe('RestoreDialogWrapper', () => {
});
it('does not start the restore', () => {
- expect(networkCalled).toBe(false);
+ expect(networkCalled).toEqual(false);
});
});
@@ -298,7 +298,7 @@ describe('RestoreDialogWrapper', () => {
});
it('does not start the restore', () => {
- expect(networkCalled).toBe(false);
+ expect(networkCalled).toEqual(false);
});
});
@@ -327,7 +327,7 @@ describe('RestoreDialogWrapper', () => {
it('does not start the restore', () => {
restoreDialogWrapper.callback(event);
- expect(networkCalled).toBe(false);
+ expect(networkCalled).toEqual(false);
});
});
@@ -353,7 +353,7 @@ describe('RestoreDialogWrapper', () => {
it('does not start the restore', () => {
restoreDialogWrapper.callback(event);
- expect(networkCalled).toBe(false);
+ expect(networkCalled).toEqual(false);
});
});
diff --git a/web/regression/javascript/selection/column_selector_spec.js b/web/regression/javascript/selection/column_selector_spec.js
index 1b3136d1..71aac0a7 100644
--- a/web/regression/javascript/selection/column_selector_spec.js
+++ b/web/regression/javascript/selection/column_selector_spec.js
@@ -100,7 +100,7 @@ describe('ColumnSelector', function () {
var columnSelector = new ColumnSelector();
var selectableColumns = columnSelector.getColumnDefinitions(columns);
- expect(selectableColumns[1].id).toBe('1');
+ expect(selectableColumns[1].id).toEqual('1');
});
describe('with ActiveCellCapture, CellSelectionModel, and GridSelector: selecting columns', function () {
@@ -142,11 +142,11 @@ describe('ColumnSelector', function () {
it('toggles a selected class to the header cell', function () {
container.find('.slick-header-column:contains(second column)').click();
expect($(container.find('.slick-header-column:contains(second column)')).hasClass('selected'))
- .toBe(true);
+ .toEqual(true);
container.find('.slick-header-column:contains(second column)').click();
expect($(container.find('.slick-header-column:contains(second column)')).hasClass('selected'))
- .toBe(false);
+ .toEqual(false);
});
});
@@ -160,14 +160,14 @@ describe('ColumnSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(2);
+ expect(selectedRanges.length).toEqual(2);
var column1 = selectedRanges[0];
- expect(column1.fromCell).toBe(1);
- expect(column1.toCell).toBe(1);
+ expect(column1.fromCell).toEqual(1);
+ expect(column1.toCell).toEqual(1);
var column2 = selectedRanges[1];
- expect(column2.fromCell).toBe(2);
- expect(column2.toCell).toBe(2);
+ expect(column2.fromCell).toEqual(2);
+ expect(column2.toCell).toEqual(2);
});
describe('and presses shift + right-arrow', function () {
@@ -176,24 +176,24 @@ describe('ColumnSelector', function () {
});
it('keeps the last column selected', function () {
- expect(cellSelectionModel.getSelectedRanges().length).toBe(1);
+ expect(cellSelectionModel.getSelectedRanges().length).toEqual(1);
});
it('grows the selection to the right', function () {
var selectedRange = cellSelectionModel.getSelectedRanges()[0];
- expect(selectedRange.fromCell).toBe(2);
- expect(selectedRange.toCell).toBe(3);
- expect(selectedRange.fromRow).toBe(0);
- expect(selectedRange.toRow).toBe(9);
+ expect(selectedRange.fromCell).toEqual(2);
+ expect(selectedRange.toCell).toEqual(3);
+ expect(selectedRange.fromRow).toEqual(0);
+ expect(selectedRange.toRow).toEqual(9);
});
it('keeps selected class on columns 2 and 3', function () {
expect($(container.find('.slick-header-column:contains(second column)')).hasClass('selected'))
- .toBe(true);
+ .toEqual(true);
expect($(container.find('.slick-header-column:contains(third column)')).hasClass('selected'))
- .toBe(true);
+ .toEqual(true);
expect($(container.find('.slick-header-column:contains(some-column-name)')).hasClass('selected'))
- .toBe(false);
+ .toEqual(false);
});
});
@@ -208,11 +208,11 @@ describe('ColumnSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
- expect(selectedRanges[0].fromCell).toBe(1);
- expect(selectedRanges[0].toCell).toBe(2);
- expect(selectedRanges[0].fromRow).toBe(0);
- expect(selectedRanges[0].toRow).toBe(9);
+ expect(selectedRanges.length).toEqual(1);
+ expect(selectedRanges[0].fromCell).toEqual(1);
+ expect(selectedRanges[0].toCell).toEqual(2);
+ expect(selectedRanges[0].fromRow).toEqual(0);
+ expect(selectedRanges[0].toRow).toEqual(9);
});
});
});
@@ -229,11 +229,11 @@ describe('ColumnSelector', function () {
it('toggles a selected class to the header cell', function () {
container.find('.slick-header-column span.column-description:contains(second column)').click();
expect($(container.find('.slick-header-column:contains(second column)')).hasClass('selected'))
- .toBe(true);
+ .toEqual(true);
container.find('.slick-header-column span.column-description:contains(second column)').click();
expect($(container.find('.slick-header-column:contains(second column)')).hasClass('selected'))
- .toBe(false);
+ .toEqual(false);
});
});
@@ -247,14 +247,14 @@ describe('ColumnSelector', function () {
container.find('.slick-header-column')[1].click();
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var column = selectedRanges[0];
- expect(column.fromCell).toBe(1);
- expect(column.toCell).toBe(1);
- expect(column.fromRow).toBe(0);
- expect(column.toRow).toBe(9);
+ expect(column.fromCell).toEqual(1);
+ expect(column.toCell).toEqual(1);
+ expect(column.fromRow).toEqual(0);
+ expect(column.toRow).toEqual(9);
});
});
@@ -289,7 +289,7 @@ describe('ColumnSelector', function () {
cellSelectionModel.setSelectedRanges([]);
expect($(container.find('.slick-header-column')[1]).hasClass('selected'))
- .toBe(false);
+ .toEqual(false);
});
});
@@ -321,14 +321,14 @@ describe('ColumnSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var column = selectedRanges[0];
- expect(column.fromCell).toBe(1);
- expect(column.toCell).toBe(1);
- expect(column.fromRow).toBe(1);
- expect(column.toRow).toBe(1);
+ expect(column.fromCell).toEqual(1);
+ expect(column.toCell).toEqual(1);
+ expect(column.fromRow).toEqual(1);
+ expect(column.toRow).toEqual(1);
});
it('keep select class on column header', function () {
@@ -346,14 +346,14 @@ describe('ColumnSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var column = selectedRanges[0];
- expect(column.fromCell).toBe(2);
- expect(column.toCell).toBe(2);
- expect(column.fromRow).toBe(2);
- expect(column.toRow).toBe(2);
+ expect(column.fromCell).toEqual(2);
+ expect(column.toCell).toEqual(2);
+ expect(column.fromRow).toEqual(2);
+ expect(column.toRow).toEqual(2);
});
it('remove select class on \'some-column-name\' column header', function () {
@@ -373,14 +373,14 @@ describe('ColumnSelector', function () {
it('column is deselected', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var column = selectedRanges[0];
- expect(column.fromCell).toBe(1);
- expect(column.toCell).toBe(3);
- expect(column.fromRow).toBe(1);
- expect(column.toRow).toBe(1);
+ expect(column.fromCell).toEqual(1);
+ expect(column.toCell).toEqual(3);
+ expect(column.fromRow).toEqual(1);
+ expect(column.toRow).toEqual(1);
});
it('no column should have the class \'selected\'', function () {
@@ -407,10 +407,10 @@ describe('ColumnSelector', function () {
var row = selectedRanges[0];
expect(selectedRanges.length).toEqual(1);
- expect(row.fromCell).toBe(1);
- expect(row.toCell).toBe(1);
- expect(row.fromRow).toBe(0);
- expect(row.toRow).toBe(9);
+ expect(row.fromCell).toEqual(1);
+ expect(row.toCell).toEqual(1);
+ expect(row.fromRow).toEqual(0);
+ expect(row.toRow).toEqual(9);
}
function pressShiftArrow(keyCode) {
diff --git a/web/regression/javascript/selection/copy_data_spec.js b/web/regression/javascript/selection/copy_data_spec.js
index ebfb8bc2..3ce49e92 100644
--- a/web/regression/javascript/selection/copy_data_spec.js
+++ b/web/regression/javascript/selection/copy_data_spec.js
@@ -88,11 +88,11 @@ describe('copyData', function () {
});
it('copies them', function () {
- spyOn(clipboard, 'copyTextToClipboard');
+ spyOn(clipboard, 'copyTextToClipboard').and.callThrough();
copyData.apply(sqlEditor);
- expect(sqlEditor.copied_rows.length).toBe(2);
+ expect(sqlEditor.copied_rows.length).toEqual(2);
expect(clipboard.copyTextToClipboard).toHaveBeenCalled();
expect(clipboard.copyTextToClipboard.calls.mostRecent().args[0]).toContain('1,"leopord",12');
@@ -103,7 +103,7 @@ describe('copyData', function () {
it('enables the paste row button', function () {
copyData.apply(_.extend({can_edit: true}, sqlEditor));
- expect($('#btn-paste-row').prop('disabled')).toBe(false);
+ expect($('#btn-paste-row').prop('disabled')).toEqual(false);
});
});
});
@@ -123,15 +123,15 @@ describe('copyData', function () {
var copyArg = clipboard.copyTextToClipboard.calls.mostRecent().args[0];
var rowStrings = copyArg.split('\n');
- expect(rowStrings[0]).toBe('1');
- expect(rowStrings[1]).toBe('2');
- expect(rowStrings[2]).toBe('3');
+ expect(rowStrings[0]).toEqual('1');
+ expect(rowStrings[1]).toEqual('2');
+ expect(rowStrings[2]).toEqual('3');
});
it('sets copied_rows to empty', function () {
copyData.apply(sqlEditor);
- expect(sqlEditor.copied_rows.length).toBe(0);
+ expect(sqlEditor.copied_rows.length).toEqual(0);
});
describe('when the user can edit the grid', function () {
@@ -140,7 +140,7 @@ describe('copyData', function () {
});
it('disables the paste row button', function () {
- expect($('#btn-paste-row').prop('disabled')).toBe(true);
+ expect($('#btn-paste-row').prop('disabled')).toEqual(true);
});
});
});
diff --git a/web/regression/javascript/selection/grid_selector_spec.js b/web/regression/javascript/selection/grid_selector_spec.js
index 899aa46f..0f9353ea 100644
--- a/web/regression/javascript/selection/grid_selector_spec.js
+++ b/web/regression/javascript/selection/grid_selector_spec.js
@@ -56,14 +56,14 @@ describe('GridSelector', function () {
});
it('renders an additional column on the left for selecting rows', function () {
- expect(columns.length).toBe(3);
+ expect(columns.length).toEqual(3);
var leftmostColumn = columns[0];
- expect(leftmostColumn.id).toBe('row-header-column');
+ expect(leftmostColumn.id).toEqual('row-header-column');
});
it('renders a button for selecting all the cells', function () {
- expect(container.find('[title=\'Select/Deselect All\']').length).toBe(1);
+ expect(container.find('[title=\'Select/Deselect All\']').length).toEqual(1);
});
describe('when the cell for the select/deselect all is clicked', function () {
@@ -71,12 +71,12 @@ describe('GridSelector', function () {
container.find('[title=\'Select/Deselect All\']').parent().trigger('click');
var selectedRanges = xCellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var selectedRange = selectedRanges[0];
- expect(selectedRange.fromCell).toBe(1);
- expect(selectedRange.toCell).toBe(2);
- expect(selectedRange.fromRow).toBe(0);
- expect(selectedRange.toRow).toBe(9);
+ expect(selectedRange.fromCell).toEqual(1);
+ expect(selectedRange.toCell).toEqual(2);
+ expect(selectedRange.fromRow).toEqual(0);
+ expect(selectedRange.toRow).toEqual(9);
});
it('adds selected class', function () {
@@ -92,12 +92,12 @@ describe('GridSelector', function () {
container.find('[title=\'Select/Deselect All\']').trigger('click');
var selectedRanges = xCellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var selectedRange = selectedRanges[0];
- expect(selectedRange.fromCell).toBe(1);
- expect(selectedRange.toCell).toBe(2);
- expect(selectedRange.fromRow).toBe(0);
- expect(selectedRange.toRow).toBe(9);
+ expect(selectedRange.fromCell).toEqual(1);
+ expect(selectedRange.toCell).toEqual(2);
+ expect(selectedRange.fromRow).toEqual(0);
+ expect(selectedRange.toRow).toEqual(9);
});
describe('when the select all button in the corner gets deselected', function () {
@@ -109,7 +109,7 @@ describe('GridSelector', function () {
container.find('[title=\'Select/Deselect All\']').trigger('click');
var selectedRanges = xCellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(0);
+ expect(selectedRanges.length).toEqual(0);
});
});
diff --git a/web/regression/javascript/selection/row_selector_spec.js b/web/regression/javascript/selection/row_selector_spec.js
index dec39833..e7594e0d 100644
--- a/web/regression/javascript/selection/row_selector_spec.js
+++ b/web/regression/javascript/selection/row_selector_spec.js
@@ -66,22 +66,22 @@ describe('RowSelector', function () {
});
it('renders an additional column on the left', function () {
- expect(columnDefinitions.length).toBe(3);
+ expect(columnDefinitions.length).toEqual(3);
var leftmostColumn = columnDefinitions[0];
- expect(leftmostColumn.id).toBe('row-header-column');
- expect(leftmostColumn.name).toBe('');
- expect(leftmostColumn.selectable).toBe(false);
+ expect(leftmostColumn.id).toEqual('row-header-column');
+ expect(leftmostColumn.name).toEqual('');
+ expect(leftmostColumn.selectable).toEqual(false);
});
it('renders a span on the leftmost column', function () {
- expect(container.find('.slick-row').length).toBe(10);
- expect(container.find('.slick-row .slick-cell:first-child span[data-cell-type="row-header-selector"]').length).toBe(10);
+ expect(container.find('.slick-row').length).toEqual(10);
+ expect(container.find('.slick-row .slick-cell:first-child span[data-cell-type="row-header-selector"]').length).toEqual(10);
});
it('preserves the other attributes of column definitions', function () {
- expect(columnDefinitions[1].id).toBe('1');
- expect(columnDefinitions[1].selectable).toBe(true);
+ expect(columnDefinitions[1].id).toEqual('1');
+ expect(columnDefinitions[1].selectable).toEqual(true);
});
describe('selecting rows', function () {
@@ -112,10 +112,10 @@ describe('RowSelector', function () {
var row = selectedRanges[0];
expect(selectedRanges.length).toEqual(1);
- expect(row.fromCell).toBe(1);
- expect(row.toCell).toBe(2);
- expect(row.fromRow).toBe(1);
- expect(row.toRow).toBe(1);
+ expect(row.fromCell).toEqual(1);
+ expect(row.toCell).toEqual(2);
+ expect(row.fromRow).toEqual(1);
+ expect(row.toRow).toEqual(1);
});
it('add selected class to parent of the span', function () {
@@ -139,7 +139,7 @@ describe('RowSelector', function () {
});
it('keeps the last row selected', function () {
- expect(cellSelectionModel.getSelectedRanges().length).toBe(1);
+ expect(cellSelectionModel.getSelectedRanges().length).toEqual(1);
});
it('grows the selection down', function () {
@@ -148,10 +148,10 @@ describe('RowSelector', function () {
var row = selectedRanges[0];
expect(selectedRanges.length).toEqual(1);
- expect(row.fromCell).toBe(1);
- expect(row.toCell).toBe(2);
- expect(row.fromRow).toBe(1);
- expect(row.toRow).toBe(2);
+ expect(row.fromCell).toEqual(1);
+ expect(row.toCell).toEqual(2);
+ expect(row.fromRow).toEqual(1);
+ expect(row.toRow).toEqual(2);
});
it('keeps selected class on rows 1 and 2', function () {
@@ -175,14 +175,14 @@ describe('RowSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var newSelection = selectedRanges[0];
- expect(newSelection.fromCell).toBe(1);
- expect(newSelection.fromRow).toBe(5);
- expect(newSelection.toCell).toBe(1);
- expect(newSelection.toRow).toBe(5);
+ expect(newSelection.fromCell).toEqual(1);
+ expect(newSelection.fromRow).toEqual(5);
+ expect(newSelection.toCell).toEqual(1);
+ expect(newSelection.toRow).toEqual(5);
});
it('keep select class on row header', function () {
@@ -200,14 +200,14 @@ describe('RowSelector', function () {
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
var newSelection = selectedRanges[0];
- expect(newSelection.fromCell).toBe(2);
- expect(newSelection.fromRow).toBe(2);
- expect(newSelection.toCell).toBe(2);
- expect(newSelection.toRow).toBe(2);
+ expect(newSelection.fromCell).toEqual(2);
+ expect(newSelection.fromRow).toEqual(2);
+ expect(newSelection.toCell).toEqual(2);
+ expect(newSelection.toRow).toEqual(2);
});
it('remove select class on "some-column-name" column header', function () {
@@ -250,12 +250,12 @@ describe('RowSelector', function () {
expect(selectedRanges.length).toEqual(2);
var row1 = selectedRanges[0];
- expect(row1.fromRow).toBe(4);
- expect(row1.toRow).toBe(4);
+ expect(row1.fromRow).toEqual(4);
+ expect(row1.toRow).toEqual(4);
var row2 = selectedRanges[1];
- expect(row2.fromRow).toBe(0);
- expect(row2.toRow).toBe(0);
+ expect(row2.fromRow).toEqual(0);
+ expect(row2.toRow).toEqual(0);
});
});
@@ -320,9 +320,9 @@ describe('RowSelector', function () {
var row = selectedRanges[0];
expect(selectedRanges.length).toEqual(1);
- expect(row.fromCell).toBe(1);
- expect(row.toCell).toBe(2);
- expect(row.fromRow).toBe(0);
- expect(row.toRow).toBe(0);
+ expect(row.fromCell).toEqual(1);
+ expect(row.toCell).toEqual(2);
+ expect(row.fromRow).toEqual(0);
+ expect(row.toRow).toEqual(0);
}
});
diff --git a/web/regression/javascript/selection/xcell_selection_model_spec.js b/web/regression/javascript/selection/xcell_selection_model_spec.js
index 13cffdac..99b69a43 100644
--- a/web/regression/javascript/selection/xcell_selection_model_spec.js
+++ b/web/regression/javascript/selection/xcell_selection_model_spec.js
@@ -437,12 +437,12 @@ describe('XCellSelectionModel', function () {
it('should call handleDragEnd from CellRangeSelector', function () {
var newRange = grid.getSelectionModel().getSelectedRanges();
- expect(newRange.length).toBe(1);
+ expect(newRange.length).toEqual(1);
- expect(newRange[0].fromCell).toBe(1);
- expect(newRange[0].toCell).toBe(3);
- expect(newRange[0].fromRow).toBe(1);
- expect(newRange[0].toRow).toBe(4);
+ expect(newRange[0].fromCell).toEqual(1);
+ expect(newRange[0].toCell).toEqual(3);
+ expect(newRange[0].fromRow).toEqual(1);
+ expect(newRange[0].toRow).toEqual(4);
});
});
});
@@ -482,7 +482,7 @@ describe('XCellSelectionModel', function () {
var selectedRanges = grid.getSelectionModel().getSelectedRanges();
- expect(selectedRanges.length).toBe(2);
+ expect(selectedRanges.length).toEqual(2);
expectRangeToMatch(selectedRanges[0], 0, 1, 0, 3);
expectRangeToMatch(selectedRanges[1], 2, 1, 2, 3);
});
@@ -505,14 +505,14 @@ describe('XCellSelectionModel', function () {
function expectOneSelectedRange(fromRow, fromCell, toRow, toCell) {
var selectedRanges = grid.getSelectionModel().getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
expectRangeToMatch(selectedRanges[0], fromRow, fromCell, toRow, toCell);
}
function expectRangeToMatch(range, fromRow, fromCell, toRow, toCell) {
- expect(range.fromRow).toBe(fromRow);
- expect(range.toRow).toBe(toRow);
- expect(range.fromCell).toBe(fromCell);
- expect(range.toCell).toBe(toCell);
+ expect(range.fromRow).toEqual(fromRow);
+ expect(range.toRow).toEqual(toRow);
+ expect(range.fromCell).toEqual(fromCell);
+ expect(range.toCell).toEqual(toCell);
}
});
diff --git a/web/regression/javascript/slickgrid/cell_selector_spec.js b/web/regression/javascript/slickgrid/cell_selector_spec.js
index a1a93add..07484139 100644
--- a/web/regression/javascript/slickgrid/cell_selector_spec.js
+++ b/web/regression/javascript/slickgrid/cell_selector_spec.js
@@ -57,11 +57,11 @@ describe('CellSelector', function () {
$(container.find('.slick-row .slick-cell.l' + column)[row]).trigger('click');
var selectedRanges = cellSelectionModel.getSelectedRanges();
- expect(selectedRanges.length).toBe(1);
- expect(selectedRanges[0].fromCell).toBe(0);
- expect(selectedRanges[0].toCell).toBe(0);
- expect(selectedRanges[0].fromRow).toBe(1);
- expect(selectedRanges[0].toRow).toBe(1);
+ expect(selectedRanges.length).toEqual(1);
+ expect(selectedRanges[0].fromCell).toEqual(0);
+ expect(selectedRanges[0].toCell).toEqual(0);
+ expect(selectedRanges[0].fromRow).toEqual(1);
+ expect(selectedRanges[0].toRow).toEqual(1);
});
it('deselects previously selected ranges', function () {
@@ -74,7 +74,7 @@ describe('CellSelector', function () {
$(container.find('.slick-row .slick-cell.l' + column)[row]).trigger('click');
expect(RangeSelectionHelper.isRangeSelected(cellSelectionModel.getSelectedRanges(), row2Range))
- .toBe(false);
+ .toEqual(false);
});
});
});
diff --git a/web/regression/javascript/slickgrid/event_handlers/handle_query_output_keyboard_event_spec.js b/web/regression/javascript/slickgrid/event_handlers/handle_query_output_keyboard_event_spec.js
index 7e581bf9..407d5efe 100644
--- a/web/regression/javascript/slickgrid/event_handlers/handle_query_output_keyboard_event_spec.js
+++ b/web/regression/javascript/slickgrid/event_handlers/handle_query_output_keyboard_event_spec.js
@@ -95,7 +95,7 @@ describe('#handleQueryOutputKeyboardEvent', function () {
handleQueryOutputKeyboardEvent(event, slickEvent);
expect(RangeSelectionHelper.isEntireGridSelected(grid)).toBeTruthy();
- expect(grid.getSelectionModel().getSelectedRanges().length).toBe(1);
+ expect(grid.getSelectionModel().getSelectedRanges().length).toEqual(1);
});
});
@@ -109,7 +109,7 @@ describe('#handleQueryOutputKeyboardEvent', function () {
handleQueryOutputKeyboardEvent(event, slickEvent);
expect(RangeSelectionHelper.isEntireGridSelected(grid)).toBeTruthy();
- expect(grid.getSelectionModel().getSelectedRanges().length).toBe(1);
+ expect(grid.getSelectionModel().getSelectedRanges().length).toEqual(1);
});
});
});
@@ -125,7 +125,7 @@ describe('#handleQueryOutputKeyboardEvent', function () {
handleQueryOutputKeyboardEvent(event, slickEvent);
expect(RangeSelectionHelper.isEntireGridSelected(grid)).toBeTruthy();
- expect(grid.getSelectionModel().getSelectedRanges().length).toBe(1);
+ expect(grid.getSelectionModel().getSelectedRanges().length).toEqual(1);
});
});
@@ -139,7 +139,7 @@ describe('#handleQueryOutputKeyboardEvent', function () {
handleQueryOutputKeyboardEvent(event, slickEvent);
expect(RangeSelectionHelper.isEntireGridSelected(grid)).toBeTruthy();
- expect(grid.getSelectionModel().getSelectedRanges().length).toBe(1);
+ expect(grid.getSelectionModel().getSelectedRanges().length).toEqual(1);
});
});
});
diff --git a/web/regression/javascript/sqleditor/calculate_query_run_time_spec.js b/web/regression/javascript/sqleditor/calculate_query_run_time_spec.js
index 5d41813f..ce74b829 100644
--- a/web/regression/javascript/sqleditor/calculate_query_run_time_spec.js
+++ b/web/regression/javascript/sqleditor/calculate_query_run_time_spec.js
@@ -30,7 +30,7 @@ describe('#calculateQueryRunTime', () => {
seconds:21,
milliseconds:70}).toDate();
expect(calculateQueryRunTime(startDate, endDate))
- .toEqual('947 msec');
+ .toEqual('947 msec');
});
});
@@ -53,7 +53,7 @@ describe('#calculateQueryRunTime', () => {
seconds:15,
milliseconds:70}).toDate();
expect(calculateQueryRunTime(startDate, endDate))
- .toEqual('54 secs 947 msec');
+ .toEqual('54 secs 947 msec');
});
});
@@ -76,7 +76,7 @@ describe('#calculateQueryRunTime', () => {
seconds:15,
milliseconds:70}).toDate();
expect(calculateQueryRunTime(startDate, endDate))
- .toEqual('9 min 54 secs');
+ .toEqual('9 min 54 secs');
});
});
@@ -99,7 +99,7 @@ describe('#calculateQueryRunTime', () => {
seconds:15,
milliseconds:70}).toDate();
expect(calculateQueryRunTime(startDate, endDate))
- .toEqual('1 hr 9 min');
+ .toEqual('1 hr 9 min');
});
});
});
diff --git a/web/regression/javascript/sqleditor/execute_query_spec.js b/web/regression/javascript/sqleditor/execute_query_spec.js
index fb7ad9ae..809b938b 100644
--- a/web/regression/javascript/sqleditor/execute_query_spec.js
+++ b/web/regression/javascript/sqleditor/execute_query_spec.js
@@ -1054,7 +1054,7 @@ describe('ExecuteQuery', () => {
executeQuery.execute('', {});
setTimeout(() => {
- expect(wasNetworkCalled).toBe(false);
+ expect(wasNetworkCalled).toEqual(false);
done();
}, 0);
});
@@ -1129,7 +1129,7 @@ describe('ExecuteQuery', () => {
});
it('reset the number of rows that were affected', () => {
- expect(sqlEditorMock.rows_affected).toBe(0);
+ expect(sqlEditorMock.rows_affected).toEqual(0);
});
it('reset query start time', () => {
@@ -1157,21 +1157,21 @@ describe('ExecuteQuery', () => {
it('should update the can edit flag', (done) => {
setTimeout(() => {
- expect(sqlEditorMock.can_edit).toBe(false);
+ expect(sqlEditorMock.can_edit).toEqual(false);
done();
}, 0);
});
it('should update the can filter flag', (done) => {
setTimeout(() => {
- expect(sqlEditorMock.can_filter).toBe(false);
+ expect(sqlEditorMock.can_filter).toEqual(false);
done();
}, 0);
});
it('should update information notifier timeout', (done) => {
setTimeout(() => {
- expect(sqlEditorMock.info_notifier_timeout).toBe(5);
+ expect(sqlEditorMock.info_notifier_timeout).toEqual(5);
done();
}, 0);
});
diff --git a/web/regression/javascript/sqleditor/keyboard_shortcuts_spec.js b/web/regression/javascript/sqleditor/keyboard_shortcuts_spec.js
index d7e18567..d0973a78 100644
--- a/web/regression/javascript/sqleditor/keyboard_shortcuts_spec.js
+++ b/web/regression/javascript/sqleditor/keyboard_shortcuts_spec.js
@@ -7,7 +7,7 @@
//
//////////////////////////////////////////////////////////////////////////
-import keyboardShortcuts from 'sources/keyboard_shortcuts';
+import * as keyboardShortcuts from 'sources/keyboard_shortcuts';
import {queryToolActions} from 'sources/sqleditor/query_tool_actions';
import gettext from 'sources/gettext';
@@ -512,30 +512,30 @@ describe('the keyboard shortcuts', () => {
};
it('shortcut_key',()=>{
- expect(keyboardShortcuts.shortcut_key(shortcut)).toBe('A');
+ expect(keyboardShortcuts.shortcut_key(shortcut)).toEqual('A');
});
it('shortcut_accesskey_title',()=>{
expect(keyboardShortcuts.shortcut_accesskey_title(
- 'Title', shortcut)).toBe(gettext('Title (accesskey + A)'));
+ 'Title', shortcut)).toEqual(gettext('Title (accesskey + A)'));
});
it('shortcut_title',()=>{
shortcut.alt = true, shortcut.shift = false, shortcut.control = false;
expect(keyboardShortcuts.shortcut_title(
- 'Title', shortcut)).toBe(gettext('Title (Alt+A)'));
+ 'Title', shortcut)).toEqual(gettext('Title (Alt+A)'));
shortcut.alt = false, shortcut.shift = true, shortcut.control = false;
expect(keyboardShortcuts.shortcut_title(
- 'Title', shortcut)).toBe(gettext('Title (Shift+A)'));
+ 'Title', shortcut)).toEqual(gettext('Title (Shift+A)'));
shortcut.alt = false, shortcut.shift = false, shortcut.control = true;
expect(keyboardShortcuts.shortcut_title(
- 'Title', shortcut)).toBe(gettext('Title (Ctrl+A)'));
+ 'Title', shortcut)).toEqual(gettext('Title (Ctrl+A)'));
shortcut.alt = true, shortcut.shift = true, shortcut.control = true;
expect(keyboardShortcuts.shortcut_title(
- 'Title', shortcut)).toBe(gettext('Title (Alt+Shift+Ctrl+A)'));
+ 'Title', shortcut)).toEqual(gettext('Title (Alt+Shift+Ctrl+A)'));
});
});
@@ -617,7 +617,7 @@ describe('the keyboard shortcuts', () => {
describe('stops all event propogation', () => {
it('should cancel the bubble', () => {
- expect(event.cancelBubble).toBe(true);
+ expect(event.cancelBubble).toEqual(true);
});
it('should prevent the default behavior', () => {
diff --git a/web/regression/javascript/sqleditor/query_tool_actions_spec.js b/web/regression/javascript/sqleditor/query_tool_actions_spec.js
index 9c187433..b2b4e871 100644
--- a/web/regression/javascript/sqleditor/query_tool_actions_spec.js
+++ b/web/regression/javascript/sqleditor/query_tool_actions_spec.js
@@ -474,13 +474,13 @@ describe('queryToolActions', () => {
it('toggle the selection and string should be in upper case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).toHaveBeenCalledWith('STRING');
+ ).toHaveBeenCalledWith('STRING');
});
it('(negative scenario toggle the selection and string should be in upper case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).not.toHaveBeenCalledWith('string');
+ ).not.toHaveBeenCalledWith('string');
});
});
@@ -492,13 +492,13 @@ describe('queryToolActions', () => {
it('toggle the selection and string should be in lower case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).toHaveBeenCalledWith('string');
+ ).toHaveBeenCalledWith('string');
});
it('(negative scenario toggle the selection and string should be in lower case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).not.toHaveBeenCalledWith('STRING');
+ ).not.toHaveBeenCalledWith('STRING');
});
});
@@ -510,13 +510,13 @@ describe('queryToolActions', () => {
it('toggle the selection and string should be in upper case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).toHaveBeenCalledWith('STRING');
+ ).toHaveBeenCalledWith('STRING');
});
it('(negative scenario toggle the selection and string should be in upper case', () => {
queryToolActions.toggleCaseOfSelectedText(sqlEditorController);
expect(replaceSelectionSpy
- ).not.toHaveBeenCalledWith('sTRIng');
+ ).not.toHaveBeenCalledWith('sTRIng');
});
});
});
diff --git a/web/regression/javascript/sqleditor/query_tool_http_error_handler_spec.js b/web/regression/javascript/sqleditor/query_tool_http_error_handler_spec.js
index e244ccf6..a2c49770 100644
--- a/web/regression/javascript/sqleditor/query_tool_http_error_handler_spec.js
+++ b/web/regression/javascript/sqleditor/query_tool_http_error_handler_spec.js
@@ -17,7 +17,7 @@ describe('#httpResponseRequiresNewTransaction', () => {
it('should return false', () => {
expect(httpResponseRequiresNewTransaction({
status: 300,
- })).toBe(false);
+ })).toEqual(false);
});
});
@@ -48,7 +48,7 @@ describe('#httpResponseRequiresNewTransaction', () => {
data: {
info: 'some information',
},
- })).toBe(false);
+ })).toEqual(false);
});
});
@@ -59,7 +59,7 @@ describe('#httpResponseRequiresNewTransaction', () => {
data: {
info: 'DATAGRID_TRANSACTION_REQUIRED',
},
- })).toBe(true);
+ })).toEqual(true);
});
});
});
@@ -79,8 +79,8 @@ describe('#handleQueryToolAjaxError', () => {
stateParameters = [];
checkTransaction = false;
sqlEditorHandler = jasmine.createSpyObj(
- 'handler', ['initTransaction', 'saveState', 'handle_connection_lost']
- );
+ 'handler', ['initTransaction', 'saveState', 'handle_connection_lost']
+ );
exceptionSpy = {
readyState: 0,
status: 404,
@@ -102,7 +102,7 @@ describe('#handleQueryToolAjaxError', () => {
pgBrowserMock, sqlEditorHandler, exceptionSpy, stateToSave,
stateParameters, checkTransaction
)
- ).toBe('Not connected to the server or the connection to the server has been closed.');
+ ).toEqual('Not connected to the server or the connection to the server has been closed.');
});
});
@@ -184,7 +184,7 @@ describe('#handleQueryToolAjaxError', () => {
pgBrowserMock, sqlEditorHandler, exceptionSpy, stateToSave,
stateParameters, checkTransaction
)
- ).toBe('ajax failed with unknown reason');
+ ).toEqual('ajax failed with unknown reason');
});
});
diff --git a/web/regression/javascript/sqleditor_utils_spec.js b/web/regression/javascript/sqleditor_utils_spec.js
index 76bf41e7..789f370c 100644
--- a/web/regression/javascript/sqleditor_utils_spec.js
+++ b/web/regression/javascript/sqleditor_utils_spec.js
@@ -8,89 +8,89 @@
//////////////////////////////////////////////////////////////////////////
define(['sources/sqleditor_utils'],
-function (SqlEditorUtils) {
- describe('SqlEditorUtils', function () {
+ function (SqlEditorUtils) {
+ describe('SqlEditorUtils', function () {
- describe('Generate a random string of size 10', function () {
- it('returns string of length 10', function () {
- expect(SqlEditorUtils.epicRandomString(10).length).toEqual(10);
+ describe('Generate a random string of size 10', function () {
+ it('returns string of length 10', function () {
+ expect(SqlEditorUtils.epicRandomString(10).length).toEqual(10);
+ });
});
- });
- describe('Generate a unique hash for given string', function () {
- it('returns unique hash', function () {
- expect(SqlEditorUtils.getHash('select * from test')).toEqual(403379630);
+ describe('Generate a unique hash for given string', function () {
+ it('returns unique hash', function () {
+ expect(SqlEditorUtils.getHash('select * from test')).toEqual(403379630);
+ });
});
- });
- describe('Capitalize the first letter of given string', function () {
- it('returns string with First letter Capital', function () {
- expect(SqlEditorUtils.capitalizeFirstLetter('create script')).toEqual('Create script');
+ describe('Capitalize the first letter of given string', function () {
+ it('returns string with First letter Capital', function () {
+ expect(SqlEditorUtils.capitalizeFirstLetter('create script')).toEqual('Create script');
+ });
});
- });
- describe('Calculate font size of input number passed', function () {
- it('calcFontSize', function () {
- expect(SqlEditorUtils.calcFontSize(1.456)).toEqual('1.46em');
- expect(SqlEditorUtils.calcFontSize()).toEqual('1em');
- expect(SqlEditorUtils.calcFontSize(2)).toEqual('2em');
+ describe('Calculate font size of input number passed', function () {
+ it('calcFontSize', function () {
+ expect(SqlEditorUtils.calcFontSize(1.456)).toEqual('1.46em');
+ expect(SqlEditorUtils.calcFontSize()).toEqual('1em');
+ expect(SqlEditorUtils.calcFontSize(2)).toEqual('2em');
+ });
});
- });
- describe('Remove the slashes', function () {
- it('it will remove the slashes', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('/')
- ).toEqual({
- 'slashLocations': '0',
- 'title': '',
+ describe('Remove the slashes', function () {
+ it('it will remove the slashes', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('/')
+ ).toEqual({
+ 'slashLocations': '0',
+ 'title': '',
+ });
});
- });
- it('it will remove if slashes are present', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('my/test')
- ).toEqual({
- 'slashLocations': '2',
- 'title': 'mytest',
+ it('it will remove if slashes are present', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('my/test')
+ ).toEqual({
+ 'slashLocations': '2',
+ 'title': 'mytest',
+ });
});
- });
- it('it will remove all the slashes are present', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('my/test/value')
- ).toEqual({
- 'slashLocations': '2,7',
- 'title': 'mytestvalue',
+ it('it will remove all the slashes are present', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('my/test/value')
+ ).toEqual({
+ 'slashLocations': '2,7',
+ 'title': 'mytestvalue',
+ });
});
- });
- it('it will remove all the slashes are present', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('a/bb/ccc/dddd/eeeee')
- ).toEqual({
- 'slashLocations': '1,4,8,13',
- 'title': 'abbcccddddeeeee',
+ it('it will remove all the slashes are present', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('a/bb/ccc/dddd/eeeee')
+ ).toEqual({
+ 'slashLocations': '1,4,8,13',
+ 'title': 'abbcccddddeeeee',
+ });
});
- });
- it('it will not remove if slash is not present', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('mytest')
- ).toEqual({
- 'slashLocations': '',
- 'title': 'mytest',
+ it('it will not remove if slash is not present', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('mytest')
+ ).toEqual({
+ 'slashLocations': '',
+ 'title': 'mytest',
+ });
});
- });
- it('it will not remove if value is not present', function () {
- expect(
- SqlEditorUtils.removeSlashInTheString('')
- ).toEqual({
- 'slashLocations': '',
- 'title': '',
+ it('it will not remove if value is not present', function () {
+ expect(
+ SqlEditorUtils.removeSlashInTheString('')
+ ).toEqual({
+ 'slashLocations': '',
+ 'title': '',
+ });
});
});
});
});
-});
diff --git a/web/regression/javascript/table/enable_disable_triggers_spec.js b/web/regression/javascript/table/enable_disable_triggers_spec.js
index 9ef98ba3..45d685e4 100644
--- a/web/regression/javascript/table/enable_disable_triggers_spec.js
+++ b/web/regression/javascript/table/enable_disable_triggers_spec.js
@@ -51,7 +51,7 @@ describe('#enableTriggers', () => {
});
setTimeout(() => {
- expect(enableTriggers(tree, alertify, generateUrlSpy, {})).toBe(false);
+ expect(enableTriggers(tree, alertify, generateUrlSpy, {})).toEqual(false);
done();
}, 0);
});
@@ -66,7 +66,7 @@ describe('#enableTriggers', () => {
});
setTimeout(() => {
- expect(enableTriggers(tree, alertify, generateUrlSpy, {})).toBe(false);
+ expect(enableTriggers(tree, alertify, generateUrlSpy, {})).toEqual(false);
}, 0);
});
});
@@ -134,7 +134,7 @@ describe('#enableTriggers', () => {
enableTriggers(tree, alertify, generateUrlSpy, {item: [{id: 'table1'}]});
setTimeout(() => {
- expect(tree.findNodeByDomElement([{id: 'table1'}]).children.length).toBe(0);
+ expect(tree.findNodeByDomElement([{id: 'table1'}]).children.length).toEqual(0);
done();
}, 20);
});
@@ -178,7 +178,7 @@ describe('#disableTriggers', () => {
});
setTimeout(() => {
- expect(disableTriggers(tree, alertify, generateUrlSpy, {})).toBe(false);
+ expect(disableTriggers(tree, alertify, generateUrlSpy, {})).toEqual(false);
done();
}, 0);
});
@@ -193,7 +193,7 @@ describe('#disableTriggers', () => {
});
setTimeout(() => {
- expect(disableTriggers(tree, alertify, generateUrlSpy, {})).toBe(false);
+ expect(disableTriggers(tree, alertify, generateUrlSpy, {})).toEqual(false);
}, 0);
});
});
@@ -261,7 +261,7 @@ describe('#disableTriggers', () => {
disableTriggers(tree, alertify, generateUrlSpy, {item: [{id: 'table1'}]});
setTimeout(() => {
- expect(tree.findNodeByDomElement([{id: 'table1'}]).children.length).toBe(0);
+ expect(tree.findNodeByDomElement([{id: 'table1'}]).children.length).toEqual(0);
done();
}, 20);
});
diff --git a/web/regression/javascript/tree/pgadmin_tree_state_save_spec.js b/web/regression/javascript/tree/pgadmin_tree_state_save_spec.js
index 113f9cbd..9d6065a5 100644
--- a/web/regression/javascript/tree/pgadmin_tree_state_save_spec.js
+++ b/web/regression/javascript/tree/pgadmin_tree_state_save_spec.js
@@ -12,6 +12,7 @@ import {pgBrowser, browserTreeState} from '../../../pgadmin/static/js/tree/pgadm
describe('#browserTreeState', () => {
beforeEach(() => {
+
pgBrowser.Nodes = {
server_group: {
_type: 'server_group',
@@ -192,10 +193,9 @@ describe('#browserTreeState', () => {
expect(browserTreeState.current_state, {1: {'paths': ['server_group/1,server/1,coll_database/1','database/10']}});
});
});
- });
- describe('When node is closed, node should get removed from the tree state cache', () => {
+
describe('When coll_database node is closed, both database and coll_database should be removed', () => {
let item = {
_type: 'coll_database',
@@ -212,6 +212,7 @@ describe('#browserTreeState', () => {
});
it('The tree current state will remove coll_database and database', () => {
+ browserTreeState.update_cache(item);
browserTreeState.remove_from_cache(item);
expect(browserTreeState.current_state, {1: {'paths': ['server_group/1,server/1']}});
});
diff --git a/web/regression/javascript/tree/tree_spec.js b/web/regression/javascript/tree/tree_spec.js
index 531525a6..06a78d0c 100644
--- a/web/regression/javascript/tree/tree_spec.js
+++ b/web/regression/javascript/tree/tree_spec.js
@@ -32,7 +32,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
it('return false for #hasParent()', () => {
const node = tree.findNode(['some new node']);
- expect(node.hasParent()).toBe(false);
+ expect(node.hasParent()).toEqual(false);
});
it('return null for #parent()', () => {
@@ -53,7 +53,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
it('return false for #hasParent()', () => {
const node = tree.findNode(['some new node']);
- expect(node.hasParent()).toBe(false);
+ expect(node.hasParent()).toEqual(false);
});
it('return null for #parent()', () => {
@@ -74,7 +74,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
it('return false for #hasParent()', () => {
const node = tree.findNode(['some new node']);
- expect(node.hasParent()).toBe(false);
+ expect(node.hasParent()).toEqual(false);
});
it('return null for #parent()', () => {
@@ -99,7 +99,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
it('return true for #hasParent()', () => {
const node = tree.findNode(['parent node', 'some new node']);
- expect(node.hasParent()).toBe(true);
+ expect(node.hasParent()).toEqual(true);
});
it('return "parent node" object for #parent()', () => {
@@ -119,7 +119,7 @@ const treeTests = (treeClass, setDefaultCallBack) => {
tree.addNewNode('some new node', {data: 'interesting 1'}, undefined, ['parent' +
' node']);
const parentNode = tree.findNode(['parent node']);
- expect(parentNode.children.length).toBe(1);
+ expect(parentNode.children.length).toEqual(1);
});
it('updates the existing node data', () => {
@@ -217,20 +217,20 @@ describe('tree tests', () => {
context('parent is null', () => {
it('returns false', () => {
let treeNode = new TreeNode('123', {}, [], null);
- expect(treeNode.hasParent()).toBe(false);
+ expect(treeNode.hasParent()).toEqual(false);
});
});
context('parent is undefined', () => {
it('returns false', () => {
let treeNode = new TreeNode('123', {}, [], undefined);
- expect(treeNode.hasParent()).toBe(false);
+ expect(treeNode.hasParent()).toEqual(false);
});
});
context('parent exists', () => {
it('returns true', () => {
let parentNode = new TreeNode('456', {}, []);
let treeNode = new TreeNode('123', {}, [], parentNode);
- expect(treeNode.hasParent()).toBe(true);
+ expect(treeNode.hasParent()).toEqual(true);
});
});
});
@@ -337,13 +337,13 @@ describe('tree tests', () => {
context('node is at the first level', () => {
it('returns false', () => {
- expect(tree.hasParent([{id: 'level1'}])).toBe(false);
+ expect(tree.hasParent([{id: 'level1'}])).toEqual(false);
});
});
context('node is at the second level', () => {
it('returns true', () => {
- expect(tree.hasParent([{id: 'level2'}])).toBe(true);
+ expect(tree.hasParent([{id: 'level2'}])).toEqual(true);
});
});
});
diff --git a/web/webpack.config.js b/web/webpack.config.js
index d188528c..33227558 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -18,37 +18,15 @@ const sourceDir = __dirname + '/pgadmin/static';
const webpackShimConfig = require('./webpack.shim');
const PRODUCTION = process.env.NODE_ENV === 'production';
const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const ExtractTextPlugin = require('extract-text-webpack-plugin');
-const extractStyle = new ExtractTextPlugin({
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+const extractStyle = new MiniCssExtractPlugin({
filename: '[name].css',
allChunks: true,
});
const envType = PRODUCTION ? 'production': 'development';
const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
-// Extract vendor related libraries(node_modules/lib/lib.js) from bundles
-// specified in `chunks` into vendor.js bundle
-const vendorChunks = new webpack.optimize.CommonsChunkPlugin({
- name: 'vendor',
- chunks: ['app.bundle', 'sqleditor', 'codemirror', 'debugger_direct'],
- filename: 'vendor.js',
- minChunks: function(module) {
- return webpackShimConfig.isExternal(module);
- },
-});
-
-// Extract pgAdmin common libraries(pgadmin/web/module/filename.js) from bundles
-// specified in `chunks` into pgadmin_commons.js bundle.
-// pgLibs holds files that will be moved into this bundle.
-const pgAdminCommonChunks = new webpack.optimize.CommonsChunkPlugin({
- name: 'pgadmin_commons',
- chunks: ['app.bundle', 'sqleditor', 'codemirror', 'debugger_direct'],
- filename: 'pgadmin_commons.js',
- minChunks: function(module) {
- return webpackShimConfig.isPgAdminLib(module);
- },
-});
-
// Expose libraries in app context so they need not to
// require('libname') when used in a module
const providePlugin = new webpack.ProvidePlugin({
@@ -64,17 +42,6 @@ const providePlugin = new webpack.ProvidePlugin({
'window.moment':'moment',
});
-// Minify and omptimize JS/CSS to reduce bundle size. It is used in production
-const uglifyPlugin = new webpack.optimize.UglifyJsPlugin({
- output: {comments: false},
- compress: {
- warnings: false,
- unused: true,
- dead_code: true,
- drop_console: true,
- },
-});
-
// Optimize CSS Assets by removing comments while bundling
const optimizeAssetsPlugin = new OptimizeCssAssetsPlugin({
assetNameRegExp: /\.css$/g,
@@ -83,15 +50,6 @@ const optimizeAssetsPlugin = new OptimizeCssAssetsPlugin({
canPrint: true,
});
-// Helps in minimising the `React' production bundle. Bundle only code
-// requires in production mode. React keeps the code conditional
-// based on 'NODE_ENV' variable. [used only in production]
-const definePlugin = new webpack.DefinePlugin({
- 'process.env': {
- 'NODE_ENV': JSON.stringify('production'),
- },
-});
-
// Manages the cache and stores it into 'sources/generated/.cache/
/' path
// where env = dev || prod
const hardSourceWebpackPlugin = new HardSourceWebpackPlugin({
@@ -164,6 +122,8 @@ for(let i=0; i