Skip to content

Commit

Permalink
Extract Functions.ajaxShowMessage() into ajax-messages.js
Browse files Browse the repository at this point in the history 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
@MauricioFauth
MauricioFauth committed Dec 6, 2022
1 parent 3816e1b commit 3bc3c7d
Show file tree
Hide file tree
Showing 43 changed files with 632 additions and 595 deletions.
16 changes: 8 additions & 8 deletions js/src/database/central_columns.js
View file
@@ -1,7 +1,7 @@
import $ from 'jquery';
import { AJAX } from '../modules/ajax.js';
import { Functions } from '../modules/functions.js';
import { CommonParams } from '../modules/common.js';
import { ajaxShowMessage } from '../modules/ajax-message.js';

/**
* @fileoverview events handling from central columns page
Expand Down Expand Up @@ -54,23 +54,23 @@ AJAX.registerOnload('database/central_columns.js', function () {
event.preventDefault();
var multiDeleteColumns = $('.checkall:checkbox:checked').serialize();
if (multiDeleteColumns === '') {
Functions.ajaxShowMessage(window.Messages.strRadioUnchecked);
ajaxShowMessage(window.Messages.strRadioUnchecked);
return false;
}
Functions.ajaxShowMessage();
ajaxShowMessage();
$('#del_col_name').val(multiDeleteColumns);
$('#del_form').trigger('submit');
});
$('#tableslistcontainer').find('button[name="edit_central_columns"]').on('click', function (event) {
event.preventDefault();
var editColumnList = $('.checkall:checkbox:checked').serialize();
if (editColumnList === '') {
Functions.ajaxShowMessage(window.Messages.strRadioUnchecked);
ajaxShowMessage(window.Messages.strRadioUnchecked);
return false;
}
var argsep = CommonParams.get('arg_separator');
var editColumnData = editColumnList + '' + argsep + 'edit_central_columns_page=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')) + argsep + 'server=' + CommonParams.get('server');
Functions.ajaxShowMessage();
ajaxShowMessage();
AJAX.source = $(this);
$.post('index.php?route=/database/central-columns', editColumnData, AJAX.responseHandler);
});
Expand All @@ -79,7 +79,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
event.stopPropagation();
var argsep = CommonParams.get('arg_separator');
var multiColumnEditData = $('#multi_edit_central_columns').serialize() + argsep + 'multi_edit_central_column_save=true' + argsep + 'ajax_request=true' + argsep + 'ajax_page_request=true' + argsep + 'db=' + encodeURIComponent(CommonParams.get('db')) + argsep + 'server=' + CommonParams.get('server');
Functions.ajaxShowMessage();
ajaxShowMessage();
AJAX.source = $(this);
$.post('index.php?route=/database/central-columns', multiColumnEditData, AJAX.responseHandler);
});
Expand Down Expand Up @@ -162,7 +162,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
dataType: 'json',
success: function (data) {
if (data.message !== '1') {
Functions.ajaxShowMessage(
ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
data.message +
'</div>',
Expand All @@ -186,7 +186,7 @@ AJAX.registerOnload('database/central_columns.js', function () {
$('#tableslistcontainer').find('.checkall').show();
},
error: function () {
Functions.ajaxShowMessage(
ajaxShowMessage(
'<div class="alert alert-danger" role="alert">' +
window.Messages.strErrorProcessingRequest +
'</div>',
Expand Down
33 changes: 17 additions & 16 deletions js/src/database/events.js
View file
Expand Up @@ -2,6 +2,7 @@ import $ from 'jquery';
import { AJAX } from '../modules/ajax.js';
import { Functions } from '../modules/functions.js';
import { Navigation } from '../modules/navigation.js';
import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.js';

AJAX.registerTeardown('database/events.js', function () {
$(document).off('click', 'a.ajax.add_anchor, a.ajax.edit_anchor');
Expand Down Expand Up @@ -57,7 +58,7 @@ const DatabaseEvents = {
},

exportDialog: function ($this) {
var $msg = Functions.ajaxShowMessage();
var $msg = ajaxShowMessage();
if ($this.attr('id') === 'bulkActionExportButton') {
var combined = {
success: true,
Expand Down Expand Up @@ -94,11 +95,11 @@ const DatabaseEvents = {
} else {
$.get($this.attr('href'), { 'ajax_request': true }, showExport);
}
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);

function showExport (data) {
if (data.success === true) {
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);
/**
* @var buttonOptions Object containing options
* for jQueryUI dialog buttons
Expand Down Expand Up @@ -132,7 +133,7 @@ const DatabaseEvents = {
var $elm = $ajaxDialog.find('textarea');
Functions.getSqlEditor($elm);
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
} // end showExport()
}, // end exportDialog()
Expand All @@ -154,11 +155,11 @@ const DatabaseEvents = {
* @var $msg jQuery object containing the reference to
* the AJAX message shown to the user
*/
var $msg = Functions.ajaxShowMessage();
var $msg = ajaxShowMessage();
$.get($this.attr('href'), { 'ajax_request': true }, function (data) {
if (data.success === true) {
// We have successfully fetched the editor form
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);
/**
* @var buttonOptions Object containing options
* for jQueryUI dialog buttons
Expand Down Expand Up @@ -187,14 +188,14 @@ const DatabaseEvents = {
* @var data Form data to be sent in the AJAX request
*/
var data = $('form.rte_form').last().serialize();
$msg = Functions.ajaxShowMessage(
$msg = ajaxShowMessage(
window.Messages.strProcessingRequest
);
var url = $('form.rte_form').last().attr('action');
$.post(url, data, function (data) {
if (data.success === true) {
// Item created successfully
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);
Functions.slidingMessage(data.message);
that.$ajaxDialog.dialog('close');
// If we are in 'edit' mode, we must
Expand Down Expand Up @@ -285,7 +286,7 @@ const DatabaseEvents = {
}
Navigation.reload();
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.post()
} // end "if (that.validate())"
Expand Down Expand Up @@ -343,7 +344,7 @@ const DatabaseEvents = {
linterOptions.eventEditor = true;
that.syntaxHiglighter = Functions.getSqlEditor($elm, {}, 'both', linterOptions);
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.get()
},
Expand All @@ -365,7 +366,7 @@ const DatabaseEvents = {
* @var msg jQuery object containing the reference to
* the AJAX message shown to the user
*/
var $msg = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
var $msg = ajaxShowMessage(window.Messages.strProcessingRequest);
var params = Functions.getJsConfirmCommonParam(this, $this.getPostData());
$.post(url, params, function (data) {
if (data.success === true) {
Expand Down Expand Up @@ -409,12 +410,12 @@ const DatabaseEvents = {
});
}
// Get rid of the "Loading" message
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);
// Show the query that we just executed
Functions.slidingMessage(data.sql_query);
Navigation.reload();
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.post()
});
Expand All @@ -427,7 +428,7 @@ const DatabaseEvents = {
* @var msg jQuery object containing the reference to
* the AJAX message shown to the user
*/
var $msg = Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
var $msg = ajaxShowMessage(window.Messages.strProcessingRequest);

// drop anchors of all selected rows
var dropAnchors = $('input.checkall:checked').parents('tr').find('.drop_anchor');
Expand Down Expand Up @@ -486,13 +487,13 @@ const DatabaseEvents = {
if (returnCount === count) {
if (success) {
// Get rid of the "Loading" message
Functions.ajaxRemoveMessage($msg);
ajaxRemoveMessage($msg);
$('#rteListForm_checkall').prop({ checked: false, indeterminate: false });
}
Navigation.reload();
}
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
success = false;
if (returnCount === count) {
Navigation.reload();
Expand Down
5 changes: 3 additions & 2 deletions js/src/database/multi_table_query.js
View file
Expand Up @@ -2,6 +2,7 @@ import $ from 'jquery';
import { AJAX } from '../modules/ajax.js';
import { Functions } from '../modules/functions.js';
import { CommonParams } from '../modules/common.js';
import { ajaxShowMessage } from '../modules/ajax-message.js';

/**
* @fileoverview function used in QBE for DB
Expand Down Expand Up @@ -61,7 +62,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
}
});
if (Object.keys(tableAliases).length === 0) {
Functions.ajaxShowMessage('Nothing selected', false, 'error');
ajaxShowMessage('Nothing selected', false, 'error');
return;
}

Expand Down Expand Up @@ -120,7 +121,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () {
var query = editor.getDoc().getValue();
// Verifying that the query is not empty
if (query === '') {
Functions.ajaxShowMessage(window.Messages.strEmptyQuery, false, 'error');
ajaxShowMessage(window.Messages.strEmptyQuery, false, 'error');
return;
}
var data = {
Expand Down
33 changes: 17 additions & 16 deletions js/src/database/operations.js
View file
Expand Up @@ -3,6 +3,7 @@ import { AJAX } from '../modules/ajax.js';
import { Functions } from '../modules/functions.js';
import { Navigation } from '../modules/navigation.js';
import { CommonActions, CommonParams } from '../modules/common.js';
import { ajaxShowMessage } from '../modules/ajax-message.js';

/**
* @fileoverview function used in server privilege pages
Expand Down Expand Up @@ -39,15 +40,15 @@ AJAX.registerOnload('database/operations.js', function () {
event.preventDefault();

if (Functions.emptyCheckTheField(this, 'newname')) {
Functions.ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
return false;
}

var oldDbName = CommonParams.get('db');
var newDbName = $('#new_db_name').val();

if (newDbName === oldDbName) {
Functions.ajaxShowMessage(window.Messages.strDatabaseRenameToSameName, false, 'error');
ajaxShowMessage(window.Messages.strDatabaseRenameToSameName, false, 'error');
return false;
}

Expand All @@ -58,10 +59,10 @@ AJAX.registerOnload('database/operations.js', function () {
Functions.prepareForAjaxRequest($form);

$form.confirm(question, $form.attr('action'), function (url) {
Functions.ajaxShowMessage(window.Messages.strRenamingDatabases, false);
ajaxShowMessage(window.Messages.strRenamingDatabases, false);
$.post(url, $('#rename_db_form').serialize() + CommonParams.get('arg_separator') + 'is_js_confirmed=1', function (data) {
if (typeof data !== 'undefined' && data.success === true) {
Functions.ajaxShowMessage(data.message);
ajaxShowMessage(data.message);
CommonParams.set('db', data.newname);

Navigation.reload(function () {
Expand All @@ -77,7 +78,7 @@ AJAX.registerOnload('database/operations.js', function () {
});
});
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.post()
});
Expand All @@ -90,11 +91,11 @@ AJAX.registerOnload('database/operations.js', function () {
event.preventDefault();

if (Functions.emptyCheckTheField(this, 'newname')) {
Functions.ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
ajaxShowMessage(window.Messages.strFormEmpty, false, 'error');
return false;
}

Functions.ajaxShowMessage(window.Messages.strCopyingDatabase, false);
ajaxShowMessage(window.Messages.strCopyingDatabase, false);
var $form = $(this);
Functions.prepareForAjaxRequest($form);
$.post($form.attr('action'), $form.serialize(), function (data) {
Expand All @@ -104,15 +105,15 @@ AJAX.registerOnload('database/operations.js', function () {
if ($('#checkbox_switch').is(':checked')) {
CommonParams.set('db', data.newname);
CommonActions.refreshMain(false, function () {
Functions.ajaxShowMessage(data.message);
ajaxShowMessage(data.message);
});
} else {
CommonParams.set('db', data.db);
Functions.ajaxShowMessage(data.message);
ajaxShowMessage(data.message);
}
Navigation.reload();
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.post()
}); // end copy database
Expand All @@ -132,12 +133,12 @@ AJAX.registerOnload('database/operations.js', function () {
event.preventDefault();
var $form = $(this);
Functions.prepareForAjaxRequest($form);
Functions.ajaxShowMessage(window.Messages.strChangingCharset);
ajaxShowMessage(window.Messages.strChangingCharset);
$.post($form.attr('action'), $form.serialize(), function (data) {
if (typeof data !== 'undefined' && data.success === true) {
Functions.ajaxShowMessage(data.message);
ajaxShowMessage(data.message);
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
}); // end $.post()
}); // end change charset
Expand All @@ -159,7 +160,7 @@ AJAX.registerOnload('database/operations.js', function () {
var params = Functions.getJsConfirmCommonParam(this, $link.getPostData());

$(this).confirm(question, $(this).attr('href'), function (url) {
Functions.ajaxShowMessage(window.Messages.strProcessingRequest);
ajaxShowMessage(window.Messages.strProcessingRequest);
$.post(url, params, function (data) {
if (typeof data !== 'undefined' && data.success) {
// Database deleted successfully, refresh both the frames
Expand All @@ -168,11 +169,11 @@ AJAX.registerOnload('database/operations.js', function () {
CommonActions.refreshMain(
'index.php?route=/server/databases',
function () {
Functions.ajaxShowMessage(data.message);
ajaxShowMessage(data.message);
}
);
} else {
Functions.ajaxShowMessage(data.error, false);
ajaxShowMessage(data.error, false);
}
});
});
Expand Down

0 comments on commit 3bc3c7d

Please sign in to comment.