mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-08-08 12:08:14 -05:00
1. Use EDB's repo for react-data-grid instead of the personal repo.
2. Improved searching in the Search Objects. 3. Fixed react warnings in the query tool. 4. Fixed some SonarQube issues.
This commit is contained in:
committed by
Akshay Joshi
parent
ab5d53f3b1
commit
2de965d710
@@ -744,13 +744,13 @@ def get_search_path(conn):
|
||||
@blueprint.route(
|
||||
'/initialize_target/<debug_type>/<int:trans_id>/<int:sid>/<int:did>/'
|
||||
'<int:scid>/<int:func_id>',
|
||||
methods=['GET', 'POST'],
|
||||
methods=['POST'],
|
||||
endpoint='initialize_target_for_function'
|
||||
)
|
||||
@blueprint.route(
|
||||
'/initialize_target/<debug_type>/<int:trans_id>/<int:sid>/<int:did>/'
|
||||
'<int:scid>/<int:func_id>/<int:tri_id>',
|
||||
methods=['GET', 'POST'],
|
||||
methods=['POST'],
|
||||
endpoint='initialize_target_for_trigger'
|
||||
)
|
||||
@login_required
|
||||
@@ -825,7 +825,7 @@ def initialize_target(debug_type, trans_id, sid, did,
|
||||
# the session variables accordingly, For indirect debugging user will
|
||||
# provide the data from another session so below condition will
|
||||
# be be required
|
||||
if request.method == 'POST':
|
||||
if request.data:
|
||||
de_inst.function_data['args_value'] = \
|
||||
json.loads(request.data, encoding='utf-8')
|
||||
|
||||
@@ -940,7 +940,7 @@ def restart_debugging(trans_id):
|
||||
|
||||
|
||||
@blueprint.route(
|
||||
'/start_listener/<int:trans_id>', methods=['GET', 'POST'],
|
||||
'/start_listener/<int:trans_id>', methods=['POST'],
|
||||
endpoint='start_listener'
|
||||
)
|
||||
@login_required
|
||||
@@ -983,7 +983,7 @@ def start_debugger_listener(trans_id):
|
||||
|
||||
# If user again start the same debug function with different arguments
|
||||
# then we need to save that values to session variable and database.
|
||||
if request.method == 'POST':
|
||||
if request.data:
|
||||
data = json.loads(request.data, encoding='utf-8')
|
||||
if data:
|
||||
de_inst.function_data['args_value'] = data
|
||||
|
||||
@@ -394,7 +394,7 @@ export default class DebuggerModule {
|
||||
|
||||
self.api({
|
||||
url: baseUrl,
|
||||
method: 'GET',
|
||||
method: 'POST',
|
||||
})
|
||||
.then(function (result) {
|
||||
|
||||
@@ -580,7 +580,7 @@ export default class DebuggerModule {
|
||||
|
||||
self.api({
|
||||
url: baseUrl,
|
||||
method: 'GET',
|
||||
method: 'POST',
|
||||
})
|
||||
.then(function (res) {
|
||||
let url = url_for('debugger.direct', {
|
||||
|
||||
@@ -38,11 +38,15 @@ try {
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
<style>
|
||||
#debugger-main-container {
|
||||
#debugger-main-container {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
#debugger-main-container:not(:empty) + .pg-sp-container {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
{% if is_desktop_mode and is_linux %}
|
||||
<style>
|
||||
@@ -50,6 +54,13 @@ try {
|
||||
</style>
|
||||
{% endif %}
|
||||
<div id="debugger-main-container" tabindex="0">
|
||||
<div class="pg-sp-container">
|
||||
<div class="pg-sp-content">
|
||||
<div class="row">
|
||||
<div class="col-12 pg-sp-icon"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -89,13 +89,13 @@ class InitTargetDebugger(BaseTestGenerator):
|
||||
|
||||
def initialize_traget(self):
|
||||
if hasattr(self, 'create_trigger_func') and self.create_trigger_func:
|
||||
return self.tester.get(
|
||||
return self.tester.post(
|
||||
self.url + str(self.trans_id) + '/' + str(self.server_id) +
|
||||
'/' + str(self.db_id) + '/' + str(self.schema_id) +
|
||||
'/' + str(self.table_id) + '/' +
|
||||
str(self.trigger_id), content_type='application/json')
|
||||
else:
|
||||
return self.tester.get(
|
||||
return self.tester.post(
|
||||
self.url + str(self.trans_id) + '/' + str(self.server_id) +
|
||||
'/' + str(self.db_id) + '/' + str(self.schema_id) +
|
||||
'/' + str(self.func_id),
|
||||
|
||||
@@ -33,11 +33,6 @@ class DebuggerStartListener(BaseTestGenerator):
|
||||
self.db_id = self.schema_data['db_id']
|
||||
self.schema_id = self.schema_data['schema_id']
|
||||
|
||||
local_self = funcs_utils.set_up(self)
|
||||
|
||||
# if self.server['type'] == 'pg':
|
||||
# self.skipTest('Skipping test case for pg')
|
||||
|
||||
self.test_data['funcowner'] = self.server["username"]
|
||||
|
||||
function_info = debugger_utils.create_function(self, utils)
|
||||
@@ -60,7 +55,7 @@ class DebuggerStartListener(BaseTestGenerator):
|
||||
data=json.dumps({}),
|
||||
content_type='application/json')
|
||||
else:
|
||||
return self.tester.get(
|
||||
return self.tester.post(
|
||||
self.url + str(self.trans_id),
|
||||
content_type='application/json')
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ def init_debugger_function(self):
|
||||
|
||||
def initialize_target(self, utils, close_debugger_instance=True):
|
||||
target_url = '/debugger/initialize_target/{0}/'.format(self.type)
|
||||
response = self.tester.get(
|
||||
response = self.tester.post(
|
||||
target_url + str(self.trans_id) + '/' + str(self.server_id) +
|
||||
'/' + str(self.db_id) + '/' + str(self.schema_id) +
|
||||
'/' + str(self.func_id),
|
||||
@@ -127,7 +127,7 @@ def initialize_target(self, utils, close_debugger_instance=True):
|
||||
|
||||
|
||||
def start_listener(self, utils, db_utils):
|
||||
response = self.tester.get(
|
||||
response = self.tester.post(
|
||||
'debugger/start_listener/' + str(self.trans_id),
|
||||
content_type='application/json')
|
||||
if response.status_code != 200:
|
||||
|
||||
@@ -33,6 +33,7 @@ const useStyles = makeStyles((theme)=>({
|
||||
display: 'flex',
|
||||
lineHeight: '16px',
|
||||
alignItems: 'center',
|
||||
fontWeight: 'normal',
|
||||
},
|
||||
columnName: {
|
||||
fontWeight: 'bold',
|
||||
|
||||
Reference in New Issue
Block a user