fix: asset property "Landing Page" (#495)

package.json

@@ -28,7 +28,7 @@
     "@ng-apimock/core": "^3.11.0",
     "@ngxs/store": "^3.8.1",
     "@sovity.de/broker-server-client": "0.20230712.71619-main-a4860cff",
-    "@sovity.de/edc-client": "0.20230926.105529-main-44861eac",
+    "@sovity.de/edc-client": "0.20230926.151824-main-fdf8eb66",
     "clean-deep": "^3.4.0",
     "date-fns": "^2.30.0",
     "dotenv": "^16.3.1",

src/app/component-library/catalog/asset-detail-dialog/asset-property-grid-group-builder.ts

@@ -14,7 +14,6 @@ import {
   getOnlineStatusColor,
   getOnlineStatusIcon,
 } from '../icon-with-online-status/online-status-utils';
-import {getLegacyPolicy} from './policy-utils';
 
 @Injectable()
 export class AssetPropertyGridGroupBuilder {
@@ -163,7 +162,9 @@ export class AssetPropertyGridGroupBuilder {
             title: `${groupLabel} Contract Policy)`,
             subtitle: asset.name,
             icon: 'policy',
-            objectForJson: getLegacyPolicy(contractOffer.contractPolicy),
+            objectForJson: JSON.parse(
+              contractOffer.contractPolicy.legacyPolicy ?? 'null',
+            ),
           }),
       },
       {

src/app/component-library/catalog/transfer-history-mini-list/transfer-history-mini-list.component.html

@@ -2,11 +2,9 @@
   No transfer processes started yet.
 </i>
 <div
-  *ngFor="
-    let transfer of contractAgreement!!.transferProcesses;
-    trackBy: 'transferProcessId' | trackByField
-  "
-  class="flex flex-row space-x-[10px]">
+  *ngFor="let transfer of contractAgreement!!.transferProcesses"
+  class="flex flex-row space-x-[10px]"
+  trackByField="transferProcessId">
   <mat-icon class="mat-icon-[28px]" style="flex-shrink: 0; margin-top: 6px">{{
     contractAgreement!!.direction === 'PROVIDING' ? 'upload' : 'download'
   }}</mat-icon>

src/app/component-library/pipes-and-directives/directives/track-by-field.directive.ts

@@ -0,0 +1,22 @@
+import {NgForOf} from '@angular/common';
+import {Attribute, Directive, TrackByFunction, inject} from '@angular/core';
+
+export const newTrackByFn =
+  <T>(key: keyof T): TrackByFunction<T> =>
+  (_, item: T) =>
+    item == null ? null : item[key] ?? item;
+
+/**
+ * Creates Track By Function for ngFor loops
+ */
+@Directive({
+  selector: '[ngFor][ngForOf][trackByField]',
+})
+export class TrackByFieldDirective {
+  constructor(
+    @Attribute('trackByField') private readonly trackByField: string,
+  ) {
+    const ngForOf = inject(NgForOf<unknown>, {self: true});
+    ngForOf.ngForTrackBy = newTrackByFn(this.trackByField);
+  }
+}

src/app/component-library/pipes-and-directives/pipes-and-directives.module.ts

@@ -4,9 +4,9 @@ import {MatIconModule} from '@angular/material/icon';
 import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
 import {AutofocusDirective} from './directives/autofocus.direcitive';
 import {RemoveClassDirective} from './directives/remove-class.directive';
+import {TrackByFieldDirective} from './directives/track-by-field.directive';
 import {CompareByFieldPipe} from './pipes/compare-by-field.pipe';
 import {IsActiveFeaturePipe} from './pipes/is-active-feature.pipe';
-import {TrackByFieldPipe} from './pipes/track-by-field.pipe';
 import {ValuesPipe} from './pipes/values.pipe';
 
 @NgModule({
@@ -23,15 +23,15 @@ import {ValuesPipe} from './pipes/values.pipe';
     CompareByFieldPipe,
     IsActiveFeaturePipe,
     RemoveClassDirective,
-    TrackByFieldPipe,
+    TrackByFieldDirective,
     ValuesPipe,
   ],
   exports: [
     AutofocusDirective,
     CompareByFieldPipe,
     IsActiveFeaturePipe,
     RemoveClassDirective,
-    TrackByFieldPipe,
+    TrackByFieldDirective,
     ValuesPipe,
   ],
 })

