Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Right Aligned numbers in study view #4539

Merged
merged 1 commit into from
Mar 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"author": "",
"license": "AGPL-3.0-or-later",
"dependencies": {
"3dmol": "^1.3.7",
"@babel/core": "7.4.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.4.4",
Expand Down Expand Up @@ -140,6 +139,7 @@
"@types/seedrandom": "2.4.27",
"@types/sinon": "^4.1.3",
"@types/superagent": "^2.0.36",
"3dmol": "^1.3.7",
"addthis-snippet": "^1.0.1",
"autobind-decorator": "^2.1.0",
"autoprefixer": "^6.7.0",
Expand Down Expand Up @@ -190,7 +190,6 @@
"html-webpack-plugin": "^5.3.2",
"igv": "^2.11.2",
"imports-loader": "^0.8.0",
"jStat": "^1.7.0",
"javascript-natural-sort": "^0.7.1",
"jquery": "3.6.0",
"jquery-migrate": "3.0.0",
Expand All @@ -199,6 +198,7 @@
"json-fn": "^1.1.1",
"jsonpath": "^1.1.1",
"jspdf": "^1.3.3",
"jStat": "^1.7.0",
"jstree": "^3.3.4",
"jszip": "^3.7.1",
"lerna": "3.19.0",
Expand Down
5 changes: 3 additions & 2 deletions src/pages/studyView/TableUtils.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ export function getFreqColumnRender(
numberOfAlteredCases: number,
matchingGenePanelIds: string[],
toggleModal?: (panelName: string) => void,
style?: CSSProperties
style?: CSSProperties,
className?: string
) {
let tooltipContent = '# of samples profiled';
if (type !== 'data') {
Expand All @@ -131,7 +132,7 @@ export function getFreqColumnRender(
overlay={addTotalProfiledOverlay}
destroyTooltipOnHide={true}
>
<span data-test="freq-cell" style={style}>
<span data-test="freq-cell" className={className} style={style}>
{getFrequencyStr(
(numberOfAlteredCases / numberOfProfiledCases) * 100
)}
Expand Down
3 changes: 1 addition & 2 deletions src/pages/studyView/table/ClinicalTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,9 @@ export default class ClinicalTable extends React.Component<
render: (data: ClinicalDataCountSummary) => (
<span
style={{
flexDirection: 'row-reverse',
display: 'flex',
marginRight: this.cellMargin[ColumnKey.FREQ],
}}
className={styles.pullRight}
>
{data.freq}
</span>
Expand Down
13 changes: 7 additions & 6 deletions src/pages/studyView/table/MultiSelectionTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ export class MultiSelectionTable extends React.Component<
<TableHeaderCellFilterIcon
cellMargin={cellMargin}
dataTest="number-column-header"
className={styles.displayFlex}
className={`${styles.displayFlex} ${styles.pullRight}`}
showFilter={!!this.props.alterationFilterEnabled}
isFiltered={!!this.props.filterAlterations}
>
Expand Down Expand Up @@ -324,7 +324,10 @@ export class MultiSelectionTable extends React.Component<
data.numberOfAlteredCases,
data.matchingGenePanelIds || [],
this.toggleModal,
{ marginLeft: cellMargin }
{
aditygrg2 marked this conversation as resolved.
Show resolved Hide resolved
marginLeft: cellMargin,
},
styles.pullRight
);
},
sortBy: (data: MultiSelectionTableRow) =>
Expand Down Expand Up @@ -357,9 +360,8 @@ export class MultiSelectionTable extends React.Component<
render: (data: MultiSelectionTableRow) => (
<span
data-test={'numberOfAlterations'}
className={styles.pullRight}
style={{
flexDirection: 'row-reverse',
display: 'flex',
marginRight: cellMargin,
}}
>
Expand Down Expand Up @@ -392,10 +394,9 @@ export class MultiSelectionTable extends React.Component<
<span
data-test={'numberOfAlterations'}
style={{
flexDirection: 'row-reverse',
display: 'flex',
marginRight: cellMargin,
}}
className={`${styles.pullRight}`}
>
{data.totalCount.toLocaleString()}
</span>
Expand Down
5 changes: 5 additions & 0 deletions src/pages/studyView/table/tables.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ $study-view-table-icon-size: 10px;
line-height: 15px;
}

.pullRight {
display: flex !important;
flex-direction: row-reverse !important;
}

.headerRow {
border-bottom: 1px solid #d1d1d1;
}
Expand Down
1 change: 1 addition & 0 deletions src/pages/studyView/table/tables.module.scss.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ declare const styles: {
readonly "labelContentSVG": string;
readonly "mutsig": string;
readonly "oddRow": string;
readonly "pullRight": string;
readonly "row": string;
readonly "studyViewTablesTable": string;
readonly "tableSearchInput": string;
Expand Down