feat(tech int): resolve conflicts

eclipse-tractusx · Aug 3, 2023 · c748e27 · c748e27
2 parents e6a16a5 + 1070a8d
commit c748e27
Show file tree

Hide file tree

Showing 19 changed files with 145 additions and 53 deletions.
diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
@@ -1005,14 +1005,14 @@
       "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 .",
-        "step1Header": "1. User Role Upload *",
+        "step1Header": "1. User Role Upload",
         "step1HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "clientID": "Client ID",
         "URL": "URL",
         "pleaseEnterValidURL": "Please enter a valid URL",
         "URLPlaceholder": "http://www.loremipsum.de",
         "clientCreated": "Client created",
-        "step2Header": "2. Technical User Setup *",
+        "step2Header": "2. Technical User Setup",
         "step2HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "uploadRolesDescription": "Upload all app roles by using the available upload template (csv) file added attached",
         "rolesPreview": "Preview of Roles uploaded",
@@ -1538,7 +1538,7 @@
         "uploadDocumentTitle": "Please upload your certificate proof:",
         "note": "Please upload only pdf files with maximum 1 MB.",
         "descriptionLabel": "Description for verification",
-        "error": "Something went wrong!",
+        "error": "Something went wrong. ",
         "success": "Certificate uploaded successfully."
       },
       "successCertificate": {

diff --git a/src/assets/locales/de/notification.json b/src/assets/locales/de/notification.json
@@ -87,13 +87,25 @@
     "title": "Assigned User Roles Updated - {{app}}",
     "content": "Hallo {{username}}, \n\nIhre App-Benutzerrollen wurden von Ihrem Unternehmensadministrator aktualisiert. Mit dem Wechsel der Rolle ändern sich Ihre Zugriffsrechte. Weitere Einzelheiten zu den Rollenänderungen finden sie anbei. \n\nHinzugefügte Rollen: {{addedRoles}} \n\nEntfernte Rollen: {{removedRoles}}"
   },
