Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Global Search field to other parts #307

Merged
merged 43 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
81943c7
chore: TRACEFOSS-2512 added filtering logic to other parts facade / s…
ds-mwesener Oct 6, 2023
1f76bdc
chore: TRACEFOSS-2512 added filtering logic to other parts facade / s…
ds-mwesener Oct 6, 2023
ba7c245
chore: TRACEFOSS-2512 added filtering logic to other parts facade / s…
ds-mwesener Oct 6, 2023
bdaa431
chore: TRACEFOSS-2512 added filtering logic to other parts facade / s…
ds-mwesener Oct 6, 2023
632e48a
chore: TRACEFOSS-2513 changed filter logic in backend
ds-mwesener Oct 9, 2023
0f9ee7c
chore: TRACEFOSS-2513 changed filter logic in backend
ds-mwesener Oct 9, 2023
99aef02
Merge pull request #653 from catenax-ng/feature/TRACEFOSS-2513-filter…
ds-mwesener Oct 9, 2023
56295c6
Merge pull request #652 from catenax-ng/feature/TRACEFOSS-2512-global…
ds-mwesener Oct 9, 2023
b72cd49
chore(flags):[TRACEFOSS-2337] move country flag assets to assets folder
ds-mmaul Oct 9, 2023
3ebe12f
chore: TRACEFOSS-2711 test walkaround
ds-ext-sceronik Oct 9, 2023
bf0862e
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 9, 2023
4c6c9f8
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 9, 2023
9cbd0e7
chore: TRACEFOSS-2711 update irs to 6.8.0
ds-ext-sceronik Oct 9, 2023
cebab29
Merge pull request #654 from catenax-ng/feature/TRACEFOSS-2337-FE-jus…
ds-mwesener Oct 9, 2023
1c76387
chore: TRACEFOSS-2512 changed filter logic in frontend
ds-mwesener Oct 9, 2023
c23b3f0
chore(flags):[TRACEFOSS-2337] move country flag assets to assets fold…
ds-mmaul Oct 9, 2023
4cc1c0d
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 9, 2023
6786912
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 9, 2023
bd46980
chore: TRACEFOSS-2512 fixed sorting
ds-mwesener Oct 10, 2023
88db285
chore: TRACEFOSS-2513 fixed multi value filtering
ds-mwesener Oct 10, 2023
aecd641
chore: TRACEFOSS-2513 fixed multi value filtering
ds-mwesener Oct 10, 2023
7bec0cd
Merge pull request #658 from catenax-ng/feature/TRACEFOSS-2512-semant…
ds-mwesener Oct 10, 2023
6dea234
Update Dependencies Backend Action
ds-mwesener Oct 10, 2023
d8e6040
Merge pull request #660 from catenax-ng/action/dependencies
ds-mwesener Oct 10, 2023
1de9667
chore: TRACEFOSS-2711 log complete object
ds-ext-sceronik Oct 10, 2023
f6626e4
chore: TRACEFOSS-2711 log complete object
ds-ext-sceronik Oct 10, 2023
3427fa0
chore: TRACEFOSS-2711 log complete object
ds-ext-sceronik Oct 10, 2023
71d12df
chore: TRACEFOSS-2711 test constraints in or clause
ds-ext-sceronik Oct 10, 2023
0c7cdff
chore: TRACEFOSS-2711 test constraints in or clause
ds-ext-sceronik Oct 10, 2023
39ebc28
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 10, 2023
250ef64
Merge branch 'main' into feature/TRACEFOSS-2536-add-active-notificati…
ds-mmaul Oct 10, 2023
bf0f346
chore: TRACEFOSS-2711 ttl change
ds-ext-sceronik Oct 10, 2023
9dcce8a
chore: TRACEFOSS-2711 ttl change
ds-ext-sceronik Oct 10, 2023
5ffc2d8
chore: TRACEFOSS-2711 remove minus day when creating policy
ds-ext-sceronik Oct 10, 2023
8c764b4
Merge pull request #655 from catenax-ng/chore/TRACEFOSS-2711-main-upd…
ds-mwesener Oct 10, 2023
0dee408
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 10, 2023
50b8e3d
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 10, 2023
f41ded0
Revert "feature(table):[TRACEFOSS-2536] display active Notifications …
ds-mmaul Oct 10, 2023
773737d
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 10, 2023
5157a58
feature: TRACEFOSS-2333 add TractionBatteryCode aspect to IRS request
ds-lcapellino Oct 10, 2023
2884642
feature(table):[TRACEFOSS-2536] display active Notifications column
ds-mmaul Oct 10, 2023
1489cf8
Merge pull request #656 from catenax-ng/feature/TRACEFOSS-2536-add-ac…
ds-mwesener Oct 10, 2023
c4ce69c
Merge pull request #665 from catenax-ng/feature/TRACEFOSS-2333-tracti…
ds-mwesener Oct 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Support for JustInSequence Semantice data model in FE
- Added country flags icons to manufacturing Country
- new submodelserver related API endpoints for data provisioning /api/submodel/data/{id}
- Added global search field to other parts
- Added possiblity to provide multiple semanticDataModels in filter
- Added two new columns for amount of open Notifications per part in part views (asBuilt)

