@if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
index 7aa1e63c562..ed1b78f4ae1 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -32,9 +32,9 @@ import { ThemedSearchComponent } from '../../../../shared/search/themed-search.c
],
standalone: true,
imports: [
+ AsyncPipe,
SearchLabelsComponent,
ThemedSearchComponent,
- AsyncPipe,
TranslateModule,
],
})
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
index 79a30b7961b..7a11c1a66c4 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -20,8 +20,8 @@ import { AdminNotifyLogsResultComponent } from '../admin-notify-logs-result/admi
],
standalone: true,
imports: [
- RouterLink,
AdminNotifyLogsResultComponent,
+ RouterLink,
TranslateModule,
],
})
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
index 02f4f024e85..aff6514e4b9 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -7,10 +7,7 @@ import {
import { RouterModule } from '@angular/router';
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import {
- of as observableOf,
- of,
-} from 'rxjs';
+import { of } from 'rxjs';
import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@@ -120,7 +117,7 @@ describe('AdminNotifySearchResultComponent', () => {
fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
component = fixture.componentInstance;
modalService = TestBed.inject(NgbModal);
- spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+ spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: of(true) }) }));
fixture.detectChanges();
});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index ece05c30bb8..7b0d3cd9335 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -39,12 +39,12 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se
],
standalone: true,
imports: [
- TranslateModule,
- DatePipe,
AsyncPipe,
+ DatePipe,
+ RouterLink,
+ TranslateModule,
TruncatableComponent,
TruncatablePartComponent,
- RouterLink,
],
})
/**
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
index bdab873717a..6deeeb1a153 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
@@ -9,7 +9,7 @@ import { Router } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
@@ -51,7 +51,7 @@ describe('AddBitstreamFormatComponent', () => {
notificationService = new NotificationsServiceStub();
bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
createBitstreamFormat: createSuccessfulRemoteDataObject$({}),
- clearBitStreamFormatRequests: observableOf(null),
+ clearBitStreamFormatRequests: of(null),
});
TestBed.configureTestingModule({
@@ -98,7 +98,7 @@ describe('AddBitstreamFormatComponent', () => {
notificationService = new NotificationsServiceStub();
bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
createBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
- clearBitStreamFormatRequests: observableOf(null),
+ clearBitStreamFormatRequests: of(null),
});
TestBed.configureTestingModule({
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
index c6d619b6118..7e31cedd82a 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
@@ -9,7 +9,7 @@ import { RouterModule } from '@angular/router';
import { provideMockStore } from '@ngrx/store/testing';
import { TranslateModule } from '@ngx-translate/core';
import { hot } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
import { PaginationService } from '../../../core/pagination/pagination.service';
@@ -88,14 +88,14 @@ describe('BitstreamFormatsComponent', () => {
notificationsServiceStub = new NotificationsServiceStub();
bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
- findAll: observableOf(mockFormatsRD),
+ findAll: of(mockFormatsRD),
find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
getSelectedBitstreamFormats: hot('a', { a: mockFormatsList }),
selectBitstreamFormat: {},
deselectBitstreamFormat: {},
deselectAllBitstreamFormats: {},
delete: createSuccessfulRemoteDataObject$({}),
- clearBitStreamFormatRequests: observableOf('cleared'),
+ clearBitStreamFormatRequests: of('cleared'),
});
paginationService = new PaginationServiceStub();
@@ -225,14 +225,14 @@ describe('BitstreamFormatsComponent', () => {
notificationsServiceStub = new NotificationsServiceStub();
bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
- findAll: observableOf(mockFormatsRD),
+ findAll: of(mockFormatsRD),
find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
- getSelectedBitstreamFormats: observableOf(mockFormatsList),
+ getSelectedBitstreamFormats: of(mockFormatsList),
selectBitstreamFormat: {},
deselectBitstreamFormat: {},
deselectAllBitstreamFormats: {},
delete: createNoContentRemoteDataObject$(),
- clearBitStreamFormatRequests: observableOf('cleared'),
+ clearBitStreamFormatRequests: of('cleared'),
});
paginationService = new PaginationServiceStub();
@@ -282,14 +282,14 @@ describe('BitstreamFormatsComponent', () => {
notificationsServiceStub = new NotificationsServiceStub();
bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
- findAll: observableOf(mockFormatsRD),
+ findAll: of(mockFormatsRD),
find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
- getSelectedBitstreamFormats: observableOf(mockFormatsList),
+ getSelectedBitstreamFormats: of(mockFormatsList),
selectBitstreamFormat: {},
deselectBitstreamFormat: {},
deselectAllBitstreamFormats: {},
delete: createFailedRemoteDataObject$(),
- clearBitStreamFormatRequests: observableOf('cleared'),
+ clearBitStreamFormatRequests: of('cleared'),
});
paginationService = new PaginationServiceStub();
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index bc0f76ea172..381172bbe9f 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -38,9 +38,9 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
templateUrl: './bitstream-formats.component.html',
imports: [
AsyncPipe,
+ PaginationComponent,
RouterLink,
TranslateModule,
- PaginationComponent,
],
standalone: true,
})
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
index 17276ef2ac4..a8785477c98 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -12,7 +12,7 @@ import {
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
import { RemoteData } from '../../../../core/data/remote-data';
@@ -44,7 +44,7 @@ describe('EditBitstreamFormatComponent', () => {
bitstreamFormat.extensions = null;
const routeStub = {
- data: observableOf({
+ data: of({
bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat),
}),
};
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
index f932d832775..f53ae710321 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
@@ -30,9 +30,9 @@ import { FormatFormComponent } from '../format-form/format-form.component';
selector: 'ds-edit-bitstream-format',
templateUrl: './edit-bitstream-format.component.html',
imports: [
+ AsyncPipe,
FormatFormComponent,
TranslateModule,
- AsyncPipe,
],
standalone: true,
})
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 4ee61c35d57..0b32cc466c9 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -14,7 +14,7 @@ import { RouterLink } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { FormBuilderService } from 'src/app/shared/form/builder/form-builder.service';
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
@@ -178,7 +178,7 @@ describe('MetadataRegistryComponent', () => {
}));
it('should cancel editing the selected schema when clicked again', waitForAsync(() => {
- comp.activeMetadataSchema$ = observableOf(mockSchemasList[0] as MetadataSchema);
+ comp.activeMetadataSchema$ = of(mockSchemasList[0] as MetadataSchema);
spyOn(registryService, 'cancelEditMetadataSchema');
row.click();
fixture.detectChanges();
@@ -193,7 +193,7 @@ describe('MetadataRegistryComponent', () => {
beforeEach(() => {
spyOn(registryService, 'deleteMetadataSchema').and.callThrough();
- comp.selectedMetadataSchemaIDs$ = observableOf(selectedSchemas.map((selectedSchema: MetadataSchema) => selectedSchema.id));
+ comp.selectedMetadataSchemaIDs$ = of(selectedSchemas.map((selectedSchema: MetadataSchema) => selectedSchema.id));
comp.deleteSchemas();
fixture.detectChanges();
});
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 8e5adeddf7a..9f69a78bb75 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -43,12 +43,12 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
templateUrl: './metadata-registry.component.html',
styleUrls: ['./metadata-registry.component.scss'],
imports: [
- MetadataSchemaFormComponent,
- TranslateModule,
AsyncPipe,
- PaginationComponent,
+ MetadataSchemaFormComponent,
NgClass,
+ PaginationComponent,
RouterLink,
+ TranslateModule,
],
standalone: true,
})
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index f98e2743241..5a4b4d162c7 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -9,7 +9,7 @@ import {
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
import { RegistryService } from '../../../../core/registry/registry.service';
@@ -72,7 +72,7 @@ describe('MetadataSchemaFormComponent', () => {
describe('without an active schema', () => {
beforeEach(() => {
- component.activeMetadataSchema$ = observableOf(undefined);
+ component.activeMetadataSchema$ = of(undefined);
component.onSubmit();
fixture.detectChanges();
});
@@ -91,7 +91,7 @@ describe('MetadataSchemaFormComponent', () => {
} as MetadataSchema);
beforeEach(() => {
- component.activeMetadataSchema$ = observableOf(expectedWithId);
+ component.activeMetadataSchema$ = of(expectedWithId);
component.onSubmit();
fixture.detectChanges();
});
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 139f711920b..ebc8e0675c6 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -37,8 +37,8 @@ import { FormComponent } from '../../../../shared/form/form.component';
templateUrl: './metadata-schema-form.component.html',
imports: [
AsyncPipe,
- TranslateModule,
FormComponent,
+ TranslateModule,
],
standalone: true,
})
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index c799d87b26a..93a19405b49 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,4 +1,4 @@
-@if (registryService.getActiveMetadataField() | async) {
+@if (activeMetadataField$ | async) {
{{messagePrefix + '.edit' | translate}}
} @else {
{{messagePrefix + '.create' | translate}}
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index 440f52a24d8..0816c9ee4dd 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -9,7 +9,7 @@ import {
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
@@ -86,7 +86,7 @@ describe('MetadataFieldFormComponent', () => {
describe('without an active field', () => {
beforeEach(() => {
- spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(undefined));
+ spyOn(registryService, 'getActiveMetadataField').and.returnValue(of(undefined));
component.onSubmit();
fixture.detectChanges();
});
@@ -107,7 +107,7 @@ describe('MetadataFieldFormComponent', () => {
});
beforeEach(() => {
- spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(expectedWithId));
+ spyOn(registryService, 'getActiveMetadataField').and.returnValue(of(expectedWithId));
component.onSubmit();
fixture.detectChanges();
});
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 63f93961bef..f1f18090008 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -19,7 +19,7 @@ import {
TranslateModule,
TranslateService,
} from '@ngx-translate/core';
-import { combineLatest } from 'rxjs';
+import { Observable } from 'rxjs';
import { take } from 'rxjs/operators';
import { MetadataField } from '../../../../core/metadata/metadata-field.model';
@@ -32,9 +32,9 @@ import { FormComponent } from '../../../../shared/form/form.component';
selector: 'ds-metadata-field-form',
templateUrl: './metadata-field-form.component.html',
imports: [
+ AsyncPipe,
FormComponent,
TranslateModule,
- AsyncPipe,
],
standalone: true,
})
@@ -109,6 +109,8 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
*/
@Output() submitForm: EventEmitter
= new EventEmitter();
+ activeMetadataField$: Observable;
+
constructor(public registryService: RegistryService,
private formBuilderService: FormBuilderService,
private translateService: TranslateService) {
@@ -117,71 +119,65 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
/**
* Initialize the component, setting up the necessary Models for the dynamic form
*/
- ngOnInit() {
- combineLatest([
- this.translateService.get(`${this.messagePrefix}.element`),
- this.translateService.get(`${this.messagePrefix}.qualifier`),
- this.translateService.get(`${this.messagePrefix}.scopenote`),
- ]).subscribe(([element, qualifier, scopenote]) => {
- this.element = new DynamicInputModel({
- id: 'element',
- label: element,
- name: 'element',
- validators: {
- required: null,
- pattern: '^[^. ,]*$',
- maxLength: 64,
- },
- required: true,
- errorMessages: {
- pattern: 'error.validation.metadata.element.invalid-pattern',
- maxLength: 'error.validation.metadata.element.max-length',
- },
- });
- this.qualifier = new DynamicInputModel({
- id: 'qualifier',
- label: qualifier,
- name: 'qualifier',
- validators: {
- pattern: '^[^. ,]*$',
- maxLength: 64,
- },
- required: false,
- errorMessages: {
- pattern: 'error.validation.metadata.qualifier.invalid-pattern',
- maxLength: 'error.validation.metadata.qualifier.max-length',
- },
- });
- this.scopeNote = new DynamicTextAreaModel({
- id: 'scopeNote',
- label: scopenote,
- name: 'scopeNote',
- required: false,
- rows: 5,
- });
- this.formModel = [
- new DynamicFormGroupModel(
- {
- id: 'metadatadatafieldgroup',
- group:[this.element, this.qualifier, this.scopeNote],
- }),
- ];
- this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
- this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => {
- if (field == null) {
- this.clearFields();
- } else {
- this.formGroup.patchValue({
- metadatadatafieldgroup: {
- element: field.element,
- qualifier: field.qualifier,
- scopeNote: field.scopeNote,
- },
- });
- this.element.disabled = true;
- this.qualifier.disabled = true;
- }
- });
+ ngOnInit(): void {
+ this.activeMetadataField$ = this.registryService.getActiveMetadataField();
+ this.element = new DynamicInputModel({
+ id: 'element',
+ label: this.translateService.instant(`${this.messagePrefix}.element`),
+ name: 'element',
+ validators: {
+ required: null,
+ pattern: '^[^. ,]*$',
+ maxLength: 64,
+ },
+ required: true,
+ errorMessages: {
+ pattern: 'error.validation.metadata.element.invalid-pattern',
+ maxLength: 'error.validation.metadata.element.max-length',
+ },
+ });
+ this.qualifier = new DynamicInputModel({
+ id: 'qualifier',
+ label: this.translateService.instant(`${this.messagePrefix}.qualifier`),
+ name: 'qualifier',
+ validators: {
+ pattern: '^[^. ,]*$',
+ maxLength: 64,
+ },
+ required: false,
+ errorMessages: {
+ pattern: 'error.validation.metadata.qualifier.invalid-pattern',
+ maxLength: 'error.validation.metadata.qualifier.max-length',
+ },
+ });
+ this.scopeNote = new DynamicTextAreaModel({
+ id: 'scopeNote',
+ label: this.translateService.instant(`${this.messagePrefix}.scopenote`),
+ name: 'scopeNote',
+ required: false,
+ rows: 5,
+ });
+ this.formModel = [
+ new DynamicFormGroupModel({
+ id: 'metadatadatafieldgroup',
+ group:[this.element, this.qualifier, this.scopeNote],
+ }),
+ ];
+ this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+ this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => {
+ if (field == null) {
+ this.clearFields();
+ } else {
+ this.formGroup.patchValue({
+ metadatadatafieldgroup: {
+ element: field.element,
+ qualifier: field.qualifier,
+ scopeNote: field.scopeNote,
+ },
+ });
+ this.element.disabled = true;
+ this.qualifier.disabled = true;
+ }
});
}
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index 5885bde2b0d..8457c67c118 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -11,7 +11,7 @@ import { ActivatedRoute } from '@angular/router';
import { RouterTestingModule } from '@angular/router/testing';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
import { buildPaginatedList } from '../../../core/data/paginated-list.model';
@@ -224,7 +224,7 @@ describe('MetadataSchemaComponent', () => {
}));
it('should cancel editing the selected field when clicked again', waitForAsync(() => {
- comp.activeField$ = observableOf(mockFieldsList[2] as MetadataField);
+ comp.activeField$ = of(mockFieldsList[2] as MetadataField);
spyOn(registryService, 'cancelEditMetadataField');
row.click();
fixture.detectChanges();
@@ -239,7 +239,7 @@ describe('MetadataSchemaComponent', () => {
beforeEach(() => {
spyOn(registryService, 'deleteMetadataField').and.callThrough();
- comp.selectedMetadataFieldIDs$ = observableOf(selectedFields.map((metadataField: MetadataField) => metadataField.id));
+ comp.selectedMetadataFieldIDs$ = of(selectedFields.map((metadataField: MetadataField) => metadataField.id));
comp.deleteFields();
fixture.detectChanges();
});
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 52f927073f5..984988b199f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -19,7 +19,7 @@ import {
BehaviorSubject,
combineLatest,
Observable,
- of as observableOf,
+ of,
Subscription,
zip,
} from 'rxjs';
@@ -53,12 +53,12 @@ import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field
styleUrls: ['./metadata-schema.component.scss'],
imports: [
AsyncPipe,
- VarDirective,
MetadataFieldFormComponent,
- TranslateModule,
- PaginationComponent,
NgClass,
+ PaginationComponent,
RouterLink,
+ TranslateModule,
+ VarDirective,
],
standalone: true,
})
@@ -126,7 +126,7 @@ export class MetadataSchemaComponent implements OnDestroy, OnInit {
*/
private updateFields() {
this.metadataFields$ = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
- switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, observableOf(currentPagination)])),
+ switchMap((currentPagination) => combineLatest([this.metadataSchema$, this.needsUpdate$, of(currentPagination)])),
switchMap(([schema, update, currentPagination]: [MetadataSchema, boolean, PaginationComponentOptions]) => {
if (update) {
this.needsUpdate$.next(false);
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
index ae4df271ae6..4c0025a0dc4 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -18,7 +18,7 @@ import {
TranslateLoader,
TranslateModule,
} from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
@@ -80,7 +80,7 @@ describe('FiltersComponent', () => {
describe('toggle', () => {
beforeEach(() => {
- spyOn(component, 'getFilteredCollections').and.returnValue(observableOf(expected));
+ spyOn(component, 'getFilteredCollections').and.returnValue(of(expected));
spyOn(component.results, 'deserialize');
spyOn(component.accordionComponent, 'expand').and.callThrough();
component.submit();
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index 85924dd82fa..a4b14e930a8 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -30,10 +30,10 @@ import { FilteredCollections } from './filtered-collections.model';
templateUrl: './filtered-collections.component.html',
styleUrls: ['./filtered-collections.component.scss'],
imports: [
- TranslateModule,
- NgbAccordionModule,
FiltersComponent,
KeyValuePipe,
+ NgbAccordionModule,
+ TranslateModule,
],
standalone: true,
})
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts
index d9627dff701..d7a93f02bb2 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.spec.ts
@@ -11,7 +11,7 @@ import { By } from '@angular/platform-browser';
import { Router } from '@angular/router';
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
+import { of } from 'rxjs';
import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
@@ -59,7 +59,7 @@ describe('FilteredItemsExportCsvComponent', () => {
invoke: createSuccessfulRemoteDataObject$(process),
});
authorizationDataService = jasmine.createSpyObj('authorizationService', {
- isAuthorized: observableOf(true),
+ isAuthorized: of(true),
});
notificationsService = new NotificationsServiceStub();
@@ -110,7 +110,7 @@ describe('FilteredItemsExportCsvComponent', () => {
describe('when the user is not an admin', () => {
beforeEach(waitForAsync(() => {
initBeforeEachAsync();
- (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+ (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(of(false));
}));
beforeEach(() => {
initBeforeEach();
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts
index 50a0ca32b7d..977f325fdd5 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.ts
@@ -35,7 +35,11 @@ import { QueryPredicate } from '../query-predicate.model';
styleUrls: ['./filtered-items-export-csv.component.scss'],
templateUrl: './filtered-items-export-csv.component.html',
standalone: true,
- imports: [NgbTooltipModule, AsyncPipe, TranslateModule],
+ imports: [
+ AsyncPipe,
+ NgbTooltipModule,
+ TranslateModule,
+ ],
})
/**
* Display a button to export the MetadataQuery (aka Filtered Items) Report results as csv
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index dd3f45c216d..e515999003e 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -15,7 +15,7 @@