Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@felipebiox
felipebiox committed Oct 28, 2020
2 parents feb6bf8 + d0e9d7d commit 972ea53
Show file tree
Hide file tree
Showing 28 changed files with 30,579 additions and 174 deletions.
4 changes: 2 additions & 2 deletions OmniDB/OmniDB/custom_settings.py
View file
@@ -1,8 +1,8 @@
import os

# OmniDB settings
OMNIDB_VERSION = 'OmniDB 3.0.1b'
OMNIDB_SHORT_VERSION = '3.0.1b'
OMNIDB_VERSION = 'OmniDB 3.0.2b'
OMNIDB_SHORT_VERSION = '3.0.2b'
DEV_MODE = True
DESKTOP_MODE = False
APP_TOKEN = None
Expand Down
2 changes: 1 addition & 1 deletion OmniDB/OmniDB_app/static/OmniDB_app/css/omnidb.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion OmniDB/OmniDB_app/static/OmniDB_app/css/omnidb.min.css.map
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions OmniDB/OmniDB_app/static/OmniDB_app/images/omnidb_loading--dark.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions OmniDB/OmniDB_app/static/OmniDB_app/js/shortcuts.js
View file
Expand Up @@ -210,6 +210,52 @@ var v_default_shortcuts = {
'meta_pressed': false,
'shortcut_key': 'A',
}
},
'shortcut_explain': {
'windows': {
'ctrl_pressed': false,
'shift_pressed': false,
'alt_pressed': true,
'meta_pressed': false,
'shortcut_key': 'W',
},
'linux': {
'ctrl_pressed': false,
'shift_pressed': false,
'alt_pressed': true,
'meta_pressed': false,
'shortcut_key': 'W',
},
'macos': {
'ctrl_pressed': true,
'shift_pressed': false,
'alt_pressed': false,
'meta_pressed': false,
'shortcut_key': 'W',
}
},
'shortcut_explain_analyze': {
'windows': {
'ctrl_pressed': false,
'shift_pressed': false,
'alt_pressed': true,
'meta_pressed': false,
'shortcut_key': 'E',
},
'linux': {
'ctrl_pressed': false,
'shift_pressed': false,
'alt_pressed': true,
'meta_pressed': false,
'shortcut_key': 'E',
},
'macos': {
'ctrl_pressed': true,
'shift_pressed': false,
'alt_pressed': false,
'meta_pressed': false,
'shortcut_key': 'E',
}
}
}

