CST-11048 First commit

This commit is contained in:
Sondissimo
2023-09-18 13:26:10 +02:00
parent 9b556fd703
commit 24a0af1e9a
32 changed files with 1297 additions and 2 deletions

View File

@@ -0,0 +1,30 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { I18nBreadcrumbResolver } from 'src/app/core/breadcrumbs/i18n-breadcrumb.resolver';
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
import { LdnServicesGuard } from './ldn-services-guard/ldn-services-guard.service';
import { LdnServiceNewComponent } from './ldn-service-new/ldn-service-new.component';
@NgModule({
imports: [
RouterModule.forChild([
{
path: '',
pathMatch: 'full',
component: LdnServicesOverviewComponent,
resolve: { breadcrumb: I18nBreadcrumbResolver },
data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
canActivate: [LdnServicesGuard]
},
{
path: 'new',
resolve: { breadcrumb: I18nBreadcrumbResolver },
component: LdnServiceNewComponent,
data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' }
},
]),
]
})
export class AdminLdnServicesRoutingModule {
}

View File

@@ -0,0 +1,23 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { AdminLdnServicesRoutingModule } from './admin-ldn-services-routing.module';
import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
import { SharedModule } from '../../shared/shared.module';
import { LdnServiceNewComponent } from './ldn-service-new/ldn-service-new.component';
import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
@NgModule({
imports: [
CommonModule,
SharedModule,
AdminLdnServicesRoutingModule,
],
declarations: [
LdnServicesOverviewComponent,
LdnServiceNewComponent,
LdnServiceFormComponent,
]
})
export class AdminLdnServicesModule { }

View File

@@ -0,0 +1,96 @@
<form (ngSubmit)="submitForm()" [formGroup]="formModel">
<div class="form-group">
<!-- In the name section -->
<label for="name">Name</label>
<input formControlName="name" id="name" name="name" placeholder="Please provide service name" required
type="text">
</div>
<!-- In the description section -->
<div class="form-group">
<label for="description">Description</label>
<input formControlName="description" id="description" name="description" placeholder="Please provide a description regarding your service"
required type="text">
</div>
<!-- In the url section -->
<div class="form-group">
<label for="url">Service URL</label>
<input formControlName="url" id="url" name="url" placeholder="Please input the URL for users to check out more information about the service"
required type="text">
</div>
<!-- In the ldnUrl section -->
<div class="form-group">
<label for="ldnUrl">LDN Inbox URL</label>
<input formControlName="ldnUrl" id="ldnUrl" name="ldnUrl" placeholder="Please specify the URL of the LDN Inbox"
required type="text">
</div>
<!-- In the Inbound Patterns section -->
<div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index" class="form-group"
formGroupName="notifyServiceInboundPatterns">
<ng-container [formGroupName]="i">
<label for="additionalInboundPattern{{i}}">Inbound Pattern {{i + 1}}</label>
<select #inboundPattern formControlName="pattern" id="additionalInboundPattern{{i}}"
name="additionalInboundPattern{{i}}" required>
<option disabled value="">Select an Additional Inbound Pattern</option>
<option *ngFor="let pattern of inboundPatterns" [ngValue]="pattern.name">{{ pattern.name }}</option>
</select>
<div *ngIf="inboundPattern.value" class="form-group">
<label for="constraint{{i}}">Selected Item Filter</label>
<select formControlName="constraint" id="constraint{{i}}" name="constraint{{i}}">
<option disabled value="">Select an Item Filter</option>
<option *ngFor="let itemFilter of itemFilterList"
[value]="itemFilter.name">{{ itemFilter.name }}</option>
</select>
</div>
<span *ngIf="i > 0" (click)="removeInboundPattern(patternGroup)" class="remove-pattern-link">- Remove</span>
</ng-container>
</div>
<span (click)="addInboundPattern()" class="add-pattern-link">+ Add more</span>
<!-- In the Outbound Patterns section -->
<div *ngFor="let patternGroup of formModel.get('notifyServiceOutboundPatterns')['controls']; let i = index" class="form-group"
formGroupName="notifyServiceOutboundPatterns">
<ng-container [formGroupName]="i">
<label for="additionalOutboundPattern{{i}}">Outbound Pattern {{i + 1}}</label>
<select formControlName="pattern" id="additionalOutboundPattern{{i}}" name="additionalOutboundPattern{{i}}"
required>
<option disabled value="">Select an Additional Outbound Pattern</option>
<option *ngFor="let pattern of outboundPatterns" [ngValue]="pattern.name">{{ pattern.name }}</option>
</select>
<span *ngIf="i > 0" (click)="removeOutboundPattern(patternGroup)" class="remove-pattern-link">- Remove</span>
</ng-container>
</div>
<span (click)="addOutboundPattern()" class="add-pattern-link">+ Add more</span>
<button class="btn btn-primary" type="submit">Submit</button>
</form>

