Skip to content

Commit

Permalink
Merge pull request #1343 from eclipse-tractusx/chore/1227-scrollbar
Browse files Browse the repository at this point in the history
chore(release): 1227 - removed scrollbar on approval dialog.
  • Loading branch information
ds-lcapellino authored Jul 31, 2024
2 parents 2bf42c8 + 7712410 commit fc09d59
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion dev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/docs/arc42/cross-cutting/domain-concepts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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, [ ]);
}

});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<app-notification-overview [notification]="notification" [showNotification]="false"></app-notification-overview>
</mat-card-content>
</mat-card>
<mat-card class="max-h-74 overflow-y-scroll">
<mat-card *ngIf="notification?.messages !== null && notification?.messages?.length > 0" class="max-h-74 overflow-y-scroll">
<mat-card-content>
<app-notification-reason [notificationMessages]="notification?.messages"></app-notification-reason>
</mat-card-content>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

0 comments on commit fc09d59

Please sign in to comment.