+  "CREDENTIAL_APPROVAL": {
+    "title": "Verified Credential {{credentialType}} angelegt",
+    "content": "Verified Credential {{credentialType}} wurde ihrem Company Wallet hinzugefügt."
+  },
+  "CREDENTIAL_REJECTED": {
+    "title": "Verified Credential {{credentialType}} abgelehnt",
+    "content": "Verified Credential {{credentialType}} wurde abgelehnt. Sie können jederzeit die Anfrage wiederholen."
+  },
+  "SUBSCRIPTION_URL_UPDATE": {
+    "title": "App URL {{app}} updated",
+    "content": "Der App Provider hat die hinterlegte App Instance URL für ihre abonnierte App {{app}} geändert.\n\nNeue URL: {{newUrl}}"
+  },
   "link": {
     "appmarketplace": "Zum App Marketplace",
     "technicalsetup": "Zur Connector Registrierung",
     "home": "Zur Startseite",
     "app": "Zur App",
     "user": "Zum Benutzer",
-    "usecases": "Zu den Use Cases",
+    "usecase": "Zu den Use Case",
     "serviceprovider": "Go to service provider",
     "appmanagementboard": "App Management Board öffnen",
     "servicemanagementboard": "Service Management Board öffnen",

diff --git a/src/assets/locales/de/servicerelease.json b/src/assets/locales/de/servicerelease.json
@@ -26,18 +26,18 @@
   "step1": {
     "headerTitle": "Service Card Erstellen",
     "headerDescription": "Die folgenden Eingabefelder und Uploads werden verwendet, um Ihre Service-'Service Card' zu erstellen, die auf dem Marktplatz platziert wird. Die Servicekarte ist der erste Berührungspunkt mit dem Kunden.",
-    "serviceName": "Service Name*",
-    "serviceType": "Service Type*",
+    "serviceName": "Service Name",
+    "serviceType": "Service Type",
     "serviceTypePlaceholder": "Wählen Sie den Servicetyp aus",
-    "shortDescriptionEN": "Kurzbeschreibung (en)*",
-    "shortDescriptionDE": "Kurzbeschreibung (de)*",
+    "shortDescriptionEN": "Kurzbeschreibung (en)",
+    "shortDescriptionDE": "Kurzbeschreibung (de)",
     "serviceLeadImageUpload": "Service Card Bild"
   },
   "step2": {
     "headerTitle": "Service Details",
     "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 .",
-    "longDescriptionEN": "Service Beschreibung (en)*",
-    "longDescriptionDE": "Service Beschreibung (de)*",
+    "longDescriptionEN": "Service Beschreibung (en)",
+    "longDescriptionDE": "Service Beschreibung (de)",
     "doc": "Supporting Material",
     "note": "Info:",
     "providerDetails": "Provider Details",

diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
@@ -930,7 +930,7 @@
         "salesManager": "Sales Manager",
         "salesManagerPlaceholder": "Please select a Sales Manager",
         "salesManagerDescription": "Please select the app sales manager via the dropdown below. The sales manager can only get set if a user of your company has the respective portal role. The sales manager will get informed as soon as a app subscribtion request is triggered by the customer.",
-        "pricingInformation": "Pricing Information (e.g. free / charged ( to be defined)",
+        "pricingInformation": "Pricing Information (e.g. free / charged (to be defined))",
         "appLeadImageUpload": "App Lead Image Upload"
       },
       "appPage": {
@@ -967,14 +967,14 @@
       "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 .",
-        "step1Header": "1. User Role Upload *",
+        "step1Header": "1. User Role Upload",
         "step1HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "clientID": "Client ID",
         "URL": "URL",
         "pleaseEnterValidURL": "Please enter a valid URL",
         "URLPlaceholder": "http://www.loremipsum.de",
         "clientCreated": "Client created",
-        "step2Header": "2. Technical User Setup *",
+        "step2Header": "2. Technical User Setup",
         "step2HeaderDescription": "[copy] Lorem ipsum sapientem ne neque dolor erat,eros solet invidunt duo Quisque aliquid leo. Pretium patrioque sociis eu nihil Cum enim ad, ipsum alii vidisse justo id. Option porttitor diam voluptua. Cu Eam augue dolor dolores quis,",
         "uploadRolesDescription": "Upload all app roles by using the available upload template (csv) file added attached",
         "rolesPreview": "Preview of Roles uploaded",
@@ -1477,7 +1477,7 @@
         "uploadDocumentTitle": "Please upload your certificate proof:",
         "note": "Please upload only pdf files with maximum 1 MB.",
         "descriptionLabel": "Description for verification",
-        "error": "Something went wrong!",
+        "error": "Something went wrong. ",
         "success": "Certificate uploaded successfully."
       },
       "successCertificate": {

diff --git a/src/assets/locales/en/notification.json b/src/assets/locales/en/notification.json
@@ -83,13 +83,25 @@
     "title": "Assigned User Roles Updated - {{app}}",
     "content": "Hallo {{username}}, \n\nyour app user roles got updated by your company administrator. With the change of the role assignment your access rights have changed. You can find all details regarding the role change below. \n\nNew Roles: {{addedRoles}} \n\nRemoved Roles: {{removedRoles}}"
   },
+  "CREDENTIAL_APPROVAL": {
+    "title": "Verified Credential {{credentialType}} assigned",
+    "content": "Verified Credential {{credentialType}} got assigned to your company wallet."
+  },
+  "CREDENTIAL_REJECTED": {
+    "title": "Verified Credential {{credentialType}} declined",
+    "content": "Verified Credential {{credentialType}} got declined. You can start a new request immediately."
+  },
+  "SUBSCRIPTION_URL_UPDATE": {
+    "title": "App URL {{app}} updated",
+    "content": "The app provider has changed the stored App Instance URL for your subscribed app {{app}}.\n\nNew URL: {{newUrl}}"
+  },
   "link": {
     "appmarketplace": "Go to app marketplace",
     "technicalsetup": "Go to connector configuration",
     "home": "Go to home page",
     "app": "Go to app",
     "user": "Go to user",
-    "usecases": "Go to use cases",
+    "usecase": "Go to Use Case",
     "serviceprovider": "Go to service provider",
     "appmanagementboard": "Get there",
     "servicemanagementboard": "Get there",

diff --git a/src/assets/locales/en/servicerelease.json b/src/assets/locales/en/servicerelease.json
@@ -26,18 +26,18 @@
   "step1": {
     "headerTitle": "Create Service",
     "headerDescription": "The following input fields and uploads are used to create your service 'Service Card' which will be placed inside the marketplace. The service card is the first touchpoint with the customer.",
-    "serviceName": "Service Name*",
-    "serviceType": "Service Type*",
+    "serviceName": "Service Name",
+    "serviceType": "Service Type",
     "serviceTypePlaceholder": "Select a Service Type Id",
-    "shortDescriptionEN": "Short Description (en)*",
-    "shortDescriptionDE": "Short Description (de)*",
+    "shortDescriptionEN": "Short Description (en)",
+    "shortDescriptionDE": "Short Description (de)",
     "serviceLeadImageUpload": "Service Card Image"
   },
   "step2": {
     "headerTitle": "Service Details",
     "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 .",
-    "longDescriptionEN": "Long Description (en)*",
-    "longDescriptionDE": "Long Description (de)*",
+    "longDescriptionEN": "Long Description (en)",
+    "longDescriptionDE": "Long Description (de)",
     "doc": "Supporting Material",
     "note": "Note:",
     "providerDetails": "Provider Details",

diff --git a/src/components/overlays/UpdateCertificate/index.tsx b/src/components/overlays/UpdateCertificate/index.tsx
@@ -66,9 +66,14 @@ export default function UpdateCertificate({ id }: { id: string }) {
         await addCertificate(data).unwrap()
         setSubmitClicked(true)
       }
-    } catch (err) {
+    } catch (err: unknown) {
       setLoading(false)
-      error(t('content.certificates.updateCertificate.error'), '', '')
+      error(
+        t('content.certificates.updateCertificate.error') +
+          err.data.errors.unknown[0],
+        '',
+        ''
+      )
     }
   }
 

diff --git a/src/components/pages/AppOverview/ChangeDescription.tsx b/src/components/pages/AppOverview/ChangeDescription.tsx
@@ -55,10 +55,10 @@ export default function ChangeDescription() {
 
   const defaultValues = useMemo(() => {
     return {
-      longDescriptionEN: description?.[0].longDescription ?? '',
-      longDescriptionDE: description?.[1].longDescription ?? '',
-      shortDescriptionEN: description?.[0].shortDescription ?? '',
-      shortDescriptionDE: description?.[1].shortDescription ?? '',
+      longDescriptionEN: description?.[0]?.longDescription ?? '',
+      longDescriptionDE: description?.[1]?.longDescription ?? '',
+      shortDescriptionEN: description?.[0]?.shortDescription ?? '',
+      shortDescriptionDE: description?.[1]?.shortDescription ?? '',
     }
   }, [description])
 
@@ -247,7 +247,7 @@ export default function ChangeDescription() {
           <TabPanel value={activeTab} index={1}>
             <div className="form-field">
               {['shortDescriptionEN', 'shortDescriptionDE'].map(
-                (item: string, i) => (
+                (item: string) => (
                   <div key={item}>
                     <ConnectorFormInputFieldShortAndLongDescription
                       {...{

diff --git a/src/components/pages/NotificationCenter/NotificationItem.tsx b/src/components/pages/NotificationCenter/NotificationItem.tsx
@@ -81,13 +81,15 @@ const NotificationContent = ({
   const userId = item.contentParsed?.userId
   const appId = item.contentParsed?.appId
   const you = UserService.getName()
-  const appName = item.contentParsed?.AppName
+  const appName = item.contentParsed?.AppName ?? item.contentParsed?.appName
   const companyName = item.contentParsed?.RequestorCompanyName
   const offerName = item.contentParsed?.OfferName
   const userName = item.contentParsed?.username
   const coreOfferName = item.contentParsed?.coreOfferName
   const removedRoles = item.contentParsed?.removedRoles
   const addedRoles = item.contentParsed?.addedRoles
+  const credentialType = item.contentParsed?.type
+  const newUrl = item.contentParsed?.newUrl
 
   return (
     <>
@@ -104,6 +106,8 @@ const NotificationContent = ({
             coreOfferName: coreOfferName,
             removedRoles: removedRoles ? removedRoles : '-',
             addedRoles: addedRoles ? addedRoles : '-',
+            credentialType: credentialType,
+            newUrl: newUrl,
           }}
         >
           <NameLink
@@ -155,7 +159,7 @@ const NotificationConfig = ({ item }: { item: CXNotificationContent }) => {
     case NotificationType.WELCOME_CONNECTOR_REGISTRATION:
       return <NotificationContent item={item} navlinks={['technicalsetup']} />
     case NotificationType.WELCOME_USE_CASES:
-      return <NotificationContent item={item} navlinks={['usecases']} />
+      return <NotificationContent item={item} navlinks={['usecase']} />
     case NotificationType.WELCOME_SERVICE_PROVIDER:
       return (
         <NotificationContent
@@ -197,6 +201,12 @@ const NotificationConfig = ({ item }: { item: CXNotificationContent }) => {
       return <NotificationContent item={item} />
     case NotificationType.ROLE_UPDATE_CORE_OFFER:
       return <NotificationContent item={item} navlinks={[PAGES.ROLE_DETAILS]} />
+    case NotificationType.CREDENTIAL_APPROVAL:
+      return <NotificationContent item={item} />
+    case NotificationType.CREDENTIAL_REJECTED:
+      return <NotificationContent item={item} />
+    case NotificationType.SUBSCRIPTION_URL_UPDATE:
+      return <NotificationContent item={item} />
     default:
       return <pre>{JSON.stringify(item, null, 2)}</pre>
   }
@@ -317,6 +327,7 @@ export default function NotificationItem({
               {t(`${item.typeId}.title`, {
                 app: item.contentParsed?.AppName ?? item.contentParsed?.appName,
                 offer: item.contentParsed?.OfferName,
+                credentialType: item.contentParsed?.type,
               })}
             </Typography>
             {open && (

diff --git a/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx b/src/components/shared/basic/ReleaseProcess/AppMarketCard/index.tsx
@@ -508,7 +508,12 @@ export default function AppMarketCard() {
               }}
               name="title"
               pattern={Patterns.appMarketCard.appTitle}
-              label={t('content.apprelease.appMarketCard.appTitle') + ' *'}
+              label={
+                <>
+                  {t('content.apprelease.appMarketCard.appTitle')}
+                  <span style={{ color: 'red' }}> *</span>
+                </>
+              }
               rules={{
                 required: `${t(
                   'content.apprelease.appMarketCard.appTitle'
@@ -538,7 +543,12 @@ export default function AppMarketCard() {
               maxLength={30}
               minLength={3}
               pattern={Patterns.appMarketCard.appProvider}
-              label={t('content.apprelease.appMarketCard.appProvider') + ' *'}
+              label={
+                <>
+                  {t('content.apprelease.appMarketCard.appProvider')}
+                  <span style={{ color: 'red' }}> *</span>
+                </>
+              }
               rules={{
                 required: `${t(
                   'content.apprelease.appMarketCard.appProvider'
@@ -572,7 +582,8 @@ export default function AppMarketCard() {
                       }}
                       label={
                         <>
-                          {t(`content.apprelease.appMarketCard.${item}`) + ' *'}
+                          {t(`content.apprelease.appMarketCard.${item}`)}
+                          <span style={{ color: 'red' }}> *</span>
                           <IconButton sx={{ color: '#939393' }} size="small">
                             <HelpOutlineIcon />
                           </IconButton>
@@ -623,9 +634,12 @@ export default function AppMarketCard() {
                   trigger,
                   errors,
                   name: 'useCaseCategory',
-                  label:
-                    t('content.apprelease.appMarketCard.useCaseCategory') +
-                    ' *',
+                  label: (
+                    <>
+                      {t('content.apprelease.appMarketCard.useCaseCategory')}
+                      <span style={{ color: 'red' }}> *</span>
+                    </>
+                  ),
                   placeholder: t(
                     'content.apprelease.appMarketCard.useCaseCategoryPlaceholder'
                   ),
@@ -663,8 +677,12 @@ export default function AppMarketCard() {
                   trigger,
                   errors,
                   name: 'appLanguage',
-                  label:
-                    t('content.apprelease.appMarketCard.appLanguage') + ' *',
+                  label: (
+                    <>
+                      {t('content.apprelease.appMarketCard.appLanguage')}
+                      <span style={{ color: 'red' }}> *</span>
+                    </>
+                  ),
                   placeholder: t(
                     'content.apprelease.appMarketCard.appLanguagePlaceholder'
                   ),
@@ -735,7 +753,10 @@ export default function AppMarketCard() {
               maxLength={15}
               minLength={1}
               label={
-                t('content.apprelease.appMarketCard.pricingInformation') + ' *'
+                <>
+                  {t('content.apprelease.appMarketCard.pricingInformation')}
+                  <span style={{ color: 'red' }}> *</span>
+                </>
               }
               rules={{
                 required: `${t(
@@ -764,7 +785,10 @@ export default function AppMarketCard() {
                 errors,
               }}
               label={
-                t('content.apprelease.appMarketCard.appLeadImageUpload') + ' *'
+                <>
+                  {t('content.apprelease.appMarketCard.appLeadImageUpload')}
+                  <span style={{ color: 'red' }}> *</span>
+                </>
               }
               noteDescription={t(
                 'content.apprelease.appReleaseForm.OnlyOneFileAllowed'

diff --git a/src/components/shared/basic/ReleaseProcess/AppPage/index.tsx b/src/components/shared/basic/ReleaseProcess/AppPage/index.tsx
@@ -481,7 +481,8 @@ export default function AppPage() {
                 }}
                 label={
                   <>
-                    {t(`content.apprelease.appPage.${item}`) + ' *'}
+                    {t(`content.apprelease.appPage.${item}`)}
+                    <span style={{ color: 'red' }}> *</span>
                     <IconButton sx={{ color: '#939393' }} size="small">
                       <HelpOutlineIcon />
                     </IconButton>
@@ -521,7 +522,8 @@ export default function AppPage() {
         <Divider sx={{ mb: 2, mr: -2, ml: -2 }} />
         <div className="form-field">
           <InputLabel sx={{ mb: 3, mt: 3 }}>
-            {t('content.apprelease.appPage.images') + ' *'}
+            {t('content.apprelease.appPage.images')}
+            <span style={{ color: 'red' }}> *</span>
           </InputLabel>
           <Controller
             name="images"
@@ -648,7 +650,8 @@ export default function AppPage() {
         />
         <Divider sx={{ mb: 2, mr: -2, ml: -2 }} />
         <InputLabel sx={{ mb: 3 }}>
-          {t('content.apprelease.appPage.privacyInformation') + ' *'}
+          {t('content.apprelease.appPage.privacyInformation')}
+          <span style={{ color: 'red' }}> *</span>
         </InputLabel>
         <Typography variant="body2" sx={{ marginBottom: '10px' }}>
           {t('content.apprelease.appPage.privacyInformationDescription')}