hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix lint, change translation, clean up component

Browse Source
This commit is contained in:
FrancescoMolinaro
2024-01-12 11:15:42 +01:00
parent b5fa46ce86
commit 7a5b52f691
7 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
View File

@@ -48,27 +48,30 @@
</div> </div>
</div> </div>
<!-- In the IP section --> <!-- In the IP range section -->
<div class="mb-5 mt-5"> <div class="mb-5 mt-5">
<label for="ipRangeMin" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label> <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
<div class="d-flex"> <div class="d-flex">
<input [class.invalid-field]="formModel.get('ipRangeMin').invalid && formModel.get('ipRangeMin').touched" <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.ipRange' | translate" class="form-control mr-2" [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
formControlName="ipRangeMin" formControlName="lowerIp"
id="ipRangeMin" id="lowerIp"
name="ipRangeMin" name="lowerIp"
type="text"> type="text">
<input [class.invalid-field]="formModel.get('ipRangeMax').invalid && formModel.get('ipRangeMax').touched" <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
[placeholder]="'ldn-new-service.form.placeholder.ipRange' | translate" class="form-control" [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
formControlName="ipRangeMax" formControlName="upperIp"
id="ipRangeMax" id="upperIp"
name="ipRangeMax" name="upperIp"
type="text"> type="text">
</div> </div>
<div *ngIf="(formModel.get('ipRangeMin').invalid && formModel.get('ipRangeMin').touched) || (formModel.get('ipRangeMax').invalid && formModel.get('ipRangeMax').touched)" class="error-text"> <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
{{ 'ldn-new-service.form.error.ipRange' | translate }} {{ 'ldn-new-service.form.error.ipRange' | translate }}
</div> </div>
<div *ngIf="!(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="text-muted">
{{ 'ldn-new-service.form.hint.ipRange' | translate }}
</div>
</div> </div>
<!-- In the ldnUrl section --> <!-- In the ldnUrl section -->
@@ -107,7 +110,7 @@
<div class="col"> <div class="col">
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label> <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
</div> </div>
<ng-container *ngIf="!!(formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern)"> <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
<div class="col"> <div class="col">
<label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label> <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
</div> </div>
@@ -168,7 +171,7 @@
<div class="col"> <div class="col">
<ng-container <ng-container
*ngIf="!!(formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern)"> *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
<div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
placement="top-start"> placement="top-start">
<div class="position-relative right-addon" role="combobox"> <div class="position-relative right-addon" role="combobox">

81
src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
View File

@@ -1,11 +1,8 @@
import { import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
EventEmitter,
Input,
OnDestroy, OnDestroy,
OnInit, OnInit,
Output,
TemplateRef, TemplateRef,
ViewChild ViewChild
} from '@angular/core'; } from '@angular/core';
@@ -49,37 +46,26 @@ import { IpV4Validator } from '../../../shared/utils/ipV4.validator';
}) })
export class LdnServiceFormComponent implements OnInit, OnDestroy { export class LdnServiceFormComponent implements OnInit, OnDestroy {
formModel: FormGroup; formModel: FormGroup;
@ViewChild('confirmModal', {static: true}) confirmModal: TemplateRef<any>; @ViewChild('confirmModal', {static: true}) confirmModal: TemplateRef<any>;
@ViewChild('resetFormModal', {static: true}) resetFormModal: TemplateRef<any>; @ViewChild('resetFormModal', {static: true}) resetFormModal: TemplateRef<any>;
public inboundPatterns: string[] = notifyPatterns; public inboundPatterns: string[] = notifyPatterns;
public isNewService: boolean; public isNewService: boolean;
public areControlsInitialized: boolean; public areControlsInitialized: boolean;
itemfiltersRD$: Observable<RemoteData<PaginatedList<Itemfilter>>>; public itemfiltersRD$: Observable<RemoteData<PaginatedList<Itemfilter>>>;
config: FindListOptions = Object.assign(new FindListOptions(), { public config: FindListOptions = Object.assign(new FindListOptions(), {
elementsPerPage: 20 elementsPerPage: 20
}); });
public markedForDeletionInboundPattern: number[] = [];
public selectedInboundPatterns: string[];
public selectedInboundItemfilters: string[];
@Input() public name: string;
@Input() public description: string;
@Input() public url: string;
@Input() public ldnUrl: string;
@Input() public ipRangeMin: string;
@Input() public ipRangeMax: string;
@Input() public score: number;
@Input() public inboundPattern: string;
@Input() public constraint: string;
@Input() public automatic: boolean;
@Input() public headerKey: string;
@Output() submitForm: EventEmitter<any> = new EventEmitter();
@Output() cancelForm: EventEmitter<any> = new EventEmitter();
markedForDeletionInboundPattern: number[] = [];
selectedInboundPatterns: string[];
selectedInboundItemfilters: string[];
protected serviceId: string; protected serviceId: string;
private deletedInboundPatterns: number[] = []; private deletedInboundPatterns: number[] = [];
private modalRef: any; private modalRef: any;
private service: LdnService; private ldnService: LdnService;
private selectPatternDefaultLabeli18Key = 'ldn-service.form.label.placeholder.default-select'; private selectPatternDefaultLabeli18Key = 'ldn-service.form.label.placeholder.default-select';
private routeSubscription: Subscription; private routeSubscription: Subscription;
@@ -102,8 +88,8 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
description: [''], description: [''],
url: ['', Validators.required], url: ['', Validators.required],
ldnUrl: ['', Validators.required], ldnUrl: ['', Validators.required],
ipRangeMin: ['', [Validators.required, new IpV4Validator()]], lowerIp: ['', [Validators.required, new IpV4Validator()]],
ipRangeMax: ['', [new IpV4Validator()]], upperIp: ['', [Validators.required, new IpV4Validator()]],
score: ['', [Validators.required, Validators.pattern('^0*(\.[0-9]+)?$|^1(\.0+)?$')]], inboundPattern: [''], score: ['', [Validators.required, Validators.pattern('^0*(\.[0-9]+)?$|^1(\.0+)?$')]], inboundPattern: [''],
constraintPattern: [''], constraintPattern: [''],
enabled: [''], enabled: [''],
@@ -144,15 +130,9 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
*/ */
createService() { createService() {
this.formModel.markAllAsTouched(); this.formModel.markAllAsTouched();
const name = this.formModel.get('name').value;
const url = this.formModel.get('url').value;
const score = this.formModel.get('score').value;
const ldnUrl = this.formModel.get('ldnUrl').value;
const hasInboundPattern = this.checkPatterns(this.formModel.get('notifyServiceInboundPatterns') as FormArray); const hasInboundPattern = this.checkPatterns(this.formModel.get('notifyServiceInboundPatterns') as FormArray);
if (!name || !url || !ldnUrl || (!score && score !== 0) || this.formModel.get('score').invalid) { if (this.formModel.invalid) {
this.closeModal(); this.closeModal();
return; return;
} }
@@ -182,9 +162,8 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
if (rd.hasSucceeded) { if (rd.hasSucceeded) {
this.notificationService.success(this.translateService.get('ldn-service-notification.created.success.title'), this.notificationService.success(this.translateService.get('ldn-service-notification.created.success.title'),
this.translateService.get('ldn-service-notification.created.success.body')); this.translateService.get('ldn-service-notification.created.success.body'));
this.sendBack();
this.closeModal(); this.closeModal();
this.sendBack();
} else { } else {
this.notificationService.error(this.translateService.get('ldn-service-notification.created.failure.title'), this.notificationService.error(this.translateService.get('ldn-service-notification.created.failure.title'),
this.translateService.get('ldn-service-notification.created.failure.body')); this.translateService.get('ldn-service-notification.created.failure.body'));
@@ -219,18 +198,21 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
).subscribe( ).subscribe(
(data: RemoteData<LdnService>) => { (data: RemoteData<LdnService>) => {
if (data.hasSucceeded) { if (data.hasSucceeded) {
this.service = data.payload; this.ldnService = data.payload;
this.formModel.patchValue({ this.formModel.patchValue({
id: this.service.id, id: this.ldnService.id,
name: this.service.name, name: this.ldnService.name,
description: this.service.description, description: this.ldnService.description,
url: this.service.url, url: this.ldnService.url,
score: this.service.score, ldnUrl: this.service.ldnUrl, score: this.ldnService.score,
type: this.service.type, ldnUrl: this.ldnService.ldnUrl,
enabled: this.service.enabled type: this.ldnService.type,
enabled: this.ldnService.enabled,
lowerIp: this.ldnService.lowerIp,
upperIp: this.ldnService.upperIp,
}); });
this.filterPatternObjectsAndPickLabel('notifyServiceInboundPatterns'); this.filterPatternObjectsAndAssignLabel('notifyServiceInboundPatterns');
} }
}, },
); );
@@ -240,11 +222,11 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
* Filters pattern objects, initializes form groups, assigns labels, and adds them to the specified form array so the correct string is shown in the dropdown.. * Filters pattern objects, initializes form groups, assigns labels, and adds them to the specified form array so the correct string is shown in the dropdown..
* @param formArrayName - The name of the form array to be populated * @param formArrayName - The name of the form array to be populated
*/ */
filterPatternObjectsAndPickLabel(formArrayName: string) { filterPatternObjectsAndAssignLabel(formArrayName: string) {
const PatternsArray = this.formModel.get(formArrayName) as FormArray; const PatternsArray = this.formModel.get(formArrayName) as FormArray;
PatternsArray.clear(); PatternsArray.clear();
let servicesToUse;
servicesToUse = this.service.notifyServiceInboundPatterns; let servicesToUse = this.ldnService.notifyServiceInboundPatterns;
servicesToUse.forEach((patternObj: NotifyServicePattern) => { servicesToUse.forEach((patternObj: NotifyServicePattern) => {
let patternFormGroup; let patternFormGroup;
@@ -258,8 +240,6 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
PatternsArray.push(patternFormGroup); PatternsArray.push(patternFormGroup);
this.cdRef.detectChanges(); this.cdRef.detectChanges();
}); });
} }
/** /**
@@ -274,6 +254,8 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
this.createReplaceOperation(patchOperations, 'ldnUrl', '/ldnurl'); this.createReplaceOperation(patchOperations, 'ldnUrl', '/ldnurl');
this.createReplaceOperation(patchOperations, 'url', '/url'); this.createReplaceOperation(patchOperations, 'url', '/url');
this.createReplaceOperation(patchOperations, 'score', '/score'); this.createReplaceOperation(patchOperations, 'score', '/score');
this.createReplaceOperation(patchOperations, 'lowerIp', '/lowerIp');
this.createReplaceOperation(patchOperations, 'upperIp', '/upperIp');
this.handlePatterns(patchOperations, 'notifyServiceInboundPatterns'); this.handlePatterns(patchOperations, 'notifyServiceInboundPatterns');
this.deletedInboundPatterns.forEach(index => { this.deletedInboundPatterns.forEach(index => {
@@ -347,11 +329,10 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
value: newStatus, value: newStatus,
}; };
this.ldnServicesService.patch(this.service, [patchOperation]).pipe( this.ldnServicesService.patch(this.ldnService, [patchOperation]).pipe(
getFirstCompletedRemoteData() getFirstCompletedRemoteData()
).subscribe( ).subscribe(
() => { () => {
this.formModel.get('enabled').setValue(newStatus); this.formModel.get('enabled').setValue(newStatus);
this.cdRef.detectChanges(); this.cdRef.detectChanges();
} }
@@ -407,7 +388,7 @@ export class LdnServiceFormComponent implements OnInit, OnDestroy {
return; return;
} }
this.ldnServicesService.patch(this.service, patchOperations).pipe( this.ldnServicesService.patch(this.ldnService, patchOperations).pipe(
getFirstCompletedRemoteData() getFirstCompletedRemoteData()
).subscribe( ).subscribe(
(rd: RemoteData<LdnService>) => { (rd: RemoteData<LdnService>) => {

6
src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
View File

@@ -41,6 +41,12 @@ export class LdnService extends CacheableObject {
@autoserialize @autoserialize
ldnUrl: string; ldnUrl: string;
@autoserialize
lowerIp: string;
@autoserialize
upperIp: string;
@autoserialize @autoserialize
notifyServiceInboundPatterns?: NotifyServicePattern[]; notifyServiceInboundPatterns?: NotifyServicePattern[];

2
src/app/shared/shared.module.ts
View File

@@ -285,7 +285,7 @@ import { NgxPaginationModule } from 'ngx-pagination';
import { SplitPipe } from './utils/split.pipe'; import { SplitPipe } from './utils/split.pipe';
import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component'; import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component'; import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
import { IpV4Validator } from "./utils/ipV4.validator"; import { IpV4Validator } from './utils/ipV4.validator';
const MODULES = [ const MODULES = [
CommonModule, CommonModule,

14
src/app/shared/utils/ipV4.validator.spec.ts
View File

@@ -1,6 +1,6 @@
import { IpV4Validator } from "./ipV4.validator"; import { IpV4Validator } from './ipV4.validator';
import { TestBed } from "@angular/core/testing"; import { TestBed } from '@angular/core/testing';
import { UntypedFormControl, UntypedFormGroup } from "@angular/forms"; import { UntypedFormControl, UntypedFormGroup } from '@angular/forms';
describe('IpV4 validator', () => { describe('IpV4 validator', () => {
@@ -22,15 +22,15 @@ describe('IpV4 validator', () => {
it('should return null for valid ipV4', () => { it('should return null for valid ipV4', () => {
formGroup.controls.ip.setValue(validIp); formGroup.controls.ip.setValue(validIp);
expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toBeNull() expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toBeNull();
}); });
it('should return {isValidIp: false} for invalid Ip', () => { it('should return {isValidIp: false} for invalid Ip', () => {
formGroup.controls.ip.setValue('100.260.45.1'); formGroup.controls.ip.setValue('100.260.45.1');
expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false}) expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false});
formGroup.controls.ip.setValue('100'); formGroup.controls.ip.setValue('100');
expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false}) expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false});
formGroup.controls.ip.setValue('testString'); formGroup.controls.ip.setValue('testString');
expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false}) expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({isValidIp: false});
}); });
}); });

4
src/app/shared/utils/ipV4.validator.ts
View File

@@ -17,10 +17,10 @@ export class IpV4Validator implements Validator {
const ipValue = formControl.value; const ipValue = formControl.value;
const ipParts = ipValue?.split('.'); const ipParts = ipValue?.split('.');
if (ipv4Regex.test(ipValue) && ipParts.every(part => parseInt(part) <= 255)) { if (ipv4Regex.test(ipValue) && ipParts.every(part => parseInt(part, 10) <= 255)) {
return null; return null;
} }
return {isValidIp: false} return {isValidIp: false};
} }
} }

4
src/assets/i18n/en.json5
View File

@@ -937,7 +937,8 @@
"ldn-new-service.form.placeholder.name": "Please provide service name", "ldn-new-service.form.placeholder.name": "Please provide service name",
"ldn-new-service.form.placeholder.description": "Please provide a description regarding your service", "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
"ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service", "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
"ldn-new-service.form.placeholder.ipRange": "Please input the IPv4 range of the service", "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
"ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
"ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox", "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
"ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator", "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
"ldn-service.form.label.placeholder.default-select": "Select a pattern", "ldn-service.form.label.placeholder.default-select": "Select a pattern",
@@ -1000,6 +1001,7 @@
"ldn-new-service.form.error.name": "Name is required", "ldn-new-service.form.error.name": "Name is required",
"ldn-new-service.form.error.url": "URL is required", "ldn-new-service.form.error.url": "URL is required",
"ldn-new-service.form.error.ipRange": "Please enter a valid IP range", "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
"ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
"ldn-new-service.form.error.ldnurl": "LDN URL is required", "ldn-new-service.form.error.ldnurl": "LDN URL is required",
"ldn-new-service.form.error.patterns": "At least a pattern is required", "ldn-new-service.form.error.patterns": "At least a pattern is required",
"ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator", "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",