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

Show appropriate error message when master password is not set instead of 'Crypt key missing'. #5735

Browse Source
This commit is contained in:
Aditya Toshniwal
2023-03-13 11:51:35 +05:30
committed by GitHub
parent 66c4b9d05a
commit ec32099d2f
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
web/pgadmin/browser/static/js/node_view.jsx
View File

@@ -56,15 +56,14 @@ export function getNodeView(nodeType, treeNodeInfo, actionType, itemNodeData, fo
resolve(res.data);
})
.catch((err)=>{
if(err.response){
console.error('error resp', err.response);
} else if(err.request){
console.error('error req', err.request);
} else if(err.message){
console.error('error msg', err.message);
}
reject(err);
Notify.pgRespErrorNotify(err);
Notify.pgNotifier('error', err, '', function(msg) {
if (msg == 'CRYPTKEY_SET') {
return Promise.resolve(initData());
} else if (msg == 'CRYPTKEY_NOT_SET') {
reject(gettext('The master password is not set.'));
}
reject(err);
});
});
}
});
@@ -81,7 +80,14 @@ export function getNodeView(nodeType, treeNodeInfo, actionType, itemNodeData, fo
resolve(res.data);
onSave && onSave(res.data);
}).catch((err)=>{
reject(err);
Notify.pgNotifier('error', err, '', function(msg) {
if (msg == 'CRYPTKEY_SET') {
return Promise.resolve(onSaveClick(isNew, data));
} else if (msg == 'CRYPTKEY_NOT_SET') {
reject(gettext('The master password is not set.'));
}
reject(err);
});
});
});