Merge pull request eclipse-tractusx#354 from eclipse-tractusx/release…

…/v1.7.0-RC3

release(1.7.0-RC3): merge release into main

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 1.7.0-RC3
+
+### Change
+
+- IdP configuration overlays, extended error handling on the ui
+- New backend error handling (extended details) implemented for bulk user changes
+  - User Management - bulk user creation error overlay for single user error message response enhanced to show for each failed user details regarding the reason for failure (if available)
+  - IdP Switch - user migration function error support enhanced with single user error message response to show for each failed user details regarding the reason for failure (if available)
+
+### Feature
+
+n/a
+
+### Technical Support
+
+- upgraded dependencies to latest version
+
+### Bugfix
+
+- Admin Business Partner Registration Request Screen - Detail Overlay country fixed to display country code received via backend api
+- Technical User Overview - displaying duplicates after adding/creating new technical users fixed
+- Technical User detail screen - removed copy icon from connector link
+- Company Role Change Screen - updated OSP value to human readable text instead of displaying technical keys
+- Company Role Change Detail Overlay - displayed invalid deselect role details for OSP fixed
+- Service Subscription sorting element behavior fixed in case the user sorts multiple times with the same sorting option
+- Vulnerability from dependency
+  - Set resolution for axios
+
+### Known Knowns
+
+- App change process 'documents' not yet integrated with backend
+- App/Service Release Process - upon clicking "Save" given consent is removed and needs to get set newly
+
 ## 1.7.0-RC2
 
 ### Change
@@ -69,8 +102,6 @@
   - UI Changes
 - Home
   - Fixed image display for 'my business applications'
-- App Subscription and Servcie Subscripiton
-  - Status UI Changes
 - Vulnerability from dependency
   - Set resolution for @babel/traverse (CVE-2023-45133)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catena-x/portal-frontend",
-  "version": "v1.7.0-RC2",
+  "version": "v1.7.0-RC3",
   "description": "Catena-X Portal Frontend",
   "author": "Catena-X Contributors",
   "license": "Apache-2.0",
@@ -92,7 +92,8 @@
   },
   "resolutions": {
     "**/nth-check": "^2.1.1",
-    "@babel/traverse": "^7.23.2"
+    "**/@babel/traverse": "^7.23.2",
+    "**/axios": "^1.6.1"
   },
   "scripts": {
     "prepare": "husky install",

src/assets/locales/de/idp.json

@@ -58,7 +58,8 @@
     "desc": "To start the configuration, <br /> enter the name and select the type of your IdP",
     "learnMore": "Learn More",
     "success": "IdP created",
-    "error": "Failed to create IdP"
+    "error": "Failed to create IdP",
+    "metadataError": "Saving Metadata - FAILED"
   },
   "delete": {
     "title": "Delete IdP Connection",

src/assets/locales/de/main.json

@@ -701,6 +701,7 @@
           "heading": "Upload form by selecting the form file with the user data"
         },
         "fileSizeError": "Uploaded file is too big. Maximum 100KB is allowed",
+        "fileHeaderError": "Bulk Upload list format wrong. Missing or incorrect header line. Recheck the download file to retrieve the expected format",
         "uploadedFile": {
           "fileHeading": "Prepared for upload:",
           "addUserRolesHeading": "Add user roles for all users in bulk upload:",
@@ -1103,7 +1104,7 @@
         "getHelp": "Get Help",
         "deleteOverlayContent": "Deletion will not be reversable, do you still want to delete?",
         "roleUploadIsMandatory": "Role upload is mandatory",
-        "technicalUserSetupMandatory": "Please select atleast one technical user setup",
+        "technicalUserSetupMandatory": "Bitte wählen Sie mindestens ein technisches Benutzer-Setup aus",
         "roleDeleteSuccessMessage": "Role deleted successfully",
         "technicalUserProfileError": "Error while updating technical user profiles",
         "roleUpdateError": "Error while updating roles"
@@ -1529,9 +1530,10 @@
       "step3": "You can add a new role to your existing role by selecting one or more of the other available roles.",
       "note": "Please note: ",
       "noteDetail": "Changing the role affects the roles, rights, and functions available to your organization in the portal. You will see the impact of your changes before you make final changes to the role(s).",
-      "ACTIVE_PARTICIPANT": "Active Participant",
-      "APP_PROVIDER": "App Provider",
-      "SERVICE_PROVIDER": "Service Provider",
+      "ACTIVE_PARTICIPANT": "Activer Teilnehmer",
+      "APP_PROVIDER": "App-Anbieter",
+      "SERVICE_PROVIDER": "Dienstleister",
+      "ONBOARDING_SERVICE_PROVIDER": "Onboarding-Dienstleister",
       "roleDescDownTitle": "Full role description",
       "roleDescUpTitle": "Close role description",
       "successDescription": "Company Roles successfully updated.",

src/assets/locales/de/notification.json

@@ -117,7 +117,8 @@
     "usermanagement": "Get there",
     "servicesubscription": "Get there",
     "serviceadminboard": "Get there",
-    "role-details": "Open Role Matrix"
+    "role-details": "Open Role Matrix",
+    "servicemarketplace": "Get there"
   },
   "due": "fällig",
   "search": "...suchen",

src/assets/locales/de/servicerelease.json

