From d89ce843dd158b7ef150c7d1af07fb41bba79a76 Mon Sep 17 00:00:00 2001 From: Jan Peter Meyer Date: Wed, 13 Sep 2023 23:13:49 +0200 Subject: [PATCH 1/3] feat: fix assets view (#89) --- .../components/asset-viewer/asset-viewer.component.html | 6 +++--- .../components/asset-viewer/asset-viewer.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html index 4f9389387..192b236fa 100644 --- a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html +++ b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html @@ -30,17 +30,17 @@ info
Name
-
{{asset.name}}
+
{{asset.properties.mandatoryValue('edc','name')}}
 category
Content Type
-
{{asset.contentType}}
+
{{asset.properties.mandatoryValue('edc','contenttype')}}
 file_copy
Version
-
{{asset.version}}
+
{{asset.properties.mandatoryValue('edc','version')}}
 diff --git a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts index 59c22ce7f..4d90c0986 100644 --- a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts +++ b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts @@ -2,12 +2,12 @@ import {Component, OnInit} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {first, map, switchMap} from 'rxjs/operators'; import {MatDialog} from '@angular/material/dialog'; -import {AssetInput } from "../../../mgmt-api-client/model"; +import {AssetInput, Asset } from "../../../mgmt-api-client/model"; import {AssetService} from "../../../mgmt-api-client"; import {AssetEditorDialog} from "../asset-editor-dialog/asset-editor-dialog.component"; import {ConfirmationDialogComponent, ConfirmDialogModel} from "../confirmation-dialog/confirmation-dialog.component"; import {NotificationService} from "../../services/notification.service"; -import { Asset } from '../../models/asset'; + @Component({ selector: 'edc-demo-asset-viewer', @@ -35,7 +35,7 @@ export class AssetViewerComponent implements OnInit { this.filteredAssets$ = this.fetch$ .pipe( switchMap(() => { - const assets$ = this.assetService.requestAssets().pipe(map(assets => assets.map(asset => new Asset(asset["edc:properties"])))); + const assets$ = this.assetService.requestAssets(); return !!this.searchText ? assets$.pipe(map(assets => assets.filter(asset => asset.name.includes(this.searchText)))) : assets$; From 414af0dc849f2aeb200fe537da774a9fcf9e645a Mon Sep 17 00:00:00 2001 From: Konstantin Frohnert Date: Wed, 13 Dec 2023 14:58:44 +0100 Subject: [PATCH 2/3] docs: fix typo and dead links --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5608a8773..3dfb1e12f 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Substitute the values as necessary: As some extra safety consider running `git udpate-index --assume-unchanged src/assets/config/app.config.json` before changing this file. -## Running a frondend and a connector locally (for demo purpose) +## Running a frontend and a connector locally (for demo purpose) To test the correct functionality locally you can spin up a local docker compose that will load the `data-dashboard` service and the `connector` one. First you need to change the `app.config.json` this way: @@ -118,4 +118,4 @@ az container create --image ${ACR_NAME}.azurecr.io/edc-showcase/edc-data-dashboa ## Contributing -See [how to contribute](https://github.com/eclipse-dataspaceconnector/DataSpaceConnector/blob/main/CONTRIBUTING.md) for details. +See [how to contribute](https://github.com/eclipse-edc/docs/blob/main/CONTRIBUTING.md) for details. From b6b4456cd859964372f8dfb174eb9db67ac2b8e6 Mon Sep 17 00:00:00 2001 From: Konstantin Frohnert Date: Fri, 15 Dec 2023 17:08:58 +0100 Subject: [PATCH 3/3] Revert "feat: fix assets view (#89)" This reverts commit d89ce843dd158b7ef150c7d1af07fb41bba79a76. --- .../components/asset-viewer/asset-viewer.component.html | 6 +++--- .../components/asset-viewer/asset-viewer.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html index 192b236fa..4f9389387 100644 --- a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html +++ b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.html @@ -30,17 +30,17 @@ info
Name
-
{{asset.properties.mandatoryValue('edc','name')}}
+
{{asset.name}}
 category
Content Type
-
{{asset.properties.mandatoryValue('edc','contenttype')}}
+
{{asset.contentType}}
 file_copy
Version
-
{{asset.properties.mandatoryValue('edc','version')}}
+
{{asset.version}}
 diff --git a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts index 4d90c0986..59c22ce7f 100644 --- a/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts +++ b/src/modules/edc-demo/components/asset-viewer/asset-viewer.component.ts @@ -2,12 +2,12 @@ import {Component, OnInit} from '@angular/core'; import {BehaviorSubject, Observable, of} from 'rxjs'; import {first, map, switchMap} from 'rxjs/operators'; import {MatDialog} from '@angular/material/dialog'; -import {AssetInput, Asset } from "../../../mgmt-api-client/model"; +import {AssetInput } from "../../../mgmt-api-client/model"; import {AssetService} from "../../../mgmt-api-client"; import {AssetEditorDialog} from "../asset-editor-dialog/asset-editor-dialog.component"; import {ConfirmationDialogComponent, ConfirmDialogModel} from "../confirmation-dialog/confirmation-dialog.component"; import {NotificationService} from "../../services/notification.service"; - +import { Asset } from '../../models/asset'; @Component({ selector: 'edc-demo-asset-viewer', @@ -35,7 +35,7 @@ export class AssetViewerComponent implements OnInit { this.filteredAssets$ = this.fetch$ .pipe( switchMap(() => { - const assets$ = this.assetService.requestAssets(); + const assets$ = this.assetService.requestAssets().pipe(map(assets => assets.map(asset => new Asset(asset["edc:properties"])))); return !!this.searchText ? assets$.pipe(map(assets => assets.filter(asset => asset.name.includes(this.searchText)))) : assets$;