From 27540cba4141f974c95622c435fd0aa41a290163 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 31 Jul 2024 10:08:32 +0200 Subject: [PATCH 1/2] chore(release): 1227 - removed scrollbar on approval dialog. --- CHANGELOG.md | 3 +++ .../modal/content/notification-modal-content.component.html | 2 +- .../modal/content/notification-modal-content.component.ts | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5752c7f928..297024e330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ _**For better traceability add the corresponding GitHub issue number in each cha - #1328 Fixed semanticDataModel translation and part name within notification detail / edit view. - #908 Renamed header in notification detail for parts from Supplier Parts to Affected parts +### Removed +- #1227 Removed scrollbar on approval dialog + ## [13.0.1 - 26.07.2024] ### Added diff --git a/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.html b/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.html index 62b05594c9..683cf6752e 100644 --- a/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.html +++ b/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.html @@ -25,7 +25,7 @@ - + diff --git a/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.ts b/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.ts index db45e8b597..83b2841050 100644 --- a/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.ts +++ b/frontend/src/app/modules/shared/modules/notification/modal/content/notification-modal-content.component.ts @@ -28,4 +28,7 @@ import { Notification } from '@shared/model/notification.model'; }) export class NotificationModalContentComponent { @Input() notification: Notification; + constructor() { + setTimeout(() => {console.log(this.notification, "notification")}, 2000); + } } From 7712410b941fb4b343827f1c11ac2cd5ed518558 Mon Sep 17 00:00:00 2001 From: Maximilian Wesener Date: Wed, 31 Jul 2024 10:20:34 +0200 Subject: [PATCH 2/2] chore(release): 1227 - fixed links --- README.md | 2 +- dev/README.md | 2 +- .../#437-adapt-to-changes-industry-core.md | 2 +- docs/src/docs/arc42/cross-cutting/domain-concepts.adoc | 2 +- .../page/admin/presentation/contracts/contracts.component.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29cb407e79..b8e9e387c4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![Kics](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/kics.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/kics.yml) [![Trivy](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/trivy.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/trivy.yml) [![Eclipse DASH IP Check](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/eclipse-dash.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/eclipse-dash.yml) -[![[BE] Dependency check](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/dependency-check.yml/badge.svg)](https://github.com/catenax-ng/tx-traceability-foss/actions/workflows/dependency-check.yml) +[![[BE] Dependency check](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/dependency-check.yml/badge.svg)](https://github.com/eclipse-tractusx/traceability-foss/actions/workflows/dependency-check.yml) ## Trace-X is a system for tracking parts along the supply chain. diff --git a/dev/README.md b/dev/README.md index 7eabbf7fa0..b315dbd97c 100644 --- a/dev/README.md +++ b/dev/README.md @@ -6,7 +6,7 @@ - Hint you need to copy the access token for argo cd into the specific environment for requests against argo (argocd.token) in insomnia: argo_access_token -Here you can find the [Trace-X Insomnia Collection](https://github.com/catenax-ng/tx-traceability-foss/blob/main/tx-backend/collection/tracex.json). Use this [README](https://github.com/catenax-ng/tx-traceability-foss/blob/main/tx-backend/collection/README.md) to find out how to setup Insomnia with the Trace-X Collection. +Here you can find the [Trace-X Insomnia Collection](https://github.com/eclipse-tractusx/traceability-foss/blob/main/tx-backend/collection/tracex.json). Use this [README](https://github.com/eclipse-tractusx/traceability-foss/blob/main/tx-backend/collection/README.md) to find out how to setup Insomnia with the Trace-X Collection. In the Collection you will find a directory named 'Argo', in which you can delete & sync all necessary application components. Go through every directory inside the 'Argo' directory and execute every request inside the Directory 'DELETE'. To make this step easier, you can install the Insomnia Plugin ['multiple requests'](https://insomnia.rest/plugins/insomnia-plugin-multiple-requests). With this Plugin you can execute all requests inside the 'DELETE' Directory by right-clicking the directory and choosing 'send Requests'. diff --git a/docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt-to-changes-industry-core.md b/docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt-to-changes-industry-core.md index 488bff44bd..f6b01ab2ee 100644 --- a/docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt-to-changes-industry-core.md +++ b/docs/concept/#437-adapt-to-changes-of-industry-core/#437-adapt-to-changes-industry-core.md @@ -143,7 +143,7 @@ values.yaml ### Changes in Domain Model -https://github.com/catenax-ng/tx-traceability-foss/blob/5b07a12830d6ecf9f3d0141d49bb89825cc86cc3/docs/src/uml-diagrams/arc42/cross-cutting/domain-model/domain-model.puml +https://github.com/eclipse-tractusx/traceability-foss/blob/5b07a12830d6ecf9f3d0141d49bb89825cc86cc3/docs/src/uml-diagrams/arc42/cross-cutting/domain-model/domain-model.puml ### Changes in Detail View ![DetailViewWithPartSiteInformation](DetailViewWithPartSiteInformation.svg) diff --git a/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc b/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc index e2e9685c61..e4e592b765 100644 --- a/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc +++ b/docs/src/docs/arc42/cross-cutting/domain-concepts.adoc @@ -2,7 +2,7 @@ == API model -For detailed information about the API model, please refer to the link:https://catenax-ng.github.io/tx-traceability-foss/docs/api-specification/api-specification.html[API specification]. +For detailed information about the API model, please refer to the link:https://eclipse-tractusx.github.io/traceability-foss/docs/api-specification/api-specification.html[API specification]. == Domain models diff --git a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts index 6c275b0578..0db0ff324d 100644 --- a/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts +++ b/frontend/src/app/modules/page/admin/presentation/contracts/contracts.component.ts @@ -36,7 +36,7 @@ export class ContractsComponent { if (data?.data?.content.length) { return; } else { - this.contractsFacade.setContracts(0, 10, [ null, null ]); + this.contractsFacade.setContracts(0, 10, [ ]); } });