fix(superset-frontend): Fixes for broken functionality when an application root is defined (#36058)

This commit is contained in:
Martyn Gigg
2026-01-23 22:13:48 +00:00
committed by GitHub
parent d54e227e25
commit e4f649e49c
9 changed files with 128 additions and 69 deletions

View File

@@ -0,0 +1,48 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import * as getBootstrapData from 'src/utils/getBootstrapData';
import { assetUrl, ensureStaticPrefix } from './assetUrl';
const staticAssetsPrefixMock = jest.spyOn(
getBootstrapData,
'staticAssetsPrefix',
);
const resourcePath = '/endpoint/img.png';
const absoluteResourcePath = `https://cdn.domain.com/static${resourcePath}`;
beforeEach(() => {
staticAssetsPrefixMock.mockReturnValue('');
});
describe('assetUrl should prepend static asset prefix for relative paths', () => {
it.each(['', '/myapp'])("'%s' for relative path", app_root => {
staticAssetsPrefixMock.mockReturnValue(app_root);
expect(assetUrl(resourcePath)).toBe(`${app_root}${resourcePath}`);
expect(assetUrl(absoluteResourcePath)).toBe(
`${app_root}/${absoluteResourcePath}`,
);
});
});
describe('assetUrl should ignore static asset prefix for absolute URLs', () => {
it.each(['', '/myapp'])("'%s' for absolute url", app_root => {
staticAssetsPrefixMock.mockReturnValue(app_root);
expect(ensureStaticPrefix(absoluteResourcePath)).toBe(absoluteResourcePath);
});
});

View File

@@ -23,6 +23,17 @@ import { staticAssetsPrefix } from 'src/utils/getBootstrapData';
* defined in the bootstrap data
* @param path A string path to a resource
*/
export function assetUrl(path: string) {
export function assetUrl(path: string): string {
return `${staticAssetsPrefix()}${path.startsWith('/') ? path : `/${path}`}`;
}
/**
* Returns the path prepended with the staticAssetsPrefix if the string is a relative path else it returns
* the string as is.
* @param url_or_path A url or relative path to a resource
*/
export function ensureStaticPrefix(url_or_path: string): string {
if (url_or_path.startsWith('/')) return assetUrl(url_or_path);
return url_or_path;
}