### Changed
- updated IRS helm chart from 6.6.1 to 6.7.2
Expand Down
4 changes: 2 additions & 2 deletions DEPENDENCIES_FRONTEND
Original file line number Diff line number Diff line change
Expand Up @@ -1514,12 +1514,12 @@ npm/npmjs/@types/range-parser/1.2.4, MIT, approved, #10795
npm/npmjs/@types/retry/0.12.0, MIT, approved, clearlydefined
npm/npmjs/@types/semver/7.3.13, MIT, approved, #4668
npm/npmjs/@types/send/0.17.1, MIT, approved, #10832
npm/npmjs/@types/serve-index/1.9.1, MIT, approved, clearlydefined
npm/npmjs/@types/serve-index/1.9.1, MIT, approved, #10976
npm/npmjs/@types/serve-static/1.15.1, MIT, approved, #9188
npm/npmjs/@types/set-cookie-parser/2.4.2, MIT, approved, clearlydefined
npm/npmjs/@types/sinonjs__fake-timers/8.1.1, MIT, approved, clearlydefined
npm/npmjs/@types/sizzle/2.3.3, MIT, approved, clearlydefined
npm/npmjs/@types/sockjs/0.3.33, MIT, approved, clearlydefined
npm/npmjs/@types/sockjs/0.3.33, MIT, approved, #10984
npm/npmjs/@types/testing-library__jasmine-dom/1.3.0, MIT, approved, clearlydefined
npm/npmjs/@types/uuid/8.3.4, MIT, approved, clearlydefined
npm/npmjs/@types/ws/8.5.4, MIT, approved, #6016
Expand Down
2 changes: 1 addition & 1 deletion charts/traceability-foss/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ dependencies:
condition: pgadmin4.enabled
- name: irs-helm
repository: https://eclipse-tractusx.github.io/item-relationship-service
version: 6.7.2
version: 6.8.0
condition: irs-helm.enabled
- name: tractusx-connector
repository: https://eclipse-tractusx.github.io/tractusx-edc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:0733946c-59c6-41ae-9570-cb43a6e43842",
Expand Down Expand Up @@ -93,7 +95,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:4a5e9ff6-2d5c-4510-a90e-d55af3ba502f",
Expand Down Expand Up @@ -131,7 +135,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa03",
Expand Down Expand Up @@ -166,7 +172,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa01",
Expand Down Expand Up @@ -196,7 +204,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:d8030bbf-a874-49fb-b2e1-7610f0ccad12",
Expand Down Expand Up @@ -231,7 +241,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2015-03-07T18:38:12"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:5205f736-8fc2-4585-b869-6bf36842369a",
Expand Down Expand Up @@ -261,7 +273,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fa02",
Expand Down Expand Up @@ -296,7 +310,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb01",
Expand Down Expand Up @@ -326,7 +342,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:6b2296cc-26c0-4f38-8a22-092338c36e22",
Expand Down Expand Up @@ -361,7 +379,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2018-09-28T02:15:57"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:c47b9f8b-48d0-4ef4-8f0b-e965a225cb8d",
Expand Down Expand Up @@ -391,7 +411,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:f11ddc62-3bd5-468f-b7b0-110fe13ed0cd",
Expand Down Expand Up @@ -421,7 +443,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:1be6ec59-40fb-4993-9836-acb0e284fb02",
Expand Down Expand Up @@ -451,7 +475,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
{
"id": "urn:uuid:7eeeac86-7b69-444d-81e6-655d0f1513bd",
Expand Down Expand Up @@ -481,7 +507,9 @@ export const mockBmwAssets = [
"manufacturingDate": "2022-02-04T13:48:54"
}
}
]
],
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
},
] as PartResponse[];

