Merge pull request #337 from catenax-ng/main

changed date picker to date range in FE
eclipse-tractusx · Nov 8, 2023 · 795b4dd · 795b4dd
2 parents 08c3dc7 + 9ff7dd3
commit 795b4dd
Show file tree

Hide file tree

Showing 20 changed files with 1,181 additions and 1,022 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,15 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Added
 - Cypress Login to E2E Environment to enable cypress e2e tests.
 - Fixed bug in argo workflow which allows to successfully run on INT-A/INT-B
+
 ### Changed
 - Fixed table-settings reset bug
+- Changed datepicker in FE to date range picker
 - Fixed name of veracode backend job
 - Bump jetty-http from 11.0.15 to 11.0.17
+- Assets response have now list of notification ids rather than count of existing notifications
+- Frontend adapt to backend api changes for activeAlerts and activeInvestigations
+
 ### Removed
 
 ## [9.0.0-rc1 - 03.11.2023]

diff --git a/DEPENDENCIES_BACKEND b/DEPENDENCIES_BACKEND
@@ -244,7 +244,6 @@ maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.15, EPL-2.0 OR Apach
 maven/mavencentral/org.eclipse.jetty/jetty-annotations/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-client/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.17, EPL-2.0 OR Apache-2.0, approved, rt.jetty
@@ -353,7 +352,7 @@ maven/mavencentral/org.projectlombok/lombok/1.18.28, MIT AND LicenseRef-Public-D
 maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined
 maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.7, MIT, approved, #7698
-maven/mavencentral/org.slf4j/slf4j-api/1.7.30, MIT, approved, CQ13368
+maven/mavencentral/org.slf4j/slf4j-api/2.0.5, MIT, approved, #5915
 maven/mavencentral/org.slf4j/slf4j-api/2.0.7, MIT, approved, #5915
 maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.4, Apache-2.0, approved, #5920
 maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.4, Apache-2.0, approved, #5950

diff --git a/frontend/src/app/mocks/services/parts-mock/partsAsBuilt/partsAsBuilt.model.ts b/frontend/src/app/mocks/services/parts-mock/partsAsBuilt/partsAsBuilt.model.ts
@@ -64,8 +64,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842",
@@ -96,8 +96,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive:[],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f",
@@ -136,8 +136,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive:[],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03",
@@ -173,8 +173,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01",
@@ -205,8 +205,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12",
@@ -242,8 +242,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a",
@@ -274,8 +274,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02",
@@ -311,8 +311,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive:[],
     },
     {
         "id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01",
@@ -343,8 +343,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22",
@@ -380,8 +380,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d",
@@ -412,8 +412,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd",
@@ -444,8 +444,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive: [],
     },
     {
         "id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02",
@@ -476,8 +476,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive: [],
+      qualityInvestigationIdsInStatusActive:[],
     },
     {
         "id": "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd",
@@ -508,8 +508,8 @@ export const mockBmwAssets = [
                 }
             }
         ],
-      qualityAlertsInStatusActive: 0,
-      qualityInvestigationsInStatusActive: 0,
+      qualityAlertIdsInStatusActive:[],
+      qualityInvestigationIdsInStatusActive: [],
     },
 ] as PartResponse[];
 
@@ -541,8 +541,8 @@ const MockEmptyPart: PartResponse = {
   qualityType: QualityType.Ok,
   van: null,
   semanticDataModel: SemanticDataModel.SERIALPART,
-  qualityAlertsInStatusActive: 0,
-  qualityInvestigationsInStatusActive: 0,
+  qualityAlertIdsInStatusActive: [],
+  qualityInvestigationIdsInStatusActive: [],
 };