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.

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

Tab component abstraction #1882

Merged
merged 8 commits into from
Apr 2, 2024
Merged

Tab component abstraction #1882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14a8b9f
abstract tab component
chengr4 Mar 28, 2024
d8ceeeb
Refactor runtime tab
chengr4 Mar 28, 2024
09eb2cd
set class table-wrapper into SummaryTable
chengr4 Mar 28, 2024
e269cb5
Refactor bootstrap tab
chengr4 Mar 28, 2024
ac3769c
Refactor artifact tab
chengr4 Mar 28, 2024
ab3065f
remove unused css (moved into tab.vue)
chengr4 Mar 28, 2024
38b1b64
tooltip is more understandable
chengr4 Mar 28, 2024
6c54c7f
Fix nit
chengr4 Apr 2, 2024
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
71 changes: 71 additions & 0 deletions site/frontend/src/components/tab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<script setup lang="ts">
const props = defineProps<{
tooltip: string;
title: string;
selected: boolean;
}>();
</script>

<template>
<div class="tab" :title="props.tooltip" :class="{selected: props.selected}">
<div class="title">{{ props.title }}</div>
<div class="summary">
<slot name="summary"></slot>
</div>
</div>
</template>

<style scoped lang="scss">
.tab {
display: flex;
flex-direction: column;
position: relative;
min-width: 200px;
min-height: 60px;
padding: 5px;
text-align: center;
border: 2px dotted #cccccc;
border-radius: 5px;
cursor: pointer;

&:hover {
@extend .selected;
}

@media (min-width: 600px) {
&:not(:first-child) {
margin-left: 30px;
}

&:not(:last-child) {
:after {
content: "";
position: absolute;
right: -17px;
border-right: 1px solid black;
top: 20%;
bottom: 20%;
}
}
}
}

.title {
font-weight: bold;
font-size: 1.1em;
margin-bottom: 5px;
}

.selected {
border-style: solid;
border-color: black;
}

.summary {
display: flex;
flex-direction: column;
justify-content: center;
font-size: 0.9em;
flex-grow: 1;
}
</style>
158 changes: 52 additions & 106 deletions site/frontend/src/pages/compare/tabs.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
import {SummaryGroup} from "./data";
import SummaryPercentValue from "./summary/percent-value.vue";
import SummaryRange from "./summary/range.vue";
import TabComponent from "../../components/tab.vue";

