Skip to content

Commit

Permalink
Merge pull request #258 from catenax-ng/main
Browse files Browse the repository at this point in the history
Removed UX breaking Snackbar statusbox component
  • Loading branch information
ds-mwesener authored Aug 18, 2023
2 parents 97fcb79 + 7fe064c commit 551c92f
Show file tree
Hide file tree
Showing 27 changed files with 212 additions and 321 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Logic of commitId retrieval by frontend has changed
- Readme / Docker Notice information as required in TRGs
- Removed references to GitHub registry and added docker hub for tractusx instead
- Removed UX breaking black status box

### Removed

Expand Down
103 changes: 71 additions & 32 deletions docs/src/uml-diagrams/concept/TRACEFOSS-1423/domain-model.puml
Original file line number Diff line number Diff line change
Expand Up @@ -2,62 +2,101 @@

title: Domain Model


abstract Asset {
* id : String
idShort : String
partInstanceId : String
manufacturerId : String
batchId : String
* private final Owner owner;
manufacturerName : String
owner : Owner
activeAlert: boolean
qualityType : QualityType
underInvestigation : boolean
semanticDataModelType : SemanticDataModelType
childRelations : List<Relation>
parentRelations : List<Relation>
underInvestigation : boolean
qualityType : QualityType
van : String
semanticDataModel: enum

abstract SemanticDataModel : getSemanticDataModel()
idShort : String
van : String
}

note left
Rename Descriptions to Relations
end note


entity Relation {
class Relation {
* id : String
idShort : String
}

enum SemanticDataModelType {
BATCH,
SERIALPART,
JUSTINSEQUENCEPART,
TRACTIONBATTERYCODE,
PARTASPLANNED,
PARTSITEINFORMATIONASPLANNED
}

entity AsBuiltAsset {
manufacturingDate : Instant
manufacturingCountry : String
manufacturerPartId : String
customerPartId : String
nameAtManufacturer : String
nameAtCustomer : String

AspectType : aspectType()
class AsBuiltAspectModel {
partId : String /' BatchID , jisNumber , partInstanceID'/

manufacturerPartId : String /' partTypeInformation.manufacturerPartId '/
nameAtManufacturer : String /' partTypeInformation.nameAtManufacturer '/
classification : String /' partTypeInformation.classification '/
businessPartner : String /' BusinessPartner '/

customerPartId : String
nameAtCustomer : String
manufacturingCountry : String (iso-3)
manufacturingDate : Instant

tractionBatteryCode : TractionBatteryCode

}

note right
SerialPart and Batch
note left
partId covers SerialPart.partInstanceID, Batch.BatchID, JustInSequencePart.jisNumber
end note

enum SemanticDataModel {
BATCH,
SERIALPART
class TractionBatteryCode {
* uuid4 : String /' UUID ID '/
productType: String
tractionBatteryCode: String
subComponents : List<TractionBatteryCode>
}

entity AsPlannedAsset {
class PartAsPlanned {
manufacturerPartId : String /' partTypeInformation.manufacturerPartId '/
nameAtManufacturer : String /' partTypeInformation.nameAtManufacturer '/
classification : String /' partTypeInformation.classification '/
businessPartner : String /' BusinessPartner '/
/'
1.0.0
'/
validityPeriodFrom : Instance
validityPeriodTo: Instance

partSiteInformationAsPlanned : PartSiteInformationAsPlanned
}

Asset --> SemanticDataModel
Asset <|.. AsBuiltAsset
Asset <|.. AsPlannedAsset
Asset }o--- Relation : childRelations
Asset }o--- Relation : parentRelations
class PartSiteInformationAsPlanned {
/'
1.0.0
Currently this is not ready for implementing - there is no specification right now.
'/
functionValidFrom : Instance
functionValidUntil : Instance

}


SemanticDataModelType <-- Asset
Asset <|.. AsBuiltAspectModel
Asset <|.. PartAsPlanned

Asset }o-- Relation : childRelations
Asset }o-- Relation : parentRelations

AsBuiltAspectModel -- TractionBatteryCode

