fix(sd document): update SD document download API (#1038)

eclipse-tractusx · Aug 28, 2024 · 0464b1a · 0464b1a
1 parent 6192911
commit 0464b1a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,10 @@
 
 - **IDP management**
   - Fixed statusTag color in status coloumn [#978](https://github.com/eclipse-tractusx/portal-frontend/pull/978)
+- **Connector Management**
+  - Updated SD document download API to fix downloading SD document issue [#1038](https://github.com/eclipse-tractusx/portal-frontend/pull/1038)
+- **Service Release Process**
+  - Fixed back button navigation to service management instead of navigating to home page[#1038](https://github.com/eclipse-tractusx/portal-frontend/pull/1038)
 - **Application Requests**
   - Fixed 'activeTab' conditions to load data for Tab-2(Registration Process) [#1050](https://github.com/eclipse-tractusx/portal-frontend/pull/1050)
 

diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
@@ -35,14 +35,14 @@ import {
   useDeleteConnectorMutation,
   useUpdateConnectorUrlMutation,
   useFetchConnectorDetailsQuery,
+  useFetchSdDocumentMutation,
 } from 'features/connector/connectorApiSlice'
 import { Box, Divider, Grid } from '@mui/material'
 import ArticleOutlinedIcon from '@mui/icons-material/ArticleOutlined'
 import { useEffect, useState } from 'react'
 import { error, success } from 'services/NotifyService'
 import EditIcon from '@mui/icons-material/Edit'
 import Patterns from 'types/Patterns'
-import { useFetchDocumentMutation } from 'features/serviceManagement/apiSlice'
 import { download } from 'utils/downloadUtils'
 import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
@@ -59,7 +59,7 @@ const ConnectorDetailsOverlay = ({
   overlayData,
 }: DeleteConfirmationOverlayProps) => {
   const { t } = useTranslation()
-  const [fetchDocumentById] = useFetchDocumentMutation()
+  const [fetchSDDocument] = useFetchSdDocumentMutation()
   const {
     data: fetchConnectorDetails,
     isFetching,
@@ -135,10 +135,7 @@ const ConnectorDetailsOverlay = ({
   const handleDownloadFn = async (documentId: string, documentName: string) => {
     if (fetchConnectorDetails?.id) {
       try {
-        const response = await fetchDocumentById({
-          appId: fetchConnectorDetails.id,
-          documentId,
-        }).unwrap()
+        const response = await fetchSDDocument(documentId).unwrap()
 
         const fileType = response.headers.get('content-type')
         const file = response.data
@@ -600,8 +597,8 @@ const ConnectorDetailsOverlay = ({
                     null ? (
                       t('content.edcconnector.details.noDocumentAvailable')
                     ) : (
-                      <>
-                        <ArticleOutlinedIcon sx={{ color: '#9c9c9c' }} />
+                      <Box sx={{ display: 'flex' }}>
+                        <ArticleOutlinedIcon sx={{ color: '#9c9c9c', mr: 1 }} />
                         <button
                           className="document-button-link"
                           onClick={() =>
@@ -616,7 +613,7 @@ const ConnectorDetailsOverlay = ({
                             'content.edcconnector.details.selfDescriptionDocument'
                           )}
                         </button>
-                      </>
+                      </Box>
                     )}
                   </Typography>
                 </Grid>

diff --git a/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx b/src/components/shared/basic/ReleaseProcess/OfferCard/index.tsx
@@ -65,6 +65,7 @@ import { ButtonLabelTypes } from '..'
 import RetryOverlay from '../components/RetryOverlay'
 import { success, error } from 'services/NotifyService'
 import { DocumentTypeId } from 'features/appManagement/apiSlice'
+import { PAGES } from 'types/Constants'
 
 type FormDataType = {
   title: string
@@ -520,7 +521,7 @@ export default function OfferCard() {
           setServiceCardSnackbar(false)
         }}
         onBackIconClick={() => {
-          navigate('/home')
+          navigate(`/${PAGES.SERVICE_MANAGEMENT}`)
         }}
         // Add an ESLint exception until there is a solution
         // eslint-disable-next-line

diff --git a/src/features/connector/connectorApiSlice.ts b/src/features/connector/connectorApiSlice.ts
@@ -173,6 +173,15 @@ export const apiSlice = createApi({
         body: data.body,
       }),
     }),
+    fetchSdDocument: builder.mutation({
+      query: (documentId) => ({
+        url: `/api/administration/documents/selfDescription/${documentId}`,
+        responseHandler: async (response) => ({
+          headers: response.headers,
+          data: await response.blob(),
+        }),
+      }),
+    }),
   }),
 })
 
@@ -186,4 +195,5 @@ export const {
   useFetchOfferSubscriptionsQuery,
   useFetchDecentralIdentityUrlsQuery,
   useUpdateConnectorUrlMutation,
+  useFetchSdDocumentMutation,
 } = apiSlice