From 2d816e2c48a25037f6b783200433efd01d3c4767 Mon Sep 17 00:00:00 2001 From: schuberr Date: Fri, 27 Sep 2024 11:05:43 +0200 Subject: [PATCH 1/7] enabled AzureStorage in Dashboard --- .../asset-editor-dialog.component.html | 32 +++++++++++++------ .../asset-editor-dialog.component.scss | 4 +-- .../asset-editor-dialog.component.ts | 7 +++- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html index ddbb7fa..664ebf6 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html @@ -19,30 +19,42 @@ Version - - -
Destination - - - HttpData + + + {{storageType.name}} +
+
+ + Account + + + + + Container + + + + Blob Name + + +
+
Base URL -
- -
Originator - +
+
Compliance Check Passed diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss index e94db37..9c531a6 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss @@ -1,5 +1,5 @@ mat-dialog-content { - width: 800px; + width: 820px; } .form-field { @@ -8,7 +8,7 @@ mat-dialog-content { } .form-field-full { - width: 780px; + width: 800px; } mat-card-actions { diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts index 62f3f3d..db5255b 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts @@ -22,8 +22,9 @@ export class AssetEditorDialog implements OnInit { contenttype: string = ''; storageTypeId: string = 'HttpData'; - account: string = ''; + account: string = 'msgedcstorage'; container: string = 'src-container'; + blobname: string = ''; originator: string = 'http://connector-1:8184/protocol'; baseUrl: string = "http://techslides.com/demos/samples/sample.txt"; @@ -446,6 +447,10 @@ export class AssetEditorDialog implements OnInit { "type": this.storageTypeId, "name": this.id, "baseUrl": this.baseUrl, + "account": this.account, + "container": this.container, + "blobname": this.blobname, + "keyName": `${this.account}-key1` } }; this.dialogRef.close({assetInput}); From c3b802c6f420669108c27baa386ca163dbed889c Mon Sep 17 00:00:00 2001 From: schuberr Date: Wed, 2 Oct 2024 10:47:39 +0200 Subject: [PATCH 2/7] removed disabled state from container field. --- .../asset-editor-dialog/asset-editor-dialog.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html index 664ebf6..0c95e67 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html @@ -36,7 +36,7 @@ Container - + From 4e9d3bf9d44c0b30d94403863f89e9642ee70b3a Mon Sep 17 00:00:00 2001 From: schuberr Date: Wed, 2 Oct 2024 15:19:03 +0200 Subject: [PATCH 3/7] set the originator field for both azure and httpdata --- .../asset-editor-dialog.component.html | 13 +++++++++---- .../asset-editor-dialog.component.ts | 4 ++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html index 0c95e67..9189521 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html @@ -27,6 +27,15 @@ + + Originator + + + + {{example}} + + +
@@ -49,10 +58,6 @@ Base URL - - Originator - -
diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts index db5255b..2724465 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts @@ -27,6 +27,10 @@ export class AssetEditorDialog implements OnInit { blobname: string = ''; originator: string = 'http://connector-1:8184/protocol'; + originatorExamples: string[] = [ + 'http://connector-1:8184/protocol', + 'https://edc-pr.gxfs.gx4fm.org/api/v1/dsp' + ]; baseUrl: string = "http://techslides.com/demos/samples/sample.txt"; claimsList: string = ""; From 6d4ea3aecda7de70d67d2ed1a5944c1c86eadf28 Mon Sep 17 00:00:00 2001 From: schuberr Date: Wed, 2 Oct 2024 15:30:23 +0200 Subject: [PATCH 4/7] added missing MatAutocompleteModule --- src/modules/app/app.module.ts | 1 + .../asset-editor-dialog/asset-editor-dialog.component.ts | 1 + src/modules/edc-demo/edc-demo.module.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/src/modules/app/app.module.ts b/src/modules/app/app.module.ts index 4b95b31..bf989ff 100644 --- a/src/modules/app/app.module.ts +++ b/src/modules/app/app.module.ts @@ -36,6 +36,7 @@ import { EdcConnectorClient } from "@think-it-labs/edc-connector-client"; MatIconModule, MatListModule, EdcDemoModule, + MatAutocompleteModule, MatSnackBarModule ], declarations: [ diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts index 2724465..924581b 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts @@ -7,6 +7,7 @@ import { NotificationService } from "../../services/notification.service"; import { HttpClient } from '@angular/common/http'; import { MatDialog } from '@angular/material/dialog'; import { ConfirmationDialogComponent, ConfirmDialogModel } from '../confirmation-dialog/confirmation-dialog.component'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; @Component({ diff --git a/src/modules/edc-demo/edc-demo.module.ts b/src/modules/edc-demo/edc-demo.module.ts index 7ecf26f..a97d66e 100644 --- a/src/modules/edc-demo/edc-demo.module.ts +++ b/src/modules/edc-demo/edc-demo.module.ts @@ -72,6 +72,7 @@ import { ConfirmationDialogComponent } from './components/confirmation-dialog/co MatListModule, RouterModule, MatProgressSpinnerModule, + MatAutocompleteModule, MatCheckboxModule ], declarations: [ From 98b7b32109d78caaf13a5264fd004098227fa9e3 Mon Sep 17 00:00:00 2001 From: schuberr Date: Wed, 2 Oct 2024 15:50:13 +0200 Subject: [PATCH 5/7] added missing MatAutocompleteModule imports --- src/modules/app/app.module.ts | 1 + src/modules/edc-demo/edc-demo.module.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/modules/app/app.module.ts b/src/modules/app/app.module.ts index bf989ff..8de012e 100644 --- a/src/modules/app/app.module.ts +++ b/src/modules/app/app.module.ts @@ -6,6 +6,7 @@ import {AppComponent} from './app.component'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {LayoutModule} from '@angular/cdk/layout'; +import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatToolbarModule} from '@angular/material/toolbar'; import {MatButtonModule} from '@angular/material/button'; import {MatSidenavModule} from '@angular/material/sidenav'; diff --git a/src/modules/edc-demo/edc-demo.module.ts b/src/modules/edc-demo/edc-demo.module.ts index a97d66e..5383753 100644 --- a/src/modules/edc-demo/edc-demo.module.ts +++ b/src/modules/edc-demo/edc-demo.module.ts @@ -2,6 +2,7 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {HttpClientModule} from '@angular/common/http'; import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {MatAutocompleteModule} from '@angular/material/autocomplete'; import {MatInputModule} from '@angular/material/input'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatSelectModule} from '@angular/material/select'; From 48acbcf1c0303e75a6052de3503b9112442433f3 Mon Sep 17 00:00:00 2001 From: schuberr Date: Thu, 10 Oct 2024 14:19:04 +0200 Subject: [PATCH 6/7] changed edc name to the value of participant id of the EDC (edc_pr) --- .../asset-editor-dialog/asset-editor-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts index 924581b..f5fd513 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts @@ -164,7 +164,7 @@ export class AssetEditorDialog implements OnInit { "@id": "https://www.gaia-x4plcaad.info/claims/service-access-point/fe9f0d7f-3a80-48ef-9630-a7c9c3c1e78f", "@type": "gx:ServiceAccessPoint", "gx:name": { - "@value": "Provider EDC", + "@value": "edc_pr", "@type": "xsd:string" }, "gx:host": { From 16aa788acf174278dff22171404e29b194977f91 Mon Sep 17 00:00:00 2001 From: schuberr Date: Mon, 14 Oct 2024 11:49:49 +0200 Subject: [PATCH 7/7] corrected edc management url --- .../asset-editor-dialog/asset-editor-dialog.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts index f5fd513..d0918c6 100644 --- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts +++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts @@ -168,7 +168,7 @@ export class AssetEditorDialog implements OnInit { "@type": "xsd:string" }, "gx:host": { - "@value": "edcdb-pr.gxfs.gx4fm.org/", + "@value": "edc-pr.gxfs.gx4fm.org/", "@type": "xsd:string" }, "gx:protocol": {