Merge pull request #153 from eclipse-tractusx/main

release(1.6.0-RC2): merge main in dev

.sonarcloud.properties

@@ -1 +1 @@
-sonar.cpd.exclusions = **/*.test.*, **/*.stories.*
+sonar.cpd.exclusions = **/*.test.*, **/*.stories.*, src/assets/locales/**/*

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.6.0-RC2
+
+### Change
+
+- App Release Process
+  - changed 'Privacy Policy' selection to mandatory
+
+### Feature
+
+- Connector Registration - Managed
+  - added subscriptionID linkage inside the registration page as well as the business logic to submit the connector connected subscriptionID
+- Search
+  - enabled in all portal pages
+  - new design update for result area
+  - added functionality to close the search whenever the user clicks on the hidden background area
+- Company Role
+  - enable company role deselection
+
+### Technical Support
+
+- exclude locales from duplication sonar checks
+
+### Bugfix
+
+- App Release Process - consent conformity check upon upload of the conformity certificate, previous selected consents got deleted
+- Data Space Information page - style fix stage sub navigation header and fixed responsive issues
+
 ## 1.6.0-RC1
 
 ### Change
@@ -9,6 +36,12 @@
   - updated language endpoint changed structure
 - Service Release Process
   - Skip technical integration for serviceTypeIds(consultancy)
+- Company Roles Update
+  - Added deselect feature
+- SSI Certificat Credential Adminboard
+  - Add new page and created UI
+  - Add Backend Logic to fetch certificates
+  - Add Confirm/Decline business logic
 
 ### Feature
 
@@ -45,8 +78,6 @@
   - Catena-X Participant
 - SSI Certificat Credential Adminboard
   - Add new page and created UI
-- Portal
-  - Add max width
 
 ### Technical Support
 

DEPENDENCIES

@@ -143,7 +143,7 @@ npm/npmjs/-/cosmiconfig/7.1.0, MIT, approved, #4975
 npm/npmjs/-/cross-spawn/7.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/crypto-random-string/2.0.0, MIT, approved, clearlydefined
 npm/npmjs/-/css-blank-pseudo/3.0.3, CC0-1.0, approved, clearlydefined
-npm/npmjs/-/css-declaration-sorter/6.4.0, ISC, approved, clearlydefined
+npm/npmjs/-/css-declaration-sorter/6.4.0, ISC, approved, #9434
 npm/npmjs/-/css-has-pseudo/3.0.4, CC0-1.0, approved, clearlydefined
 npm/npmjs/-/css-loader/6.8.1, MIT AND Apache-2.0, approved, #8759
 npm/npmjs/-/css-minimizer-webpack-plugin/3.4.1, MIT, approved, clearlydefined
@@ -1303,7 +1303,7 @@ npm/npmjs/@types/serve-index/1.9.1, MIT, approved, clearlydefined
 npm/npmjs/@types/serve-static/1.15.2, MIT, approved, #9188
 npm/npmjs/@types/sockjs/0.3.33, MIT, approved, clearlydefined
 npm/npmjs/@types/stack-utils/2.0.1, MIT, approved, clearlydefined
-npm/npmjs/@types/testing-library__jest-dom/5.14.6, MIT, approved, clearlydefined
+npm/npmjs/@types/testing-library__jest-dom/5.14.6, MIT, approved, #9436
 npm/npmjs/@types/trusted-types/2.0.3, MIT, approved, clearlydefined
 npm/npmjs/@types/use-sync-external-store/0.0.3, MIT, approved, clearlydefined
 npm/npmjs/@types/ws/8.5.5, MIT, approved, #6016

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v1.6.0-RC1",
+  "version": "v1.6.0-RC2",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",

src/assets/locales/de/main.json

@@ -519,6 +519,11 @@
             "label": "Öffentlicher Authentifizierungsschlüssel/Zertifikat*",
             "error": "Please use a valid type. e.g. .pem; .cert",
             "tooltipMsg": "Laden Sie das Zertifikat hoch, das die öffentlichen Schlüsselinformationen Ihres Connectors enthält."
