Skip to content

Bugfix: Add the correct techs to the compare button when loading a page #1025

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
tunetheweb merged 2 commits into from
Apr 14, 2025
Merged

Bugfix: Add the correct techs to the compare button when loading a page #1025

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
0e24d7d
add the correct techs to the compare button when loading a page
sarahfossheim Apr 2, 2025
6094446
make comma usage consistent
sarahfossheim Apr 12, 2025
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
3 changes: 2 additions & 1 deletion src/js/components/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ class Filters {
// url.hash = '#report-content';

/* Update the url */
location.href = url;
const styledUrl = url.href.replaceAll('%2C', ',');
location.href = styledUrl;
}

/* Update the list of technologies */
Expand Down
16 changes: 5 additions & 11 deletions src/js/techreport/tableLinked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class TableLinked {
this.submetric = ''; // TODO: Fetch the default one from somewhere
this.data = data;
this.dataArray = [];
this.selectedTechs = this.getTechsFromURL()?.split(',') || [];
this.selectedTechs = DataUtils.getTechsFromURL()?.split(',') || [];
this.rows = filters.rows || 10;

this.updateContent();
this.updateSelectionText(this.getTechsFromURL());
this.updateSelectionText(DataUtils.getTechsFromURL());

const rowCount = document.getElementById('rowsPerPage');
rowCount?.addEventListener('change', (e) => this.updateRowsPerPage(e));
Expand All @@ -35,8 +35,6 @@ class TableLinked {

this.dataArray = this.dataArray.filter(row => row.length > 0);

console.log('set content', content, this.dataArray);

const isContent = content?.length > 0 || this.dataArray?.length > 0;

if(tbody && isContent) {
Expand Down Expand Up @@ -159,11 +157,6 @@ class TableLinked {
}
}

getTechsFromURL() {
const url = new URL(window.location);
return url.searchParams.get('selected') || null;
}

addColumnCheckbox(app) {
const cell = document.createElement('td');
const formattedApp = DataUtils.formatAppName(app);
Expand Down Expand Up @@ -192,7 +185,7 @@ class TableLinked {

// Set selected content
isTechSelected(app) {
const urlSelected = this.getTechsFromURL();
const urlSelected = DataUtils.getTechsFromURL();
return urlSelected?.includes(app) || false;
}

Expand Down Expand Up @@ -243,7 +236,8 @@ class TableLinked {
updateURL(param, value) {
const url = new URL(window.location);
url.searchParams.set(param, value);
window.history.replaceState(null, null, url);
const styledUrl = url.href.replaceAll('%2C', ',');
window.history.replaceState(null, null, styledUrl);
}

updateSelectionText(allSelectedApps) {
Expand Down
12 changes: 10 additions & 2 deletions src/js/techreport/utils/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,12 @@ const fetchCategoryData = (rows, filters, callback) => {
const lastTechNr = pageNr * rows;
const paginatedTechs = category?.technologies?.slice(firstTechNr, lastTechNr);

const technologyFormatted = encodeURI(paginatedTechs?.join('%2C'));
const techsFromUrl = getTechsFromURL();
const technologyFormatted = paginatedTechs?.join(',');
const technologyUrl = encodeURI(techsFromUrl || technologyFormatted);

const compare = document.querySelector('[data-name="selected-apps"]');
compare.setAttribute('href', `/reports/techreport/tech?tech=${technologyFormatted}`);
compare.setAttribute('href', `/reports/techreport/tech?tech=${technologyUrl}`);

let allResults = {};
paginatedTechs.forEach(tech => allResults[tech] = []);
Expand Down Expand Up @@ -194,6 +196,11 @@ const fetchCategoryData = (rows, filters, callback) => {
});
}

const getTechsFromURL = () => {
const url = new URL(window.location);
return url.searchParams.get('selected') || null;
}

export const DataUtils = {
parseVitalsData,
parseLighthouseData,
Expand All @@ -203,4 +210,5 @@ export const DataUtils = {
getLighthouseScoreCategories,
formatAppName,
fetchCategoryData,
getTechsFromURL,
};
Loading