View File

@@ -0,0 +1,51 @@
form {
display: flex;
flex-direction: column;
align-items: flex-start;
margin: 0 auto;
max-width: 600px;
font-size: 14px;
}
.form-group input[type="text"],
.form-group select {
max-width: 100%;
width: 100%;
padding: 8px;
margin-bottom: 5px;
box-sizing: border-box;
font-size: 14px;
}
.description {
height: 9em;
width: 100%;
}
.form-group select {
position: relative;
z-index: 1;
}
.form-group select option {
font-weight: bold;
}
.add-pattern-link{
color: #0048ff;
cursor: pointer;
margin-left: 10px;
}
.remove-pattern-link{
color: #e34949;
cursor: pointer;
margin-left: 10px;
}

View File

@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { LdnServiceFormComponent } from './ldn-service-form.component';
describe('LdnServiceFormComponent', () => {
let component: LdnServiceFormComponent;
let fixture: ComponentFixture<LdnServiceFormComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ LdnServiceFormComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(LdnServiceFormComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,142 @@
import { Component, Input, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators, FormArray } from '@angular/forms';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Router } from '@angular/router';
import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
import { LdnServiceConstraint } from '../ldn-services-model/ldn-service-constraint.model';
import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patterns';
import { LdnDirectoryService } from '../ldn-services-services/ldn-directory.service';
import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
@Component({
selector: 'ds-ldn-service-form',
templateUrl: './ldn-service-form.component.html',
styleUrls: ['./ldn-service-form.component.scss'],
})
export class LdnServiceFormComponent implements OnInit {
formModel: FormGroup;
showItemFilterDropdown = false;
public inboundPatterns: object[] = notifyPatterns;
public outboundPatterns: object[] = notifyPatterns;
public itemFilterList: LdnServiceConstraint[];
additionalOutboundPatterns: FormGroup[] = [];
additionalInboundPatterns: FormGroup[] = [];
@Input() public name: string;
@Input() public description: string;
@Input() public url: string;
@Input() public ldnUrl: string;
@Input() public inboundPattern: string;
@Input() public outboundPattern: string;
@Input() public constraint: string;
@Input() public automatic: boolean;
@Input() public headerKey: string;
constructor(
private ldnServicesService: LdnServicesService,
private ldnDirectoryService: LdnDirectoryService,
private formBuilder: FormBuilder,
private http: HttpClient,
private router: Router
) {
this.formModel = this.formBuilder.group({
id: [''],
name: ['', Validators.required],
description: ['', Validators.required],
url: ['', Validators.required],
ldnUrl: ['', Validators.required],
inboundPattern: [''],
outboundPattern: [''],
constraintPattern: [''],
notifyServiceInboundPatterns: this.formBuilder.array([this.createInboundPatternFormGroup()]),
notifyServiceOutboundPatterns: this.formBuilder.array([this.createOutboundPatternFormGroup()]),
type: LDN_SERVICE.value,
});
}
ngOnInit(): void {
this.ldnDirectoryService.getItemFilters().subscribe((itemFilters) => {
console.log(itemFilters);
this.itemFilterList = itemFilters._embedded.itemfilters.map((filter: { id: string; }) => ({
name: filter.id
}));
console.log(this.itemFilterList);
});
}
submitForm() {
this.formModel.removeControl('inboundPattern');
this.formModel.removeControl('outboundPattern');
this.formModel.removeControl('constraintPattern');
console.log('JSON Data:', this.formModel.value);
const apiUrl = 'http://localhost:8080/server/api/ldn/ldnservices';
this.http.post(apiUrl, this.formModel.value ).subscribe(
(response) => {
console.log('Service created successfully:', response);
this.formModel.reset();
this.sendBack();
},
(error) => {
console.error('Error creating service:', error);
}
);
}
private validateForm(form: FormGroup): boolean {
let valid = true;
Object.keys(form.controls).forEach((key) => {
if (form.controls[key].invalid) {
form.controls[key].markAsDirty();
valid = false;
}
});
return valid;
}
private sendBack() {
this.router.navigateByUrl('admin/ldn/services');
}
addInboundPattern() {
const notifyServiceInboundPatternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
notifyServiceInboundPatternsArray.push(this.createInboundPatternFormGroup());
}
removeInboundPattern(patternGroup: FormGroup) {
const notifyServiceInboundPatternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
notifyServiceInboundPatternsArray.removeAt(notifyServiceInboundPatternsArray.controls.indexOf(patternGroup));
}
addOutboundPattern() {
const notifyServiceOutboundPatternsArray = this.formModel.get('notifyServiceOutboundPatterns') as FormArray;
notifyServiceOutboundPatternsArray.push(this.createOutboundPatternFormGroup());
}
removeOutboundPattern(patternGroup: FormGroup) {
const notifyServiceOutboundPatternsArray = this.formModel.get('notifyServiceOutboundPatterns') as FormArray;
notifyServiceOutboundPatternsArray.removeAt(notifyServiceOutboundPatternsArray.controls.indexOf(patternGroup));
}
private createOutboundPatternFormGroup(): FormGroup {
return this.formBuilder.group({
pattern: [''],
constraint: [''],
});
}
private createInboundPatternFormGroup(): FormGroup {
return this.formBuilder.group({
pattern: [''],
constraint: [''],
automatic: [true]
});
}
}

View File

@@ -0,0 +1 @@
<ds-ldn-service-form></ds-ldn-service-form>

View File

@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { LdnServiceNewComponent } from './ldn-service-new.component';
describe('LdnServiceNewComponent', () => {
let component: LdnServiceNewComponent;
let fixture: ComponentFixture<LdnServiceNewComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ LdnServiceNewComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(LdnServiceNewComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,28 @@
import { Component, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { LdnService } from "../ldn-services-model/ldn-services.model";
import { ActivatedRoute } from "@angular/router";
import { ProcessDataService } from "../../../core/data/processes/process-data.service";
import { LinkService } from "../../../core/cache/builders/link.service";
import { getFirstSucceededRemoteDataPayload } from "../../../core/shared/operators";
@Component({
selector: 'ds-ldn-service-new',
templateUrl: './ldn-service-new.component.html',
styleUrls: ['./ldn-service-new.component.scss']
})
export class LdnServiceNewComponent implements OnInit {
/**
* Emits preselected process if there is one
*/
ldnService$?: Observable<LdnService>;
constructor(private route: ActivatedRoute, private processService: ProcessDataService, private linkService: LinkService) {
}
/**
* If there's an id parameter, use this the process with this identifier as presets for the form
*/
ngOnInit() {
}
}

View File

@@ -0,0 +1,73 @@
import { LdnService } from '../ldn-services-model/ldn-services.model';
import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list.model';
import { Observable, of } from 'rxjs';
// Create a mock data object for a single LDN notify service
export const mockLdnService: LdnService = {
id: 1,
name: 'Service Name',
description: 'Service Description',
url: 'Service URL',
ldnUrl: 'Service LDN URL',
notifyServiceInboundPatterns: [
{
pattern: 'patternA',
constraint: 'itemFilterA',
automatic: false,
},
{
pattern: 'patternB',
constraint: 'itemFilterB',
automatic: true,
},
],
notifyServiceOutboundPatterns: [
{
pattern: 'patternC',
constraint: 'itemFilterC',
},
],
type: LDN_SERVICE,
_links: {
self: {
href: 'http://localhost/api/ldn/ldnservices/1',
},
},
};
const mockLdnServices = {
payload: {
elementsPerPage: 20,
totalPages: 1,
totalElements: 1,
currentPage: 1,
first: undefined,
prev: undefined,
next: undefined,
last: undefined,
page: [mockLdnService],
type: LDN_SERVICE,
self: undefined,
getPageLength: function() {
return this.page.length;
},
_links: {
self: {
href: 'http://localhost/api/ldn/ldnservices/1',
},
page: [],
},
},
hasSucceeded: true,
msToLive: 0,
};
// Create a mock ldnServicesRD$ observable
export const mockLdnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>> = of((mockLdnServices as unknown) as RemoteData<PaginatedList<LdnService>>);

View File

@@ -0,0 +1,90 @@
import { Injectable } from '@angular/core';
import { dataService } from '../../../core/data/base/data-service.decorator';
import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
import { FindAllData, FindAllDataImpl } from '../../../core/data/base/find-all-data';
import { DeleteData, DeleteDataImpl } from '../../../core/data/base/delete-data';
import { RequestService } from '../../../core/data/request.service';
import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
import { ObjectCacheService } from '../../../core/cache/object-cache.service';
import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { FindListOptions } from '../../../core/data/find-list-options.model';
import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
import { Observable } from 'rxjs';
import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list.model';
import { NoContent } from '../../../core/shared/NoContent.model';
import { map, take } from 'rxjs/operators';
import { URLCombiner } from '../../../core/url-combiner/url-combiner';
import { MultipartPostRequest } from '../../../core/data/request.models';
import { RestRequest } from '../../../core/data/rest-request.model';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { hasValue } from '../../../shared/empty.util';
import { LdnService } from '../ldn-services-model/ldn-services.model';
import { LdnServiceConstraint } from '../ldn-services-model/ldn-service-constraint.model';
@Injectable()
@dataService(LDN_SERVICE)
export class LdnServicesService extends IdentifiableDataService<LdnService> implements FindAllData<LdnService>, DeleteData<LdnService> {
private findAllData: FindAllDataImpl<LdnService>; // Corrected the type
private deleteData: DeleteDataImpl<LdnService>; // Corrected the type
constructor(
protected requestService: RequestService,
protected rdbService: RemoteDataBuildService,
protected objectCache: ObjectCacheService,
protected halService: HALEndpointService,
protected notificationsService: NotificationsService,
) {
super('ldnservices', requestService, rdbService, objectCache, halService);
this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
}
findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
}
public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
return this.deleteData.delete(objectId, copyVirtualMetadata);
}
public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
return this.deleteData.deleteByHref(href, copyVirtualMetadata);
}
public invoke(serviceName: string, parameters: LdnServiceConstraint[], files: File[]): Observable<RemoteData<LdnService>> {
const requestId = this.requestService.generateRequestId();
this.getBrowseEndpoint().pipe(
take(1),
map((endpoint: string) => new URLCombiner(endpoint, serviceName, 'processes').toString()),
map((endpoint: string) => {
const body = this.getInvocationFormData(parameters, files);
return new MultipartPostRequest(requestId, endpoint, body);
})
).subscribe((request: RestRequest) => this.requestService.send(request));
return this.rdbService.buildFromRequestUUID<LdnService>(requestId);
}
private getInvocationFormData(constrain: LdnServiceConstraint[], files: File[]): FormData {
const form: FormData = new FormData();
form.set('properties', JSON.stringify(constrain));
files.forEach((file: File) => {
form.append('file', file);
});
return form;
}
public ldnServiceWithNameExistsAndCanExecute(scriptName: string): Observable<boolean> {
return this.findById(scriptName).pipe(
getFirstCompletedRemoteData(),
map((rd: RemoteData<LdnService>) => {
return hasValue(rd.payload);
}),
);
}
}

View File

@@ -0,0 +1,85 @@
<div class="container">
{{ldnServicesRD$ | async | json }}
<div class="d-flex">
<h2 class="flex-grow-1">{{'ldn-registered-services.title' | translate}}</h2>
</div>
<div class="d-flex justify-content-end">
<button *ngIf="ldnServicesBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
(click)="ldnServicesBulkDeleteService.clearAllServices()"><i
class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
</button>
<button *ngIf="ldnServicesBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
(click)="openDeleteModal(deleteModal)"><i
class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: ldnServicesBulkDeleteService.getAmountOfSelectedServices()} }}
</button>
<button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
</div>
<ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
[paginationOptions]="pageConfig"
[pageInfoState]="(ldnServicesRD$ | async)?.payload"
[collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
[hideGear]="true"
[hidePagerWhenSinglePage]="true">
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead>
<tr>
<th scope="col">{{'service.overview.table.name' | translate}}</th>
<th scope="col">{{'service.overview.table.description' | translate}}</th>
<th scope="col">{{'service.overview.table.status' | translate}}</th>
<th scope="col">{{'service.overview.table.actions' | translate}}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let ldnService of (ldnServicesRD$ | async)?.payload?.page"
[class.table-danger]="ldnServicesBulkDeleteService.isToBeDeleted(ldnService.id)">
<td><a [routerLink]="['/ldn-services/', ldnService.id]">{{ldnService.id}}</a></td>
<td>{{ldnService.description}}</td>
<td>
<button class="btn btn-outline-danger"
(click)="ldnServicesBulkDeleteService.toggleDelete(ldnService.id)"><i
class="fas fa-trash"></i></button>
</td>
</tr>
</tbody>
</table>
</div>
</ds-pagination>
</div>
<ng-template #deleteModal>
<div>
<div class="modal-header">
<div>
<h4>{{'process.overview.delete.header' | translate }}</h4>
</div>
<button type="button" class="close"
(click)="closeModal()" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
</div>
<div class="modal-body">
<div *ngIf="!(ldnServicesBulkDeleteService.isProcessing$() |async)">{{'process.overview.delete.body' | translate: {count: ldnServicesBulkDeleteService.getAmountOfSelectedServices()} }}</div>
<div *ngIf="ldnServicesBulkDeleteService.isProcessing$() |async" class="alert alert-info">
<span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
<span> {{ 'process.overview.delete.processing' | translate: {count: ldnServicesBulkDeleteService.getAmountOfSelectedServices()} }}</span>
</div>
<div class="mt-4">
<button class="btn btn-primary mr-2" [disabled]="ldnServicesBulkDeleteService.isProcessing$() |async"
(click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
<button id="delete-confirm" class="btn btn-danger"
[disabled]="ldnServicesBulkDeleteService.isProcessing$() |async"
(click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: ldnServicesBulkDeleteService.getAmountOfSelectedServices()} }}
</button>
</div>
</div>
</div>
</ng-template>