Expand Down Expand Up @@ -512,7 +540,9 @@ const MockEmptyPart: PartResponse = {
underInvestigation: false,
qualityType: QualityType.Ok,
van: null,
semanticDataModel: SemanticDataModel.SERIALPART
semanticDataModel: SemanticDataModel.SERIALPART,
qualityAlertsInStatusActive: 0,
qualityInvestigationsInStatusActive: 0,
};


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ export const MOCK_part_5 = {
"manufacturingDate": "2022-02-04T13:48:54",
}
}
]
],
'qualityAlertsInStatusActive': 0,
'qualityInvestigationsInStatusActive': 0,
};

export const MOCK_part_4 = {
Expand Down Expand Up @@ -87,7 +89,9 @@ export const MOCK_part_4 = {
"manufacturingDate": "2022-02-04T13:48:54",
}
}
]
],
'qualityAlertsInStatusActive': 0,
'qualityInvestigationsInStatusActive': 0,
};

export const MOCK_part_3 = {
Expand Down Expand Up @@ -124,7 +128,9 @@ export const MOCK_part_3 = {
"manufacturingDate": "2022-02-04T13:48:54",
}
}
]
],
'qualityAlertsInStatusActive': 0,
'qualityInvestigationsInStatusActive': 0,
};

export const MOCK_part_2 = {
Expand Down Expand Up @@ -165,7 +171,9 @@ export const MOCK_part_2 = {
"manufacturingDate": "2022-02-04T13:48:54",
}
}
]
],
'qualityAlertsInStatusActive': 0,
'qualityInvestigationsInStatusActive': 0,
};

export const MOCK_part_1 = {
Expand Down Expand Up @@ -203,7 +211,9 @@ export const MOCK_part_1 = {
"manufacturingDate": "2022-02-04T13:48:54",
}
}
]
],
'qualityAlertsInStatusActive': 0,
'qualityInvestigationsInStatusActive': 0,
};

export const mockAssets: PartsResponse = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,33 @@ export class OtherPartsFacade {
}

// TODO: remove OtherPartsService and integrate in PartService
public setCustomerPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter): void {
public setCustomerPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter, isOrSearch?: boolean): void {
this.customerPartsAsBuiltSubscription?.unsubscribe();
this.customerPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.CUSTOMER, filter).subscribe({
this.customerPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.CUSTOMER, filter, isOrSearch).subscribe({
next: data => (this.otherPartsState.customerPartsAsBuilt = {data}),
error: error => (this.otherPartsState.customerPartsAsBuilt = {error}),
});
}

public setCustomerPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter): void {
public setCustomerPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter, isOrSearch?: boolean): void {
this.customerPartsAsPlannedSubscription?.unsubscribe();
this.customerPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.CUSTOMER, filter).subscribe({
this.customerPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.CUSTOMER, filter, isOrSearch).subscribe({
next: data => (this.otherPartsState.customerPartsAsPlanned = {data}),
error: error => (this.otherPartsState.customerPartsAsPlanned = {error}),
});
}

public setSupplierPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter): void {
public setSupplierPartsAsBuilt(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsBuiltFilter, isOrSearch?: boolean): void {
this.supplierPartsAsBuiltSubscription?.unsubscribe();
this.supplierPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.SUPPLIER, filter).subscribe({
this.supplierPartsAsBuiltSubscription = this.otherPartsService.getOtherPartsAsBuilt(page, pageSize, sorting, Owner.SUPPLIER, filter, isOrSearch).subscribe({
next: data => (this.otherPartsState.supplierPartsAsBuilt = {data}),
error: error => (this.otherPartsState.supplierPartsAsBuilt = {error}),
});
}

public setSupplierPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter): void {
public setSupplierPartsAsPlanned(page = 0, pageSize = 50, sorting: TableHeaderSort[] = [], filter?: AssetAsPlannedFilter, isOrSearch?: boolean): void {
this.supplierPartsAsPlannedSubscription?.unsubscribe();
this.supplierPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.SUPPLIER, filter).subscribe({
this.supplierPartsAsPlannedSubscription = this.otherPartsService.getOtherPartsAsPlanned(page, pageSize, sorting, Owner.SUPPLIER, filter, isOrSearch).subscribe({
next: data => (this.otherPartsState.supplierPartsAsPlanned = {data}),
error: error => (this.otherPartsState.supplierPartsAsPlanned = {error}),
});
Expand Down
Loading
Loading