From 482865f04f268f0bc81f4e52455c06319a73be03 Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:54:18 +0200
Subject: [PATCH 1/6] fix fake backend

---
 .../contract-agreement-fake-service.ts                | 11 +++++++++--
 .../services/api/fake-backend/edc-fake-backend.ts     |  6 ++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
index 639578fd8..df82289d7 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
@@ -2,6 +2,7 @@ import {
   ContractAgreementCard,
   ContractAgreementPage,
   ContractAgreementTransferProcess,
+  ContractTerminationStatus,
   IdResponseDto,
   InitiateTransferRequest,
 } from '@sovity.de/edc-client';
@@ -127,9 +128,15 @@ let contractAgreements: ContractAgreementCard[] = [
     ],
   },
 ];
-export const contractAgreementPage = (): ContractAgreementPage => {
+export const contractAgreementPage = (
+  terminationStatus?: ContractTerminationStatus,
+): ContractAgreementPage => {
   return {
-    contractAgreements,
+    contractAgreements: terminationStatus
+      ? contractAgreements.filter(
+          (x) => x.terminationStatus === terminationStatus,
+        )
+      : contractAgreements,
   };
 };
 
diff --git a/src/app/core/services/api/fake-backend/edc-fake-backend.ts b/src/app/core/services/api/fake-backend/edc-fake-backend.ts
index 526b83115..b0222a5b7 100644
--- a/src/app/core/services/api/fake-backend/edc-fake-backend.ts
+++ b/src/app/core/services/api/fake-backend/edc-fake-backend.ts
@@ -1,5 +1,6 @@
 import {
   AssetPageToJSON,
+  ContractAgreementPageQueryFromJSON,
   ContractAgreementPageToJSON,
   ContractDefinitionPageToJSON,
   ContractDefinitionRequestFromJSON,
@@ -167,8 +168,9 @@ export const EDC_FAKE_BACKEND: FetchAPI = async (
     })
 
     .url('pages/contract-agreement-page')
-    .on('GET', () => {
-      const page = contractAgreementPage();
+    .on('POST', () => {
+      const pageQuery = body ? ContractAgreementPageQueryFromJSON(body) : null;
+      const page = contractAgreementPage(pageQuery?.terminationStatus);
       return ok(ContractAgreementPageToJSON(page));
     })
 

From 40db3106ba32562acbbdd6e90b02a80a661ac48b Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:46:33 +0200
Subject: [PATCH 2/6] on request asset icon in data offer cards

---
 .../contract-offer-icon.component.ts          | 20 ++++++++++++++++---
 .../catalog-fake-service.ts                   | 11 ++++++++++
 .../connector-fake-impl/data/test-assets.ts   | 13 ++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts b/src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts
index 96b79484f..02e9fb503 100644
--- a/src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts
+++ b/src/app/component-library/catalog/contract-offer-icon/contract-offer-icon.component.ts
@@ -5,7 +5,7 @@ import {DataOffer} from '../../../core/services/models/data-offer';
 @Component({
   selector: 'contract-offer-icon',
   template: `
-    <!-- Negotiation Success Indicator -->
+    <!-- Negotiation Success Overlay Icon -->
     <div *ngIf="isNegotiated()" style="position: absolute;">
       <mat-icon
         class="mat-card-avatar-icon"
@@ -19,8 +19,18 @@ import {DataOffer} from '../../../core/services/models/data-offer';
       </mat-icon>
     </div>
 
-    <!-- Icon -->
-    <mat-icon class="mat-card-avatar-icon">sim_card</mat-icon>
+    <!-- Live Icon -->
+    <mat-icon *ngIf="!isOnRequestAsset()" class="mat-card-avatar-icon"
+      >sim_card</mat-icon
+    >
+
+    <!-- On Request Icon -->
+    <mat-icon
+      *ngIf="this.isOnRequestAsset()"
+      class="mat-card-avatar-icon"
+      style="transform: scaleX(-1);"
+      >contact_page</mat-icon
+    >
   `,
 })
 export class ContractOfferIconComponent {
@@ -34,4 +44,8 @@ export class ContractOfferIconComponent {
       this.contractNegotiationService.isNegotiated(it),
     );
   }
+
+  isOnRequestAsset(): boolean {
+    return this.dataOffer.asset.dataSourceAvailability === 'ON_REQUEST';
+  }
 }
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/catalog-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/catalog-fake-service.ts
index 8acfd8398..98b400e22 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/catalog-fake-service.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/catalog-fake-service.ts
@@ -42,6 +42,17 @@ let dataOffers: UiDataOffer[] = [
       },
     ],
   },
