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

UI datasets ordering starting from 0 #2106

Merged
merged 1 commit into from
Oct 25, 2024
Merged

UI datasets ordering starting from 0 #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion horreum-backend/src/main/java/io/hyperfoil/tools/horreum/notification/EmailPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void notifyMissingDataset(String testName, int testId, String ruleName, l
@Override
public void notifyMissingValues(String testName, String fingerprint, MissingValuesEvent event) {
String subject = String.format("%s Missing change detection values in test %s, dataset %d#%d",
subjectPrefix, testName, event.dataset.runId, event.dataset.ordinal + 1);
subjectPrefix, testName, event.dataset.runId, event.dataset.ordinal);
missingValuesNotificationEmail
.data("username", username)
.data("testName", testName)
Expand Down
14 changes: 7 additions & 7 deletions horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ReportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ private Map<Integer, TableReportDAO.Data> getData(TableReportConfigDAO config, T
} catch (PolyglotException e) {
log(report, PersistentLogDAO.ERROR,
"Failed to run report %s(%d) category function on dataset %d/%d (%d). Offending code: <br><pre>%s</pre>",
config.title, config.id, data.runId, data.ordinal + 1, data.datasetId, jsCode);
config.title, config.id, data.runId, data.ordinal, data.datasetId, jsCode);
log.debug("Caused by exception", e);
continue;
}
Expand All @@ -480,7 +480,7 @@ private Map<Integer, TableReportDAO.Data> getData(TableReportConfigDAO config, T
} catch (PolyglotException e) {
log(report, PersistentLogDAO.ERROR,
"Failed to run report %s(%d) series function on run %d/%d (%d). Offending code: <br><pre>%s</pre>",
config.title, config.id, runId, ordinal + 1, datasetId, jsCode);
config.title, config.id, runId, ordinal, datasetId, jsCode);
log.debug("Caused by exception", e);
}
}
Expand All @@ -504,7 +504,7 @@ private Map<Integer, TableReportDAO.Data> getData(TableReportConfigDAO config, T
} catch (PolyglotException e) {
log(report, PersistentLogDAO.ERROR,
"Failed to run report %s(%d) label function on dataset %d/%d (%d). Offending code: <br><pre>%s</pre>",
config.title, config.id, runId, ordinal + 1, datasetId, jsCode);
config.title, config.id, runId, ordinal, datasetId, jsCode);
log.debug("Caused by exception", e);
}
}
Expand Down Expand Up @@ -639,7 +639,7 @@ private List<Integer> filterDatasetIds(TableReportConfigDAO config, TableReportD
if (debugList.length() != 0) {
debugList.append(", ");
}
debugList.append(runId).append('/').append(ordinal + 1);
debugList.append(runId).append('/').append(ordinal);
if (row[3] != null && ((JsonNode) row[3]).asBoolean(false)) {
datasetIds.add(datasetId);
} else {
Expand All @@ -658,7 +658,7 @@ private List<Integer> filterDatasetIds(TableReportConfigDAO config, TableReportD
if (debugList.length() != 0) {
debugList.append(", ");
}
debugList.append(runId).append('/').append(ordinal + 1);
debugList.append(runId).append('/').append(ordinal);
try {
org.graalvm.polyglot.Value value = context.eval("js", jsCode);
if (value.isBoolean()) {
Expand All @@ -673,13 +673,13 @@ private List<Integer> filterDatasetIds(TableReportConfigDAO config, TableReportD
debugList.append("(filtered: not boolean)");
log(report, PersistentLogDAO.ERROR,
"Report %s(%d) filter result for dataset %d/%d (%d) is not a boolean: %s. Offending code: <br><pre>%s</pre>",
config.title, config.id, runId, ordinal + 1, datasetId, value, jsCode);
config.title, config.id, runId, ordinal, datasetId, value, jsCode);
}
} catch (PolyglotException e) {
debugList.append("(filtered: JS error)");
log(report, PersistentLogDAO.ERROR,
"Failed to run report %s(%d) filter function on dataset %d/%d (%d). Offending code: <br><pre>%s</pre>",
config.title, config.id, runId, ordinal + 1, datasetId, jsCode);
config.title, config.id, runId, ordinal, datasetId, jsCode);
log.debug("Caused by exception", e);
}
}
Expand Down
2 changes: 1 addition & 1 deletion horreum-backend/src/main/resources/templates/tags/dataset_link.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{it.runId}#{it.ordinal + 1}]({publicUrl}/run/{it.runId}#dataset{it.ordinal})
[{it.runId}/{it.ordinal}]({publicUrl}/run/{it.runId}#dataset{it.ordinal})
2 changes: 1 addition & 1 deletion horreum-web/src/domain/alerting/ChangeTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export const ChangeTable = ({ varId, fingerprint, testOwner, selectedChangeId }:
if (!dataset) return <></>
return (
<NavLink to={`/run/${dataset.runId}#dataset${dataset.ordinal}`}>
{dataset.runId}/{dataset.ordinal + 1}
{dataset.runId}/{dataset.ordinal}
</NavLink>
)
},
Expand Down
2 changes: 1 addition & 1 deletion horreum-web/src/domain/alerting/RecalculateModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function datasetsToLinks(datasets: DatasetInfo[] | undefined | null) {
<>
{i !== 0 && ", "}
<NavLink to={`/run/${ds.runId}#dataset${ds.ordinal}`}>
{ds.runId}/{ds.ordinal + 1}
{ds.runId}/{ds.ordinal}
</NavLink>
</>
))}
Expand Down
2 changes: 1 addition & 1 deletion horreum-web/src/domain/reports/TableReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function DataView(props: DataViewProps) {
<>
Dataset{" "}
<NavLink to={`/run/${data.runId}#dataset${data.ordinal}`}>
{data.runId}/{data.ordinal + 1}
{data.runId}/{data.ordinal}
</NavLink>
</>
}
Expand Down
6 changes: 3 additions & 3 deletions horreum-web/src/domain/runs/DatasetComparison.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export default function DatasetComparison() {
...datasets.map(item => ({
title: (
<NavLink to={`/run/${item.runId}#dataset${item.ordinal}`}>
{item.runId}/{item.ordinal + 1}
{item.runId}/{item.ordinal}
</NavLink>
),
})),
Expand Down Expand Up @@ -166,7 +166,7 @@ function LabelsComparison({headers, datasets, alerting}: LabelsComparisonProps)
title: (
<BarValuesChart
values={row.slice(1)}
legend={labels.map(item => `${item.runId}/${item.ordinal + 1}`)}
legend={labels.map(item => `${item.runId}/${item.ordinal}`)}
/>
),
props: {
Expand Down Expand Up @@ -261,7 +261,7 @@ function ViewComparison({headers, view, datasets, alerting}: ViewComparisonProps
title: (
<BarValuesChart
values={rd.slice(1)}
legend={summaries.map(summary => `${summary.runId}/${summary.ordinal + 1}`)}
legend={summaries.map(summary => `${summary.runId}/${summary.ordinal}`)}
/>
) ,
props: {
Expand Down
2 changes: 1 addition & 1 deletion horreum-web/src/domain/runs/ExperimentModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ export default function ExperimentModal(props: ExperimentModalProps) {
interleave(
result.baseline.map((ds, i) => (
<NavLink key={2 * i} to={`/run/${ds.runId}#dataset${ds.ordinal}`}>
{ds.runId}/{ds.ordinal + 1}
{ds.runId}/{ds.ordinal}
</NavLink>
)),
i => <React.Fragment key={2 * i + 1}>, </React.Fragment>
Expand Down
2 changes: 1 addition & 1 deletion horreum-web/src/domain/runs/TestDatasets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const staticColumns: DatasetColumn[] = [
<>
<NavLink to={`/run/${value}#dataset${arg.row.original.ordinal}`}>
<ArrowRightIcon />
{`\u00A0${value} #${arg.row.original.ordinal + 1}`}
{`\u00A0${value}/${arg.row.original.ordinal}`}
</NavLink>
</>
)
Expand Down
2 changes: 1 addition & 1 deletion horreum-web/src/domain/schemas/TestLabelModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default function TestLabelModal(props: TestLabelModalProps) {
{
title: (
<NavLink to={`/run/${d.runId}#dataset${d.ordinal}`}>
{d.runId}/{d.ordinal + 1}
{d.runId}/{d.ordinal}
</NavLink>
),
},
Expand Down
4 changes: 2 additions & 2 deletions horreum-web/src/domain/schemas/TryJsonPathModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ export default function TryJsonPathModal(props: TryJsonPathModalProps) {
props.jsonpath || ""
)}#dataset${d.ordinal}`}
>
{d.runId}/{d.ordinal + 1}
{d.runId}/{d.ordinal}
</NavLink>
),
},
Expand Down Expand Up @@ -284,7 +284,7 @@ export default function TryJsonPathModal(props: TryJsonPathModalProps) {
props.jsonpath || ""
)}#dataset${(target as DatasetSummary).ordinal}`}
>
Go to dataset {(target as DatasetSummary).runId} #{(target as DatasetSummary).ordinal + 1}
Go to dataset {(target as DatasetSummary).runId} #{(target as DatasetSummary).ordinal}
</NavLink>
)}
</div>
Expand Down