View File

@@ -0,0 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ServicesDirectoryComponent } from './services-directory.component';
describe('ServicesDirectoryComponent', () => {
let component: ServicesDirectoryComponent;
let fixture: ComponentFixture<ServicesDirectoryComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ServicesDirectoryComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(ServicesDirectoryComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,105 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { LdnDirectoryService } from '../ldn-services-services/ldn-directory.service';
import { Observable, Subscription } from 'rxjs';
import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list.model';
import { FindListOptions } from '../../../core/data/find-list-options.model';
import { LdnService } from '../ldn-services-model/ldn-services.model';
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
import { switchMap } from 'rxjs/operators';
import { LdnServicesService } from 'src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
import { PaginationService } from 'src/app/core/pagination/pagination.service';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { LdnServicesBulkDeleteService } from 'src/app/admin/admin-ldn-services/ldn-services-services/ldn-service-bulk-delete.service';
import { hasValue } from '../../../shared/empty.util';
import { HttpClient } from '@angular/common/http';
@Component({
selector: 'ds-ldn-services-directory',
templateUrl: './ldn-services-directory.component.html',
styleUrls: ['./ldn-services-directory.component.scss'],
})
export class LdnServicesOverviewComponent implements OnInit, OnDestroy {
ldnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>>;
config: FindListOptions = Object.assign(new FindListOptions(), {
elementsPerPage: 20
});
pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
id: 'po',
pageSize: 20
});
private modalRef: any;
isProcessingSub: Subscription;
constructor(
protected processLdnService: LdnServicesService,
protected paginationService: PaginationService,
protected modalService: NgbModal,
public ldnServicesBulkDeleteService: LdnServicesBulkDeleteService,
public ldnDirectoryService: LdnDirectoryService,
private http: HttpClient
) {}
ngOnInit(): void {
this.setLdnServices();
this.ldnDirectoryService.listLdnServices();
this.searchByLdnUrl();
}
setLdnServices() {
debugger;
this.ldnServicesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
switchMap((config) => this.processLdnService.findAll(config, true, false))
);
console.log()
}
ngOnDestroy(): void {
this.paginationService.clearPagination(this.pageConfig.id);
if (hasValue(this.isProcessingSub)) {
this.isProcessingSub.unsubscribe();
}
}
openDeleteModal(content) {
this.modalRef = this.modalService.open(content);
}
closeModal() {
this.modalRef.close();
}
findByLdnUrl(): Observable<any> {
const url = 'http://localhost:8080/server/api/ldn/ldnservices';
return this.http.get(url);
}
searchByLdnUrl(): void {
this.findByLdnUrl().subscribe(
(response) => {
console.log('Search results:', response);
},
(error) => {
console.error('Error:', error);
}
);
}
deleteSelected() {
this.ldnServicesBulkDeleteService.deleteSelectedLdnServices();
if (hasValue(this.isProcessingSub)) {
this.isProcessingSub.unsubscribe();
}
this.isProcessingSub = this.ldnServicesBulkDeleteService.isProcessing$()
.subscribe((isProcessing) => {
if (!isProcessing) {
this.closeModal();
this.setLdnServices();
}
});
}
}

