Skip to content

Fixed bug where HTTP Datatarget updates did not save correctly (IOT-1… #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2023
Merged

Fixed bug where HTTP Datatarget updates did not save correctly (IOT-1… #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down
33 changes: 19 additions & 14 deletions src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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}}*
Expand Down
7 changes: 7 additions & 0 deletions src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
15 changes: 9 additions & 6 deletions src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion src/assets/i18n/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down