Expand Down Expand Up @@ -237,6 +283,20 @@ $(function () {
else if (v_connTabControl.selectedTab.tag.mode=='outer_terminal')
terminalRun();
},
shortcut_explain: function() {

if (v_connTabControl.selectedTab.tag.mode=='connection') {
if (v_connTabControl.selectedTab.tag.tabControl.selectedTab.tag.mode=='query')
getExplain(0);
}
},
shortcut_explain_analyze: function() {

if (v_connTabControl.selectedTab.tag.mode=='connection') {
if (v_connTabControl.selectedTab.tag.tabControl.selectedTab.tag.mode=='query')
getExplain(1);
}
},
shortcut_cancel_query: function() {

if (v_connTabControl.selectedTab.tag.mode=='connection') {
Expand Down
70 changes: 43 additions & 27 deletions OmniDB/OmniDB_app/static/OmniDB_app/js/tab_functions/inner_query_tab.js
View file
Expand Up @@ -102,33 +102,41 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {

// Creating the template for the inner_query_tab.
var v_html =
"<div id='txt_query_" + v_tab.id + "' style=' width: 100%; height: 200px;'></div>" +
"<div class='omnidb__resize-line__container' onmousedown='resizeVertical(event)' style='width: 100%; height: 5px; cursor: ns-resize;'><div class='resize_line_horizontal' style='height: 0px; border-bottom: 1px dashed #acc4e8;'></div><div style='height:5px;'></div></div>" +
'<div id="txt_query_' + v_tab.id + '" style="width: 100%; height: 200px;"></div>' +
'<div class="omnidb__resize-line__container" onmousedown="resizeVertical(event)" style="width: 100%; height: 5px; cursor: ns-resize;"><div class="resize_line_horizontal" style="height: 0px; border-bottom: 1px dashed #acc4e8;"></div><div style="height:5px;"></div></div>' +
command_history_modal +
"<div class='row mb-1'>" +
"<div class='tab_actions omnidb__tab-actions col-12'>" +
"<button id='bt_start_" + v_tab.id + "' class='btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn' title='Run' onclick='querySQL(0);'><i class='fas fa-play fa-light'></i></button>" +
"<button id='bt_indent_" + v_tab.id + "' class='btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' title='Indent SQL' onclick='indentSQL();'><i class='fas fa-indent fa-light'></i></button>" +
"<button id='bt_history_" + v_tab.id + "' class='btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' title='Command History' onclick='showCommandList();'><i class='fas fa-list fa-light'></i></button>" +
"<button id='bt_explain_" + v_tab.id + "' class='dbms_object postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' onclick='getExplain(0)' title='Explain' style='display: none;'><i class='fas fa-search fa-light'></i></button>" +
"<button id='bt_analyze_" + v_tab.id + "' class='dbms_object postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' onclick='getExplain(1)' title='Explain Analyze' style='display: none;'><i class='fas fa-search-plus fa-light'></i></button>" +
"<div class='dbms_object postgresql_object omnidb__form-check form-check form-check-inline'><input id='check_autocommit_" + v_tab.id + "' class='form-check-input' type='checkbox' checked='checked'><label class='form-check-label dbms_object postgresql_object custom_checkbox query_info' for='check_autocommit_" + v_tab.id + "'>Autocommit</label></div>" +
"<div class='dbms_object postgresql_object omnidb__tab-status'><i id='query_tab_status_" + v_tab.id + "' title='Not connected' class='fas fa-dot-circle tab-status tab-status-closed dbms_object postgresql_object omnidb__tab-status__icon'></i><span id='query_tab_status_text_" + v_tab.id + "' title='Not connected' class='tab-status-text query_info dbms_object postgresql_object ml-1'>Not connected</span></div>" +
"<button id='bt_fetch_more_" + v_tab.id + "' class='btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' title='Run' style='display: none; ' onclick='querySQL(1);'>Fetch more</button>" +
"<button id='bt_fetch_all_" + v_tab.id + "' class='btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' title='Run' style='margin-left: 5px; display: none; ' onclick='querySQL(2);'>Fetch all</button>" +
"<button id='bt_commit_" + v_tab.id + "' class='dbms_object dbms_object_hidden postgresql_object btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn' title='Run' style='margin-left: 5px; display: none; ' onclick='querySQL(3);'>Commit</button>" +
"<button id='bt_rollback_" + v_tab.id + "' class='dbms_object dbms_object_hidden postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn' title='Run' style='margin-left: 5px; display: none; ' onclick='querySQL(4);'>Rollback</button>" +
"<button id='bt_cancel_" + v_tab.id + "' class='btn btn-sm btn-danger omnidb__tab-actions__btn' title='Cancel' style='display: none; ' onclick='cancelSQL();'>Cancel</button>" +
"<div id='div_query_info_" + v_tab.id + "' class='omnidb__query-info'></div>" +
"<button class='btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn ml-auto' title='Export Data' onclick='v_connTabControl.selectedTab.tag.tabControl.selectedTab.tag.exportData();'><i class='far fa-file fa-light'></i></button>" +
"<select id='sel_export_type_" + v_tab.id + "' class='form-control omnidb__tab-actions__select' style='width: 80px;'><option selected='selected' value='csv' >CSV</option><option value='xlsx' >XLSX</option></select>" +
"</div>" +
"</div>" +
"<div id='query_result_tabs_container" + v_tab.id + "' class='omnidb__query-result-tabs'>" +
"<button style='position:absolute;top:0.25rem;right:0.25rem;' type='button' class='btn btn-sm omnidb__theme__btn--secondary' onclick=toggleExpandToPanelView('query_result_tabs_container" + v_tab.id + "')><i class='fas fa-expand'></i></button>" +
"<div id='query_result_tabs_" + v_tab.id + "'>" +
"</div>" +
"</div>";
'<div class="row mb-1">' +
'<div class="tab_actions omnidb__tab-actions col-12">' +
'<button id="bt_start_' + v_tab.id + '" class="btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn" title="Run" onclick="querySQL(0);"><i class="fas fa-play fa-light"></i></button>' +
'<button id="bt_indent_' + v_tab.id + '" class="btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" title="Indent SQL" onclick="indentSQL();"><i class="fas fa-indent fa-light"></i></button>' +
'<button id="bt_history_' + v_tab.id + '" class="btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" title="Command History" onclick="showCommandList();"><i class="fas fa-list fa-light"></i></button>' +
'<button id="bt_explain_' + v_tab.id + '" class="dbms_object postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" onclick="getExplain(0)" title="Explain" style="display: none;"><i class="fas fa-search fa-light"></i></button>' +
'<button id="bt_analyze_' + v_tab.id + '" class="dbms_object postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" onclick="getExplain(1)" title="Explain Analyze" style="display: none;"><i class="fas fa-search-plus fa-light"></i></button>' +
'<div class="dbms_object postgresql_object omnidb__form-check form-check form-check-inline"><input id="check_autocommit_' + v_tab.id + '" class="form-check-input" type="checkbox" checked="checked"><label class="form-check-label dbms_object postgresql_object custom_checkbox query_info" for="check_autocommit_' + v_tab.id + '">Autocommit</label></div>' +
'<div class="dbms_object postgresql_object omnidb__tab-status"><i id="query_tab_status_' + v_tab.id + '" title="Not connected" class="fas fa-dot-circle tab-status tab-status-closed dbms_object postgresql_object omnidb__tab-status__icon"></i><span id="query_tab_status_text_' + v_tab.id + '" title="Not connected" class="tab-status-text query_info dbms_object postgresql_object ml-1">Not connected</span></div>' +
'<button id="bt_fetch_more_' + v_tab.id + '" class="btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" title="Run" style="display: none;" onclick="querySQL(1);">Fetch more</button>' +
'<button id="bt_fetch_all_' + v_tab.id + '" class="btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" title="Run" style="margin-left: 5px; display: none;" onclick="querySQL(2);">Fetch all</button>' +
'<button id="bt_commit_' + v_tab.id + '" class="dbms_object dbms_object_hidden postgresql_object btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn" title="Run" style="margin-left: 5px; display: none;" onclick="querySQL(3);">Commit</button>' +
'<button id="bt_rollback_' + v_tab.id + '" class="dbms_object dbms_object_hidden postgresql_object btn btn-sm omnidb__theme__btn--secondary omnidb__tab-actions__btn" title="Run" style="margin-left: 5px; display: none;" onclick="querySQL(4);">Rollback</button>' +
'<button id="bt_cancel_' + v_tab.id + '" class="btn btn-sm btn-danger omnidb__tab-actions__btn" title="Cancel" style="display: none;" onclick="cancelSQL();">Cancel</button>' +
'<div id="div_query_info_' + v_tab.id + '" class="omnidb__query-info"></div>' +
'<button class="btn btn-sm omnidb__theme__btn--primary omnidb__tab-actions__btn ml-auto" title="Export Data" onclick="v_connTabControl.selectedTab.tag.tabControl.selectedTab.tag.exportData();"><i class="far fa-file fa-light"></i></button>' +
'<select id="sel_export_type_' + v_tab.id + '" class="form-control omnidb__tab-actions__select" style="width: 80px;"><option selected="selected" value="csv">CSV</option><option value="xlsx">XLSX</option></select>' +
'</div>' +
'</div>' +
'<div id="query_result_tabs_container' + v_tab.id + '" class="omnidb__query-result-tabs">' +
'<div style="position:absolute;top:0.25rem;right:2.5rem;">' +
'<div class="omnidb__switch--explain omnidb__switch--explain--sm float-right" data-toggle="tooltip" data-placement="left" data-html="true" title="" data-original-title="<h5>Toggle explain component.</h5><div>Switch between old and new explain visualizer (experimental).</div>">' +
'<input id="explainContextToggler' + v_tab.id + '" type="checkbox" class="omnidb__switch--explain--input" onclick="toggleExplainContext()">' +
'<label for="explainContextToggler' + v_tab.id + '" class="omnidb__switch--explain--label">' +
'<span><i class="fas fa-th"></i></span>' +
'</label>' +
'</div>' +
'</div>' +
'<button style="position:absolute;top:0.25rem;right:0.25rem;" type="button" class="btn btn-sm omnidb__theme__btn--secondary" onclick=toggleExpandToPanelView("query_result_tabs_container' + v_tab.id + '")><i class="fas fa-expand"></i></button>' +
'<div id="query_result_tabs_' + v_tab.id + '">' +
'</div>' +
'</div>';

// Updating the html.
v_tab.elementDiv.innerHTML = v_html;
Expand Down Expand Up @@ -156,6 +164,8 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {
v_curr_tabs.selectTabIndex(2);
v_connTabControl.selectedTab.tag.tabControl.selectedTab.tag.currQueryTab = 'explain';
refreshHeights();
// Loads or Updates all tooltips.
$('[data-toggle="tooltip"]').tooltip({animation:true});
}

// Creating the `data` tab.
Expand Down Expand Up @@ -196,7 +206,8 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {
});
v_explain_tab.elementDiv.innerHTML =
"<div class='p-2 omnidb__query-result-tabs__content omnidb__theme-border--primary'>" +
"<div id='div_explain_" + v_tab.id + "' class='omnidb__query-result-tabs__content' style='width: 100%; overflow: hidden;'></div>" +
"<div id='div_explain_default" + v_tab.id + "' class='omnidb__query-result-tabs__content omnidb__query-result-tabs__content--explain-default' style='width: 100%; overflow: auto;'></div>" +
"<div id='div_explain_" + v_tab.id + "' class='omnidb__query-result-tabs__content omnidb__query-result-tabs__content--explain-legere' style='width: 100%; overflow: hidden;'></div>" +
"</div>";
v_explain_tab.elementA.classList.add('dbms_object');
v_explain_tab.elementA.classList.add('postgresql_object');
Expand Down Expand Up @@ -274,6 +285,7 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {

// Remove shortcuts from ace in order to avoid conflict with omnidb shortcuts
v_editor.commands.bindKey("ctrl-space", null);
v_editor.commands.bindKey("alt-e", null);
v_editor.commands.bindKey("Cmd-,", null);
v_editor.commands.bindKey("Ctrl-,", null);
v_editor.commands.bindKey("Cmd-Delete", null);
Expand Down Expand Up @@ -319,6 +331,7 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {
div_result: document.getElementById('div_result_' + v_tab.id),
div_notices: document.getElementById('div_notices_' + v_tab.id),
div_explain: document.getElementById('div_explain_' + v_tab.id),
div_explain_default: document.getElementById('div_explain_default' + v_tab.id),
div_count_notices: document.getElementById('query_result_tabs_count_notices_' + v_tab.id),
sel_filtered_data : document.getElementById('sel_filtered_data_' + v_tab.id),
sel_export_type : document.getElementById('sel_export_type_' + v_tab.id),
Expand Down Expand Up @@ -390,6 +403,9 @@ var v_createQueryTabFunction = function(p_table, p_tab_db_id) {
mode: 'add'
}

// Loads or Updates all tooltips.
$('[data-toggle="tooltip"]').tooltip({animation:true});

// Requesting an update on the workspace layout and sizes.
setTimeout(function() {
refreshHeights();
Expand Down
2 changes: 0 additions & 2 deletions OmniDB/OmniDB_app/static/OmniDB_app/js/tab_functions/outer_welcome_tab.js
View file
Expand Up @@ -74,8 +74,6 @@ var v_createWelcomeTabFunction = function(p_index,p_create_query_tab = true, p_n

var v_animated_omnis =
`<svg
class="animated-omnis"
version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px"
width="82.333px" height="82.333px"
Expand Down

0 comments on commit 972ea53

Please sign in to comment.