Finished implementing new flow for sending ODDK-registration-mails directly from OS2IoT, instead of having to go through users mail-client..

Author: Fritsen

src/app/admin/organisation/organisation.model.ts

@@ -16,6 +16,7 @@ export interface OrganisationResponse {
   createdByName: string;
   updatedByName: string;
   name: string;
+  openDataDkRegistered: boolean;
 
   payloadDecoders: PayloadDecoder[];
   applications: Application[];

src/app/applications/datatarget/datatarget.model.ts

@@ -44,3 +44,10 @@ export class DatatargetTypeDescriptor {
     readMoreUrl: string;
     provider: string;
 }
+
+export class OddkMailInfo {
+    organizationId?: number;
+    organizationOddkAlias: string;
+    comment?: string;
+    sharingUrl?: string
+}

src/app/applications/datatarget/datatarget.module.ts

@@ -24,6 +24,8 @@ import { DatatargetEditTypeSelectorDirective } from './datatarget-edit/datatarge
 import { MqttEditComponent } from './mqtt-edit/mqtt-edit.component';
 import { MqttDetailComponent } from './mqtt-detail/mqtt-detail.component';
 import { DatatargetTabComponent } from './datatarget-tab/datatarget-tab.component';
+import { OpenDataDkMailDialogComponent } from './opendatadk/opendatadk-edit/opendatadk-mail-dialog/opendatadk-mail-dialog';
+import { OpenDataDkWarningDialogComponent } from './opendatadk/opendatadk-edit/opendatadk-warning-dialog/opendatadk-warning-dialog';
 
 @NgModule({
   declarations: [
@@ -38,11 +40,14 @@ import { DatatargetTabComponent } from './datatarget-tab/datatarget-tab.componen
     OpendatadkComponent,
     OpendatadkEditComponent,
     OpendatadkDetailComponent,
+    OpenDataDkMailDialogComponent,
+    OpenDataDkWarningDialogComponent,
     MqttDetailComponent,
     MqttEditComponent,
     DatatargetDetailTypeSelectorDirective,
     DatatargetEditTypeSelectorDirective,
-    DatatargetTabComponent],
+    DatatargetTabComponent,
+  ],
   imports: [
     CommonModule,
     RouterModule,
@@ -64,7 +69,7 @@ import { DatatargetTabComponent } from './datatarget-tab/datatarget-tab.componen
     FiwareEditComponent,
     HttppushDetailComponent,
     HttppushEditComponent,
-    NGMaterialModule
-  ]
+    NGMaterialModule,
+  ],
 })
-export class DatatargetModule { }
+export class DatatargetModule {}

src/app/applications/datatarget/datatarget.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { DatatargetResponse } from '@applications/datatarget/datatarget-response.model';
 import { RestService } from '@shared/services/rest.service';
-import { DatatargetData, Datatarget } from './datatarget.model';
+import { DatatargetData, Datatarget, OddkMailInfo } from './datatarget.model';
 import { map } from 'rxjs/operators';
 import { OpenDataDkDataset } from './opendatadk/opendatadk-dataset.model';
 import { SharedVariableService } from '@shared/shared-variable/shared-variable.service';
@@ -116,4 +116,14 @@ export class DatatargetService {
     return this.restService.createResourceUrl('open-data-dk-sharing', this.sharedVariableService.getSelectedOrganisationId());
   }
 
+  getOpenDataDkRegistered(organizationId: number): Observable<boolean> {
+    return this.restService.get(this.dataTargetURL + '/getOpenDataDkRegistered', undefined, organizationId);
+  }
+  updateOpenDataDkRegistered(organizationId: number): Observable<boolean> {
+    return this.restService.put(this.dataTargetURL + '/updateOpenDataDkRegistered', undefined, organizationId);
+  }
+  sendOpenDataDkMail(mailDto: OddkMailInfo): Observable<boolean> {
+    mailDto.sharingUrl = this.getOpendataSharingApiUrl();
+    return this.restService.post(this.dataTargetURL + '/sendOpenDataDkMail', mailDto);
+  }
 }

src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html

@@ -287,7 +287,7 @@
   <h6 *ngIf="datatargetId === 0" class="mt-3">{{ 'QUESTION.DATATARGET.RELATIONS' | translate }}</h6>
 
   <!-- For existing data-targets, we show list of payload-decoders and button etc. for adding new -->
-  <!-- TODO: Seems we have the exact same thing on HTTP, OpenDataDK, Fireware and MQTT... Why not make it a separate component!? -->
+  <!-- TODO: Seems we have the exact same thing on HTTP, OpenDataDK, Fireware and MQTT... Why not make it a separate, re-usable component!? -->
   <div *ngIf="datatargetId > 0" class="container row" class="mt-3">
     <a (click)="addRow()" class="btn btn-secondary my-2 mb-3 mt-3">
         {{'QUESTION.ADD-RELATIONS' | translate}}
@@ -377,7 +377,7 @@ <h6 *ngIf="datatargetId === 0" class="mt-3">{{ 'QUESTION.DATATARGET.RELATIONS' |
     <button (click)="routeToDatatargets()" class="btn btn-light" type="button">
       {{ 'GEN.BACK' | translate }}
     </button>
-    <button [disabled]="disableSaveButton()" class="btn btn-primary ml-2" type="submit">
+    <button [disabled]="!datatarget?.openDataDkDataset?.acceptTerms" class="btn btn-primary ml-2" type="submit">
       {{ 'DATATARGET.SAVE' | translate }}
     </button>
   </div>