From 61f7a1911b36dd523a27297a5210f9093441b4a2 Mon Sep 17 00:00:00 2001 From: Deepankumar Loganathan Date: Thu, 15 Feb 2024 21:04:09 +0100 Subject: [PATCH] fixed Azure DevOps ADR file path Signed-off-by: Deepankumar Loganathan --- plugins/adr/src/components/AdrReader/AdrReader.tsx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/plugins/adr/src/components/AdrReader/AdrReader.tsx b/plugins/adr/src/components/AdrReader/AdrReader.tsx index 6b07eee4cd..f41b1b1fdb 100644 --- a/plugins/adr/src/components/AdrReader/AdrReader.tsx +++ b/plugins/adr/src/components/AdrReader/AdrReader.tsx @@ -45,8 +45,18 @@ export const AdrReader = (props: { const scmIntegrations = useApi(scmIntegrationsApiRef); const adrApi = useApi(adrApiRef); const adrLocationUrl = getAdrLocationUrl(entity, scmIntegrations); + let url = `${adrLocationUrl.replace(/\/$/, '')}`; + const adrUrlPath = url.match(/path=\/.*\&/); + if (adrUrlPath) { + // Azure DevOps SCM handle the path in URL Params + const adrPath = adrUrlPath![0].replace(/\&$/, ''); + const regex = new RegExp(`${adrPath}`); + url = url.replace(regex, `${adrPath}/${adr}}`); + } else { + // Other SCM tools + url = `${url}/${adr}`; + } - const url = `${adrLocationUrl.replace(/\/$/, '')}/${adr}`; const { value, loading, error } = useAsync( async () => adrApi.readAdr(url), [url],