View File

@@ -0,0 +1,29 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class LdnServicesGuard implements CanActivate {
constructor(
//private notifyInfoService: NotifyInfoService,
private router: Router
) {}
canActivate(
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
return true;
/*return this.notifyInfoService.isCoarConfigEnabled().pipe(
map(coarLdnEnabled => {
if (coarLdnEnabled) {
return true;
} else {
return this.router.parseUrl('/404');
}
})
);*/
}
}

View File

@@ -0,0 +1,17 @@
import { TestBed } from '@angular/core/testing';
import { LdnServicesGuard } from './ldn-services-guard.service';
describe('LdnServicesGuard', () => {
let guard: LdnServicesGuard;
beforeEach(() => {
TestBed.configureTestingModule({});
guard = TestBed.inject(LdnServicesGuard);
});
it('should be created', () => {
// @ts-ignore
expect(guard).toBeTruthy();
});
});

View File

@@ -0,0 +1,26 @@
/**
* A cosntrain that can be used when running a service
*/
export class LdnServiceConstraint {
/**
* The name of the constrain
*/
name: string;
/**
* The value of the constrain
*/
value: string;
}
export const EndorsmentConstrain = [
{
name: 'Type 1 Item',
value: 'Type1'
},
{
name: 'Type 2 Item',
value: 'Type2'
},
];

