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

feat: consolidate columns in comparison and fix #241

Merged
merged 3 commits into from
Sep 29, 2023
Merged

feat: consolidate columns in comparison and fix #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84170e2
feat: consolidate columns in comparison and fix
cabreraalex Sep 28, 2023
fb883b3
fix
cabreraalex Sep 28, 2023
e21920a
lint
cabreraalex Sep 28, 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
18 changes: 10 additions & 8 deletions backend/zeno_backend/database/select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,18 +1155,20 @@ def table_data_paginated(
sql.SQL("DESC" if req.sort[1] else "ASC"),
)

db.cur.execute(
sql.SQL("SELECT * {} FROM {} {} {} LIMIT %s OFFSET %s;").format(
final_statement = sql.SQL(" ").join(
[
sql.SQL("SELECT *"),
diff_sql,
sql.Identifier(f"{project}"),
sql.SQL("FROM {}").format(sql.Identifier(project)),
filter,
order_sql,
),
[
req.limit,
req.offset,
],
sql.SQL("LIMIT {} OFFSET {};").format(
sql.Literal(req.limit), sql.Literal(req.offset)
),
]
)
db.cur.execute(final_statement)

if db.cur.description is not None:
columns = [desc[0] for desc in db.cur.description]
filter_results = db.cur.fetchall()
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/lib/api/table.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ export async function getFilteredTable(
);

// create diff columns for comparison view
const diffColumn1 = diffColumn;
let diffColumn1 = undefined;
let diffColumn2 = undefined;
if (filterModels.length > 1 && diffColumn !== undefined) {
diffColumn1 = completeColumns.find(
(c) => c.name === diffColumn.name && c.model === filterModels[0]
);
diffColumn2 = completeColumns.find(
(c) => c.name === diffColumn.name && c.model === filterModels[1]
);
Expand Down
138 changes: 92 additions & 46 deletions frontend/src/lib/components/instance-views/ComparisonView.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
tagIds
} from '$lib/stores';
import { Join, MetadataType, ZenoColumnType, type GroupMetric } from '$lib/zenoapi';
import { Label } from '@smui/button';
import { Icon, Label } from '@smui/button';
import { Pagination } from '@smui/data-table';
import IconButton from '@smui/icon-button';
import Select, { Option } from '@smui/select';
import ComparisonViewTableHeader from './ComparisonViewTableHeader.svelte';
import { viewMap } from './views/viewMap';

export let viewOptions: Record<string, unknown> | undefined;
Expand Down Expand Up @@ -48,6 +47,7 @@
$: if (currentPage > lastPage) {
currentPage = lastPage;
}

$: modelAResult.then((r) => {
if (r !== undefined && r.length > 0) {
lastPage = Math.max(Math.ceil(r[0].size / $rowsPerPage) - 1, 0);
Expand All @@ -64,10 +64,10 @@
// when state changes update current table view
$: {
currentPage;
$model;
$comparisonModel;
$comparisonColumn;
$rowsPerPage;
$model;
$compareSort;
$selectionIds;
$selectionPredicates;
Expand Down Expand Up @@ -118,37 +118,45 @@
}

function updateTable() {
if (isNaN(start) || isNaN(end) || end <= start) return;
if ($model !== undefined && $comparisonModel !== undefined) {
let predicates = $selectionPredicates;
if (predicates !== undefined && instanceOfFilterPredicate(predicates)) {
predicates = {
join: Join._,
predicates: [predicates]
};
}
const secureTagIds = $tagIds === undefined ? [] : $tagIds;
const secureSelectionIds = $selectionIds === undefined ? [] : $selectionIds;
const dataIds = [...new Set([...secureTagIds, ...secureSelectionIds])];
tablePromise = getFilteredTable(
$project.uuid,
$columns,
[$model, $comparisonModel],
$comparisonColumn,
start,
end - start,
$compareSort,
dataIds,
predicates
);
if (instanceContainer) {
instanceContainer.scrollTop = 0;
}
if (
isNaN(start) ||
isNaN(end) ||
end <= start ||
$model === undefined ||
$comparisonModel === undefined
)
return;

let predicates = $selectionPredicates;
if (predicates !== undefined && instanceOfFilterPredicate(predicates)) {
predicates = {
join: Join._,
predicates: [predicates]
};
}

const secureTagIds = $tagIds === undefined ? [] : $tagIds;
const secureSelectionIds = $selectionIds === undefined ? [] : $selectionIds;
const dataIds = [...new Set([...secureTagIds, ...secureSelectionIds])];
tablePromise = getFilteredTable(
$project.uuid,
$columns,
[$model, $comparisonModel],
$comparisonColumn,
start,
end - start,
$compareSort,
dataIds,
predicates
);

if (instanceContainer) {
instanceContainer.scrollTop = 0;
}
}

function modelValueAndDiff(
model: string,
model: string | undefined,
tableContent: Record<string, string | number | boolean>
) {
const compareColumnObj = $columns.filter(
Expand All @@ -166,8 +174,19 @@
<thead
class="sticky border-b border-grey-lighter font-semibold top-0 left-0 text-left align-top bg-background z-10"
>
<th class="p-3">
<div>A: {$model}</div>
<th class="p-3 cursor-pointer hover:text-primary" on:click={() => updateSort($model)}>
<div class="flex">
<p>A: {$model}</p>
{#if sortModel === $model}
<Icon class="material-icons">
{#if $compareSort[0] && $compareSort[1]}
arrow_drop_up
{:else if $compareSort[0]}
arrow_drop_down
{/if}
</Icon>
{/if}
</div>
<div>
<span class="font-normal text-sm mr-3.5 text-grey-dark">
{$metric ? $metric.name + ':' : ''}
Expand All @@ -183,13 +202,27 @@
</span>
</div>
</th>
<th class="p-3">
<div>B: {$comparisonModel}</div>
<th
class="p-3 cursor-pointer hover:text-primary"
on:click={() => updateSort($comparisonModel)}
>
<div class="flex">
<p>B: {$comparisonModel}</p>
{#if sortModel === $comparisonModel}
<Icon class="material-icons">
{#if $compareSort[0] && $compareSort[1]}
arrow_drop_up
{:else if $compareSort[0]}
arrow_drop_down
{/if}
</Icon>
{/if}
</div>
<div>
<span class="font-normal text-sm mr-3.5 text-grey-dark">
{$metric ? $metric.name + ':' : ''}
</span>
<span class="font-normal text-sm mr-3.5 text-primary">
<span class="font-normal mr-3.5 text-primary">
{#await modelBResult then res}
{#if res !== undefined && res.length > 0}
{#if res[0].metric !== undefined && res[0].metric !== null}
Expand All @@ -200,14 +233,22 @@
</span>
</div>
</th>
<th on:click={() => updateSort($model)} class="cursor-pointer p-3 min-w-[150px]">
<ComparisonViewTableHeader {sortModel} header={$model} />
</th>
<th on:click={() => updateSort($comparisonModel)} class="cursor-pointer p-3 min-w-[150px]">
<ComparisonViewTableHeader {sortModel} header={$comparisonModel} />
</th>
<th on:click={() => updateSort('')} class="cursor-pointer p-3 min-w-[150px]">
<ComparisonViewTableHeader {sortModel} header={''} />
<th class="p-3 cursor-pointer hover:text-primary" on:click={() => updateSort('')}>
<div class="flex">
<div>
<span class="whitespace-nowrap">Difference in</span>
<span class="text-grey-dark whitespace-nowrap">{$comparisonColumn?.name}</span>
</div>
{#if sortModel === ''}
<Icon class="material-icons">
{#if $compareSort[0] && $compareSort[1]}
arrow_drop_up
{:else if $compareSort[0]}
arrow_drop_down
{/if}
</Icon>
{/if}
</div>
</th>
</thead>
{#await tablePromise then table}
Expand All @@ -216,6 +257,10 @@
<tr>
{#if viewMap[$project.view] !== undefined}
<td class="p-3 align-baseline">
<p class="mb-2">
<span class="text-grey-dark">{$comparisonColumn?.name}:</span>
{modelValueAndDiff($model, tableContent)}
</p>
<div class="instance">
<svelte:component
this={viewMap[$project.view]}
Expand All @@ -226,6 +271,10 @@
</div>
</td>
<td class="p-3 align-baseline">
<p class="mb-2">
<span class="text-grey-dark">{$comparisonColumn?.name}:</span>
{modelValueAndDiff($comparisonModel, tableContent)}
</p>
<div class="instance">
<svelte:component
this={viewMap[$project.view]}
Expand All @@ -237,9 +286,6 @@
</td>
{/if}
{#if $model !== undefined && $comparisonModel !== undefined}
<td class="p-3 align-text-top">{modelValueAndDiff($model, tableContent)}</td>
<td class="p-3 align-text-top">{modelValueAndDiff($comparisonModel, tableContent)}</td
>
<td class="p-3 align-text-top"
>{$comparisonColumn?.dataType === MetadataType.CONTINUOUS
? Number(tableContent['diff']).toFixed(2)
Expand Down
25 changes: 13 additions & 12 deletions frontend/src/lib/components/metadata/MetadataHeader.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,29 +63,30 @@
</div>
{/if}
</div>
{#if $page.url.href.includes('compare') && $metric !== undefined && $metrics.length > 0}
<div class="flex flex-col w-full">
<span class="my-1 text-grey-dark">Metric</span>

{#if $page.url.href.includes('compare') && comparisonColumnOptions.length > 0}
<div class="mt-3 mb-3">
<h4 class="mb-1">Comparison Feature</h4>
<select
class="w-full h-9 border border-grey-light rounded text-sm text-grey"
bind:value={$metric}
bind:value={$comparisonColumn}
>
{#each $metrics as met}
<option value={met}>{met.name}</option>
{#each comparisonColumnOptions as col (col.id)}
<option value={col}>{col.name}</option>
{/each}
</select>
</div>
{/if}

{#if $page.url.href.includes('compare') && comparisonColumnOptions.length > 0}
<div class="mt-3 mb-3">
<h4 class="mb-1">Comparison Feature</h4>
{#if $page.url.href.includes('compare') && $metric !== undefined && $metrics.length > 0}
<div class="flex flex-col w-full mt-3 mb-3">
<span class="my-1 text-grey-dark">Metric</span>
<select
class="w-full h-9 border border-grey-light rounded text-sm text-grey"
bind:value={$comparisonColumn}
bind:value={$metric}
>
{#each comparisonColumnOptions as col (col.id)}
<option value={col}>{col.name}</option>
{#each $metrics as met}
<option value={met}>{met.name}</option>
{/each}
</select>
</div>
Expand Down