Skip to content

Fix COAR Notify not rendering logs #4867

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

Open
alexandrevryghem wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix COAR Notify not rendering logs #4867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62574fc
134770: Fixed COAR notify not rendering inbound/outbounds logs
alexandrevryghem Oct 16, 2025
64ad280
134770: Aligned styling from Add LDN service form with other submissi…
alexandrevryghem Oct 26, 2025
f36fb7f
Merge branch 'coar-notify-fixes_contribute-main'
alexandrevryghem Nov 24, 2025
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
165 changes: 83 additions & 82 deletions src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,63 @@
<div class="container">
<form (ngSubmit)="onSubmit()" [formGroup]="formModel">
<div class="d-flex">
<div class="d-flex justify-content-between">
<h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
</div>
<!-- In the toggle section -->
@if (!isNewService) {
<div class="toggle-switch-container">
<label class="status-label fw-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
<div>
<input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
<div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
<div class="slider"></div>
<div>
<!-- In the toggle section -->
@if (!isNewService) {
<div class="d-flex justify-content-end">
<ui-switch (change)="toggleEnabled()" [checkedLabel]="'ldn-service.overview.table.enabled' | translate"
[uncheckedLabel]="'ldn-service.overview.table.disabled' | translate"
formControlName="enabled" id="enabled" size="medium">
</ui-switch>
</div>
</div>
}
</div>
}
</div>
<!-- In the Name section -->
<div class="mb-5">
<label for="name" class="fw-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
<input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
<div class="mb-2">
<label for="name" class="form-label">{{ 'ldn-new-service.form.label.name' | translate }}</label>
<input [class.is-invalid]="formModel.get('name').invalid && formModel.get('name').touched"
[placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
formControlName="name"
id="name"
name="name"
type="text">
@if (formModel.get('name').invalid && formModel.get('name').touched) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.name' | translate }}
</div>
</small>
}
</div>

<!-- In the description section -->
<div class="mb-5 mt-5 d-flex flex-column">
<label for="description" class="fw-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
<div class="mb-2 d-flex flex-column">
<label for="description" class="form-label">{{ 'ldn-new-service.form.label.description' | translate }}</label>
<textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
class="form-control" formControlName="description" id="description" name="description"></textarea>
</div>

<div class="mb-5 mt-5">
<div class="mb-2">
<!-- In the url section -->
<div class="d-flex align-items-center">
<div class="d-flex flex-column w-50 me-2">
<label for="url" class="fw-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
<input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
<div class="row">
<div class="col mb-auto">
<label for="url" class="form-label">{{ 'ldn-new-service.form.label.url' | translate }}</label>
<input [class.is-invalid]="formModel.get('url').invalid && formModel.get('url').touched"
[placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
formControlName="url"
id="url"
name="url"
type="text">
@if (formModel.get('url').invalid && formModel.get('url').touched) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.url' | translate }}
</div>
</small>
}
</div>

<div class="d-flex flex-column w-50">
<label for="score" class="fw-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
<input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
<div class="col mb-auto">
<label for="score" class="form-label">{{ 'ldn-new-service.form.label.score' | translate }}</label>
<input [class.is-invalid]="formModel.get('score').invalid && formModel.get('score').touched"
[placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
id="score"
name="score"
Expand All @@ -68,45 +67,50 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
class="form-control"
type="number">
@if (formModel.get('score').invalid && formModel.get('score').touched) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.score' | translate }}
</div>
</small>
}
</div>
</div>
</div>

<!-- In the IP range section -->
<div class="mb-5 mt-5">
<label for="lowerIp" class="fw-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
<div class="d-flex">
<input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
formControlName="lowerIp"
id="lowerIp"
name="lowerIp"
type="text">
<input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
formControlName="upperIp"
id="upperIp"
name="upperIp"
type="text">
<div class="mb-2">
<label for="lowerIp" class="form-label">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
<div class="row">
<div class="col">
<input [class.is-invalid]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
formControlName="lowerIp"
id="lowerIp"
name="lowerIp"
type="text">
</div>
<div class="col">
<input [class.is-invalid]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
formControlName="upperIp"
id="upperIp"
name="upperIp"
type="text">
</div>
</div>
@if ((formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.ipRange' | translate }}
</div>
</small>
} @else {
<small class="text-muted">
{{ 'ldn-new-service.form.hint.ipRange' | translate }}
</small>
}
<div class="text-muted">
{{ 'ldn-new-service.form.hint.ipRange' | translate }}
</div>
</div>

<!-- In the ldnUrl section -->
<div class="mb-5 mt-5">
<label for="ldnUrl" class="fw-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
<input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
<div class="mb-2">
<label for="ldnUrl" class="form-label">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
<input [class.is-invalid]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
[placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
formControlName="ldnUrl"
id="ldnUrl"
Expand All @@ -115,48 +119,47 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
@if (formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched) {
<div >
@if (formModel.get('ldnUrl').errors['required']) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.ldnurl' | translate }}
</div>
</small>
}
@if (formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']) {
<div class="error-text">
<small class="invalid-feedback d-block">
{{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
</div>
</small>
}
</div>
}
</div>

<!-- In the usesActorEmailId section -->
<div class="mb-5 mt-5">
<label class="status-label fw-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
<div class="mb-2">
<label class="form-label" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
<div>
<input formControlName="usesActorEmailId" hidden id="usesActorEmailId"
name="usesActorEmailId" type="checkbox">
<div (click)="toggleUsesActorEmailId()"
[class.checked]="formModel.get('usesActorEmailId').value" class="toggle-switch">
<div class="slider"></div>
<div>
<ui-switch (change)="toggleUsesActorEmailId()" formControlName="usesActorEmailId" id="usesActorEmailId"
size="small">
</ui-switch>
</div>
<div class="text-muted">
<small class="text-muted">
{{ 'ldn-service-usesActorEmailId-description' | translate }}
</div>
</small>
</div>
</div>


<!-- In the Inbound Patterns Labels section -->
@if (areControlsInitialized) {
<div class="row mb-1 mt-5">
<div class="row">
<div class="col">
<label class="fw-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
<label class="form-label">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
</div>
@if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
<div class="col">
<label class="fw-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
<label class="form-label">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
</div>
<div class="col-sm-1">
<label class="fw-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
<label class="form-label">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
</div>
}
<div class="col-sm-2">
Expand Down Expand Up @@ -260,18 +263,14 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
<div
[style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
class="col-sm-1">
<input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
type="checkbox">
<div (click)="toggleAutomatic(i)"
[class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
class="toggle-switch">
<div class="slider"></div>
</div>
<ui-switch (change)="toggleAutomatic(i)" class="d-flex" formControlName="automatic"
id="automatic{{i}}" size="small">
</ui-switch>
</div>
<div class="col-sm-2">
<div class="btn-group">
<button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
[title]="'ldn-service-button-mark-inbound-deletion' | translate"
<button (click)="markForInboundPatternDeletion(i)" class="btn btn-secondary"
[attr.aria-label]="'ldn-service-button-mark-inbound-deletion' | translate"
type="button">
<i class="fas fa-trash"></i>
</button>
Expand All @@ -292,8 +291,10 @@ <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translat
</div>
}

<span (click)="addInboundPattern()"
class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
<button (click)="addInboundPattern()" [attr.aria-label]="'ldn-new-service.form.label.addPattern' | translate"
class="ds-form-add-more btn btn-link" role="button" type="button">
<i class="fas fa-plus"></i> {{ 'ldn-new-service.form.label.addPattern' | translate }}
</button>
<hr>
<div class="mb-3 row">
<div class="col text-end space-children-mr">
Expand Down
Loading
Loading