fix: 🐛 Fix RT Panel hide/show and Fix looping load errors (#1877)

* fix: 🐛 Fix RT Panel hide/show

* Prevent infinite loop by persisting load errors on displaySet.

* fix: 🐛 Fix infinite error messages

* Fix unit tests.

* comment out reamining MRSTUDY line
This commit is contained in:
James Petts authored and GitHub committed 2020-07-13 14:51:33 +02:00
1 parent 6121bdcf63
commit e7cc735c03
10 files changed
+127 -79

No files matched your search

@@ -135,6 +135,7 @@ export class StudyMetadata extends Metadata {
study,
sopClassUIDs
);
if (displaySet) {
displaySet.sopClassModule = true;
@@ -82,12 +82,17 @@ const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
// For each type, see if any are loaded, if not load the most recent.
Object.keys(displaySetsPerModality).forEach(key => {
const displaySets = displaySetsPerModality[key];
const isLoaded = displaySets.some(displaySet => displaySet.isLoaded);
if (isLoaded) {
return;
}
if (displaySets.some(displaySet => displaySet.loadError)) {
return;
}
// find most recent and load it.
let recentDateTime = 0;
let recentDisplaySet = displaySets[0];
@@ -102,6 +107,8 @@ const loadAndCacheDerivedDisplaySets = (referencedDisplaySet, studies) => {
}
});
recentDisplaySet.isLoading = true;
promises.push(recentDisplaySet.load(referencedDisplaySet, studies));
});
@@ -5,17 +5,18 @@ describe('OHIF Routes', function() {
cy.openStudyList();
});
it('checks TEST json url study route', function() {
cy.visit(
'/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json'
);
// TODO -> Bring back when testJSON is hosted again.
// it('checks TEST json url study route', function() {
// cy.visit(
// '/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json'
// );
cy.server();
cy.route('GET', '**/MRStudy/**').as('getTESTStudy');
// cy.server();
// cy.route('GET', '**/ MRStudy; /**').as('getTESTStudy');
cy.wait('@getTESTStudy.all');
cy.get('@getTESTStudy').should($route => {
expect($route.status).to.be.eq(200);
});
});
// cy.wait('@getTESTStudy.all');
// cy.get('@getTESTStudy').should($route => {
// expect($route.status).to.be.eq(200);
// });
// });
});
@@ -38,12 +38,12 @@ describe('OHIF Study List', function() {
});
it('searches Accession with exact string', function() {
cy.get('@AccessionNumber').type('fpcben98890');
cy.get('@AccessionNumber').type('0000481914');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('fpcben98890');
expect($list).to.contain('0000481914');
});
});
@@ -53,7 +53,7 @@ describe('OHIF Study List', function() {
cy.waitStudyList();
cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(15);
expect($list.length).to.be.eq(9);
expect($list).to.contain('MR');
});
});
@@ -149,18 +149,18 @@ describe('OHIF Study List', function() {
cy.waitStudyList();
cy.get('@searchResult').should($list => {
// TODO: Why are we facing some inconsistency with this result? ¯\_(ツ)_/¯
expect($list.length).to.be.eq(15);
expect($list.length).to.be.eq(9);
expect($list).to.contain('MR');
});
});
it('searches Accession with exact string', function() {
cy.get('@accessionModalityDescription').type('fpcben98890');
cy.get('@accessionModalityDescription').type('0000481914');
//Wait result list to be displayed
cy.waitStudyList();
cy.get('@searchResult').should($list => {
expect($list.length).to.be.eq(1);
expect($list).to.contain('fpcben98890');
expect($list).to.contain('0000481914');
});
});
@@ -5,13 +5,15 @@ describe('Visual Regression - OHIF Routes', function() {
cy.openStudyList();
});
/*
// TODO -> Bring back when testJSON is hosted again.
it('checks TEST json url study route', function() {
cy.visit(
'/viewer?url=https://ohif-viewer.s3.eu-central-1.amazonaws.com/JSON/testJSON.json'
);
cy.server();
cy.route('GET', '**/TESTStudy/**').as('getTESTStudy');
cy.route('GET', '**/ TESTStudy; /**').as('getTESTStudy');
cy.wait('@getTESTStudy.all');
cy.get('@getTESTStudy').should($route => {
@@ -20,4 +22,5 @@ describe('Visual Regression - OHIF Routes', function() {
cy.percyCanvasSnapshot('TEST json study route');
});
*/
});
+1 -2
View File
@@ -9,11 +9,10 @@ window.config = function(props) {
httpErrorHandler: error => {
// This is 429 when rejected from the public idc sandbox too often.
console.warn(error.status);
// Could use services manager here to bring up a dialog/modal if needed.
console.warn('test, navigate to https://ohif.org/');
window.location = 'https://ohif.org/';
},
healthcareApiEndpoint: 'https://idc-sandbox-002.appspot.com/v1beta1',
healthcareApiEndpoint: 'https://proxy-dot-idc-dev.appspot.com/v1beta1',
};
};