From e6855709ab6813854027d1c6a0b42921a915c8c7 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 11 Apr 2024 17:59:45 +0200 Subject: [PATCH 1/7] Load max 100 license labels in the edit license page --- .../modal/define-license-form/define-license-form.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts index 75793460e1c..2551f700017 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-form/define-license-form.component.ts @@ -182,7 +182,7 @@ export class DefineLicenseFormComponent implements OnInit { * @private */ private loadAndAssignClarinLicenseLabels() { - this.clarinLicenseLabelService.findAll({}, false) + this.clarinLicenseLabelService.findAll({ elementsPerPage: 100 }, false) .pipe(getFirstSucceededRemoteListPayload()) .subscribe(res => { res.forEach(clarinLicenseLabel => { From 98c750eceefd83ab0e11ed546ad4afb15fd4e7c0 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 11 Apr 2024 18:01:06 +0200 Subject: [PATCH 2/7] The icon is not required during creation of the clarin license label --- .../define-license-label-form.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts index 1c12ff45090..0233b13b910 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts @@ -64,7 +64,7 @@ export class DefineLicenseLabelFormComponent implements OnInit { label: [this.label, [Validators.required, Validators.maxLength(5)]], title: [this.title, Validators.required], extended: isNotEmpty(this.extended) ? this.extended : this.extendedOptions[0], - icon: [this.icon, validateLicenseLabel()], + icon: [this.icon], }); } From 2f953d5e1a2a94be5f9e975672931eff212c4ef9 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 11 Apr 2024 18:01:50 +0200 Subject: [PATCH 3/7] Updated creating of the clarin license label - refactored code, the icon is not required --- .../clarin-license-table.component.ts | 44 +++++++++++++------ .../define-license-label-form.component.html | 2 +- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts index 2888ba95333..1bf3ea66c22 100644 --- a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts @@ -222,12 +222,21 @@ export class ClarinLicenseTableComponent implements OnInit { const reader = new FileReader(); const fileByteArray = []; + let hasIcon = true; try { reader.readAsArrayBuffer(clarinLicenseLabel.icon?.[0]); } catch (error) { - this.notifyOperationStatus(null, successfulMessageContentDef, errorMessageContentDef); + // Cannot read any icon that means there is no icon + hasIcon = false; + } + + // Create license label without icon + if (!hasIcon) { + this.createClarinLicenseLabel(clarinLicenseLabel, [], successfulMessageContentDef, errorMessageContentDef); + return; } + // Create license label with icon reader.onerror = (evt) => { this.notifyOperationStatus(null, successfulMessageContentDef, errorMessageContentDef); }; @@ -240,22 +249,31 @@ export class ClarinLicenseTableComponent implements OnInit { fileByteArray.push(item); } } - clarinLicenseLabel.icon = fileByteArray; - // convert string value from the form to the boolean - clarinLicenseLabel.extended = ClarinLicenseLabelExtendedSerializer.Serialize(clarinLicenseLabel.extended); - - // create - this.clarinLicenseLabelService.create(clarinLicenseLabel) - .pipe(getFirstCompletedRemoteData()) - .subscribe((defineLicenseLabelResponse: RemoteData) => { - // check payload and show error or successful - this.notifyOperationStatus(defineLicenseLabelResponse, successfulMessageContentDef, errorMessageContentDef); - this.loadAllLicenses(); - }); + this.createClarinLicenseLabel(clarinLicenseLabel, fileByteArray, successfulMessageContentDef, errorMessageContentDef); } }; } + /** + * Call BE request to create a clarin license label with or without icon. + * Show response in the notification popup. + */ + createClarinLicenseLabel(clarinLicenseLabel: ClarinLicenseLabel, fileByteArray: any[] = [], + successfulMessageContentDef: any, errorMessageContentDef: any) { + clarinLicenseLabel.icon = fileByteArray; + // convert string value from the form to the boolean + clarinLicenseLabel.extended = ClarinLicenseLabelExtendedSerializer.Serialize(clarinLicenseLabel.extended); + + // create + this.clarinLicenseLabelService.create(clarinLicenseLabel) + .pipe(getFirstCompletedRemoteData()) + .subscribe((defineLicenseLabelResponse: RemoteData) => { + // check payload and show error or successful + this.notifyOperationStatus(defineLicenseLabelResponse, successfulMessageContentDef, errorMessageContentDef); + this.loadAllLicenses(); + }); + } + // delete license /** * Delete selected license. If none license is selected do nothing. diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.html b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.html index 69bbe0f4248..a78a285f638 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.html +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.html @@ -25,7 +25,7 @@

{{'clarin-license.define-license-form.form-name' | trans
- +
From 32546db43b42fbf39a00e352eb5acb41a0b17e1e Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Thu, 11 Apr 2024 18:26:56 +0200 Subject: [PATCH 4/7] Fixed issue with wrong loaded required info. --- src/app/shared/utils/clarin-license-checked.pipe.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/shared/utils/clarin-license-checked.pipe.ts b/src/app/shared/utils/clarin-license-checked.pipe.ts index 02d368521fe..1072115c881 100644 --- a/src/app/shared/utils/clarin-license-checked.pipe.ts +++ b/src/app/shared/utils/clarin-license-checked.pipe.ts @@ -18,13 +18,13 @@ export class ClarinLicenseCheckedPipe implements PipeTransform { * @param clarinLicenseProp to compare * @param clarinLicenseProps all extended clarin license labels or non extended clarin license label in array */ - transform(clarinLicenseProp: ClarinLicenseLabel | ClarinLicenseRequiredInfo, clarinLicenseProps: any[]): boolean { + transform(clarinLicenseProp: any | ClarinLicenseRequiredInfo, clarinLicenseProps: any[]): boolean { let contains = false; if (isEmpty(clarinLicenseProp) || isEmpty(clarinLicenseProps)) { return contains; } clarinLicenseProps.forEach(cll => { - if (cll.id === clarinLicenseProp.id) { + if (cll.name === clarinLicenseProp.name) { contains = true; } }); From aa91bdd4f507baec81ef939bef990b05a04dada8 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Fri, 12 Apr 2024 08:24:01 +0200 Subject: [PATCH 5/7] Fixed lint issue --- .../define-license-label-form.component.ts | 1 - src/app/shared/utils/clarin-license-checked.pipe.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts index 0233b13b910..2749751a522 100644 --- a/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/modal/define-license-label-form/define-license-label-form.component.ts @@ -1,7 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { validateLicenseLabel } from '../define-license-form/define-license-form-validator'; import { isNotEmpty } from '../../../../shared/empty.util'; /** diff --git a/src/app/shared/utils/clarin-license-checked.pipe.ts b/src/app/shared/utils/clarin-license-checked.pipe.ts index 1072115c881..e319d6eb84f 100644 --- a/src/app/shared/utils/clarin-license-checked.pipe.ts +++ b/src/app/shared/utils/clarin-license-checked.pipe.ts @@ -1,5 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { ClarinLicenseLabel } from '../../core/shared/clarin/clarin-license-label.model'; import { isEmpty } from '../empty.util'; import { ClarinLicenseRequiredInfo } from '../../core/shared/clarin/clarin-license.resource-type'; From ccd31a8163a47cf882986b34bb588a080f4e78c3 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Fri, 12 Apr 2024 10:30:59 +0200 Subject: [PATCH 6/7] Updated test which controlles creating license label without icon --- .../clarin-license-table.component.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.spec.ts b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.spec.ts index 7aabfda6996..0cc824bdd8b 100644 --- a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.spec.ts +++ b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.spec.ts @@ -149,10 +149,10 @@ describe('ClarinLicenseTableComponent', () => { expect((component as ClarinLicenseTableComponent).licensesRD$).not.toBeNull(); }); - it('should not create new clarin license label when icon image is null', () => { + it('should create new clarin license label when icon image is null', () => { // non extended ll has no icon (component as ClarinLicenseTableComponent).defineLicenseLabel(mockNonExtendedLicenseLabel); - expect((component as any).notificationService.error).toHaveBeenCalled(); + expect((component as any).notificationService.success).toHaveBeenCalled(); }); it('should create new clarin license label and load table data', fakeAsync(() => { From 431b6a398bf1cd7b17ac4a88ca482a9001c3fa12 Mon Sep 17 00:00:00 2001 From: milanmajchrak Date: Tue, 23 Apr 2024 09:11:04 +0200 Subject: [PATCH 7/7] Replaced `if` condition by `catch`. --- .../clarin-license-table/clarin-license-table.component.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts index 1bf3ea66c22..30ddd691537 100644 --- a/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts +++ b/src/app/clarin-licenses/clarin-license-table/clarin-license-table.component.ts @@ -222,16 +222,11 @@ export class ClarinLicenseTableComponent implements OnInit { const reader = new FileReader(); const fileByteArray = []; - let hasIcon = true; try { reader.readAsArrayBuffer(clarinLicenseLabel.icon?.[0]); } catch (error) { // Cannot read any icon that means there is no icon - hasIcon = false; - } - - // Create license label without icon - if (!hasIcon) { + // Create license label without icon this.createClarinLicenseLabel(clarinLicenseLabel, [], successfulMessageContentDef, errorMessageContentDef); return; }