@@ -60,7 +60,7 @@
   "technicalIntegration": {
     "headerTitle": "Technical Integration",
     "headerDescription": "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 .",
-    "technicalUserSetupMandatory": "Please select atleast one technical user setup",
+    "technicalUserSetupMandatory": "Bitte wählen Sie mindestens ein technisches Benutzer-Setup aus",
     "technicalUserProfileError": "Error while updating technical user profiles"
   },
   "step4": {

src/assets/locales/en/idp.json

@@ -58,7 +58,8 @@
     "desc": "To start the configuration, <br /> enter the name and select the type of your IdP",
     "learnMore": "Learn More",
     "success": "IdP created",
-    "error": "Failed to create IdP"
+    "error": "Failed to create IdP",
+    "metadataError": "Saving Metadata - FAILED"
   },
   "delete": {
     "title": "Delete IdP Connection",

src/assets/locales/en/main.json

@@ -79,7 +79,7 @@
     "idp_status_change_info": "{{status}} identity provider",
     "idp_status_change_intro2": "Are you sure you want to enable this idp?",
     "idp_status_change_intro1": "Disable the idp will always result into the deactivation, but not deletion. You can always enable it again",
-    "idp_status_tooltip_info": "Atleast one company service needs to enabled",
+    "idp_status_tooltip_info": "At least one company service needs to enabled",
     "idp_test_intro1": "Identity Provider was successfully created.",
     "idp_test_intro2": "The IdP is disabled for now and get enabled below.",
     "idp_test_description": "Please note, before enabling the Idp and trying to login, you need to setup the Idp connection on you side as well and connect your CX user to the IdP connection. To enable the same, please fillout the fields below.",
@@ -702,6 +702,7 @@
           "heading": "Upload form by selecting the form file with the user data"
         },
         "fileSizeError": "Uploaded file is too big. Maximum 100KB is allowed",
+        "fileHeaderError": "Bulk Upload list format wrong. Missing or incorrect header line. Recheck the download file to retrieve the expected format",
         "uploadedFile": {
           "fileHeading": "Prepared for upload:",
           "addUserRolesHeading": "Add user roles for all users in bulk upload:",
@@ -1067,7 +1068,7 @@
         "getHelp": "Get Help",
         "deleteOverlayContent": "Deletion will not be reversable, do you still want to delete?",
         "roleUploadIsMandatory": "Role upload is mandatory",
-        "technicalUserSetupMandatory": "Please select atleast one technical user setup",
+        "technicalUserSetupMandatory": "Please select at least one technical user setup",
         "roleDeleteSuccessMessage": "Role deleted successfully",
         "technicalUserProfileError": "Error while updating technical user profiles",
         "roleUpdateError": "Error while updating roles"
@@ -1496,6 +1497,7 @@
       "ACTIVE_PARTICIPANT": "Active Participant",
       "APP_PROVIDER": "App Provider",
       "SERVICE_PROVIDER": "Service Provider",
+      "ONBOARDING_SERVICE_PROVIDER": "Onboarding Service Provider",
       "roleDescDownTitle": "Full role description",
       "roleDescUpTitle": "Close role description",
       "successDescription": "Company Roles successfully updated.",

src/assets/locales/en/notification.json

@@ -113,7 +113,8 @@
     "usermanagement": "Get there",
     "servicesubscription": "Get there",
     "serviceadminboard": "Get there",
-    "role-details": "Open Role Matrix"
+    "role-details": "Open Role Matrix",
+    "servicemarketplace": "Get there"
   },
   "due": "due",
   "search": "Enter your search value",

src/components/overlays/AddIDP/index.tsx

@@ -47,7 +47,8 @@ import { ValidatingInput } from '../CXValidatingOverlay/ValidatingInput'
 import { isCompanyName } from 'types/Patterns'
 import { getCentralIdp } from 'services/EnvironmentService'
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline'
-import { error, success } from 'services/NotifyService'
+import WarningAmberIcon from '@mui/icons-material/WarningAmber'
+import { success } from 'services/NotifyService'
 
 enum IDPType {
   COMPANY = 'Company',
@@ -254,6 +255,8 @@ export const AddIdp = ({
     name: '',
   })
   const [loading, setLoading] = useState(false)
+  const [showError, setShowError] = useState(false)
+
   const [addIdp] = useAddIDPMutation()
   const [updateIdp] = useUpdateIDPMutation()
 
@@ -281,7 +284,7 @@ export const AddIdp = ({
       dispatch(show(OVERLAYS.UPDATE_IDP, idp.identityProviderId))
       success(t('add.success'))
     } catch (err) {
-      error(t('add.error'), t('state.error'), err as object)
+      setShowError(true)
     }
     setLoading(false)
   }
@@ -333,19 +336,40 @@ export const AddIdp = ({
           sx={{
             display: 'flex',
             justifyContent: 'center',
-            cursor: 'pointer',
             color: '#0088CC',
+            cursor: 'pointer',
             textDecoration: 'underline',
           }}
         >
           <HelpOutlineIcon
             sx={{
-              fontSize: '18px',
               marginRight: '5px',
+              fontSize: '18px',
             }}
           />
           {t('add.learnMore')}
         </Typography>
+        {showError && (
+          <Typography
+            sx={{
+              display: 'flex',
+              color: '#d91e18',
+              padding: '20px 40px',
+              marginTop: '30px',
+              border: '1px solid #d91e18',
+              borderRadius: '5px',
+            }}
+            variant="label3"
+          >
+            <WarningAmberIcon
+              sx={{
+                fontSize: '18px',
+                marginRight: '5px',
+              }}
+            />
+            {t('add.metadataError')}
+          </Typography>
+        )}
       </DialogContent>
       <DialogActions>
         <Button variant="outlined" onClick={() => dispatch(closeOverlay())}>