From 1de25a21de299a267fd9f44d19eef0bd7007f317 Mon Sep 17 00:00:00 2001 From: robertschubert <70939848+robertschubert@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:23:08 +0200 Subject: [PATCH] feat: enable AzureStorage (#38) * enabled AzureStorage in Dashboard * removed disabled state from container field. * set the originator field for both azure and httpdata * added missing MatAutocompleteModule * added missing MatAutocompleteModule imports * changed edc name to the value of participant id of the EDC (edc_pr) * corrected edc management url --------- Co-authored-by: schuberr --- src/modules/app/app.module.ts | 2 + .../asset-editor-dialog.component.html | 41 +++++++++++++------ .../asset-editor-dialog.component.scss | 4 +- .../asset-editor-dialog.component.ts | 16 ++++++-- src/modules/edc-demo/edc-demo.module.ts | 2 + 5 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/modules/app/app.module.ts b/src/modules/app/app.module.ts index 4b95b31..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'; @@ -36,6 +37,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.html b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html index ddbb7fa..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 @@ -19,30 +19,47 @@ Version - - -
Destination - - - HttpData + + + {{storageType.name}} + + Originator + + + + {{example}} + + + +
+
+ + 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..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 @@ -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({ @@ -22,10 +23,15 @@ 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'; + 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 = ""; @@ -158,11 +164,11 @@ 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": { - "@value": "edcdb-pr.gxfs.gx4fm.org/", + "@value": "edc-pr.gxfs.gx4fm.org/", "@type": "xsd:string" }, "gx:protocol": { @@ -446,6 +452,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}); diff --git a/src/modules/edc-demo/edc-demo.module.ts b/src/modules/edc-demo/edc-demo.module.ts index 7ecf26f..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'; @@ -72,6 +73,7 @@ import { ConfirmationDialogComponent } from './components/confirmation-dialog/co MatListModule, RouterModule, MatProgressSpinnerModule, + MatAutocompleteModule, MatCheckboxModule ], declarations: [