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

Fix failing jasmin test cases. #5701

pull/5859/head
Aditya Toshniwal 2023-02-10 14:47:29 +05:30 committed by GitHub
parent ff877d6e91
commit be72cee6be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@ -600,7 +600,7 @@ define('pgadmin.node.server', [
let wasConnected = reconnect || data.connected,
onFailure = function(
xhr, error, _node, _data, _tree, _item, _wasConnected
error, errormsg, _node, _data, _tree, _item, _wasConnected
) {
data.connected = false;
@ -615,7 +615,7 @@ define('pgadmin.node.server', [
}
}
if (xhr.status != 200 && xhr.responseText.search('Ticket expired') !== -1) {
if (error.response?.status != 200 && error.response?.request?.responseText?.search('Ticket expired') !== -1) {
tree.addIcon(_item, {icon: 'icon-server-connecting'});
let fetchTicket = Kerberos.fetch_ticket();
fetchTicket.then(
@ -624,11 +624,11 @@ define('pgadmin.node.server', [
},
function() {
tree.addIcon(_item, {icon: 'icon-server-not-connected'});
Notify.pgNotifier('error', 'Connection error', xhr, gettext('Connect to server.'));
Notify.pgNotifier('error', error, 'Connection error', gettext('Connect to server.'));
}
);
} else {
Notify.pgNotifier('error', xhr, error, function(msg) {
Notify.pgNotifier('error', error, errormsg, function(msg) {
setTimeout(function() {
if (msg == 'CRYPTKEY_SET') {
connect_to_server(_node, _data, _tree, _item, _wasConnected);
@ -735,9 +735,9 @@ define('pgadmin.node.server', [
);
}
})
.catch((xhr)=>{
.catch((error)=>{
return onFailure(
xhr.response?.request, parseApiError(xhr), obj, data, tree, item, wasConnected
error, parseApiError(error), obj, data, tree, item, wasConnected
);
})
.then(()=>{

3
web/pgadmin/dashboard/static/js/Dashboard.jsx
View File

@ -941,7 +941,8 @@ export function ChartContainer(props) {
</div>
</Box>} />
<CardContent className={classes.chartCardContent}>
{!props.errorMsg ? props.children : <EmptyPanelMessage text={props.errorMsg}/>}
{!props.errorMsg && !props.isTest && props.children}
<EmptyPanelMessage text={props.errorMsg}/>
</CardContent>
</Card>
);

3
web/regression/javascript/erd/erd_core_spec.js
View File

@ -10,7 +10,7 @@ import ERDCore from 'pgadmin.tools.erd/erd_tool/ERDCore';
import * as createEngineLib from '@projectstorm/react-diagrams';
import TEST_TABLES_DATA from './test_tables';
import { FakeLink, FakeNode } from './fake_item';
import { PortModelAlignment } from '@projectstorm/react-diagrams';
import { PortModelAlignment, PathFindingLinkFactory } from '@projectstorm/react-diagrams';
describe('ERDCore', ()=>{
let eleFactory = jasmine.createSpyObj('nodeFactories', {
@ -45,6 +45,7 @@ describe('ERDCore', ()=>{
beforeAll(()=>{
spyOn(createEngineLib, 'default').and.returnValue(erdEngine);
spyOn(PathFindingLinkFactory.prototype, 'calculateRoutingMatrix').and.callFake(()=>{/* intentionally empty */});
});
it('initialization', ()=>{