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

Fix jasmine test case failures in SchemaView.

Browse Source
This commit is contained in:
Aditya Toshniwal 2021-07-08 13:23:33 +05:30 committed by Akshay Joshi
parent 793dbc6e7f
commit de3f3e6e61
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,7 +251,7 @@ const sessDataReducer = (state, action)=>{
_.set(data, action.path, action.value);
/* If there is any dep listeners get the changes */
if(action.depChange) {
_.set(data, action.depChange(data));
data = action.depChange(data);
}
break;
case SCHEMA_STATE_ACTIONS.ADD_ROW:
@ -412,16 +412,14 @@ function SchemaDialogView({
setSaving(true);
setLoaderText('Saving...');
/* Get the changed data */
let changeData = {};
let changeData = getChangedData(schema, viewHelperProps.mode, sessData);
/* Add the id when in edit mode */
if(viewHelperProps.mode === 'edit') {
changeData = getChangedData(schema, viewHelperProps.mode, sessData);
changeData[schema.idAttribute] = schema.origData[schema.idAttribute];
} else {
if(viewHelperProps.mode !== 'edit') {
/* If new then merge the changed data with origData */
changeData = {...schema.origData};
_.merge(changeData, sessData);
changeData = _.assign({}, schema.origData, changeData);
} else {
changeData[schema.idAttribute] = schema.origData[schema.idAttribute];
}
props.onSave(isNew, changeData)
@ -455,13 +453,10 @@ function SchemaDialogView({
/* Called when SQL tab is active */
if(dirty) {
if(!formErr.name) {
let changeData = {};
if(viewHelperProps.mode === 'edit') {
changeData = getChangedData(schema, viewHelperProps.mode, sessData);
} else {
let changeData = getChangedData(schema, viewHelperProps.mode, sessData);
if(viewHelperProps.mode !== 'edit') {
/* If new then merge the changed data with origData */
changeData = {...schema.origData};
_.merge(changeData, sessData);
changeData = _.assign({}, schema.origData, changeData);
}
/* Call the passed incoming getSQLValue func to get the SQL
return of getSQLValue should be a promise.