Merge pull request #96 from alisman/styleUpdate

get rid of tslint errors. adjust patient table col width
cBioPortal · Dec 6, 2016 · 01e98b2 · 01e98b2
2 parents d033949 + e15a7e3
commit 01e98b2
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 33 deletions.
diff --git a/src/pages/datasetView/DatasetPage.tsx b/src/pages/datasetView/DatasetPage.tsx
@@ -1,8 +1,6 @@
 import * as React from "react";
-import { connect } from 'react-redux';
 import { Table, unsafe }  from 'reactableMSK';
-import * as _ from 'underscore';
-import Connector, { DatasetDownloads } from './Connector';
+import Connector from './Connector';
 
 export interface IDatasetPageUnconnectedProps {
 
@@ -25,24 +23,28 @@ export default class DataSetPageUnconnected extends React.Component<IDatasetPage
             const rows: Array<any> = [];
             this.props.datasets.forEach((item) => {
                 const tempObj: any = {
-                    "CancerStudy": unsafe(`<a href='http://www.cbioportal.org/study?id=${ item.cancer_study_identifier }#summary' target='_blank'> ${ item.name } </a>  <a href='https://github.com/cBioPortal/datahub/blob/master/public/${ item.cancer_study_identifier }.tar.gz' download><i class='fa fa-download'></i></a>`),
-                    "Reference": unsafe(`<a target='_blank' href='https://www.ncbi.nlm.nih.gov/pubmed/${ item.pmid }'>${ item.citation }</a>`),
+                    CancerStudy: unsafe(`<a href='http://www.cbioportal.org/study?id=${ item.cancer_study_identifier }#summary' target='_blank'> ${ item.name } </a>  <a href='https://github.com/cBioPortal/datahub/blob/master/public/${ item.cancer_study_identifier }.tar.gz' download><i class='fa fa-download'></i></a>`),
+                    Reference: unsafe(`<a target='_blank' href='https://www.ncbi.nlm.nih.gov/pubmed/${ item.pmid }'>${ item.citation }</a>`),
                     "All": item.all,
-                    "Sequenced": item.sequenced,
-                    "CNA": item.cna,
+                    Sequenced: item.sequenced,
+                    CNA: item.cna,
                     "Tumor mRNA (RNA-Seq V2)": item.rna_seq_v2_mrna,
                     "Tumor mRNA (microarray)": item.microrna,
                     "Tumor miRNA": item.mrna,
                     "Methylation (HM27)": item.methylation_hm27,
-                    "RPPA": item.rppa,
-                    "Complete": item.complete
+                    RPPA: item.rppa,
+                    Complete: item.complete
                 };
                 rows.push(tempObj);
             });
-            return <Table className="table" data={rows} sortable={true}
-                          filterable={['CancerStudy','Reference','All','Sequenced','CNA','Tumor mRNA (RNA-Seq V2)','Tumor mRNA (microarray)','Tumor miRNA','Methylation (HM27)','RPPA','Complete']}/>;
+            return <Table
+                          className="table"
+                          data={rows}
+                          sortable={true}
+                          filterable={['CancerStudy','Reference','All','Sequenced','CNA','Tumor mRNA (RNA-Seq V2)','Tumor mRNA (microarray)','Tumor miRNA','Methylation (HM27)','RPPA','Complete']}
+            />;
         } else {
-            return <div>loading</div>
+            return <div>loading</div>;
         }
     }
 }

diff --git a/src/pages/patientView/PatientViewPage.tsx b/src/pages/patientView/PatientViewPage.tsx
@@ -6,7 +6,6 @@ import ClinicalInformationContainer from './clinicalInformation/ClinicalInformat
 import PatientHeaderUnconnected from './patientHeader/PatientHeader';
 import {IPatientHeaderProps} from './patientHeader/PatientHeader';
 import {RootState} from "../../redux/rootReducer";
