mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-15 14:03:06 +00:00
119915: Changed the dspace.entity.type textarea with a select to prevent incorrect values
This commit is contained in:
@@ -0,0 +1,5 @@
|
|||||||
|
<select class="form-control" [(ngModel)]="mdValue?.newValue.value" (ngModelChange)="confirm.emit(false)">
|
||||||
|
<option *ngFor="let entity of (entities$ | async)" [value]="entity.label === 'none' ? undefined : entity.label">
|
||||||
|
{{ entity.label }}
|
||||||
|
</option>
|
||||||
|
</select>
|
@@ -0,0 +1,32 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
import { DsoEditMetadataEntityFieldComponent } from './dso-edit-metadata-entity-field.component';
|
||||||
|
import { EntityTypeDataServiceStub } from '../../../../shared/testing/entity-type-data.service.stub';
|
||||||
|
import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service';
|
||||||
|
|
||||||
|
describe('DsoEditMetadataEntityFieldComponent', () => {
|
||||||
|
let component: DsoEditMetadataEntityFieldComponent;
|
||||||
|
let fixture: ComponentFixture<DsoEditMetadataEntityFieldComponent>;
|
||||||
|
|
||||||
|
let entityTypeService: EntityTypeDataServiceStub;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
entityTypeService = new EntityTypeDataServiceStub();
|
||||||
|
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
declarations: [
|
||||||
|
DsoEditMetadataEntityFieldComponent,
|
||||||
|
],
|
||||||
|
providers: [
|
||||||
|
{ provide: EntityTypeDataService, useValue: entityTypeService },
|
||||||
|
],
|
||||||
|
}).compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(DsoEditMetadataEntityFieldComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
@@ -0,0 +1,38 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { editMetadataValueFieldComponent } from '../dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator';
|
||||||
|
import { EditMetadataValueFieldType } from '../dso-edit-metadata-field-type.enum';
|
||||||
|
import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
|
||||||
|
import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
|
||||||
|
import { AbstractDsoEditMetadataValueFieldComponent } from '../abstract-dso-edit-metadata-value-field.component';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The component used to gather input for entity-type metadata fields
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'ds-dso-edit-metadata-entity-field',
|
||||||
|
templateUrl: './dso-edit-metadata-entity-field.component.html',
|
||||||
|
styleUrls: ['./dso-edit-metadata-entity-field.component.scss'],
|
||||||
|
})
|
||||||
|
@editMetadataValueFieldComponent(EditMetadataValueFieldType.ENTITY_TYPE)
|
||||||
|
export class DsoEditMetadataEntityFieldComponent extends AbstractDsoEditMetadataValueFieldComponent implements OnInit {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List of all the existing entity types
|
||||||
|
*/
|
||||||
|
entities$: Observable<ItemType[]>;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
protected entityTypeService: EntityTypeDataService,
|
||||||
|
) {
|
||||||
|
super();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.entities$ = this.entityTypeService.findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
|
||||||
|
getFirstSucceededRemoteListPayload(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -3,4 +3,5 @@
|
|||||||
*/
|
*/
|
||||||
export enum EditMetadataValueFieldType {
|
export enum EditMetadataValueFieldType {
|
||||||
PLAIN_TEXT = 'PLAIN_TEXT',
|
PLAIN_TEXT = 'PLAIN_TEXT',
|
||||||
|
ENTITY_TYPE = 'ENTITY_TYPE',
|
||||||
}
|
}
|
||||||
|
@@ -146,6 +146,9 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
|
|||||||
* Retrieves the {@link EditMetadataValueFieldType} to be displayed for the current field while in edit mode.
|
* Retrieves the {@link EditMetadataValueFieldType} to be displayed for the current field while in edit mode.
|
||||||
*/
|
*/
|
||||||
getFieldType(): EditMetadataValueFieldType {
|
getFieldType(): EditMetadataValueFieldType {
|
||||||
|
if (this.mdField === 'dspace.entity.type') {
|
||||||
|
return EditMetadataValueFieldType.ENTITY_TYPE;
|
||||||
|
}
|
||||||
return EditMetadataValueFieldType.PLAIN_TEXT;
|
return EditMetadataValueFieldType.PLAIN_TEXT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -10,9 +10,11 @@ import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-e
|
|||||||
import { DsoEditMetadataValueFieldLoaderComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component';
|
import { DsoEditMetadataValueFieldLoaderComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component';
|
||||||
import { DsoEditMetadataTextFieldComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-text-field/dso-edit-metadata-text-field.component';
|
import { DsoEditMetadataTextFieldComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-text-field/dso-edit-metadata-text-field.component';
|
||||||
import { DsoEditMetadataValueFieldLoaderDirective } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.directive';
|
import { DsoEditMetadataValueFieldLoaderDirective } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.directive';
|
||||||
|
import { DsoEditMetadataEntityFieldComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component';
|
||||||
|
|
||||||
const ENTRY_COMPONENTS = [
|
const ENTRY_COMPONENTS = [
|
||||||
DsoEditMetadataTextFieldComponent,
|
DsoEditMetadataTextFieldComponent,
|
||||||
|
DsoEditMetadataEntityFieldComponent,
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
19
src/app/shared/testing/entity-type-data.service.stub.ts
Normal file
19
src/app/shared/testing/entity-type-data.service.stub.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { FindListOptions } from '../../core/data/find-list-options.model';
|
||||||
|
import { FollowLinkConfig } from '../utils/follow-link-config.model';
|
||||||
|
import { ItemType } from '../../core/shared/item-relationships/item-type.model';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { RemoteData } from '../../core/data/remote-data';
|
||||||
|
import { PaginatedList } from '../../core/data/paginated-list.model';
|
||||||
|
import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
|
||||||
|
import { createPaginatedList } from './utils.test';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stub class {@link EntityTypeDataService}
|
||||||
|
*/
|
||||||
|
export class EntityTypeDataServiceStub {
|
||||||
|
|
||||||
|
public findAll(_options?: FindListOptions, _useCachedVersionIfAvailable?: boolean, _reRequestOnStale?: boolean, ..._linksToFollow: FollowLinkConfig<ItemType>[]): Observable<RemoteData<PaginatedList<ItemType>>> {
|
||||||
|
return createSuccessfulRemoteDataObject$(createPaginatedList());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Reference in New Issue
Block a user