From f1c94c0d34b49e4cda0bf359f6761ce2565ec273 Mon Sep 17 00:00:00 2001
From: Chris Johansen <cdj@iterator-it.dk>
Date: Tue, 2 May 2023 17:49:38 +0200
Subject: [PATCH] Fixed bug where HTTP Datatarget updates did not save
 correctly (IOT-1462). Made minor adjustments to layout of ODDK creation-form
 (IOT-1464 + IOT-1465) and redirect (IOT-1463), as suggested by feedback after
 test..

---
 .../httppush-edit/httppush-edit.component.ts  | 18 +++++-----
 .../opendatadk-edit.component.html            | 33 +++++++++++--------
 .../opendatadk-edit.component.scss            |  7 ++++
 .../opendatadk-edit.component.ts              | 15 +++++----
 src/assets/i18n/da.json                       |  3 +-
 5 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts b/src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts
index 3bf2d40e..9c05dca7 100644
--- a/src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts
+++ b/src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts
@@ -167,14 +167,11 @@ export class HttppushEditComponent
 
   updateDatatarget() {
     this.resetErrors();
-    this.counter =
-      1 +
-      (this.payloadDeviceDatatarget?.length
-        ? this.payloadDeviceDatatarget?.length
-        : 0);
+    this.counter = 1 + (this.payloadDeviceDatatarget?.length ?? 0);
     this.datatargetService.update(this.datatarget).subscribe(
       (response: Datatarget) => {
         this.datatarget = response;
+        this.countToRedirect();
       },
       (error: HttpErrorResponse) => {
         this.handleError(error);
@@ -236,7 +233,7 @@ export class HttppushEditComponent
         this.datatargetid = response.id;
         this.datatarget = response;
         this.showSavedSnack();
-        this.routeToDatatargets();
+        this.routeToCreatedDatatarget();
       },
       (error: HttpErrorResponse) => {
         this.handleError(error);
@@ -288,9 +285,12 @@ export class HttppushEditComponent
     this.scrollToTopService.scrollToTop();
   }
 
-  routeToDatatargets(): void {
-    this.router.navigate(['applications', this.applicationId.toString()]);
-  }
+  routeToDatatargets = () => this.router.navigate(['applications', this.applicationId, 'data-targets']);
+  routeToCreatedDatatarget = () =>
+    this.router.navigate(
+      ['applications', this.applicationId, 'datatarget', this.datatarget.id],
+      { replaceUrl: true }
+    );
 
   onCoordinateKey(event: any) {
     if (event.target.value.length > event.target.maxLength) {
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html
index f7ff7355..f548a85a 100644
--- a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html
+++ b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html
@@ -4,17 +4,9 @@
   [canEdit]="canEdit">
 </app-top-bar>
 
-<form
-  (ngSubmit)="onSubmit()"
-  #datatargetForm="ngForm"
-  class="os2-form p-3 mt-4">
-  <div *ngIf="errorMessages" class="error-messages p-3">
-    <ul class="mb-0">
-      <li *ngFor="let error of errorMessages">{{ error | translate }}</li>
-    </ul>
-  </div>
-
-  <!-- Foldable intro-texts -->
+<!-- Foldable intro-texts -->
+<div class="os2-form p-3 mt-4">
+  <h3>{{'GUIDE' | translate}}</h3>
   <mat-expansion-panel class="row mb-2">
     <mat-expansion-panel-header>
       <mat-panel-title>
@@ -31,12 +23,12 @@
       {{ 'OPENDATADK.INTRO.GUIDE3' | translate }}
       <br><br>
       {{ 'OPENDATADK.INTRO.GUIDE4' | translate }}
-      <a href="http://portal.opendata.dk/dataset/open-data-dk-licens">{{ 'OPENDATADK.INTRO.GUIDE5' | translate }}</a>
+      <a href="https://creativecommons.org/publicdomain/zero/1.0/deed.da">{{ 'OPENDATADK.INTRO.GUIDE5' | translate }}</a>
       <br><br>
     </p>
   </mat-expansion-panel>
   <mat-divider></mat-divider>
-  <mat-expansion-panel class="row mb-4 mt-2">
+  <mat-expansion-panel class="row mt-2">
     <mat-expansion-panel-header>
       <mat-panel-title>
         <p>
@@ -57,9 +49,22 @@
       </p></li>
     </ol>
   </mat-expansion-panel>
+</div>
+
+<form
+  (ngSubmit)="onSubmit()"
+  #datatargetForm="ngForm"
+  class="os2-form p-3 mt-4">
+  <h3>{{'FORM.CREATE-NEW-DATATARGET' | translate}}</h3>
+
+  <div *ngIf="errorMessages" class="error-messages p-3">
+    <ul class="mb-0">
+      <li *ngFor="let error of errorMessages">{{ error | translate }}</li>
+    </ul>
+  </div>
 
   <!-- Name of data target -->
-  <div class="row mb-2">
+  <div class="row mb-2 mt-4">
     <div class="form-group col-12">
       <label class="form-label" for="name">
         {{'QUESTION.GIVE-DATATARGET-NAME' | translate}}*
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.scss b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.scss
index 9e1cdf18..84d479e9 100644
--- a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.scss
+++ b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.scss
@@ -1,6 +1,13 @@
 @import 'src/assets/scss/setup/fonts';
 
 :host {
+  h3 {
+    border-bottom-width: 5px;
+    border-bottom-style: solid;
+    border-bottom-color: rgb(245, 122, 47);
+    width: fit-content;
+    padding-right: 12px;
+  }
   .form-info-icon {
     margin-left: 5px;
     cursor: pointer;
diff --git a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts
index 3d3cbe73..0cec46c1 100644
--- a/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts
+++ b/src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts
@@ -232,7 +232,7 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
     if (!this.alreadySentOddkMail) {
       this.openMailDialog();
     } else {
-      this.routeToDatatargets();
+      this.routeToCreatedDatatarget();
     }
   };
   // Note: When updating, we send multiple async request, and use this counter to know when everything is done, so we can redirect
@@ -261,9 +261,12 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
     this.scrollToTopService.scrollToTop();
   }
 
-  routeToDatatargets(): void {
-    this.router.navigate(['applications', this.applicationId.toString(), 'data-targets']);
-  }
+  routeToDatatargets = () => this.router.navigate(['applications', this.applicationId, 'data-targets']);
+  routeToCreatedDatatarget = () =>
+    this.router.navigate(
+      ['applications', this.applicationId, 'datatarget', this.datatarget.id],
+      { replaceUrl: true }
+    );
 
   // For mail dialog
   private getAlreadySentOddkMail = () => {
@@ -292,7 +295,7 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
           .sendOpenDataDkMail(result)
           .pipe(first())
           .toPromise();
-        this.routeToDatatargets();
+        this.routeToCreatedDatatarget();
       } else {
         // User cancelled -> Show the warning
         this.openMailWarningDialog();
@@ -307,7 +310,7 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
         if (result.neverAgain) {
           await this.setAlreadySentOddkMail();
         }
-        this.routeToDatatargets();
+        this.routeToCreatedDatatarget();
       } else {
         // User cancelled -> Show the mail-dialog again
         this.openMailDialog();
diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
index 8a22efb2..e6a46ccb 100644
--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -269,7 +269,7 @@
       "GUIDE2": "Senest modtagede datapakke udstilles via OS2iots API og kan hentes via en URL angivet på det enkelte ODDK-data target og på jeres datasæt på opendata.dk. Der opsamles og udstilles altså ikke historisk data i hverken OS2iot eller på opendata.dk.",
       "GUIDE3": "Nye ODDK-data targets høstes automatisk, og I behøver ikke gøre noget aktivt for at gøre dem tilgængelige på opendata.dk. Hvis I sletter et ODDK-data target forsvinder det af sig selv fra opendata.dk.",
       "GUIDE4": "Datasæt fra OS2iot publiceres under licensen",
-      "GUIDE5": "Open DATA DK Licens.",
+      "GUIDE5": "Creative Commons CC0 1.0 Universel.",
       "PROCEDURE_HEADER": "Procedure ved oprettelse af første data target",
       "PROCEDURE1": "Bliv medlem af Open Data DK, hvis jeres myndighed ikke allerede er det:",
       "PROCEDURE2": "Opret første ODDK-data target i OS2iot",
@@ -1120,6 +1120,7 @@
   },
   "false": "Nej",
   "true": "Ja",
+  "GUIDE": "Guide",
   "HTTP_PUSH": "HTTP Push",
   "Forbidden": "Du har ikke rettigheder til at foretage denne handling",
   "Forbidden resource": "Du har ikke rettigheder til at foretage denne handling",