const props = withDefaults(
defineProps<{
Expand Down Expand Up @@ -42,27 +43,29 @@ function SummaryTable({summary}: {summary: SummaryGroup}) {
const valid = summary.all.count > 0;
if (valid) {
return (
<table>
<thead>
<tr>
<th>Range</th>
<th>Mean</th>
</tr>
</thead>
<thead>
<tr>
<td>
<SummaryRange range={summary.all.range} />
</td>
<td>
<SummaryPercentValue
class={percentClass(summary.all.average)}
value={summary.all.average}
/>
</td>
</tr>
</thead>
</table>
<div class="table-wrapper">
<table>
<thead>
<tr>
<th>Range</th>
<th>Mean</th>
</tr>
</thead>
<thead>
<tr>
<td>
<SummaryRange range={summary.all.range} />
</td>
<td>
<SummaryPercentValue
class={percentClass(summary.all.average)}
value={summary.all.average}
/>
</td>
</tr>
</thead>
</table>
</div>
);
}
return <div>No results</div>;
Expand Down Expand Up @@ -95,36 +98,33 @@ const activeTab: Ref<Tab> = ref(props.initialTab);

<template>
<div class="wrapper">
<div
class="tab"
title="Compilation time benchmarks: measure how long does it take to compile various crates using the compared rustc."
:class="{selected: activeTab === Tab.CompileTime}"
<TabComponent
tooltip="Compilation time benchmarks: measure how long does it take to compile various crates using the compared rustc."
title="Compile-time"
:selected="activeTab === Tab.CompileTime"
@click="changeTab(Tab.CompileTime)"
>
<div class="title">Compile-time</div>
<div class="summary table-wrapper">
<template v-slot:summary>
<SummaryTable :summary="compileTimeSummary" />
</div>
</div>
<div
class="tab"
title="Runtime benchmarks: measure how long does it take to execute (i.e. how fast are) programs compiled by the compared rustc."
:class="{selected: activeTab === Tab.Runtime}"
</template>
</TabComponent>
<TabComponent
tooltip="Runtime benchmarks: measure how long does it take to execute (i.e. how fast are) programs compiled by the compared rustc."
title="Runtime"
:selected="activeTab === Tab.Runtime"
@click="changeTab(Tab.Runtime)"
>
<div class="title">Runtime</div>
<div class="summary table-wrapper">
<template v-slot:summary>
<SummaryTable :summary="runtimeSummary" />
</div>
</div>
<div
class="tab"
title="Bootstrap duration: measures how long does it take to compile rustc by itself."
:class="{selected: activeTab === Tab.Bootstrap}"
</template>
</TabComponent>
<TabComponent
tooltip="Bootstrap duration: measures how long does it take to compile rustc by itself."
title="Bootstrap"
:selected="activeTab === Tab.Bootstrap"
@click="changeTab(Tab.Bootstrap)"
>
<div class="title">Bootstrap</div>
<div class="summary">
<template v-slot:summary>
<div>
{{ formatBootstrap(bootstrapA) }} ->
{{ formatBootstrap(bootstrapB) }}
Expand All @@ -137,17 +137,16 @@ const activeTab: Ref<Tab> = ref(props.initialTab);
(((bootstrapB - bootstrapA) / bootstrapA) * 100).toFixed(3)
}}%)
</div>
</div>
</div>
<div
class="tab"
title="Artifact size: sizes of individual components of the two artifacts."
</template>
</TabComponent>
<TabComponent
tooltip="Artifact size: sizes of individual components of the two artifacts."
title="Artifact size"
v-if="sizesAvailable"
:class="{selected: activeTab === Tab.ArtifactSize}"
:selected="activeTab === Tab.ArtifactSize"
@click="changeTab(Tab.ArtifactSize)"
>
<div class="title">Artifact size</div>
<div class="summary">
<template v-slot:summary>
<div>
{{ formatArtifactSize(totalSizeA) }} ->
{{ formatArtifactSize(totalSizeB) }}
Expand All @@ -161,8 +160,8 @@ const activeTab: Ref<Tab> = ref(props.initialTab);
formatPercentChange(totalSizeA, totalSizeB)
}})
</div>
</div>
</div>
</template>
</TabComponent>
</div>
</template>

Expand All @@ -180,51 +179,6 @@ const activeTab: Ref<Tab> = ref(props.initialTab);
}
}

.tab {
display: flex;
flex-direction: column;
position: relative;
min-width: 200px;
min-height: 60px;
padding: 5px;
text-align: center;
border: 2px dotted #cccccc;
border-radius: 5px;
cursor: pointer;

&:hover {
@extend .selected;
}

@media (min-width: 600px) {
&:not(:first-child) {
margin-left: 30px;
}

&:not(:last-child) {
:after {
content: "";
position: absolute;
right: -17px;
border-right: 1px solid black;
top: 20%;
bottom: 20%;
}
}
}
}

.title {
font-weight: bold;
font-size: 1.1em;
margin-bottom: 5px;
}

.selected {
border-style: solid;
border-color: black;
}

.table-wrapper {
table {
width: 100%;
Expand All @@ -235,12 +189,4 @@ const activeTab: Ref<Tab> = ref(props.initialTab);
font-weight: normal;
}
}

.summary {
display: flex;
flex-direction: column;
justify-content: center;
font-size: 0.9em;
flex-grow: 1;
}
</style>
Loading