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

Jump to bottom

Set 2024 as default interop year #3669

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Set 2024 as default interop year #3669

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
0889ec8
set Interop 2024 as active dashboard
DanielRyanSmith Jan 24, 2024
f9729c3
Update interop-data-manager.js
DanielRyanSmith Jan 24, 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
6 changes: 1 addition & 5 deletions webapp/components/interop-data-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,7 @@ class InteropDataManager {
this.issueURL = yearInfo.issue_url;
this.tableSections = yearInfo.table_sections;
// Keep a list of years we have interop data prepared for.
// TODO(DanielRyanSmith): Revert this back to using the keys in interop-data
// with the change to set Interop 2024 as the default dashboard.
// This change is to avoid displaying the banner on the 2023 dashboard that
// states the user is viewing a previous year.
this.validYears = ['2021', '2022', '2023'];
this.validYears = Object.keys(paramsByYear);
}

// Fetches the datatable for the given feature and stable/experimental state.
Expand Down
2 changes: 1 addition & 1 deletion webapp/components/wpt-header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WPTHeader extends WPTFlags(PolymerElement) {
<!-- TODO: handle onclick with wpt-results.navigate if available -->
<a href="/">Latest Run</a>
<a href="/runs">Recent Runs</a>
<a href="/interop">&#10024;Interop 2023&#10024;</a>
<a href="/interop">&#10024;Interop 2024&#10024;</a>
<a href="/insights">Insights</a>
<template is="dom-if" if="[[processorTab]]">
<a href="/status">Processor</a>
Expand Down
4 changes: 2 additions & 2 deletions webapp/interop_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ type interopData struct {
}

// Set of years that are valid for Interop 20XX.
var validYears = map[string]bool{"2021": true, "2022": true, "2023": true}
var validYears = map[string]bool{"2021": true, "2022": true, "2023": true, "2024": true}

// Year that any invalid year will redirect to.
// TODO(danielrsmith): Change this redirect for next year's interop page.
const defaultRedirectYear = "2023"
const defaultRedirectYear = "2024"

// interopHandler handles GET requests to /interop-20XX and /compat20XX
func interopHandler(w http.ResponseWriter, r *http.Request) {
Expand Down
4 changes: 2 additions & 2 deletions webapp/interop_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestInteropHandler_redirect(t *testing.T) {
loc, err := resp.Location()
assert.Nil(t, err)
// Check that the path has been properly updated to the current interop effort.
assert.Equal(t, loc.Path, "/interop-2023")
assert.Equal(t, loc.Path, "/interop-2024")
// Check if embedded param is maintained after redirect.
assert.Equal(t, loc.RawQuery, "embedded")
}
Expand All @@ -55,7 +55,7 @@ func TestInteropHandler_redirectdefault(t *testing.T) {
loc, err := resp.Location()
assert.Nil(t, err)
// Check that the path has been properly updated to the current interop effort.
assert.Equal(t, loc.Path, "/interop-2023")
assert.Equal(t, loc.Path, "/interop-2024")
// Check if embedded param is maintained after redirect.
assert.Equal(t, loc.RawQuery, "embedded")
}
Expand Down
Loading