+  {
+    endpoint: 'http://existing-other-connector/api/dsp',
+    participantId: 'MDSL1234XX.C1234XX',
+    asset: TestAssets.onRequestAsset,
+    contractOffers: [
+      {
+        contractOfferId: 'on-request-contract-offer',
+        policy: TestPolicies.failedMapping,
+      },
+    ],
+  },
 ];
 
 export const getCatalogPageDataOffers = (
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
index 8cefb2c27..2137fc2ab 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
@@ -73,6 +73,19 @@ export namespace TestAssets {
 This is a short description text that should be fully rendered without being **collapsed**. No *show more* button should be visible.
 `;
 
+  export const onRequestAsset: UiAsset = {
+    dataSourceAvailability: 'ON_REQUEST',
+    assetId: 'on-request-asset',
+    title: 'On Request Asset',
+    description: '',
+    descriptionShortText: '',
+    connectorEndpoint: 'https://my-other-connector/api/dsp',
+    participantId: 'MDSL1234XX.C1234XX',
+    creatorOrganizationName: 'my-org',
+    temporalCoverageFrom: new Date('2024-01-01'),
+    isOwnConnector: false,
+  };
+
   export const boring: UiAsset = {
     dataSourceAvailability: 'LIVE',
     assetId: 'data-sample-ckd-skd-demands-2023-Jan',

From b0eed854dd638592c5adaf869829c43bdb9b1629 Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:54:42 +0200
Subject: [PATCH 3/6] differentiate on request offers on detail dialog

---
 .../asset-detail-dialog.component.html        | 29 +++++++++++++----
 .../asset-detail-dialog.component.ts          | 29 ++++++++++++++++-
 .../connector-fake-impl/data/test-assets.ts   |  6 ++--
 .../core/services/mailto-link-builder.spec.ts | 24 ++++++++++++++
 src/app/core/services/mailto-link-builder.ts  | 31 +++++++++++++++++++
 src/app/core/utils/record-utils.ts            | 12 +++++++
 6 files changed, 122 insertions(+), 9 deletions(-)
 create mode 100644 src/app/core/services/mailto-link-builder.spec.ts
 create mode 100644 src/app/core/services/mailto-link-builder.ts

diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
index 680348c62..2f57f9414 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
@@ -51,7 +51,7 @@
 <div class="flex flex-col space-y-[10px]" mat-dialog-content>
   <!-- Progress Bar -->
   <mat-progress-bar
-    *ngIf="showProgressBar"
+    *ngIf="isProgressBarVisible"
     color="primary"
     mode="indeterminate"></mat-progress-bar>
 
@@ -88,10 +88,22 @@
 
   <!-- Contract Offers -->
   <contract-offer-mini-list
-    *ngIf="data.type === 'data-offer'"
+    *ngIf="isLiveDataOffer"
     [data]="data.dataOffer!"
     (negotiateClick)="onNegotiateClick($event)">
   </contract-offer-mini-list>
+
+  <div *ngIf="isOnRequestDataOffer">
+    <div class="property-grid-group-title">On Request Data Offer</div>
+    <div>
+      This data offer is not available for immediate consumption. However, the
+      creator left an email address to contact him if interested.
+    </div>
+    <div>
+      Click <span class="!font-bold">Contact</span> to email the data offer
+      provider.
+    </div>
+  </div>
 </div>
 
 <mat-dialog-actions>
@@ -102,10 +114,7 @@
       </button>
 
       <ng-container
-        *ngIf="
-          data.type === 'data-offer' &&
-          data.dataOffer!.contractOffers.length === 1
-        ">
+        *ngIf="isLiveDataOffer && data.dataOffer!.contractOffers.length === 1">
         <button
           *ngIf="data.asset.isOwnConnector"
           disabled
@@ -139,6 +148,14 @@
         </button>
       </ng-container>
 
+      <a
+        *ngIf="isOnRequestDataOffer"
+        mat-raised-button
+        color="primary"
+        [href]="this.onRequestContactLink">
+        Contact
+      </a>
+
       <button
         *ngIf="
           data.type === 'contract-agreement' &&
diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
index 7b0544c89..f7c1d3ff0 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.ts
@@ -7,6 +7,7 @@ import {
 import {Observable, Subject, isObservable} from 'rxjs';
 import {filter, finalize, takeUntil} from 'rxjs/operators';
 import {UiContractOffer} from '@sovity.de/edc-client';
+import {MailtoLinkBuilder} from 'src/app/core/services/mailto-link-builder';
 import {EdcApiService} from '../../../core/services/api/edc-api.service';
 import {ContractNegotiationService} from '../../../core/services/contract-negotiation.service';
 import {UiAssetMapped} from '../../../core/services/models/ui-asset-mapped';
@@ -40,7 +41,7 @@ export class AssetDetailDialogComponent implements OnDestroy {
 
   loading = false;
 
-  get showProgressBar(): boolean {
+  get isProgressBarVisible(): boolean {
     switch (this.data.type) {
       case 'data-offer':
         return (
@@ -55,6 +56,31 @@ export class AssetDetailDialogComponent implements OnDestroy {
     }
   }
 
+  get isLiveDataOffer(): boolean {
+    return (
+      this.data.type === 'data-offer' &&
+      this.data.asset.dataSourceAvailability === 'LIVE'
+    );
+  }
+
+  get isOnRequestDataOffer(): boolean {
+    return (
+      this.data.type === 'data-offer' &&
+      this.data.asset.dataSourceAvailability === 'ON_REQUEST'
+    );
+  }
+
+  get onRequestContactLink(): string {
+    if (!this.asset.onRequestContactEmail) {
+      throw new Error('On request asset must have contact email');
+    }
+    return this.mailtoLinkBuilder.buildMailtoUrl(
+      this.asset.onRequestContactEmail,
+      this.asset.onRequestContactEmailSubject ??
+        "I'm interested in your data offer",
+    );
+  }
+
   constructor(
     private edcApiService: EdcApiService,
     private notificationService: NotificationService,
@@ -63,6 +89,7 @@ export class AssetDetailDialogComponent implements OnDestroy {
     @Inject(MAT_DIALOG_DATA)
     private _data: AssetDetailDialogData | Observable<AssetDetailDialogData>,
     public contractNegotiationService: ContractNegotiationService,
+    private mailtoLinkBuilder: MailtoLinkBuilder,
   ) {
     if (isObservable(this._data)) {
       this._data
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
index 2137fc2ab..42fe1dcca 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/data/test-assets.ts
@@ -75,14 +75,16 @@ This is a short description text that should be fully rendered without being **c
 
   export const onRequestAsset: UiAsset = {
     dataSourceAvailability: 'ON_REQUEST',
-    assetId: 'on-request-asset',
-    title: 'On Request Asset',
+    assetId: 'comfee-or',
+    title: 'Comfee OR',
     description: '',
     descriptionShortText: '',
     connectorEndpoint: 'https://my-other-connector/api/dsp',
     participantId: 'MDSL1234XX.C1234XX',
     creatorOrganizationName: 'my-org',
     temporalCoverageFrom: new Date('2024-01-01'),
+    onRequestContactEmail: 'mail@mail.mail',
+    onRequestContactEmailSubject: "Request for asset 'comfee-or'",
     isOwnConnector: false,
   };
 
diff --git a/src/app/core/services/mailto-link-builder.spec.ts b/src/app/core/services/mailto-link-builder.spec.ts
new file mode 100644
index 000000000..02907ce20
--- /dev/null
+++ b/src/app/core/services/mailto-link-builder.spec.ts
@@ -0,0 +1,24 @@
+import {MailtoLinkBuilder} from './mailto-link-builder';
+
+describe('mailto-link-builder', () => {
+  const builder = new MailtoLinkBuilder();
+
+  it('build link with all fields', () => {
+    expect(
+      builder.buildMailtoUrl(
+        'test@test.com',
+        'subject abc',
+        'body',
+        'cc',
+        'bcc',
+      ),
+    ).toEqual(
+      'mailto:test@test.com?subject=subject%20abc&body=body&cc=cc&bcc=bcc',
+    );
+  });
+  it('build link with only email', () => {
+    expect(builder.buildMailtoUrl('test@test.com')).toEqual(
+      'mailto:test@test.com',
+    );
+  });
+});
diff --git a/src/app/core/services/mailto-link-builder.ts b/src/app/core/services/mailto-link-builder.ts
new file mode 100644
index 000000000..e50b0022f
--- /dev/null
+++ b/src/app/core/services/mailto-link-builder.ts
@@ -0,0 +1,31 @@
+import {Injectable} from '@angular/core';
+import {removeUndefinedValues} from '../utils/record-utils';
+
+@Injectable({providedIn: 'root'})
+export class MailtoLinkBuilder {
+  private readonly MAILTO = 'mailto:';
+
+  constructor() {}
+
+  buildMailtoUrl(
+    email: string,
+    subject?: string,
+    body?: string,
+    cc?: string,
+    bcc?: string,
+  ): string {
+    const queryParams = new URLSearchParams(
+      removeUndefinedValues({
+        subject,
+        body,
+        cc,
+        bcc,
+      }),
+    );
+    // URLSearchParams replaces spaces with '+', so we need to replace them with '%20' for the mail scenario
+    const queryParamsStr = queryParams.toString().replaceAll('+', '%20');
+    const queryStr = queryParamsStr ? `?${queryParamsStr}` : '';
+
+    return `${this.MAILTO}${email}${queryStr}`;
+  }
+}
diff --git a/src/app/core/utils/record-utils.ts b/src/app/core/utils/record-utils.ts
index 3854067b3..50865743a 100644
--- a/src/app/core/utils/record-utils.ts
+++ b/src/app/core/utils/record-utils.ts
@@ -10,6 +10,18 @@ export function removeNullValues(
   );
 }
 
+/**
+ * Remove fields with undefined values from property records
+ * @param obj object / record
+ */
+export function removeUndefinedValues(
+  obj: Record<string, string | undefined>,
+): Record<string, string> {
+  return Object.fromEntries(
+    Object.entries(obj).filter(([_, v]) => v != null) as [string, string][],
+  );
+}
+
 /**
  * Maps keys of a given object
  * @param obj object

From 4fa33fd4a9244643a247da920dfa607cb887529f Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:03:28 +0200
Subject: [PATCH 4/6] .

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f5030135..7ca40e958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ the detailed section referring to by linking pull requests or issues.
 
 #### Minor
 
+- Adjusted data offer card/detail dialog UI to differentiate live and on request assets
+
 #### Patch
 
 ### Deployment Migration Notes

From 4b74b02e1462aa8a0a38b6b10e1f7e00015d52da Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Mon, 22 Jul 2024 17:14:12 +0200
Subject: [PATCH 5/6] fixes

---
 .../asset-detail-dialog.component.html                 |  4 ++--
 .../contract-agreement-fake-service.ts                 |  1 -
 .../connector-fake-impl/ee-fake-service.ts             | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
index dea295306..f0c937f33 100644
--- a/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
+++ b/src/app/component-library/catalog/asset-detail-dialog/asset-detail-dialog.component.html
@@ -145,10 +145,10 @@
     <div class="property-grid-group-title">On Request Data Offer</div>
     <div>
       This data offer is not available for immediate consumption. However, the
-      creator left an email address to contact him if interested.
+      creator left an email address to contact them if interested.
     </div>
     <div>
-      Click <span class="!font-bold">Contact</span> to email the data offer
+      Click <span class="!font-medium">Contact</span> to email the data offer
       provider.
     </div>
   </div>
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
index c76ee3956..b5c374e53 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/contract-agreement-fake-service.ts
@@ -3,7 +3,6 @@ import {
   ContractAgreementPage,
   ContractAgreementTransferProcess,
   ContractTerminationStatus,
-  GetContractAgreementPageRequest,
   IdResponseDto,
   InitiateTransferRequest,
 } from '@sovity.de/edc-client';
diff --git a/src/app/core/services/api/fake-backend/connector-fake-impl/ee-fake-service.ts b/src/app/core/services/api/fake-backend/connector-fake-impl/ee-fake-service.ts
index 2fbf42d6f..c96dd82d8 100644
--- a/src/app/core/services/api/fake-backend/connector-fake-impl/ee-fake-service.ts
+++ b/src/app/core/services/api/fake-backend/connector-fake-impl/ee-fake-service.ts
@@ -2,10 +2,10 @@ import {ConnectorLimits} from '@sovity.de/edc-client';
 import {contractAgreementPage} from './contract-agreement-fake-service';
 
 export const connectorLimits = (): ConnectorLimits => ({
-  numActiveConsumingContractAgreements: contractAgreementPage(
-    {},
-  ).contractAgreements.filter(
-    (it) => it.direction === 'CONSUMING' && it.terminationStatus === 'ONGOING',
-  ).length,
+  numActiveConsumingContractAgreements:
+    contractAgreementPage().contractAgreements.filter(
+      (it) =>
+        it.direction === 'CONSUMING' && it.terminationStatus === 'ONGOING',
+    ).length,
   maxActiveConsumingContractAgreements: 1,
 });

From 69391b0837a2fec0928ac6c7d00f459b0537058f Mon Sep 17 00:00:00 2001
From: kulgg <75735874+kulgg@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:56:28 +0200
Subject: [PATCH 6/6] review

---
 src/app/core/services/mailto-link-builder.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/app/core/services/mailto-link-builder.ts b/src/app/core/services/mailto-link-builder.ts
index e50b0022f..52795d85d 100644
--- a/src/app/core/services/mailto-link-builder.ts
+++ b/src/app/core/services/mailto-link-builder.ts
@@ -5,8 +5,6 @@ import {removeUndefinedValues} from '../utils/record-utils';
 export class MailtoLinkBuilder {
   private readonly MAILTO = 'mailto:';
 
-  constructor() {}
-
   buildMailtoUrl(
     email: string,
     subject?: string,