PartAsPlanned -- PartSiteInformationAsPlanned
@enduml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('About Page', () => {


it('should render about page', async () => {
await renderComponent(AboutComponent, { imports: [AboutModule] });
await renderComponent(AboutComponent, { imports: [AboutModule], providers: [AboutComponent] });
expect(screen.getByText('pageAbout.content')).toBeInTheDocument();
const componentInstance = TestBed.inject(AboutComponent);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import { AlertDetailFacade } from '@page/alerts/core/alert-detail.facade';
import { AlertHelperService } from '@page/alerts/core/alert-helper.service';
import { AlertsFacade } from '@page/alerts/core/alerts.facade';
import { Part } from '@page/parts/model/parts.model';
import { CtaSnackbarService } from '@shared/components/call-to-action-snackbar/cta-snackbar.service';
import { NotificationCommonModalComponent } from '@shared/components/notification-common-modal/notification-common-modal.component';
import { CreateHeaderFromColumns, TableConfig, TableEventConfig } from '@shared/components/table/table.model';
import { ToastService } from '@shared/components/toasts/toast.service';
import { Notification } from '@shared/model/notification.model';
import { TranslationContext } from '@shared/model/translation-context.model';
import { View } from '@shared/model/view.model';
Expand Down Expand Up @@ -75,7 +75,7 @@ export class AlertDetailComponent implements AfterViewInit, OnDestroy {
private readonly alertsFacade: AlertsFacade,
private router: Router,
private readonly route: ActivatedRoute,
private readonly ctaSnackbarService: CtaSnackbarService,
private readonly toastService: ToastService,
) {
this.alertPartsInformation$ = this.alertDetailFacade.notificationPartsInformation$;
this.supplierPartsDetailInformation$ = this.alertDetailFacade.supplierPartsInformation$;
Expand Down Expand Up @@ -143,7 +143,7 @@ export class AlertDetailComponent implements AfterViewInit, OnDestroy {

public copyToClipboard(semanticModelId: string): void {
const text = { id: 'clipboard', values: { value: semanticModelId } };
navigator.clipboard.writeText(semanticModelId).then(_ => this.ctaSnackbarService.show(text));
navigator.clipboard.writeText(semanticModelId).then(_ => this.toastService.info(text));
}

public navigateBackToAlerts(): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import { InvestigationDetailFacade } from '@page/investigations/core/investigati
import { InvestigationHelperService } from '@page/investigations/core/investigation-helper.service';
import { InvestigationsFacade } from '@page/investigations/core/investigations.facade';
import { Part } from '@page/parts/model/parts.model';
import { CtaSnackbarService } from '@shared/components/call-to-action-snackbar/cta-snackbar.service';
import { NotificationCommonModalComponent } from '@shared/components/notification-common-modal/notification-common-modal.component';
import { CreateHeaderFromColumns, TableConfig, TableEventConfig } from '@shared/components/table/table.model';
import { ToastService } from '@shared/components/toasts/toast.service';
import { Notification } from '@shared/model/notification.model';
import { TranslationContext } from '@shared/model/translation-context.model';
import { View } from '@shared/model/view.model';
Expand Down Expand Up @@ -77,7 +77,7 @@ export class InvestigationDetailComponent implements AfterViewInit, OnDestroy {
public readonly investigationsFacade: InvestigationsFacade,
private router: Router,
private readonly route: ActivatedRoute,
private readonly ctaSnackbarService: CtaSnackbarService,
private readonly toastService: ToastService,
) {
this.investigationPartsInformation$ = this.investigationDetailFacade.notificationPartsInformation$;
this.supplierPartsDetailInformation$ = this.investigationDetailFacade.supplierPartsInformation$;
Expand Down Expand Up @@ -145,7 +145,7 @@ export class InvestigationDetailComponent implements AfterViewInit, OnDestroy {

public copyToClipboard(semanticModelId: string): void {
const text = { id: 'clipboard', values: { value: semanticModelId } };
navigator.clipboard.writeText(semanticModelId).then(_ => this.ctaSnackbarService.show(text));
navigator.clipboard.writeText(semanticModelId).then(_ => this.toastService.info(text));
}

public navigateBackToInvestigations(): void {
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 551c92f

Please sign in to comment.