Merge pull request #18891 from blaryjp/fix/explore

fix(explore): don't put ? if no query params
This commit is contained in:
Patrik Oldsberg
2023-08-12 14:57:48 +02:00
committed by GitHub
3 changed files with 22 additions and 1 deletions
+5
View File
@@ -0,0 +1,5 @@
---
'@backstage/plugin-explore': patch
---
Don't put "?" in URL if no query parameters.
@@ -83,6 +83,22 @@ describe('ExploreClient', () => {
});
expect(response).toEqual(expectedResponse);
});
it('should request explore tools without filters', async () => {
const expectedResponse: GetExploreToolsResponse = {
tools: mockTools,
};
server.use(
rest.get(`${mockBaseUrl}/tools`, (req, res, ctx) => {
expect(req.url.search).toBe('');
return res(ctx.json(expectedResponse));
}),
);
const response = await client.getTools();
expect(response).toEqual(expectedResponse);
});
});
describe('when using exploreToolsConfig for backwards compatibility', () => {
+1 -1
View File
@@ -71,7 +71,7 @@ export class ExploreClient implements ExploreApi {
filter?.lifecycle?.map(l => `lifecycle=${encodeURIComponent(l)}`) ?? [];
const query = [...tags, ...lifecycles].join('&');
const response = await fetch(`${baseUrl}/tools?${query}`);
const response = await fetch(`${baseUrl}/tools${query ? `?${query}` : ''}`);
if (!response.ok) {
throw await ResponseError.fromResponse(response);