From dc2fe17a351582509653ee3fd2c306fa547d55ca Mon Sep 17 00:00:00 2001 From: ds-ext-sceronik Date: Wed, 11 Oct 2023 14:47:05 +0200 Subject: [PATCH 01/33] chore: TRACEFOSS-XXX submodelserver calls removed and replaced with backend implementation logic implemented under /api/submodel --- dev/README.md | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/dev/README.md b/dev/README.md index 6980446dbe..77f94dd419 100644 --- a/dev/README.md +++ b/dev/README.md @@ -21,7 +21,7 @@ Wait until pvc and database pods are restored. Underneath all 'DELETE' directori - Wait until pvc and database pods are restored - Sync full application with prune and replace -Repeat those steps for registry, submodelserver, trace-x-provider-edcs, tracex-instances +Repeat those steps for registry, trace-x-provider-edcs, tracex-instances ## 2) Data upload of assets @@ -32,66 +32,55 @@ Keep in mind to always update DEV and TEST since they are dependend on each othe Sample invocation (DEV) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server.dev.demo.catena-x.net -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc.dev.demo.catena-x.net -a https://trace-x-registry.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (TEST) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-test.dev.demo.catena-x.net -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-test.dev.demo.catena-x.net/api/submodel -edc https://trace-x-test-edc.dev.demo.catena-x.net -a https://trace-x-registry-test.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-test-edc-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-e2e-a.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-e2e-a.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-a.dev.demo.catena-x.net -a https://trace-x-registry-e2e-a.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-a-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (E2E B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-e2e-b.dev.demo.catena-x.net -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-e2e-b.dev.demo.catena-x.net/api/submodel -edc https://trace-x-edc-e2e-b.dev.demo.catena-x.net -a https://trace-x-registry-e2e-b.dev.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-e2e-b-dataplane.dev.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC ``` Sample invocation (INT A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-int-a.int.demo.catena-x.net -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-int-a.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-a.int.demo.catena-x.net -a https://trace-x-registry-int-a.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (INT B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tracex-submodel-server-int-b.int.demo.catena-x.net -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-int-b.int.demo.catena-x.net/api/submodel -edc https://trace-x-edc-int-b.int.demo.catena-x.net -a https://trace-x-registry-int-b.int.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE A) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tx-submodel-server-stable-a.stable.demo.catena-x.net -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://tx-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-stable-a.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://tx-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` Sample invocation (STABLE B) ``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://tx-submodel-server-stable-b.stable.demo.catena-x.net -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://tx-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV +python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.11.json -s https://traceability-stable-b.stable.demo.catena-x.net/api/submodel -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://tx-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV ``` -Sample invocation (STABLE A) - -``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tx-submodel-server-stable-a.stable.demo.catena-x.net -edc https://trace-x-edc-stable-a.stable.demo.catena-x.net -a https://tx-registry-stable-a.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-a-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV -``` - -Sample invocation (STABLE B) - -``` -python transform-and-upload.py -f CX_Testdata_MessagingTest_v0.0.9.json -s https://tx-submodel-server-stable-b.stable.demo.catena-x.net -edc https://trace-x-edc-stable-b.stable.demo.catena-x.net -a https://tx-registry-stable-b.stable.demo.catena-x.net/semantics/registry/api/v3.0 -d https://trace-x-edc-int-b-dataplane.int.demo.catena-x.net -p id-3.0-trace -k --aas3 --allowedBPNs BPNL00000003CML1 BPNL00000003CNKC BPNL00000003AZQP BPNL00000003CSGV -``` where: * -f file to be used for data provisioning /tx-backend/testdata/CX_Testdata_MessagingTest_vx.x.x.json -* -s submodel server url(s) +* -s submodel server url(s) -- ( currently pointing to our backend api as it was implemented under /api/submodel ) * -edc edc url(s) to upload data to * -a aas url(s) * -p policies to add to the data From 696864f58d45028040d956fa79a4408a5ed7c24a Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 11 Oct 2023 15:42:45 +0200 Subject: [PATCH 02/33] feature: TRACEFOSS-1439 fix dash ip check with backend dependencies --- .github/workflows/eclipse-dash.yml | 8 +++++--- CONTRIBUTING.md | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/eclipse-dash.yml b/.github/workflows/eclipse-dash.yml index 779a529c9f..5c7f8e636c 100644 --- a/.github/workflows/eclipse-dash.yml +++ b/.github/workflows/eclipse-dash.yml @@ -20,12 +20,14 @@ name: "[BE][FE][SECURITY] Eclipse DASH IP" on: workflow_dispatch: # Trigger manually push: - branches: main + branches: + - main paths-ignore: - '**/*.md' - '**/*.txt' pull_request: - branches: main + branches: + - main paths: - '**/pom.xml' - 'pom.xml' @@ -73,7 +75,7 @@ jobs: - name: Check dependencies run: | - mvn package -pl tx-models,tx-backend org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true + mvn package org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true - name: upload results if: always() diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0b625dd252..ef53c229eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -142,7 +142,7 @@ https://gitlab.eclipse.org/-/profile/personal_access_tokens #### Backend ##### Generate Dependencies -`mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES_BACKEND` +`mvn package org.eclipse.dash:license-tool-plugin:license-check -DskipTests=true -Ddash.summary=DEPENDENCIES_BACKEND -Ddash.fail=true` ##### Request Review From 6563a6d23791da14ddd2b09222bab47ab611fc8b Mon Sep 17 00:00:00 2001 From: ds-lcapellino Date: Wed, 11 Oct 2023 15:50:47 +0200 Subject: [PATCH 03/33] feature: TRACEFOSS-1439 update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 973b95ac85..b1147a5dfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,8 +31,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - updated maven-site-plugin from 4.0.0-M5 to 4.0.0-M9 - updated testcontainer-postgresql from 1.17.6 to 1.19.0 - updated docker/build-push-action from 4 to 5 - - Updated user manual to reflect current state of the part views +- Fixed dash IP GitHub action that scans Backend dependencies ### Removed - Owner filter and replaced it with the new filter query param From 8e2c436ea46382b795a8185763448687517c4a71 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 11 Oct 2023 21:35:24 +0200 Subject: [PATCH 04/33] chore: TRACEFOSS-2733 add date picker to allow date filter passed by picker --- .../multi-select-autocomplete.component.html | 21 ++++++++++++++--- .../multi-select-autocomplete.component.scss | 9 +++++++- .../multi-select-autocomplete.component.ts | 23 +++++++++++++++++++ .../parts-table/parts-table.component.html | 3 ++- .../parts-table/parts-table.component.ts | 19 +++++++++------ .../shared/components/unscoped-styles.scss | 15 ++++++++++++ frontend/src/theme/base.scss | 5 ++-- 7 files changed, 81 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html index f4207c838a..cce2f9d968 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html @@ -17,14 +17,15 @@ SPDX-License-Identifier: Apache-2.0 --> - - + + + {{onDisplayString()}} + + diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.scss b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.scss index bca877044b..6fc61c1049 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.scss +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.scss @@ -25,7 +25,7 @@ display: flex; } -.box-search input { +.box-search, input { flex: 1; border: none; outline: none; @@ -45,3 +45,10 @@ .pl-1 { padding-left: 1rem; } + +.date-search { + display: flex; + align-items: center; + justify-content: center; + /* Add any other necessary styling for the date-search container */ +} diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts index 614bc937e1..a76610aabd 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.ts @@ -19,6 +19,7 @@ import {Component, EventEmitter, Input, OnChanges, Output, ViewChild} from '@angular/core'; import {FormControl} from '@angular/forms'; +import {MatDatepickerInputEvent} from "@angular/material/datepicker"; @Component({ selector: 'app-multiselect', @@ -47,6 +48,8 @@ export class MultiSelectAutocompleteComponent implements OnChanges { multiple = true; @Input() textSearch = true; + @Input() + isDate = false; // New Options @Input() @@ -54,6 +57,8 @@ export class MultiSelectAutocompleteComponent implements OnChanges { @Input() appearance = 'standard'; + public readonly minDate = new Date(); + @ViewChild('searchInput', {static: true}) searchInput: any; theSearchElement: string = ''; @@ -72,6 +77,10 @@ export class MultiSelectAutocompleteComponent implements OnChanges { return !this.textSearch || this.textSearch && (this.theSearchElement === null || this.theSearchElement === ''); } + shouldHideDatePicker(): boolean{ + return !this.isDate; + } + ngOnChanges(): void { this.filteredOptions = this.options; if (this.selectedOptions) { @@ -136,6 +145,19 @@ export class MultiSelectAutocompleteComponent implements OnChanges { this.selectedValue = this.theSearchElement as unknown as []; } + changeDateOption(): void { + /* this.formControl.patchValue(this.theSearchElement); + this.selectedValue = this.theSearchElement as unknown as [];*/ + } + + events: string[] = []; + + addEvent(type: string, event: MatDatepickerInputEvent) { + console.log(type, "type"); + console.log(event, "event"); + this.events.push(`${type}: ${event.value}`); + } + clickClear(): void { this.formControl.patchValue(""); this.formControl.reset(); @@ -200,6 +222,7 @@ export class MultiSelectAutocompleteComponent implements OnChanges { onSelectionChange(val: any) { + const filteredValues = this.getFilteredOptionsValues(); if (this.multiple) { const selectedCount = this.selectedValue.filter(item => filteredValues.includes(item)).length; diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html index 7cf2ce4e94..ef1dcbaca1 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html +++ b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html @@ -62,8 +62,9 @@ semanticModel.nameAtCustomer {filterKey: 'semanticModelId', headerKey: 'filterSemanticModelId', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'semanticDataModel', headerKey: 'filterSemanticDataModel', isTextSearch: false, option: this.semanticDataModelOptions}, - {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: true, option: this.optionTextSearch}, + {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: false, isDate: true, option: this.optionTextSearch}, {filterKey: 'manufacturingCountry', headerKey: 'filterManufacturingCountry', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'activeAlerts', headerKey: 'filterActiveAlerts', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'activeInvestigations', headerKey: 'filterActiveInvestigations', isTextSearch: true, option: this.optionTextSearch}, @@ -572,7 +577,7 @@ export class PartsTableComponent implements OnInit { {filterKey: 'manufacturerName', headerKey: 'filterManufacturer', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'manufacturerPartId', headerKey: 'filterPartId', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'semanticModelId', headerKey: 'filterSemanticModelId', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: true, option: this.optionTextSearch}, + {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: false, isDate: true, option: this.optionTextSearch}, {filterKey: 'activeAlerts', headerKey: 'filterActiveAlerts', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'activeInvestigations', headerKey: 'filterActiveInvestigations', isTextSearch: true, option: this.optionTextSearch}, ]; @@ -585,7 +590,7 @@ export class PartsTableComponent implements OnInit { {filterKey: 'manufacturerName', headerKey: 'filterManufacturer', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'manufacturerPartId', headerKey: 'filterPartId', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'semanticModelId', headerKey: 'filterSemanticModelId', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: true, option: this.optionTextSearch}, + {filterKey: 'manufacturingDate', headerKey: 'filterManufacturingDate', isTextSearch: false, isDate: true, option: this.optionTextSearch}, {filterKey: 'activeAlerts', headerKey: 'filterActiveAlerts', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'activeInvestigations', headerKey: 'filterActiveInvestigations', isTextSearch: true, option: this.optionTextSearch}, ]; @@ -601,12 +606,12 @@ export class PartsTableComponent implements OnInit { {filterKey: 'classification', headerKey: 'filterClassification', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'semanticDataModel', headerKey: 'filterSemanticDataModel', isTextSearch: false, option: this.semanticDataModelOptions}, {filterKey: 'semanticModelId', headerKey: 'filterSemanticModelId', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'validityPeriodFrom', headerKey: 'filterValidityPeriodFrom', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'validityPeriodTo', headerKey: 'filterValidityPeriodTo', isTextSearch: true, option: this.optionTextSearch}, + {filterKey: 'validityPeriodFrom', headerKey: 'filterValidityPeriodFrom', isTextSearch: false, isDate: true, option: this.optionTextSearch}, + {filterKey: 'validityPeriodTo', headerKey: 'filterValidityPeriodTo', isTextSearch: false, isDate: true, option: this.optionTextSearch}, {filterKey: 'function', headerKey: 'filterPsFunction', isTextSearch: true, option: this.optionTextSearch}, {filterKey: 'catenaxSiteId', headerKey: 'filterCatenaXSiteId', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'functionValidFrom', headerKey: 'filterFunctionValidFrom', isTextSearch: true, option: this.optionTextSearch}, - {filterKey: 'functionValidUntil', headerKey: 'filterFunctionValidUntil', isTextSearch: true, option: this.optionTextSearch} + {filterKey: 'functionValidFrom', headerKey: 'filterFunctionValidFrom', isTextSearch: false, isDate: true, option: this.optionTextSearch}, + {filterKey: 'functionValidUntil', headerKey: 'filterFunctionValidUntil', isTextSearch: false, isDate: true, option: this.optionTextSearch} ]; diff --git a/frontend/src/app/modules/shared/components/unscoped-styles.scss b/frontend/src/app/modules/shared/components/unscoped-styles.scss index 40d2905731..581ecc6805 100644 --- a/frontend/src/app/modules/shared/components/unscoped-styles.scss +++ b/frontend/src/app/modules/shared/components/unscoped-styles.scss @@ -33,6 +33,17 @@ app-multiselect { +/* .date-search{ + .mat-mdc-form-field{ + height:56px; + display:flex; + } + } + + + .mat-mdc-form-field-infix{ + + }*/ /* Remove border*/ .mdc-line-ripple::before { border-bottom-width: 0 !important; @@ -43,6 +54,10 @@ app-multiselect { } + .mat-mdc-text-field-wrapper{ + + } + /* Remove grey background of filter selection */ .mdc-text-field--filled:not(.mdc-text-field--disabled) { background-color: unset !important; diff --git a/frontend/src/theme/base.scss b/frontend/src/theme/base.scss index e4238fce53..644ae283f7 100644 --- a/frontend/src/theme/base.scss +++ b/frontend/src/theme/base.scss @@ -138,9 +138,10 @@ @apply font-semiBold; } - .mat-mdc-form-field-infix { + // todo check if we can remove this +/* .mat-mdc-form-field-infix { padding-bottom: 0px !important; - } + }*/ } .mdc-text-field__input::-webkit-calendar-picker-indicator { From fc45065594a2f087963f89edcff7b7212dcdac52 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 11 Oct 2023 22:27:31 +0200 Subject: [PATCH 05/33] chore: TRACEFOSS-2733 add date picker to allow date filter passed by picker --- .../multi-select-autocomplete.component.html | 6 +-- .../shared/components/unscoped-styles.scss | 40 +++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html index cce2f9d968..bd83adf9a4 100644 --- a/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html +++ b/frontend/src/app/modules/shared/components/multi-select-autocomplete/multi-select-autocomplete.component.html @@ -49,10 +49,10 @@