View File

@@ -0,0 +1,8 @@
/**
* List of services statuses
*/
export enum LdnServiceStatus {
UNKOWN,
DISABLED,
ENABLED,
}

View File

@@ -0,0 +1,9 @@
/**
* The resource type for Ldn-Services
*
* Needs to be in a separate file to prevent circular
* dependencies in webpack.
*/
import { ResourceType } from '../../../core/shared/resource-type';
export const LDN_SERVICE = new ResourceType('notifyservice');

View File

@@ -0,0 +1,58 @@
import { ResourceType } from '../../../core/shared/resource-type';
import { CacheableObject } from '../../../core/cache/cacheable-object.model';
import { autoserialize, deserialize } from 'cerialize';
import { LDN_SERVICE } from './ldn-service.resource-type';
import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
import { typedObject } from '../../../core/cache/builders/build-decorators';
@typedObject
export class LdnService extends CacheableObject {
static type = LDN_SERVICE;
@excludeFromEquals
@autoserialize
type: ResourceType;
@autoserialize
id?: number;
@autoserialize
name: string;
@autoserialize
description: string;
@autoserialize
url: string;
@autoserialize
ldnUrl: string;
@autoserialize
notifyServiceInboundPatterns?: NotifyServicePattern[];
@autoserialize
notifyServiceOutboundPatterns?: NotifyServicePattern[];
@deserialize
_links: {
self: {
href: string;
};
};
get self(): string {
return this._links.self.href;
}
}
class NotifyServicePattern {
@autoserialize
pattern: string;
@autoserialize
constraint?: string;
@autoserialize
automatic?: boolean;
}

