Fix merge conflicts and add tests for Comparison page

cBioPortal · Feb 17, 2022 · 1bcaa6b · 1bcaa6b
1 parent 8894f5a
commit 1bcaa6b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 59 deletions.
diff --git a/end-to-end-test/remote/specs/core/customTabs.spec.js b/end-to-end-test/remote/specs/core/customTabs.spec.js
@@ -273,6 +273,9 @@ function runTests(pageName, url, tabLocation) {
                     $('.nextPageBtn').isDisplayed() &&
                         $('.nextPageBtn').click();
                     break;
+                case 'COMPARISON_PAGE':
+                    $("[data-test='groupSelectorButtonMSI/CIMP']").click();
+                    break;
             }
 
             $('div=Second render').waitForDisplayed();
@@ -289,6 +292,8 @@ const resultsUrl = `${CBIOPORTAL_URL}/results?cancer_study_list=coadread_tcga_pu
 
 const patientUrl = `${CBIOPORTAL_URL}/patient?studyId=ucec_tcga_pub&caseId=TCGA-AP-A053#navCaseIds=ucec_tcga_pub:TCGA-AP-A053,ucec_tcga_pub:TCGA-BG-A0M8,ucec_tcga_pub:TCGA-BG-A0YV,ucec_tcga_pub:TCGA-BS-A0U8`;
 
+const comparisonUrl = `${CBIOPORTAL_URL}/comparison?comparisonId=61845a6ff8f71021ce56e22b`;
+
 describe('Patient Cohort View Custom Tab Tests', () => {
     const conf = [
         {
@@ -395,3 +400,5 @@ describe('Patient Cohort View Custom Tab Tests', () => {
 runTests('ResultsView', resultsUrl, 'RESULTS_PAGE');
 
 runTests('PatientView', patientUrl, 'PATIENT_PAGE');
+
+runTests('ComparisonPage', comparisonUrl, 'COMPARISON_PAGE');
diff --git a/my-index.ejs b/my-index.ejs
@@ -5,34 +5,6 @@
     <link rel="icon" href="/images/cbioportal_icon.png"/>
     <title>cBioPortal for Cancer Genomics</title>
     <script>
-        
-        window.devContext = true;
-            // @ts-ignore: ENV_* are defined in webpack.config.js
-           // genomeNexusApiUrl : ENV_GENOME_NEXUS_URL,
-        window.frontendConfig = {
-            //configurationServiceUrl:"http://localhost:8080/config_service.jsp",
-            //frontendUrl:'//'+window.location.host + '/',
-            //apiRoot: 'http://www.cbioportal.org/rc',
-            //sessionServiceUrl:'http://www.cbioportal.org/rc/api-legacy/proxy/session/',
-
-//             serverConfig:{
-//
-// //             custom_tabs:[
-// //                             {
-// //                                 "title": "Custom Tab",
-// //                                 "location": "RESULTS_PAGE",
-// //                                 "mountCallbackName": "renderCustomTab1",
-// //                                 "hide":false,
-// //                                 //"pathsToJs":["http:127.0.0.1:8081/customTab1.js"],
-// //                                 "showWithMultipleStudies": true,
-// //                                 "customParameters": { example:1 },
-// //                                 "unmountOnHide":false
-// //                             }
-// //                         ],
-// //
-// //             }
-
-        };
 
         localStorage.frontendConfig = JSON.stringify(
             {

diff --git a/src/pages/patientView/PatientViewPageTabs.tsx b/src/pages/patientView/PatientViewPageTabs.tsx
@@ -1,6 +1,6 @@
 import { MSKTab, MSKTabs } from 'shared/components/MSKTabs/MSKTabs';
 import LoadingIndicator from 'shared/components/loadingIndicator/LoadingIndicator';
-import TimelineWrapper from 'pages/patientView/timeline2/TimelineWrapper';
+import TimelineWrapper from 'pages/patientView/timeline/TimelineWrapper';
 import WindowStore from 'shared/components/window/WindowStore';
 import GenomicOverview from 'pages/patientView/genomicOverview/GenomicOverview';
 import { default as PatientViewMutationTable } from 'pages/patientView/mutation/PatientViewMutationTable';
@@ -11,7 +11,7 @@ import PatientViewMutationsTab from 'pages/patientView/mutation/PatientViewMutat
 import PatientViewPathwayMapper from 'pages/patientView/pathwayMapper/PatientViewPathwayMapper';
 import ClinicalInformationPatientTable from 'pages/patientView/clinicalInformation/ClinicalInformationPatientTable';
 import ClinicalInformationSamples from 'pages/patientView/clinicalInformation/ClinicalInformationSamplesTable';
-import ClinicalEventsTables from 'pages/patientView/timeline2/ClinicalEventsTables';
+import ClinicalEventsTables from 'pages/patientView/timeline/ClinicalEventsTables';
 import ResourcesTab, {
     RESOURCES_TAB_NAME,
 } from 'pages/patientView/resources/ResourcesTab';

diff --git a/src/pages/patientView/timeline/TimelineWrapper.tsx b/src/pages/patientView/timeline/TimelineWrapper.tsx
@@ -31,7 +31,7 @@ export interface ISampleMetaDeta {
     label: { [sampleId: string]: string };
 }
 
-export interface ITimeline2Props {
+export interface ITimelineProps {
     dataStore: PatientViewMutationsDataStore;
     data: ClinicalEvent[];
     caseMetaData: ISampleMetaDeta;
@@ -42,14 +42,14 @@ export interface ITimeline2Props {
     headerWidth?: number;
 }
 
-const TimelineWrapper: React.FunctionComponent<ITimeline2Props> = observer(
+const TimelineWrapper: React.FunctionComponent<ITimelineProps> = observer(
     function({
         data,
         caseMetaData,
         sampleManager,
         width,
         headerWidth,
-    }: ITimeline2Props) {
+    }: ITimelineProps) {
         const [events, setEvents] = useState<
             TimelineTrackSpecification[] | null
         >(null);

diff --git a/src/shared/components/PageDecorator/PageDecorator.spec.tsx b/src/shared/components/PageDecorator/PageDecorator.spec.tsx
diff --git a/src/shared/components/PageDecorator/PageDecorator.tsx b/src/shared/components/PageDecorator/PageDecorator.tsx