Merge branch 'release/v1.6.0-RC4' into updates/CPLP-2973-connector-co…

…nfig
eclipse-tractusx · Jul 27, 2023 · 2f023a1 · 2f023a1
2 parents 3924d22 + a455745
commit 2f023a1
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.6.0-RC3
+
+### Change
+
+- App Subscription Management
+  - Activation Approval Overlay (enhanced by customer name, bpn, technical user permission, appId)
+- Technical User Management
+  - support managed tech user with app information
+- Connector Registration
+  - managed connector option only available for app/service provider
+  - info message added for inactive select scenario
+
+### Bugfix
+
+- Managed connector registration api call - technicalUserID string empty instead of submitting the subscriptionID
+
 ## 1.6.0-RC2
 
 ### Change

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v1.6.0-RC2",
+  "version": "v1.6.0-RC3",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

diff --git a/src/components/pages/AdminCredential/AdminCredentialElements.tsx b/src/components/pages/AdminCredential/AdminCredentialElements.tsx
@@ -34,6 +34,7 @@ import { download } from 'utils/downloadUtils'
 import { useFetchNewDocumentByIdMutation } from 'features/appManagement/apiSlice'
 import { error, success } from 'services/NotifyService'
 import { uniqueId } from 'lodash'
+import { SubscriptionStatus } from 'features/apps/apiSlice'
 
 export interface DummyData {
   date: string
@@ -95,6 +96,7 @@ export default function AdminCredentialElements() {
         status === StatusType.APPROVE
           ? success(t('content.adminCertificate.approvedMessage'))
           : error(t('content.adminCertificate.declinedMessage'))
+        setRefresh(Date.now())
       })
       .catch(() => {
         error(t('content.adminCertificate.errorMessage'))
@@ -165,28 +167,38 @@ export default function AdminCredentialElements() {
       flex: 2.5,
       renderCell: ({ row }: { row: CredentialData }) => (
         <>
-          <Button
-            size="small"
-            color="error"
-            variant="contained"
-            className="statusBtn"
-            onClick={() =>
-              handleApproveDecline(row.credentialDetailId, StatusType.DECLINE)
-            }
-          >
-            {t('global.actions.decline')}
-          </Button>
-          <Button
-            size="small"
-            color="success"
-            variant="contained"
-            className="statusBtn ml-10"
-            onClick={() =>
-              handleApproveDecline(row.credentialDetailId, StatusType.APPROVE)
-            }
-          >
-            {t('global.actions.confirm')}
-          </Button>
+          {row.participantStatus === SubscriptionStatus.PENDING && (
+            <>
+              <Button
+                size="small"
+                color="error"
+                variant="contained"
+                className="statusBtn"
+                onClick={() =>
+                  handleApproveDecline(
+                    row.credentialDetailId,
+                    StatusType.DECLINE
+                  )
+                }
+              >
+                {t('global.actions.decline')}
+              </Button>
+              <Button
+                size="small"
+                color="success"
+                variant="contained"
+                className="statusBtn ml-10"
+                onClick={() =>
+                  handleApproveDecline(
+                    row.credentialDetailId,
+                    StatusType.APPROVE
+                  )
+                }
+              >
+                {t('global.actions.confirm')}
+              </Button>
+            </>
+          )}
         </>
       ),
     },

diff --git a/src/components/pages/AppOverview/AppOverview.scss b/src/components/pages/AppOverview/AppOverview.scss
@@ -55,6 +55,7 @@
       flex-wrap: wrap;
       gap: 20px;
       width: 1140px;
+      max-width: 100%;
       margin: 0px auto;
       padding-bottom: 40px;
 

diff --git a/src/components/pages/EdcConnector/index.tsx b/src/components/pages/EdcConnector/index.tsx
@@ -159,7 +159,7 @@ const EdcConnector = () => {
     } else if (selectedService.type === ConnectType.MANAGED_CONNECTOR) {
       // body.append('providerBpn', data.ConnectorBPN)
       body.append('subscriptionId', data.ConnectorSubscription.subscriptionId)
-      body.append('technicalUserId', data.ConnectorSubscription.subscriptionId)
+      body.append('technicalUserId', '')
       await createManagedConnector(body)
         .unwrap()
         .then(() => showOverlay(true))

diff --git a/src/types/Config.tsx b/src/types/Config.tsx
@@ -202,7 +202,7 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.APP_MANAGEMENT,
-    role: ROLES.SERVICEMANAGEMENT_VIEW,
+    role: ROLES.APPMANAGEMENT_VIEW,
     element: <AppOverview />,
   },
   {