View File

@@ -0,0 +1,10 @@
/**
* List of parameter types used for scripts
*/
export enum LdnServiceConstrainType {
STRING = 'String',
DATE = 'date',
BOOLEAN = 'boolean',
FILE = 'InputStream',
OUTPUT = 'OutputStream'
}

View File

@@ -0,0 +1,73 @@
export const notifyPatterns = [
{
name: 'Acknowledge and Accept',
description: 'This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.',
category: 'Acknowledgements'
},
{
name: 'Acknowledge and Reject',
description: 'This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.',
category: 'Acknowledgements'
},
{
name: 'Acknowledge and Tentatively Accept',
description: 'This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.',
category: 'Acknowledgements'
},
{
name: 'Acknowledge and Tentatively Reject',
description: 'This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.',
category: 'Acknowledgements'
},
{
name: 'Announce Endorsement',
description: 'This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.',
category: 'Announcements'
},
{
name: 'Announce Ingest',
description: 'This pattern is used to announce that a resource has been ingested.',
category: 'Announcements'
},
{
name: 'Announce Relationship',
description: 'This pattern is used to announce a relationship between two resources.',
category: 'Announcements'
},
{
name: 'Announce Review',
description: 'This pattern is used to announce the existence of a review, referencing the reviewed resource.',
category: 'Announcements'
},
{
name: 'Announce Service Result',
description: 'This pattern is used to announce the existence of a "service result", referencing the relevant resource.',
category: 'Announcements'
},
{
name: 'Request Endorsement',
description: 'This pattern is used to request endorsement of a resource owned by the origin system.',
category: 'Requests'
},
{
name: 'Request Ingest',
description: 'This pattern is used to request that the target system ingest a resource.',
category: 'Requests'
},
{
name: 'Request Review',
description: 'This pattern is used to request a review of a resource owned by the origin system.',
category: 'Requests'
},
{
name: 'Undo Offer',
description: 'This pattern is used to undo (retract) an offer previously made.',
category: 'Undo'
}
];
const pattern = notifyPatterns[0];
console.log(`Pattern Name: ${pattern.name}`);
console.log(`Pattern Description: ${pattern.description}`);
console.log(`Pattern Category: ${pattern.category}`);

View File

@@ -0,0 +1,17 @@
import { TestBed } from '@angular/core/testing';
import { LdnDirectoryService } from './ldn-directory.service';
describe('LdnDirectoryService', () => {
let service: LdnDirectoryService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(LdnDirectoryService);
});
it('should be created', () => {
// @ts-ignore
expect(service).toBeTruthy();
});
});

View File

