From 0e172cd0d2e6931d6312205d400b0364f3ff71bf Mon Sep 17 00:00:00 2001 From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local> Date: Fri, 24 Jan 2025 11:27:37 +0100 Subject: [PATCH 1/4] CE-3427: Api documentation link help page --- src/views/help/HelpView.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/help/HelpView.tsx b/src/views/help/HelpView.tsx index f1cf5911..d7bb9572 100644 --- a/src/views/help/HelpView.tsx +++ b/src/views/help/HelpView.tsx @@ -42,6 +42,7 @@ export function HelpView() { docsHref="https://confluence.esss.lu.se/x/CVGQFg" supportHref={env.SUPPORT_URL} version={env.FRONTEND_VERSION} + apiUrl={`${env.SERVER_ADDRESS}/api/swagger-ui/index.html`} /> </RootPaper> ); -- GitLab From 11a726d3d5543fe27fd8da8a2a9f13fa36414b92 Mon Sep 17 00:00:00 2001 From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local> Date: Mon, 27 Jan 2025 14:29:25 +0100 Subject: [PATCH 2/4] remove env.SERVER_ADDRESS --- src/views/help/HelpView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/help/HelpView.tsx b/src/views/help/HelpView.tsx index d7bb9572..c35e3ae9 100644 --- a/src/views/help/HelpView.tsx +++ b/src/views/help/HelpView.tsx @@ -42,7 +42,7 @@ export function HelpView() { docsHref="https://confluence.esss.lu.se/x/CVGQFg" supportHref={env.SUPPORT_URL} version={env.FRONTEND_VERSION} - apiUrl={`${env.SERVER_ADDRESS}/api/swagger-ui/index.html`} + apiUrl="/api/swagger-ui/index.html" /> </RootPaper> ); -- GitLab From 91a48a44d1c417e21201637df80b112441b0d15a Mon Sep 17 00:00:00 2001 From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local> Date: Wed, 29 Jan 2025 12:51:13 +0100 Subject: [PATCH 3/4] apiUrl -> apiHref --- src/views/help/HelpView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/help/HelpView.tsx b/src/views/help/HelpView.tsx index c35e3ae9..0e0615a6 100644 --- a/src/views/help/HelpView.tsx +++ b/src/views/help/HelpView.tsx @@ -42,7 +42,7 @@ export function HelpView() { docsHref="https://confluence.esss.lu.se/x/CVGQFg" supportHref={env.SUPPORT_URL} version={env.FRONTEND_VERSION} - apiUrl="/api/swagger-ui/index.html" + apiHref="/api/swagger-ui/index.html" /> </RootPaper> ); -- GitLab From a55d3c3bd4357aaf39ac0dbef110cb23d97982e3 Mon Sep 17 00:00:00 2001 From: Max Frederiksen <maxfrederiksen@Maxs-MacBook-Air.local> Date: Wed, 29 Jan 2025 15:34:54 +0100 Subject: [PATCH 4/4] bump common 14.0.0 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index f321686d..04547506 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@ess-ics/ce-ui-common": "^12.0.0", + "@ess-ics/ce-ui-common": "^14.0.0", "@mui/icons-material": "^5.14.1", "@mui/material": "^5.14.1", "@reduxjs/toolkit": "^2.2.7", @@ -1387,9 +1387,9 @@ } }, "node_modules/@ess-ics/ce-ui-common": { - "version": "12.0.0", - "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-12.0.0.tgz", - "integrity": "sha512-Da6n7/FfWl50hUwvyfiq4/gHUXU5zIcSakUt9+o5MbkXcfFET040W4Y8VTrQUDK6NBBnVuW1A1BrHOw0FK79Ow==", + "version": "14.0.0", + "resolved": "https://artifactory.esss.lu.se/artifactory/api/npm/ics-npm/@ess-ics/ce-ui-common/-/ce-ui-common-14.0.0.tgz", + "integrity": "sha512-PHx2yPhuDVEN+B6vbfcr0/2jN4szViuoaXJL0A6uvAIaDwCpe/GrIPbKtuQihzTmHq9PRxUaTgfNURFqlT08aQ==", "dependencies": { "@fontsource/titillium-web": "^5.0.22", "@mui/x-data-grid-pro": "^6.5.0", diff --git a/package.json b/package.json index 230088c6..dd646b5c 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", - "@ess-ics/ce-ui-common": "^12.0.0", + "@ess-ics/ce-ui-common": "^14.0.0", "@mui/icons-material": "^5.14.1", "@mui/material": "^5.14.1", "@reduxjs/toolkit": "^2.2.7", -- GitLab