feat(certificate):resolve conflicts

eclipse-tractusx · Jul 11, 2023 · 0f83c01 · 0f83c01
2 parents 5ed6207 + f98ec79
commit 0f83c01
Show file tree

Hide file tree

Showing 38 changed files with 824 additions and 477 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,19 +24,22 @@
   - Enhance Sub Menu by adding 'Change Image' for active apps
   - Change Image(sub menu) functionality added for active apps
   - App overview 'in review' style fix
+  - Enhance Sub Menu by adding 'Change Description' for active apps
 - Bugfix
   - Service Release Process
     - Service Release process not working
     - Service details page crash issue
 - Usecase Participation
   - Created New page under User profile
   - Add edit Overlay UI
+  - Fetech usecase via API
 - Service Release Process
   - Service Release process not working
   - Service details page crash issue
 - Notification
   - Show done state
   - Provide icon for marking a notification as read/unread
+  - New Header and Filter UI
 - App Release Process
   - App lead image load issue fix
   - Service Marketplace
@@ -51,6 +54,7 @@
 - Certificates
   - Created New page under User profile
   - Fetch Certificates and connected to UI
+- Data Space
 
 ## 1.5.0
 

diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -55,9 +55,9 @@ npm/npmjs/-/babel-plugin-istanbul/6.1.1, BSD-3-Clause, approved, clearlydefined
 npm/npmjs/-/babel-plugin-jest-hoist/27.5.1, MIT, approved, clearlydefined
 npm/npmjs/-/babel-plugin-macros/3.1.0, MIT, approved, clearlydefined
 npm/npmjs/-/babel-plugin-named-asset-import/0.3.8, MIT, approved, clearlydefined
-npm/npmjs/-/babel-plugin-polyfill-corejs2/0.4.3, MIT, approved, clearlydefined
-npm/npmjs/-/babel-plugin-polyfill-corejs3/0.8.1, MIT, approved, clearlydefined
-npm/npmjs/-/babel-plugin-polyfill-regenerator/0.5.0, MIT, approved, clearlydefined
+npm/npmjs/-/babel-plugin-polyfill-corejs2/0.4.3, MIT, approved, #9309
+npm/npmjs/-/babel-plugin-polyfill-corejs3/0.8.1, MIT, approved, #9316
+npm/npmjs/-/babel-plugin-polyfill-regenerator/0.5.0, MIT, approved, #9310
 npm/npmjs/-/babel-plugin-transform-react-remove-prop-types/0.4.24, MIT, approved, clearlydefined
 npm/npmjs/-/babel-preset-current-node-syntax/1.0.1, MIT, approved, clearlydefined
 npm/npmjs/-/babel-preset-jest/27.5.1, MIT, approved, clearlydefined
@@ -502,7 +502,7 @@ npm/npmjs/-/json5/1.0.2, MIT, approved, CQ22351
 npm/npmjs/-/json5/2.2.3, MIT, approved, #2126
 npm/npmjs/-/jsonfile/6.1.0, MIT, approved, clearlydefined
 npm/npmjs/-/jsonpointer/5.0.1, MIT, approved, clearlydefined
-npm/npmjs/-/jsx-ast-utils/3.3.3, MIT, approved, clearlydefined
+npm/npmjs/-/jsx-ast-utils/3.3.3, MIT, approved, #9209
 npm/npmjs/-/keycloak-js/21.1.1, Apache-2.0 AND MIT, approved, #9145
 npm/npmjs/-/kind-of/6.0.3, MIT, approved, clearlydefined
 npm/npmjs/-/kleur/3.0.3, MIT, approved, clearlydefined
@@ -597,7 +597,7 @@ npm/npmjs/-/once/1.4.0, ISC, approved, clearlydefined
 npm/npmjs/-/onetime/5.1.2, MIT, approved, clearlydefined
 npm/npmjs/-/open/8.4.2, MIT, approved, #7102
 npm/npmjs/-/optionator/0.8.3, MIT, approved, clearlydefined
