pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Table node related fixes: 

1. File select control sets the value for all other to last selected file. Fixes #6814
2. Vacuum parameters-related issues. Fixes #6777
3. Exclusion removes all columns if one row is removed. Fixes #6771
pull/62/head
Aditya Toshniwal 2021-10-01 12:57:04 +05:30 committed by Akshay Joshi
parent 5e0c113c7b
commit 357a020828
7 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
View File

@ -15,7 +15,7 @@ export function getNodeExclusionConstraintSchema(treeNodeInfo, itemNodeData, pgB
spcname: ()=>getNodeListByName('tablespace', treeNodeInfo, itemNodeData, {}, (m)=>{ spcname: ()=>getNodeListByName('tablespace', treeNodeInfo, itemNodeData, {}, (m)=>{
return (m.label != 'pg_global'); return (m.label != 'pg_global');
}), }),
getOperClass: (urlParams)=>getNodeAjaxOptions('get_oper_class', tableNode, treeNodeInfo, itemNodeData, {urlParams: urlParams}, (data)=>{ getOperClass: (urlParams)=>getNodeAjaxOptions('get_oper_class', tableNode, treeNodeInfo, itemNodeData, {urlParams: urlParams, useCache:false}, (data)=>{
let res = []; let res = [];
if (data && _.isArray(data)) { if (data && _.isArray(data)) {
_.each(data, function(d) { _.each(data, function(d) {
@ -24,7 +24,7 @@ export function getNodeExclusionConstraintSchema(treeNodeInfo, itemNodeData, pgB
} }
return res; return res;
}), }),
getOperator: (urlParams)=>getNodeAjaxOptions('get_operator', tableNode, treeNodeInfo, itemNodeData, {urlParams: urlParams}, (data)=>{ getOperator: (urlParams)=>getNodeAjaxOptions('get_operator', tableNode, treeNodeInfo, itemNodeData, {urlParams: urlParams, useCache:false}, (data)=>{
let res = []; let res = [];
if (data && _.isArray(data)) { if (data && _.isArray(data)) {
_.each(data, function(d) { _.each(data, function(d) {
@ -33,7 +33,7 @@ export function getNodeExclusionConstraintSchema(treeNodeInfo, itemNodeData, pgB
} }
return res; return res;
}), }),
}); }, treeNodeInfo);
} }
class ExclusionColHeaderSchema extends BaseUISchema { class ExclusionColHeaderSchema extends BaseUISchema {
@ -168,9 +168,7 @@ class ExclusionColumnSchema extends BaseUISchema {
},{ },{
id: 'operator', label: gettext('Operator'), type: 'select', id: 'operator', label: gettext('Operator'), type: 'select',
width: 95, width: 95,
editable: function() { editable: obj.isEditable,
return obj.isNewExCons;
},
cell: (state)=>{ cell: (state)=>{
return { return {
cell: 'select', cell: 'select',
@ -185,7 +183,7 @@ class ExclusionColumnSchema extends BaseUISchema {
} }
export default class ExclusionConstraintSchema extends BaseUISchema { export default class ExclusionConstraintSchema extends BaseUISchema {
constructor(fieldOptions={}, nodeInfo, getColumns) { constructor(fieldOptions={}, nodeInfo) {
super({ super({
name: undefined, name: undefined,
oid: undefined, oid: undefined,
@ -202,7 +200,7 @@ export default class ExclusionConstraintSchema extends BaseUISchema {
this.nodeInfo = nodeInfo; this.nodeInfo = nodeInfo;
this.fieldOptions = fieldOptions; this.fieldOptions = fieldOptions;
this.exHeaderSchema = new ExclusionColHeaderSchema(fieldOptions.columns, getColumns); this.exHeaderSchema = new ExclusionColHeaderSchema(fieldOptions.columns);
this.exColumnSchema = new ExclusionColumnSchema(fieldOptions.getOperator); this.exColumnSchema = new ExclusionColumnSchema(fieldOptions.getOperator);
this.exHeaderSchema.exColumnSchema = this.exColumnSchema; this.exHeaderSchema.exColumnSchema = this.exColumnSchema;
} }

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js
View File

@ -161,7 +161,7 @@ export class PartitionsSchema extends BaseUISchema {
return true; return true;
}, },
},{ },{
id: 'partition_name', label: gettext('Name'), id: 'partition_name', label: gettext('Name'), deps: ['is_attach'],
type: (state)=>{ type: (state)=>{
if(state.is_attach) { if(state.is_attach) {
return { return {

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
View File

@ -2072,10 +2072,10 @@ class BaseTableView(PGChildNodeView, BasePartitionTable, VacuumSettings):
for old_data_row in old_data[vacuum_key]: for old_data_row in old_data[vacuum_key]:
if data_row['name'] == old_data_row['name'] and \ if data_row['name'] == old_data_row['name'] and \
'value' in data_row: 'value' in data_row:
if data_row['value'] is not None: if data_row['value'] is not None and \
data_row['value'] != '':
set_values.append(data_row) set_values.append(data_row)
elif data_row['value'] is None and \ elif 'value' in old_data_row:
'value' in old_data_row:
reset_values.append(data_row) reset_values.append(data_row)
if len(set_values) > 0: if len(set_values) > 0:

17
web/pgadmin/static/js/SchemaView/DataGridView.jsx
View File

@ -29,6 +29,7 @@ import { confirmDeleteRow } from '../helpers/legacyConnector';
import CustomPropTypes from 'sources/custom_prop_types'; import CustomPropTypes from 'sources/custom_prop_types';
import { evalFunc } from 'sources/utils'; import { evalFunc } from 'sources/utils';
import { DepListenerContext } from './DepListener'; import { DepListenerContext } from './DepListener';
import { useIsMounted } from '../custom_hooks';
const useStyles = makeStyles((theme)=>({ const useStyles = makeStyles((theme)=>({
grid: { grid: {
@ -179,17 +180,19 @@ function DataTableRow({row, totalRows, isResizing, schema, schemaRef, accessPath
}, []); }, []);
useEffect(()=>{ useEffect(()=>{
schema.fields.forEach((field)=>{ schemaRef.current.fields.forEach((field)=>{
/* Self change is also dep change */ /* Self change is also dep change */
if(field.depChange) { if(field.depChange || field.deferredDepChange) {
depListener?.addDepListener(accessPath.concat(field.id), accessPath.concat(field.id), field.depChange); depListener.addDepListener(accessPath.concat(field.id), accessPath.concat(field.id), field.depChange, field.deferredDepChange);
} }
(evalFunc(null, field.deps) || []).forEach((dep)=>{ (evalFunc(null, field.deps) || []).forEach((dep)=>{
let source = accessPath.concat(dep); let source = accessPath.concat(dep);
if(_.isArray(dep)) { if(_.isArray(dep)) {
source = dep; source = dep;
} }
depListener?.addDepListener(source, accessPath.concat(field.id), field.depChange); if(field.depChange) {
depListener.addDepListener(source, accessPath.concat(field.id), field.depChange);
}
}); });
}); });
return ()=>{ return ()=>{
@ -244,6 +247,7 @@ export default function DataGridView({
fixedRows, ...props}) { fixedRows, ...props}) {
const classes = useStyles(); const classes = useStyles();
const stateUtils = useContext(StateUtilsContext); const stateUtils = useContext(StateUtilsContext);
const checkIsMounted = useIsMounted();
/* Using ref so that schema variable is not frozen in columns closure */ /* Using ref so that schema variable is not frozen in columns closure */
const schemaRef = useRef(schema); const schemaRef = useRef(schema);
@ -432,7 +436,7 @@ export default function DataGridView({
); );
useEffect(()=>{ useEffect(()=>{
let rowsPromise = fixedRows, umounted=false; let rowsPromise = fixedRows;
/* If fixedRows is defined, fetch the details */ /* If fixedRows is defined, fetch the details */
if(typeof rowsPromise === 'function') { if(typeof rowsPromise === 'function') {
@ -442,12 +446,11 @@ export default function DataGridView({
Promise.resolve(rowsPromise) Promise.resolve(rowsPromise)
.then((res)=>{ .then((res)=>{
/* If component unmounted, dont update state */ /* If component unmounted, dont update state */
if(!umounted) { if(checkIsMounted()) {
stateUtils.initOrigData(accessPath, res); stateUtils.initOrigData(accessPath, res);
} }
}); });
} }
return ()=>umounted=true;
}, []); }, []);
const isResizing = _.flatMap(headerGroups, headerGroup => headerGroup.headers.map(col=>col.isResizing)).includes(true); const isResizing = _.flatMap(headerGroups, headerGroup => headerGroup.headers.map(col=>col.isResizing)).includes(true);

3
web/pgadmin/static/js/SchemaView/FormView.jsx
View File

@ -237,7 +237,6 @@ export default function FormView({
); );
} else if(field.type === 'collection') { } else if(field.type === 'collection') {
/* If its a collection, let data grid view handle it */ /* If its a collection, let data grid view handle it */
let depsMap = [value[field.id]];
/* Pass on the top schema */ /* Pass on the top schema */
if(isNested) { if(isNested) {
field.schema.top = schemaRef.current.top; field.schema.top = schemaRef.current.top;
@ -245,8 +244,6 @@ export default function FormView({
field.schema.top = schemaRef.current; field.schema.top = schemaRef.current;
} }
depsMap.push(canAdd, canEdit, canDelete, visible);
if(!_.isUndefined(field.fixedRows)) { if(!_.isUndefined(field.fixedRows)) {
canAdd = false; canAdd = false;
canDelete = false; canDelete = false;

11
web/pgadmin/static/js/SchemaView/index.jsx
View File

@ -121,6 +121,7 @@ function getChangedData(topSchema, viewHelperProps, sessData, stringify=false) {
/* Will be called recursively as data can be nested */ /* Will be called recursively as data can be nested */
const parseChanges = (schema, origVal, sessVal)=>{ const parseChanges = (schema, origVal, sessVal)=>{
let levelChanges = {}; let levelChanges = {};
parseChanges.depth = _.isUndefined(parseChanges.depth) ? 0 : parseChanges.depth+1;
/* The comparator and setter */ /* The comparator and setter */
const attrChanged = (id, change, force=false)=>{ const attrChanged = (id, change, force=false)=>{
@ -131,8 +132,9 @@ function getChangedData(topSchema, viewHelperProps, sessData, stringify=false) {
if(stringify && (_.isArray(change) || _.isObject(change))) { if(stringify && (_.isArray(change) || _.isObject(change))) {
change = JSON.stringify(change); change = JSON.stringify(change);
} }
/* Null values are not passed in URL params, pass it as an empty string */ /* Null values are not passed in URL params, pass it as an empty string
if(_.isNull(change)) { Nested values does not need this */
if(_.isNull(change) && parseChanges.depth === 0) {
change = ''; change = '';
} }
return levelChanges[id] = change; return levelChanges[id] = change;
@ -234,6 +236,7 @@ function getChangedData(topSchema, viewHelperProps, sessData, stringify=false) {
} }
}); });
parseChanges.depth--;
return levelChanges; return levelChanges;
}; };
@ -480,7 +483,7 @@ function SchemaDialogView({
/* tell the callbacks the data has changed */ /* tell the callbacks the data has changed */
props.onDataChange && props.onDataChange(isDataChanged, changedData); props.onDataChange && props.onDataChange(isDataChanged, changedData);
}, [sessData]); }, [sessData, formReady]);
useEffect(()=>{ useEffect(()=>{
if(sessData.__deferred__?.length > 0) { if(sessData.__deferred__?.length > 0) {
@ -488,7 +491,6 @@ function SchemaDialogView({
type: SCHEMA_STATE_ACTIONS.CLEAR_DEFERRED_QUEUE, type: SCHEMA_STATE_ACTIONS.CLEAR_DEFERRED_QUEUE,
}); });
// let deferredDepChang = sessData.__deferred__[0];
let item = sessData.__deferred__[0]; let item = sessData.__deferred__[0];
item.promise.then((resFunc)=>{ item.promise.then((resFunc)=>{
sessDispatch({ sessDispatch({
@ -526,7 +528,6 @@ function SchemaDialogView({
}); });
setFormReady(true); setFormReady(true);
setLoaderText(''); setLoaderText('');
}); });
} else { } else {
/* Use the defaults as the initital data */ /* Use the defaults as the initital data */

8
web/pgadmin/static/js/helpers/legacyConnector.js
View File

@ -47,12 +47,16 @@ export function showFileDialog(dialogParams, onFileSelect) {
pgAdmin.FileManager.init(); pgAdmin.FileManager.init();
pgAdmin.FileManager.show_dialog(params); pgAdmin.FileManager.show_dialog(params);
const onFileSelectClose = (value)=>{
removeListeners();
onFileSelect(value);
};
const onDialogClose = ()=>removeListeners(); const onDialogClose = ()=>removeListeners();
pgAdmin.Browser.Events.on('pgadmin-storage:finish_btn:' + params.dialog_type, onFileSelect); pgAdmin.Browser.Events.on('pgadmin-storage:finish_btn:' + params.dialog_type, onFileSelectClose);
pgAdmin.Browser.Events.on('pgadmin-storage:cancel_btn:' + params.dialog_type, onDialogClose); pgAdmin.Browser.Events.on('pgadmin-storage:cancel_btn:' + params.dialog_type, onDialogClose);
const removeListeners = ()=>{ const removeListeners = ()=>{
pgAdmin.Browser.Events.off('pgadmin-storage:finish_btn:' + params.dialog_type, onFileSelect); pgAdmin.Browser.Events.off('pgadmin-storage:finish_btn:' + params.dialog_type, onFileSelectClose);
pgAdmin.Browser.Events.off('pgadmin-storage:cancel_btn:' + params.dialog_type, onDialogClose); pgAdmin.Browser.Events.off('pgadmin-storage:cancel_btn:' + params.dialog_type, onDialogClose);
}; };
} }