IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some changes to the core code that will be helpful for other nodes.

Browse Source
This commit is contained in:
Aditya Toshniwal
2021-06-29 14:38:04 +05:30
committed by Akshay Joshi
parent 764677431f
commit b20558cb99
10 changed files with 61 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,7 +85,10 @@ function getChangedData(topSchema, mode, sessData, stringify=false) {
return;
} else {
change = change || _.get(sessData, currPath);
_.set(changedData, currPath, stringify ? JSON.stringify(change) : change);
if(stringify && (_.isArray(change) || _.isObject(change))) {
change = JSON.stringify(change);
}
_.set(changedData, currPath, change);
}
};
@@ -104,8 +107,8 @@ function getChangedData(topSchema, mode, sessData, stringify=false) {
/* Use diffArray package to get the array diff and extract the info
cid is used to identify the rows uniquely */
const changeDiff = diffArray(
_.get(topSchema.origData, currPath),
_.get(sessData, currPath),
_.get(topSchema.origData, currPath) || [],
_.get(sessData, currPath) || [],
'cid'
);
change = {};
@@ -437,7 +440,13 @@ function SchemaDialogView({
/* Called when SQL tab is active */
if(dirty) {
if(!formErr.name) {
let changeData = getChangedData(schema, viewHelperProps.mode, sessData, true);
let changeData = {};
if(viewHelperProps.mode === 'edit') {
changeData = getChangedData(schema, viewHelperProps.mode, sessData, true);
} else {
/* If new then merge the changed data with origData */
changeData = _.merge(schema.origData, sessData);
}
/* Call the passed incoming getSQLValue func to get the SQL
return of getSQLValue should be a promise.
*/
@@ -566,10 +575,10 @@ function SchemaPropertiesView({
_visible = (field.mode.indexOf(viewHelperProps.mode) > -1);
}
if(_visible && visible) {
_visible = evalFunc(visible, origData);
_visible = evalFunc(schema, visible, origData);
}
disabled = evalFunc(disabled, origData);
disabled = evalFunc(schema, disabled, origData);
readonly = true;
if(_visible && verInLimit) {
if(!tabs[group]) tabs[group] = [];