-npm/npmjs/-/optionator/0.9.1, MIT, approved, clearlydefined
+npm/npmjs/-/optionator/0.9.1, MIT, approved, #9208
 npm/npmjs/-/p-limit/2.3.0, MIT, approved, clearlydefined
 npm/npmjs/-/p-limit/3.1.0, MIT, approved, clearlydefined
 npm/npmjs/-/p-locate/3.0.0, MIT, approved, clearlydefined
@@ -1003,7 +1003,7 @@ npm/npmjs/@babel/helper-builder-binary-assignment-operator-visitor/7.22.5, MIT A
 npm/npmjs/@babel/helper-compilation-targets/7.22.5, MIT, approved, #9037
 npm/npmjs/@babel/helper-create-class-features-plugin/7.22.5, MIT, approved, #8985
 npm/npmjs/@babel/helper-create-regexp-features-plugin/7.22.5, MIT, approved, #8950
-npm/npmjs/@babel/helper-define-polyfill-provider/0.4.0, MIT, approved, clearlydefined
+npm/npmjs/@babel/helper-define-polyfill-provider/0.4.0, MIT, approved, #9314
 npm/npmjs/@babel/helper-environment-visitor/7.22.5, MIT, approved, #8934
 npm/npmjs/@babel/helper-function-name/7.22.5, MIT, approved, #9071
 npm/npmjs/@babel/helper-hoist-variables/7.22.5, MIT, approved, #8957
@@ -1124,7 +1124,7 @@ npm/npmjs/@babel/template/7.22.5, MIT, approved, #9017
 npm/npmjs/@babel/traverse/7.22.5, MIT, approved, #8954
 npm/npmjs/@babel/types/7.22.5, MIT, approved, #8967
 npm/npmjs/@bcoe/v8-coverage/0.2.3, ISC AND MIT, approved, clearlydefined
-npm/npmjs/@catena-x/portal-shared-components/2.0.2, Apache-2.0 AND (BSD-3-Clause AND JSON AND MIT), restricted, #9187
+npm/npmjs/@catena-x/portal-shared-components/2.0.5, Apache-2.0 AND (BSD-3-Clause AND MIT), approved, #9187
 npm/npmjs/@csstools/normalize.css/12.0.0, CC0-1.0, approved, clearlydefined
 npm/npmjs/@csstools/postcss-cascade-layers/1.1.1, CC0-1.0, approved, clearlydefined
 npm/npmjs/@csstools/postcss-color-function/1.1.1, CC0-1.0 AND (MIT AND W3C-20150513) AND W3C-20150513 AND MIT, approved, #3022
@@ -1191,7 +1191,7 @@ npm/npmjs/@jest/types/29.5.0, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/gen-mapping/0.3.3, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/resolve-uri/3.1.0, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/set-array/1.1.2, MIT, approved, clearlydefined
-npm/npmjs/@jridgewell/source-map/0.3.3, MIT, approved, clearlydefined
+npm/npmjs/@jridgewell/source-map/0.3.3, MIT, approved, #9304
 npm/npmjs/@jridgewell/sourcemap-codec/1.4.14, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/sourcemap-codec/1.4.15, MIT, approved, clearlydefined
 npm/npmjs/@jridgewell/trace-mapping/0.3.18, MIT, approved, clearlydefined

diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     ]
   },
   "dependencies": {
-    "@catena-x/portal-shared-components": "2.0.4",
+    "@catena-x/portal-shared-components": "^2.0.5",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/error-message": "^2.0.1",

diff --git a/src/assets/locales/de/main.json b/src/assets/locales/de/main.json
@@ -60,7 +60,8 @@
     "company-role": "Config - Company Role",
     "usecase-participation": "Config - Use Case Participation",
     "certificate-credential": "Config - Certificates",
-    "about": "About"
+    "about": "About",
+    "dataspace": "Data Space"
   },
   "overlays": {
     "invite": "Neuen Geschäftspartner einladen",
@@ -184,22 +185,26 @@
         "slider1": {
           "title": "Catena-X",
           "subtitle": "das Tor zum digitalen Automotive-Netzwerk",
-          "buttonName": "Meine Apps"
+          "buttonName": "Meine Apps",
+          "navigation": "/appmanagement"
         },
         "slider2": {
           "title": "Use Case Introduction",
           "subtitle": "Lernen Sie die unterstützten Anwendungsfälle, zugehörigen semantischen Modelle und Apps kennen, um Ihre anwendungsfallgesteuerte Onboarding-Reise zu beginnen.",
-          "buttonName": "Use Case Introduction"
+          "buttonName": "Use Case Introduction",
+          "navigation": "/usecase"
         },
         "slider3": {
           "title": "Marktplätze",
           "subtitle": "Transparenter und interoperabler Service- und Business-Applikations-Marktplatz, um neue Ideen umzusetzen und Daten optimal zu nutzen.",
-          "buttonName": "Marktplatz"
+          "buttonName": "Marktplatz",
+          "navigation": "/marketplace"
         },
         "slider4": {
           "title": "Benutzermanagement",
           "subtitle": "Verwalten Sie Benutzerzugriffe zentral, um den Verwaltungsaufwand zu reduzieren und einen transparenten Überblick über alle Benutzerrechte zu gewährleisten.",
-          "buttonName": "Benutzermanagement"
+          "buttonName": "Benutzermanagement",
+          "navigation": "/usermanagement"
         }
       },
       "searchSection": {
@@ -379,7 +384,8 @@
       },
       "sortOptions": {
         "deactivate": "Deactivate",
-        "changeImage": "Change Image"
+        "changeImage": "Change Image",
+        "changeDescription": "Change Description"
       },
       "addbtn": "Registrieren Sie Ihre App",
       "confirmModal": {
@@ -1427,6 +1433,9 @@
       "step2": "You can sign additional use cases by selecting the document download, signing the document and upload the same",
       "note": "Please note: ",
       "noteDetail": "Please note - use case participation revocation is currently not enabled. Please contact the platform owner for support.",
+      "version": "Version: {{version}}",
+      "framework": "Framework",
+      "expiry": "Expiry: {{expiry}}",
       "editUsecase": {
         "title": "Trigger the use case participation by signing and uploading the use case frame agreement for {use case name}",
         "description": "To be able to participate in the data exchange of the use case {use case name} please download the use case frame agreement {placeholder until download is available} and upload the signed document in the upload window below.After submission, the platform owner will validate the uploaded document you will be informed as soon as the validation is successfully finished",

diff --git a/src/assets/locales/de/notification.json b/src/assets/locales/de/notification.json
@@ -120,15 +120,37 @@
     "new": "Neuste",
     "oldest": "Älteste",
     "unread": "Ungelesen",
-    "all": "Alle",
-    "app": "Apps",
-    "info": "Information",
-    "withaction": "Action"
+    "all": {
+      "title": "All notifications",
+      "description": "Messaged for required action from your side",
+      "countTitle": "new"
+    },
+    "info": {
+      "title": "Info notifications",
+      "description": "Changes of assigned roles or newly created tech users",
+      "countTitle": "new"
+    },
+    "app": {
+      "title": "App notifications",
+      "description": "App publish notifications, request, activations, etc.",
+      "countTitle": "new"
+    },
+    "withaction": {
+      "title": "Action Required",
+      "description": "Your action is needed",
+      "countTitle": "to do"
+    }
   },
   "tooltip": {
     "email": {
       "read": "Mark it as unread",
       "unread": "Mark it as read"
     }
+  },
+  "header": {
+    "title": "Notifications",
+    "subtitle": "Hier erhalten Sie relevante Neuigkeiten zu Catena-X, veröffentlichten Apps und Diensten sowie den von Ihnen genutzten Apps und Diensten. Darüber hinaus werden Änderungen an Ihrem Benutzerkonto, z. B. neu zugewiesene oder entzogene Rollen, geteilt.",
+    "linkText": "Help",
+    "link": "https://portal.dev.demo.catena-x.net/documentation/?path=docs%2F06.+Notifications"
   }
 }
