Skip to content

Switch to styled-components for compare components #3108

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.

Sign up for GitHub

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

Merged
koesie10 merged 2 commits into from
Dec 6, 2023
Merged

Switch to styled-components for compare components #3108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b421a19
Switch to styled-components for compare components
koesie10 Dec 6, 2023
4a46873
Merge remote-tracking branch 'origin/main' into koesie10/compare-styled
koesie10 Dec 6, 2023
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
21 changes: 17 additions & 4 deletions extensions/ql-vscode/src/view/compare/Compare.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as React from "react";
import { useState, useEffect } from "react";
import { styled } from "styled-components";

import {
ToCompareViewMessage,
Expand All @@ -11,6 +12,18 @@ import CompareTable from "./CompareTable";

import "../results/resultsView.css";

const Header = styled.div`
display: flex;
`;

const HeaderTitle = styled.div`
margin: 0 1.5rem;
`;

const Message = styled.div`
padding: 1.5rem;
`;

export function Compare(_: Record<string, never>): JSX.Element {
const [comparison, setComparison] = useState<SetComparisonsMessage | null>(
null,
Expand Down Expand Up @@ -49,20 +62,20 @@ export function Compare(_: Record<string, never>): JSX.Element {
try {
return (
<>
<div className="vscode-codeql__compare-header">
<div className="vscode-codeql__compare-header-item">Comparing:</div>
<Header>
<HeaderTitle>Comparing:</HeaderTitle>
<CompareSelector
availableResultSets={comparison.commonResultSetNames}
currentResultSetName={comparison.currentResultSetName}
updateResultSet={(newResultSetName: string) =>
vscode.postMessage({ t: "changeCompare", newResultSetName })
}
/>
</div>
</Header>
{hasRows ? (
<CompareTable comparison={comparison}></CompareTable>
) : (
<div className="vscode-codeql__compare-message">{message}</div>
<Message>{message}</Message>
)}
</>
);
Expand Down
13 changes: 11 additions & 2 deletions extensions/ql-vscode/src/view/compare/CompareTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ const OpenButton = styled(TextButton)`
padding: 0;
`;

const Table = styled.table`
margin: 20px 0;
width: 100%;

& > tbody {
vertical-align: top;
}
`;

export default function CompareTable(props: Props) {
const comparison = props.comparison;
const result = props.comparison.result!;
Expand All @@ -29,7 +38,7 @@ export default function CompareTable(props: Props) {
}

return (
<table className="vscode-codeql__compare-body">
<Table>
<thead>
<tr>
<td>
Expand Down Expand Up @@ -74,6 +83,6 @@ export default function CompareTable(props: Props) {
</td>
</tr>
</tbody>
</table>
</Table>
);
}
21 changes: 0 additions & 21 deletions extensions/ql-vscode/src/view/results/resultsView.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,27 +168,6 @@ td.vscode-codeql__path-index-cell {
opacity: 0.6;
}

.vscode-codeql__compare-header {
display: flex;
}

.vscode-codeql__compare-header-item {
margin: 0 1.5rem;
}

.vscode-codeql__compare-message {
padding: 1.5rem;
}

.vscode-codeql__compare-body {
margin: 20px 0;
width: 100%;
}

.vscode-codeql__compare-body > tbody {
vertical-align: top;
}

.vscode-codeql__empty-query-message {
height: 300px;
display: flex;
Expand Down