-import PageDecorator from '../../shared/components/PageDecorator/PageDecorator';
 
 interface IPatientViewPageProps {
     store?: RootState;
@@ -45,7 +44,7 @@ export default class PatientViewPage extends React.Component<IPatientViewPagePro
 
     // this gives the parent (legacy) cbioportal code control to mount
     // these components whenever and wherever it wants
-    exposeComponentRenderersToParentScript(){
+    exposeComponentRenderersToParentScript() {
 
         const win: any = window;
 

diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationContainer.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationContainer.tsx
@@ -12,7 +12,7 @@ export interface IClinicalInformationContainerProps {
     status?: typeof _ClinicalInformationData.status;
     patient?: typeof _ClinicalInformationData.patient;
     samples?: typeof _ClinicalInformationData.samples;
-    nodes?: TODO;//PDXNode[];
+    nodes?: TODO;// PDXNode[];
     loadClinicalInformationTableData?: () => void;
     setTab?: (activeTab:number) => void;
     store?: any;
@@ -26,16 +26,6 @@ export default class ClinicalInformationContainer extends React.Component<IClini
             this.props.loadClinicalInformationTableData();
     }
 
-    private buildTabs() {
-        return (
-            <div>
-                <ClinicalInformationPatientTable showTitleBar={true} data={this.props.patient && this.props.patient.clinicalData} />
-                <hr />
-                <ClinicalInformationSamples samples={this.props.samples} />
-            </div>
-        );
-    }
-
     public render() {
         switch (this.props.status) {
             case 'fetching':
@@ -51,4 +41,16 @@ export default class ClinicalInformationContainer extends React.Component<IClini
                 return <div />;
         }
     }
+
+    private buildTabs() {
+        return (
+            <div>
+                <ClinicalInformationPatientTable showTitleBar={true} data={this.props.patient && this.props.patient.clinicalData} />
+                <hr />
+                <ClinicalInformationSamples samples={this.props.samples} />
+            </div>
+        );
+    }
+
+
 }
diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationPatientTable.tsx
@@ -3,6 +3,8 @@ import {ClinicalData} from "../../../shared/api/CBioPortalAPI";
 import {Table as DataTable} from "reactableMSK";
 import TableExportButtons from "../../../shared/components/tableExportButtons/TableExportButtons";
 
+import styles from './style/patientTable.module.scss';
+
 export interface IClinicalInformationPatientTableProps {
     data?: Array<ClinicalData>;
     showTitleBar?: Boolean;
@@ -27,7 +29,7 @@ export default class ClinicalInformationPatientTable extends React.Component<ICl
                         </div>
                     :   null
                 }
-                <DataTable className='table table-striped' columns={[{ key:'attribute', label:'Attribute'},{ key:'value', label:'Value'}]} data={tableData} />
+                <DataTable className={ `table table-striped ${styles.patientTable}` } columns={[{ key:'attribute', label:'Attribute'},{ key:'value', label:'Value'}]} data={tableData} />
             </div>
         );
     }

diff --git a/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx b/src/pages/patientView/clinicalInformation/ClinicalInformationSamplesTable.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import {ClinicalDataBySampleId} from "./getClinicalInformationData";
 import convertSamplesData, {IConvertedSamplesData} from "./lib/convertSamplesData";
 import {SampleLabelHTML} from "../SampleLabel";
-import {Table as DataTable, Tr, Td, Thead, Th} from "reactableMSK";
+import {Table as DataTable, Thead, Th} from "reactableMSK";
 import TableExportButtons from "../../../shared/components/tableExportButtons/TableExportButtons";
 
 interface IClinicalInformationSamplesTableProps {
@@ -28,11 +28,10 @@ export default class ClinicalInformationSamplesTable extends React.Component<ICl
         );
     }
 
-    public buildHeaderCells(sampleInvertedData: IConvertedSamplesData){
+    public buildHeaderCells(sampleInvertedData: IConvertedSamplesData) {
 
         const headerCells: Array<JSX.Element> = sampleInvertedData.columns.map((col, i) => {
             return (<Th column={col.id} key={i}>
-                <SampleLabelHTML color={'black'} label={(i + 1).toString()} />
                 {' ' + col.id}
             </Th>);
         });
@@ -43,7 +42,7 @@ export default class ClinicalInformationSamplesTable extends React.Component<ICl
         return headerCells;
     }
 
-    public prepareData(sampleInvertedData: IConvertedSamplesData){
+    public prepareData(sampleInvertedData: IConvertedSamplesData) {
 
         const tableData: Array<any> = [];
 

diff --git a/src/pages/patientView/clinicalInformation/style/local.module.scss b/src/pages/patientView/clinicalInformation/style/local.module.scss
@@ -6,7 +6,6 @@ h4 {
     margin-top:20px;
   }
 
-
 }
 
 

diff --git a/src/pages/patientView/clinicalInformation/style/patientTable.module.scss b/src/pages/patientView/clinicalInformation/style/patientTable.module.scss
@@ -0,0 +1,9 @@
+.patientTable {
+
+    td:first-child {
+
+        width:300px;
+
+    }
+
+}
diff --git a/src/shared/components/PageDecorator/PageDecorator.tsx b/src/shared/components/PageDecorator/PageDecorator.tsx
@@ -10,4 +10,4 @@ export default function (component: typeof React.Component): any {
             }
         }
     };
-};
+};
diff --git a/tslint.json b/tslint.json
@@ -25,19 +25,21 @@
         "no-unsafe-finally": true,
         "no-var-keyword": true,
         "only-arrow-functions": false,
+        "ordered-imports": false,
         "one-line": [
             true,
-            "check-open-brace",
             "check-whitespace"
         ],
         "quotemark": [
             false,
             "single"
         ],
+        "object-literal-sort-keys": false,
         "semicolon": [
             true,
             "always"
         ],
+        "trailing-comma": [false],
         "triple-equals": [
             true,
             "allow-null-check"
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         };
-    };
+    };