Skip to content

Commit 2f3c311

Browse files
flashdesignoryflashdesignory
committed
fix params
1 parent 7b395c2 commit 2f3c311

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

‎resources/newssite/news-next/dist/404.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/0WioSK_GYKwlHihOM6Gxq/_buildManifest.js" defer=""></script><script src="./_next/static/0WioSK_GYKwlHihOM6Gxq/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"0WioSK_GYKwlHihOM6Gxq","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/pages/_error-54de1933a164a1ff.js" defer=""></script><script src="./_next/static/RXw279T3dUuVjZ-if2raN/_buildManifest.js" defer=""></script><script src="./_next/static/RXw279T3dUuVjZ-if2raN/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{"statusCode":404}},"page":"/_error","query":{},"buildId":"RXw279T3dUuVjZ-if2raN","assetPrefix":".","nextExport":true,"isFallback":false,"gip":true,"scriptLoader":[]}</script></body></html>

resources/newssite/news-next/dist/_next/static/0WioSK_GYKwlHihOM6Gxq/_buildManifest.js renamed to resources/newssite/news-next/dist/_next/static/RXw279T3dUuVjZ-if2raN/_buildManifest.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/newssite/news-next/dist/_next/static/0WioSK_GYKwlHihOM6Gxq/_ssgManifest.js renamed to resources/newssite/news-next/dist/_next/static/RXw279T3dUuVjZ-if2raN/_ssgManifest.js

File renamed without changes.

resources/newssite/news-next/dist/_next/static/chunks/pages/index-bca4656243ade034.js renamed to resources/newssite/news-next/dist/_next/static/chunks/pages/index-545f8ffcc3fedf0a.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/newssite/news-next/dist/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-bca4656243ade034.js" defer=""></script><script src="./_next/static/0WioSK_GYKwlHihOM6Gxq/_buildManifest.js" defer=""></script><script src="./_next/static/0WioSK_GYKwlHihOM6Gxq/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"0WioSK_GYKwlHihOM6Gxq","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charSet="utf-8"/><meta name="viewport" content="width=device-width"/><meta name="next-head-count" content="2"/><link rel="preload" href="./_next/static/css/a0dca1379a01e5cf.css" as="style"/><link rel="stylesheet" href="./_next/static/css/a0dca1379a01e5cf.css" data-n-g=""/><link rel="preload" href="./_next/static/css/2cf5163b53bb0adb.css" as="style"/><link rel="stylesheet" href="./_next/static/css/2cf5163b53bb0adb.css" data-n-p=""/><noscript data-n-css=""></noscript><script defer="" nomodule="" src="./_next/static/chunks/polyfills-c67a75d1b6f99dc8.js"></script><script src="./_next/static/chunks/webpack-e50e9853db18b759.js" defer=""></script><script src="./_next/static/chunks/framework-2c79e2a64abdb08b.js" defer=""></script><script src="./_next/static/chunks/main-2ba37e62325cc71b.js" defer=""></script><script src="./_next/static/chunks/pages/_app-77983e68be50f72a.js" defer=""></script><script src="./_next/static/chunks/743-fd706aeabb7828e3.js" defer=""></script><script src="./_next/static/chunks/pages/index-545f8ffcc3fedf0a.js" defer=""></script><script src="./_next/static/RXw279T3dUuVjZ-if2raN/_buildManifest.js" defer=""></script><script src="./_next/static/RXw279T3dUuVjZ-if2raN/_ssgManifest.js" defer=""></script></head><body><div id="__next"></div><div id="settings-container"></div><div id="notifications-container"></div><script id="__NEXT_DATA__" type="application/json">{"props":{"pageProps":{}},"page":"/","query":{},"buildId":"RXw279T3dUuVjZ-if2raN","assetPrefix":".","nextExport":true,"autoExport":true,"isFallback":false,"scriptLoader":[]}</script></body></html>

‎resources/shared/params.mjs‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export class Params {
108108
return defaultParams.suites;
109109
}
110110

111-
_parseTags() {
111+
_parseTags(searchParams) {
112112
if (!searchParams.has("tags"))
113113
return defaultParams.tags;
114114
if (this.suites.length)
@@ -146,18 +146,24 @@ export class Params {
146146
return shuffleSeed;
147147
}
148148

149-
toSearchParams(forRemote = false) {
150-
const rawParams = { ...this };
151-
rawParams["viewport"] = `${this.viewport.width}x${this.viewport.height}`;
152-
153-
// Only returning params that are useful for the workload.
154-
// Both, 'suites' and 'tags', are specific to the debug menu.
155-
if (forRemote) {
156-
delete rawParams["suites"];
157-
delete rawParams["tags"];
149+
toSearchParamsObject() {
150+
const rawParams = { __proto__: null };
151+
for (const [key, value] of Object.entries(this)) {
152+
if (value === defaultParams[key])
153+
continue;
154+
rawParams[key] = value;
158155
}
159156

160-
return new URLSearchParams(rawParams).toString();
157+
// Either suites or params can be used at the same time.
158+
if (rawParams.suites?.length && rawParams.tags?.length)
159+
delete rawParams.suites;
160+
rawParams.viewport = `${this.viewport.width}x${this.viewport.height}`;
161+
162+
return new URLSearchParams(rawParams);
163+
}
164+
165+
toSearchParams() {
166+
return this.toSearchParamsObject().toString();
161167
}
162168
}
163169

‎resources/suite-runner.mjs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ export class SuiteRunner {
9898
const frame = this.#frame;
9999
frame.onload = () => resolve();
100100
frame.onerror = () => reject();
101-
// Passing in 'true' to the 'toSearchParams' method, to filter params for the workload.
102-
frame.src = `${this.#suite.url}?${this.#params.toSearchParams(true)}`;
101+
frame.src = `${this.#suite.url}?${this.#params.toSearchParams()}`;
103102
});
104103
}
105104

0 commit comments

Comments
 (0)