From e8d53db3e2fd11f8f98f4029e2dd2d8015b86fca Mon Sep 17 00:00:00 2001 From: "krisztian.klucsik" Date: Tue, 14 May 2024 09:49:39 +0200 Subject: [PATCH] fix checks --- CHANGELOG.md | 1 + src/frontend/utils/imageLoader.js | 34 ++++++++++++++++--------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61010f8190..a06508b8a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ the release. ([#1515](https://github.com/open-telemetry/opentelemetry-demo/pull/1486)) * [frontend] Fix imageloading issues on optimized images. bump next.js version to 13.5.1 ([#1571](https://github.com/open-telemetry/opentelemetry-demo/pull/1571)) + ## 1.9.0 * [chore] docker compose: add container name as tag attribute to container logs diff --git a/src/frontend/utils/imageLoader.js b/src/frontend/utils/imageLoader.js index 3e317dff1f..c6d2bf0f51 100644 --- a/src/frontend/utils/imageLoader.js +++ b/src/frontend/utils/imageLoader.js @@ -1,18 +1,20 @@ - /* - * We connect to imageprovider through the envoy proxy, straight from the browser, for this we need to know the current hostname and port. - * During building and serverside rendering, these are undefined so we use some conditionals and default values. - */ - let hostname = "localhost"; - let port = 8080; - let protocol = "http"; +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 +/* + * We connect to imageprovider through the envoy proxy, straight from the browser, for this we need to know the current hostname and port. + * During building and serverside rendering, these are undefined so we use some conditionals and default values. + */ +let hostname = "localhost"; +let port = 8080; +let protocol = "http"; - if (typeof window !== "undefined" && window.location) { - hostname = window.location.hostname; - port = window.location.port ? parseInt(window.location.port, 10) : (window.location.protocol === "https:" ? 443 : 80); - protocol = window.location.protocol.slice(0, -1); // Remove trailing ':' - } +if (typeof window !== "undefined" && window.location) { + hostname = window.location.hostname; + port = window.location.port ? parseInt(window.location.port, 10) : (window.location.protocol === "https:" ? 443 : 80); + protocol = window.location.protocol.slice(0, -1); // Remove trailing ':' +} - export default function imageLoader({ src, width, quality }) { - // We pass down the optimization request to the iamgeprovider service here, without this, nextJs would try to use internal optimizer which is not working with the external imageprovider. - return `${protocol}://${hostname}:${port}/${src}?w=${width}&q=${quality || 75}` - } +export default function imageLoader({ src, width, quality }) { + // We pass down the optimisation request to the imageprovider service here, without this, nextJs would try to use internal optimiser which is not working with the external imageprovider. + return `${protocol}://${hostname}:${port}/${src}?w=${width}&q=${quality || 75}` +}