chore: Linking of asset and contract definition creation workflows (WIP)

src/app/routes/connector-ui/asset-page/asset-create-dialog/asset-create-dialog.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnDestroy} from '@angular/core';
 import {MatDialog, MatDialogRef} from '@angular/material/dialog';
-import {Observable, Subject} from 'rxjs';
+import {distinctUntilChanged, Observable, Subject} from 'rxjs';
 import {filter, finalize, map, takeUntil} from 'rxjs/operators';
 import {
   ConfirmDialogModel,
@@ -72,11 +72,9 @@ export class AssetCreateDialogComponent implements OnDestroy {
         complete: () => {
           this.notificationService.showInfo('Successfully created asset');
           this.close({refreshList: true});
-          console.log(assetEntryDto.asset);
           this.onAssetCreation(formValue.metadata?.id!);
         },
-        error: (error) => {
-          console.error('Failed creating asset!', error);
+        error: () => {
           this.notificationService.showError('Failed creating asset!');
           this.close({refreshList: true});
           console.log(assetEntryDto.asset);
@@ -90,18 +88,16 @@ export class AssetCreateDialogComponent implements OnDestroy {
   }
 
   private onAssetCreation(assetId: string) {
-    console.log('the asset id is' + assetId);
-    this.confirmCreate(assetId).subscribe(() => {
-      complete: () => {
+    this.confirmCreate(assetId).pipe(distinctUntilChanged()).subscribe(() => {
         this.close({refreshList: true});
+        ContractDefinitionEditorDialog.assetIdFromAssetCreation = assetId;
         const dialogRef = this.matDialog.open(ContractDefinitionEditorDialog);
-        dialogRef
-          .afterClosed()
-          .pipe(
-            map((it) => it as ContractDefinitionEditorDialogResult | null),
-            filter((it) => !!it?.refreshList),
-          ).subscribe(() => ContractDefinitionPageComponent.fetch$.next(null));
-      };
+       dialogRef
+         .afterClosed()
+         .pipe(
+           map((it) => it as ContractDefinitionEditorDialogResult | null),
+           filter((it) => !!it?.refreshList),
+         ).subscribe(() => ContractDefinitionPageComponent.fetch$.next(null));
     });
   }
 

src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog-form.ts

@@ -32,4 +32,8 @@ export class ContractDefinitionEditorDialogForm {
       assets: [[] as Asset[], Validators.required],
     });
   }
+
+  patchValue(param: { id: string }) {
+
+  }
 }

src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.html

@@ -8,7 +8,7 @@ <h1 mat-dialog-title>Create New Contract Definition</h1>
       id="form-field-id"
       color="accent">
       <mat-label>ID</mat-label>
-      <input matInput autocomplete="new-id" [formControl]="ctrl" />
+      <input matInput autocomplete="new-id" [formControl]="ctrl"/>
       <mat-error *ngIf="ctrl.invalid && ctrl.errors?.pattern">{{
         validationMessages.invalidWhitespacesMessage
       }}</mat-error>

src/app/routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts

@@ -26,7 +26,7 @@ export class ContractDefinitionEditorDialog implements OnInit, OnDestroy {
   policies: PolicyDefinition[] = [];
   assets: Asset[] = [];
   loading = false;
-
+  static assetIdFromAssetCreation: string;
   constructor(
     public form: ContractDefinitionEditorDialogForm,
     private notificationService: NotificationService,
@@ -40,7 +40,9 @@ export class ContractDefinitionEditorDialog implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
-
+    this.form.patchValue({
+      id: ContractDefinitionEditorDialog.assetIdFromAssetCreation,
+    });
     this.policyService
       .getAllPolicies(0, 10_000_000)
       .pipe(takeUntil(this.ngOnDestroy$))

src/app/routes/connector-ui/contract-definition-page/contract-definition-page/contract-definition-page.component.ts

@@ -20,7 +20,7 @@ export class ContractDefinitionPageComponent implements OnInit {
   searchText = new FormControl<string>('');
   deleteBusy = false;
 
-  public static fetch$ = new BehaviorSubject(null);
+  static fetch$ = new BehaviorSubject(null);
 
   constructor(
     private contractDefinitionPageService: ContractDefinitionPageService,