@@ -0,0 +1,54 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { LdnService } from '../ldn-services-model/ldn-services.model';
@Injectable({
providedIn: 'root',
})
export class LdnDirectoryService {
private baseUrl = 'http://localhost:8080/server/api/ldn/ldnservices';
private itemFilterEndpoint = 'http://localhost:8080/server/api/config/itemfilters';
constructor(private http: HttpClient) {}
public listLdnServices(): Observable<LdnService[]> {
const endpoint = `${this.baseUrl}`;
return this.http.get<LdnService[]>(endpoint);
}
public getLdnServiceById(id: string): Observable<LdnService> {
const endpoint = `${this.baseUrl}/${id}`;
return this.http.get<LdnService>(endpoint);
}
public createLdnService(ldnService: LdnService): Observable<LdnService> {
return this.http.post<LdnService>(this.baseUrl, ldnService);
}
public updateLdnService(id: string, ldnService: LdnService): Observable<LdnService> {
const endpoint = `${this.baseUrl}/${id}`;
return this.http.put<LdnService>(endpoint, ldnService);
}
public deleteLdnService(id: string): Observable<void> {
const endpoint = `${this.baseUrl}/${id}`;
return this.http.delete<void>(endpoint);
}
public searchLdnServicesByLdnUrl(ldnUrl: string): Observable<LdnService[]> {
const endpoint = `${this.baseUrl}/search/byLdnUrl?ldnUrl=${ldnUrl}`;
return this.http.get<LdnService[]>(endpoint);
}
public getItemFilters(): Observable<any> {
const endpoint = `${this.itemFilterEndpoint}`;
return this.http.get(endpoint);
}
}

View File

@@ -0,0 +1,17 @@
import { TestBed } from '@angular/core/testing';
import { LdnServicesBulkDeleteService } from './ldn-service-bulk-delete.service';
describe('LdnServiceBulkDeleteService', () => {
let service: LdnServicesBulkDeleteService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(LdnServicesBulkDeleteService);
});
it('should be created', () => {
// @ts-ignore
expect(service).toBeTruthy();
});
});

View File

@@ -0,0 +1,117 @@
import { Injectable } from '@angular/core';
import { BehaviorSubject, count, from } from 'rxjs';
import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
import { NotificationsService } from '../../../shared/notifications/notifications.service';
import { TranslateService } from '@ngx-translate/core';
import { isNotEmpty } from '../../../shared/empty.util';
import { concatMap, filter, tap } from 'rxjs/operators';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { RemoteData } from '../../../core/data/remote-data';
import { LdnService } from '../ldn-services-model/ldn-services.model';
@Injectable({
providedIn: 'root'
})
/**
* Service to facilitate removing ldn services in bulk.
*/
export class LdnServicesBulkDeleteService {
/**
* Array to track the services to be deleted
*/
ldnServicesToDelete: string[] = [];
/**
* Behavior subject to track whether the delete is processing
* @protected
*/
protected isProcessingBehaviorSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
constructor(
protected processLdnService: LdnServicesService,
protected notificationsService: NotificationsService,
protected translateService: TranslateService
) {
}
/**
* Add or remove a process id to/from the list
* If the id is already present it will be removed, otherwise it will be added.
*
* @param notifyServiceName - The process id to add or remove
*/
toggleDelete(notifyServiceName: string) {
if (this.isToBeDeleted(notifyServiceName)) {
this.ldnServicesToDelete.splice(this.ldnServicesToDelete.indexOf(notifyServiceName), 1);
} else {
this.ldnServicesToDelete.push(notifyServiceName);
}
}
/**
* Checks if the provided service id is present in the to be deleted list
* @param notifyServiceName
*/
isToBeDeleted(notifyServiceName: string) {
return this.ldnServicesToDelete.includes(notifyServiceName);
}
/**
* Clear the list of services to be deleted
*/
clearAllServices() {
this.ldnServicesToDelete.splice(0);
}
/**
* Get the amount of processes selected for deletion
*/
getAmountOfSelectedServices() {
return this.ldnServicesToDelete.length;
}
/**
* Returns a behavior subject to indicate whether the bulk delete is processing
*/
isProcessing$() {
return this.isProcessingBehaviorSubject;
}
/**
* Returns whether there currently are values selected for deletion
*/
hasSelected(): boolean {
return isNotEmpty(this.ldnServicesToDelete);
}
/**
* Delete all selected processes one by one
* When the deletion for a process fails, an error notification will be shown with the process id,
* but it will continue deleting the other processes.
* At the end it will show a notification stating the amount of successful deletes
* The successfully deleted processes will be removed from the list of selected values, the failed ones will be retained.
*/
deleteSelectedLdnServices() {
this.isProcessingBehaviorSubject.next(true);
from([...this.ldnServicesToDelete]).pipe(
concatMap((notifyServiceName) => {
return this.processLdnService.delete(notifyServiceName).pipe(
getFirstCompletedRemoteData(),
tap((rd: RemoteData<LdnService>) => {
if (rd.hasFailed) {
this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', {processId: notifyServiceName}));
} else {
this.toggleDelete(notifyServiceName);
}
})
);
}),
filter((rd: RemoteData<LdnService>) => rd.hasSucceeded),
count(),
).subscribe((value) => {
this.notificationsService.success(this.translateService.get('process.bulk.delete.success', {count: value}));
this.isProcessingBehaviorSubject.next(false);
});
}
}

View File