+          },
+          "subscription": {
+            "label": "Customer Link",
+            "placeholder": "Select the related subscription",
+            "tooltipMsg": "Select the related subscription"
           }
         },
         "create": {
@@ -967,7 +972,8 @@
         "pleaseEnterValidContact": "Please enter a valid Provider Phone Contact in the format +xx (xxx) xxxxxxxxxx; +xx xxxxxxxxxx and +xxxxxxxxxxxx",
         "privacyInformation": "Privacy Information",
         "privacyInformationDescription": "The privacy information is used to display data types the app may collect on the app detail page. You may select several options OR select “none”.",
-        "privacyInfoError": "Error - values couldn't get fetched. Please try it later again"
+        "privacyInfoError": "Error - values couldn't get fetched. Please try it later again or contact your administrator.",
+        "privacyInformationMandatory": "Privacy Information is mandatory"
       },
       "contractAndConsent": {
         "headerTitle": "Consent & Contract",
@@ -1458,8 +1464,31 @@
         "success": "Usecase document upload has been done successfully."
       }
     },
+    "adminCertificate": {
+      "headline": "Credential Request Overview",
+      "search": "Suchen via Zertifikatstyp",
+      "tabs": {
+        "all": "Alle",
+        "open": "Offen",
+        "confirmed": "Bestätigt",
+        "declined": "Abgelehnt"
+      },
+      "sortOptions": {
+        "name": "Company Name",
+        "date": "Date"
+      },
+      "table": {
+        "crendentialType": "Type",
+        "companyInfo": "Company Info",
+        "certificate": "Zertifikat",
+        "document": "Dokumente"
+      },
+      "approvedMessage": "Anmeldeinformationsanfrage erfolgreich angenommen.",
+      "declinedMessage": "Anmeldeinformationsanfrage wurde abgelehnt.",
+      "errorMessage": "Etwas ist schief gelaufen. Bitte kontaktieren sie ihren Administrator."
+    },
     "certificates": {
-      "heading": "Company Certificates",
+      "heading": "Zertifikate",
       "description": "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard .",
       "search": "Search",
       "tabs": {
@@ -1501,26 +1530,6 @@
         "status": "Status: "
       },
       "noData": "Derzeit bestehen keine Zertifikate für das Unternehmen. Sie können mit dem Hochladen eines Zertifikats beginnen, indem Sie oben auf die Schaltfläche „Zertifikat hochladen“ klicken."
-    },
-    "adminCertificate": {
-      "headline": "Credential Request Overview",
-      "search": "...search for certificate type",
-      "tabs": {
-        "all": "All",
-        "open": "Open",
-        "confirmed": "Confirmed",
-        "declined": "Declined"
-      },
-      "sortOptions": {
-        "name": "By Name",
-        "date": "By Date"
-      },
-      "table": {
-        "date": "Date",
-        "companyInfo": "Company Info",
-        "certificate": "Certificate",
-        "details": "Details"
-      }
     }
   },
   "navigation": {

src/assets/locales/en/main.json

@@ -518,6 +518,11 @@
             "label": "Public Authentication Key/Certificate*",
             "error": "Please use a valid type. E.g. .pem; .cert",
             "tooltipMsg": "Upload the certificate that contains your connector's public key information."
+          },
+          "subscription": {
+            "label": "Customer Link",
+            "placeholder": "Select the related subscription",
+            "tooltipMsg": "Select the related subscription"
           }
         },
         "create": {
@@ -929,7 +934,8 @@
         "pleaseEnterValidContact": "Please enter a valid Provider Phone Contact in the format +xx (xxx) xxxxxxxxxx; +xx xxxxxxxxxx and +xxxxxxxxxxxx",
         "privacyInformation": "Privacy Information",
         "privacyInformationDescription": "The privacy information is used to display data types the app may collect on the app detail page. You may select several options OR select “none”.",
-        "privacyInfoError": "Error - values couldn't get fetched. Please try it later again"
+        "privacyInfoError": "Error - values couldn't get fetched. Please try it later again or contact your administrator.",
+        "privacyInformationMandatory": "Privacy Information is mandatory"
       },
       "contractAndConsent": {
         "headerTitle": "Consent & Contract",
@@ -1478,11 +1484,14 @@
         "date": "By Date"
       },
       "table": {
-        "date": "Date",
+        "crendentialType": "Type",
         "companyInfo": "Company Info",
         "certificate": "Certificate",
-        "details": "Details"
-      }
+        "document": "Document"
+      },
+      "approvedMessage": "Credential Request Accepted successfully.",
+      "declinedMessage": "Credential Request Declined successfully.",
+      "errorMessage": "Something went wrong!"
     }
   },
   "navigation": {

src/components/Main.tsx

@@ -30,6 +30,7 @@ import { useEffect } from 'react'
 import { OVERLAYS } from 'types/Constants'
 import './styles/main.scss'
 import MainNotify from './MainNotify'
+import MainSearchOverlay from './shared/frame/SearchOverlay'
 
 export default function Main() {
   document.title = useTranslation().t('title')
@@ -47,6 +48,7 @@ export default function Main() {
         main={AccessService.mainMenuTree()}
         user={AccessService.userMenu()}
       />
+      <MainSearchOverlay />
       <Outlet />
       <Footer pages={AccessService.footerMenu()} />
       <MainOverlay />

src/components/overlays/AppInfo/index.tsx

@@ -33,14 +33,14 @@ export default function AppInfo({ id, title }: { id: string; title?: string }) {
     <>
       <DialogHeader
         {...{
-          title: title || '',
+          title: title ?? ' ',
           closeWithIcon: true,
           onCloseWithIcon: () => dispatch(show(OVERLAYS.NONE, '')),
         }}
       />
 
       <DialogContent>
-        {data && <AppDetailContentDetails item={data} />}
+        {data && <AppDetailContentDetails item={data} showBack={false} />}
       </DialogContent>
     </>
   )

src/components/overlays/NewsDetail/index.tsx

@@ -19,9 +19,7 @@
  ********************************************************************************/
 
 import {
-  Button,
   Cards,
-  DialogActions,
   DialogContent,
   DialogHeader,
 } from '@catena-x/portal-shared-components'
@@ -43,8 +41,6 @@ export default function NewsDetail({ id }: { id: string }) {
     dispatch(fetchItems())
   }, [dispatch])
 
-  const handleConfirm = () => console.log('confirm')
-
   return (
     <>
       <DialogHeader
@@ -65,18 +61,6 @@ export default function NewsDetail({ id }: { id: string }) {
           variant="text-only"
         />
       </DialogContent>
-
-      <DialogActions>
-        <Button
-          variant="outlined"
-          onClick={() => dispatch(show(OVERLAYS.NONE, ''))}
-        >
-          {`${t('global.actions.cancel')}`}
-        </Button>
-        <Button variant="contained" onClick={handleConfirm}>
-          {`${t('global.actions.confirm')}`}
-        </Button>
-      </DialogActions>
     </>
   )
 }

src/components/overlays/UpdateCertificate/index.tsx

@@ -38,7 +38,7 @@ import { OVERLAYS } from 'types/Constants'
 import { closeOverlay, show } from 'features/control/overlay'
 import { store } from 'features/store'
 import { Dropzone } from '../../shared/basic/Dropzone'
-import { error, success } from 'services/NotifyService'
+import { error } from 'services/NotifyService'
 import { useAddCertificateMutation } from 'features/certification/certificationApiSlice'
 import './style.scss'
 
@@ -65,9 +65,6 @@ export default function UpdateCertificate({ id }: { id: string }) {
         }
         await addCertificate(data).unwrap()
         setSubmitClicked(true)
-        setLoading(false)
-        dispatch(closeOverlay())
-        success(t('content.certificates.updateCertificate.success'))
       }
     } catch (err) {
       setLoading(false)