src/app/core/services/api/fake-backend/impl/contract-negotiation-fake-service.ts

@@ -1,7 +1,7 @@
 import {
   ContractNegotiationRequest,
+  ContractNegotiationSimplifiedState,
   ContractNegotiationState,
-  ContractNegotiationStateSimplifiedStateEnum,
   UiContractNegotiation,
 } from '@sovity.de/edc-client';
 import {Patcher, patchObj} from '../../../../utils/object-utils';
@@ -12,13 +12,13 @@ import {getPolicyDefinitionByJsonLd} from './policy-definition-fake-service';
 const initiated: ContractNegotiationState = {
   name: 'INITIATED',
   code: 500,
-  simplifiedState: ContractNegotiationStateSimplifiedStateEnum.InProgress,
+  simplifiedState: ContractNegotiationSimplifiedState.InProgress,
 };
 
 const agreed: ContractNegotiationState = {
   name: 'AGREED',
   code: 1000,
-  simplifiedState: ContractNegotiationStateSimplifiedStateEnum.Agreed,
+  simplifiedState: ContractNegotiationSimplifiedState.Agreed,
 };
 
 let negotiations: UiContractNegotiation[] = [

src/app/core/services/api/model/criterion-type-ext.ts

@@ -1,9 +1,6 @@
-import {UiCriterionOperatorEnum} from '@sovity.de/edc-client';
+import {UiCriterionOperator} from '@sovity.de/edc-client';
 
-export const CRITERION_OPERATOR_SYMBOLS: Record<
-  UiCriterionOperatorEnum,
-  string
-> = {
+export const CRITERION_OPERATOR_SYMBOLS: Record<UiCriterionOperator, string> = {
   EQ: '=',
   IN: 'in',
   LIKE: 'like',

src/app/core/services/api/model/policy-type-ext.ts

@@ -1,14 +1,10 @@
-import {UiPolicyConstraintOperatorEnum} from '@sovity.de/edc-client';
+import {OperatorDto} from '@sovity.de/edc-client';
 
 export const PolicyLeftExpressions = {
   PolicyEvaluationTime: 'POLICY_EVALUATION_TIME',
   ReferringConnector: 'REFERRING_CONNECTOR',
 };
 
-export type OperatorDto =
-  | UiPolicyConstraintOperatorEnum
-  | UiPolicyConstraintOperatorEnum;
-
 export const OPERATOR_SYMBOLS: Record<OperatorDto, string> = {
   GT: '>',
   LT: '<',

src/app/core/services/asset-create-request-builder.ts

@@ -30,15 +30,14 @@ export class AssetCreateRequestBuilder {
     let creatorOrganizationName = this.config.curatorOrganizationName;
     let publisherHomepage = formValue.metadata?.publisher;
     let mediaType = formValue.metadata?.contentType;
+    let landingPageUrl = formValue.metadata?.endpointDocumentation;
 
     let dataCategory = formValue.advanced?.dataModel;
     let dataSubcategory = formValue.advanced?.dataSubcategory?.id;
     let transportMode = formValue.advanced?.transportMode?.id;
     let geoReferenceMethod = formValue.advanced?.geoReferenceMethod;
     let dataModel = formValue.advanced?.dataModel;
 
-    let landingPageUrl = formValue.datasource?.httpUrl;
-
     const dataAddressProperties =
       this.dataAddressMapper.buildDataAddressProperties(formValue.datasource);
     return {
@@ -59,9 +58,6 @@ export class AssetCreateRequestBuilder {
       geoReferenceMethod,
       transportMode,
       dataAddressProperties,
-      additionalProperties: {},
-      privateProperties: {},
-      additionalJsonProperties: {},
     };
   }
 }

src/app/core/services/contract-definition-builder.ts

@@ -1,7 +1,7 @@
 import {Injectable} from '@angular/core';
 import {
   ContractDefinitionRequest,
-  UiCriterionLiteralTypeEnum,
+  UiCriterionLiteralType,
 } from '@sovity.de/edc-client';
 import {ContractDefinitionEditorDialogFormValue} from '../../routes/connector-ui/contract-definition-page/contract-definition-editor-dialog/contract-definition-editor-dialog-form-model';
 import {AssetProperty} from './models/asset-properties';
@@ -28,7 +28,7 @@ export class ContractDefinitionBuilder {
           operandLeft: AssetProperty.id,
           operator: 'IN',
           operandRight: {
-            type: UiCriterionLiteralTypeEnum.ValueList,
+            type: UiCriterionLiteralType.ValueList,
             valueList: formValue.assets!.map((it) => it.assetId),
           },
         },

src/app/core/services/policy-definition-builder.ts

@@ -1,11 +1,12 @@
 import {Injectable} from '@angular/core';
 import {
+  OperatorDto,
   PolicyDefinitionCreateRequest,
   UiPolicyConstraint,
 } from '@sovity.de/edc-client';
 import {addDays} from 'date-fns';
 import {NewPolicyDialogFormValue} from '../../routes/connector-ui/policy-definition-page/new-policy-dialog/new-policy-dialog-form-model';
-import {OperatorDto, PolicyLeftExpressions} from './api/model/policy-type-ext';
+import {PolicyLeftExpressions} from './api/model/policy-type-ext';
 
 @Injectable({
   providedIn: 'root',

src/app/routes/broker-ui/catalog-page/catalog-page/catalog-page.component.html

@@ -89,12 +89,9 @@
   <!-- Filters Accordeon -->
   <mat-accordion>
     <mat-expansion-panel
-      *ngFor="
-        let filter of state?.filters!! | values;
-        let first = first;
-        trackBy: 'id' | trackByField
-      "
+      *ngFor="let filter of state?.filters!! | values; let first = first"
       class="w-[300px] mat-expansion-panel-flex-col"
+      trackByField="id"
       [expanded]="first">
       <mat-expansion-panel-header>
         <mat-panel-title

src/app/routes/broker-ui/catalog-page/filter-value-select/filter-value-select.component.html

@@ -4,8 +4,9 @@
   [formControl]="formControl"
   [compareWith]="'id' | compareByField">
   <mat-list-option
-    *ngFor="let item of state.visibleItems; trackBy: 'id' | trackByField"
+    *ngFor="let item of state.visibleItems"
     class="max-two-lines-list-item"
+    trackByField="id"
     checkboxPosition="before"
     [class.italic]="item.type === 'NO_VALUE'"
     [value]="item"

src/app/routes/connector-ui/contract-agreement-page/contract-agreement-cards/contract-agreement-cards.component.html

@@ -1,9 +1,7 @@
 <div class="flex flex-row flex-wrap gap-[16px] justify-start">
   <mat-card
-    *ngFor="
-      let card of contractAgreements;
-      trackBy: 'contractAgreementId' | trackByField
-    "
+    *ngFor="let card of contractAgreements"
+    trackByField="contractAgreementId"
     style="width: 400px; min-height: 120px">
     <mat-card-header>
       <mat-icon mat-card-avatar>

tsconfig.json

@@ -24,6 +24,7 @@
     "enableI18nLegacyMessageIdFormat": false,
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true,
-    "strictTemplates": true
+    "strictTemplates": true,
+    "fullTemplateTypeCheck": true
   }
 }