@@ -11,3 +11,5 @@ export function getRegistriesModuleRoute() {
export function getNotificationsModuleRoute() { export function getNotificationsModuleRoute() {
return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString(); return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
} }
export const LDN_PATH = 'ldn';

View File

@@ -7,6 +7,7 @@ import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow
import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service'; import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component'; import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
import { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths'; import { REGISTRIES_MODULE_PATH, NOTIFICATIONS_MODULE_PATH } from './admin-routing-paths';
import { LDN_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component'; import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
@NgModule({ @NgModule({
@@ -52,13 +53,24 @@ import { BatchImportPageComponent } from './admin-import-batch-page/batch-import
component: BatchImportPageComponent, component: BatchImportPageComponent,
data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' } data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }
}, },
{
path: LDN_PATH,
children: [
{ path: '', pathMatch: 'full', redirectTo: 'services' },
{
path: 'services',
loadChildren: () => import('./admin-ldn-services/admin-ldn-services.module')
.then((m) => m.AdminLdnServicesModule),
}
]
},
{ {
path: 'system-wide-alert', path: 'system-wide-alert',
resolve: { breadcrumb: I18nBreadcrumbResolver }, resolve: { breadcrumb: I18nBreadcrumbResolver },
loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule), loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule),
data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'} data: {title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert'}
}, },
]) ]),
], ],
providers: [ providers: [
I18nBreadcrumbResolver, I18nBreadcrumbResolver,

View File

@@ -187,6 +187,7 @@ import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-brows
import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model'; import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
import { SuggestionTarget } from './suggestion-notifications/reciter-suggestions/models/suggestion-target.model'; import { SuggestionTarget } from './suggestion-notifications/reciter-suggestions/models/suggestion-target.model';
import { SuggestionSource } from './suggestion-notifications/reciter-suggestions/models/suggestion-source.model'; import { SuggestionSource } from './suggestion-notifications/reciter-suggestions/models/suggestion-source.model';
import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
/** /**
* When not in production, endpoint responses can be mocked for testing purposes * When not in production, endpoint responses can be mocked for testing purposes
@@ -309,7 +310,8 @@ const PROVIDERS = [
OrcidAuthService, OrcidAuthService,
OrcidQueueDataService, OrcidQueueDataService,
OrcidHistoryDataService, OrcidHistoryDataService,
SupervisionOrderDataService SupervisionOrderDataService,
LdnServicesService,
]; ];
/** /**

View File

@@ -890,6 +890,28 @@
"claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow", "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
"ldn-registered-services.title": "Registered Services",
"ldn-registered-services.table.name":"Name",
"ldn-registered-services.table.description": "Description",
"ldn-registered-services.table.status": "Status",
"ldn-registered-services.table.action": "Action",
"ldn-registered-services.new": "NEW",
"ldn-registered-services.new.breadcrumbs": "Registered Services",
"ldn-register-new-service.title": "Register a new service",
"ldn-register-new-service.name": "Name",
"ldn-register-new-service.url": "Service URL",
"ldn-register-new-service.ldn.inbox.url": "LDN InBox URL",
"ldn-register-new-service.inbound": "Inbound- Patterns supported by the service (i.e. messages that the service is able to receive and understand)",
"ldn-register-new-service.outbound": "Outbound- Patterns supported by the service (i.e. messages that the service is likely to generate and that should be processed by DSpace)",
"ldn-register-new-service.addmore": "+ Add more",
"ldn-register-new-service.breadcrumbs": "New Service",
"ldn-register-new-service.notification.error.title": "Error",
"ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
"ldn-register-new-service.notification.success.title": "Success",
"ldn-register-new-service.notification.success.content": "The process was successfully created",
"collection.create.head": "Create a Collection", "collection.create.head": "Create a Collection",
"collection.create.notifications.success": "Successfully created the Collection", "collection.create.notifications.success": "Successfully created the Collection",
@@ -3328,6 +3350,10 @@
"process.new.breadcrumbs": "Create a new process", "process.new.breadcrumbs": "Create a new process",
"process.detail.arguments": "Arguments", "process.detail.arguments": "Arguments",
"process.detail.arguments.empty": "This process doesn't contain any arguments", "process.detail.arguments.empty": "This process doesn't contain any arguments",
@@ -3410,6 +3436,25 @@
"process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted", "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
"service.overview.table.id": "Services ID",
"service.overview.table.name": "Name",
"service.overview.table.start": "Start time (UTC)",
"service.overview.table.status": "Status",
"service.overview.table.user": "User",
"service.overview.title": "Services Overview",
"service.overview.breadcrumbs": "Services Overview",
"service.overview.table.actions": "Actions",
"service.overview.table.description": "Description",
"profile.breadcrumbs": "Update Profile", "profile.breadcrumbs": "Update Profile",
"profile.card.identify": "Identify", "profile.card.identify": "Identify",