IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-22 08:46:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Fix codemirror cursor issue. - Fix foreign table jasmine test cases.

Browse Source
This commit is contained in:
Aditya Toshniwal 2021-08-26 17:02:59 +05:30 committed by Akshay Joshi
parent c8026873b4
commit 2a76027cce
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
View File

@ -51,6 +51,7 @@ export default class ForeignTableSchema extends BaseUISchema {
...fieldOptions,
};
this.columnsObj = getNodeColumnSchema(this.fieldOptions.nodeInfo, this.fieldOptions.nodeData, this.fieldOptions.pgBrowser);
}
get idAttribute() {
@ -133,7 +134,7 @@ export default class ForeignTableSchema extends BaseUISchema {
if(tabColsResponse) {
tabColsResponse.then((res)=>{
resolve((state)=>{
let finalCols = res.map((col)=> col);
let finalCols = res.map((col)=>obj.columnsObj.getNewData(col));
finalCols = [...state.columns, ...finalCols];
return {
adding_inherit_cols: false,
@ -170,7 +171,7 @@ export default class ForeignTableSchema extends BaseUISchema {
{
id: 'columns', label: gettext('Columns'), cell: 'text',
type: 'collection', group: gettext('Columns'), mode: ['edit', 'create'],
schema: new getNodeColumnSchema(obj.fieldOptions.nodeInfo, obj.fieldOptions.nodeData, obj.fieldOptions.pgBrowser),
schema: this.columnsObj,
canAdd: true, canDelete: true, canEdit: true, columns: ['attname', 'datatype', 'inheritedfrom'],
// For each row edit/delete button enable/disable
canEditRow: this.canEditDeleteRowColumns,

4
web/pgadmin/static/js/components/CodeMirror.jsx
View File

@ -42,7 +42,9 @@ export default function CodeMirror({currEditor, name, value, options, events, cl
useMemo(() => {
if(editor.current) {
editor.current.setValue(value);
if(value != editor.current.getValue()) {
editor.current.setValue(value);
}
}
}, [value]);

9
web/pgadmin/static/js/components/FormComponents.jsx
View File

@ -8,7 +8,7 @@
//////////////////////////////////////////////////////////////
/* Common form components used in pgAdmin */
import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
import { makeStyles } from '@material-ui/core/styles';
import { Box, FormControl, OutlinedInput, FormHelperText,
Grid, IconButton, FormControlLabel, Switch, Checkbox, useTheme, InputLabel, Paper } from '@material-ui/core';
@ -149,7 +149,7 @@ export function InputSQL({value, options, onChange, readonly, className, ...prop
}
}, [readonly]);
return useMemo(()=>(
return (
<CodeMirror
currEditor={(obj)=>editor.current=obj}
value={value||''}
@ -166,13 +166,14 @@ export function InputSQL({value, options, onChange, readonly, className, ...prop
}}
{...props}
/>
), [value]);
);
}
InputSQL.propTypes = {
value: PropTypes.string,
options: PropTypes.object,
onChange: PropTypes.func,
readonly: PropTypes.bool
readonly: PropTypes.bool,
className: CustomPropTypes.className,
};
export function FormInputSQL({hasError, required, label, className, helpMessage, testcid, value, controlProps, noLabel, ...props}) {

3
web/regression/javascript/schema_ui_files/foreign_table.ui.spec.js
View File

@ -176,13 +176,14 @@ describe('ForeignTableSchema', ()=>{
it('add first selection', (done)=>{
let state = {columns: [], inherits: ['table1']};
let newCol = schemaObj.columnsObj.getNewData(inheritCol);
let deferredPromise = deferredDepChange(state, null, null, {
oldState: {
inherits: [],
},
});
deferredPromise.then((depChange)=>{
let finalCols = [{name: 'id'}];
let finalCols = [newCol];
expect(depChange(state)).toEqual({
adding_inherit_cols: false,
columns: finalCols,