diff --git a/src/assets/locales/en/main.json b/src/assets/locales/en/main.json
@@ -59,7 +59,8 @@
     "company-role": "Config - Company Role",
     "usecase-participation": "Config - Use Case Participation",
     "certificate-credential": "Config - Certificates",
-    "about": "About"
+    "about": "About",
+    "dataspace": "Data Space"
   },
   "overlays": {
     "invite": "Invite new Business Partner",
@@ -183,22 +184,26 @@
         "slider1": {
           "title": "Catena-X",
           "subtitle": "the gateway to the automotive digital network",
-          "buttonName": "My Apps"
+          "buttonName": "My Apps",
+          "navigation": "/appmanagement"
         },
         "slider2": {
           "title": "Use Case Introduction",
           "subtitle": "Get to know the supported use cases, related semantic models and apps to start your use case driven onboarding journey.",
-          "buttonName": "Use Case Introduction"
+          "buttonName": "Use Case Introduction",
+          "navigation": "/usecase"
         },
         "slider3": {
           "title": "Marketplaces",
           "subtitle": "Transparent and interobarble service and business application marketplace to realize new ideas and use data optimally",
-          "buttonName": "Marketplace"
+          "buttonName": "Marketplace",
+          "navigation": "/marketplace"
         },
         "slider4": {
           "title": "User Management",
           "subtitle": "Manage user access centrally to reduce administrative work and ensure a transparent overview of all user rights.",
-          "buttonName": "User Management"
+          "buttonName": "User Management",
+          "navigation": "/usermanagement"
         }
       },
       "searchSection": {
@@ -378,7 +383,8 @@
       },
       "sortOptions": {
         "deactivate": "Deactivate",
-        "changeImage": "Change Image"
+        "changeImage": "Change Image",
+        "changeDescription": "Change Description"
       },
       "addbtn": "Register your App",
       "confirmModal": {
@@ -1389,6 +1395,9 @@
       "step2": "You can sign additional use cases by selecting the document download, signing the document and upload the same",
       "note": "Please note: ",
       "noteDetail": "Please note - use case participation revocation is currently not enabled. Please contact the platform owner for support.",
+      "version": "Version: {{version}}",
+      "framework": "Framework",
+      "expiry": "Expiry: {{expiry}}",
       "editUsecase": {
         "title": "Trigger the use case participation by signing and uploading the use case frame agreement for {use case name}",
         "description": "To be able to participate in the data exchange of the use case {use case name} please download the use case frame agreement {placeholder until download is available} and upload the signed document in the upload window below.After submission, the platform owner will validate the uploaded document you will be informed as soon as the validation is successfully finished",

diff --git a/src/assets/locales/en/notification.json b/src/assets/locales/en/notification.json
@@ -116,15 +116,37 @@
     "new": "Newest First",
     "oldest": "Oldest First",
     "unread": "Unread First",
-    "all": "all",
-    "app": "app only",
-    "info": "info only",
-    "withaction": "action required"
+    "all": {
+      "title": "All notifications",
+      "description": "Messaged for required action from your side",
+      "countTitle": "new"
+    },
+    "info": {
+      "title": "Info notifications",
+      "description": "Changes of assigned roles or newly created tech users",
+      "countTitle": "new"
+    },
+    "app": {
+      "title": "App notifications",
+      "description": "App publish notifications, request, activations, etc.",
+      "countTitle": "new"
+    },
+    "withaction": {
+      "title": "Action Required",
+      "description": "Your action is needed",
+      "countTitle": "to do"
+    }
   },
   "tooltip": {
     "email": {
       "read": "Mark it as unread",
       "unread": "Mark it as read"
     }
+  },
+  "header": {
+    "title": "Notifications",
+    "subtitle": "Here you will receive relevant news about Catena-X, published apps and services and the apps and services you use. In addition, changes to your user account, e.g. B. newly assigned or revoked roles.",
+    "linkText": "Help",
+    "link": "https://portal.dev.demo.catena-x.net/documentation/?path=docs%2F06.+Notifications"
   }
 }