IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-07 22:53:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing feature tests

Browse Source
This commit is contained in:
Aditya Toshniwal 2024-03-26 11:20:04 +05:30
parent cc1ce09b73
commit c0a1429664
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/static/js/components/ReactCodeMirror/CustomEditorView.js
View File

@ -73,7 +73,7 @@ export default class CustomEditorView extends EditorView {
} else {
const line = this.state.doc.line(lineNo);
pos = line.from + ch;
if(pos > line.to) {
if(ch == -1 || pos > line.to) {
pos = line.to;
}
}

20
web/pgadmin/tools/sqleditor/static/js/components/sections/MainToolBar.jsx
View File

@ -371,24 +371,6 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) {
callback: ()=>{onRollbackClick();}
}
},
{
shortcut: queryToolPref.indent,
options: {
callback: ()=>{executeCmd('indentMore');}
}
},
{
shortcut: queryToolPref.unindent,
options: {
callback: ()=>{executeCmd('indentLess');}
}
},
{
shortcut: queryToolPref.comment,
options: {
callback: ()=>{executeCmd('toggleComment');}
}
},
{
shortcut: queryToolPref.toggle_case,
options: {
@ -494,7 +476,7 @@ export function MainToolBar({containerRef, onFilterClick, onManageMacros}) {
<PgIconButton title={gettext('Execute script')} icon={<PlayArrowRoundedIcon style={{height: 'unset'}} />}
onClick={executeQuery} disabled={buttonsDisabled['execute']} shortcut={queryToolPref.execute_query}/>
<PgIconButton title={gettext('Execute options')} icon={<KeyboardArrowDownIcon />} splitButton
name="menu-autocommit" ref={autoCommitMenuRef} accesskey={shortcut_key(queryToolPref.btn_delete_row)}
name="menu-autocommit" ref={autoCommitMenuRef} accesskey={shortcut_key(queryToolPref.btn_execute_options)}
onClick={toggleMenu} disabled={buttonsDisabled['execute-options']}/>
</PgButtonGroup>
<PgButtonGroup size="small">

3
web/pgadmin/tools/sqleditor/static/js/components/sections/Query.jsx
View File

@ -412,7 +412,8 @@ export default function Query() {
const shortcutOverrideKeys = useMemo(
()=>{
const queryToolPref = queryToolCtx.preferences.sqleditor;
// omit CM internal shortcuts
const queryToolPref = _.omit(queryToolCtx.preferences.sqleditor, ['indent', 'unindent', 'comment']);
return Object.values(queryToolPref)
.filter((p)=>isShortcutValue(p))
.map((p)=>({

2
web/regression/feature_utils/pgadmin_page.py
View File

@ -936,7 +936,7 @@ class PgadminPage:
self.driver.execute_script(
"arguments[0].cmView.view.setValue(arguments[1]);"
"arguments[0].cmView.view.setCursor("
"arguments[0].cmView.view.lineCount(),0);",
"arguments[0].cmView.view.lineCount(),-1);",
codemirror_ele, field_content)
def click_tab(self, tab_name):