Skip to content

Commit 77b66a5

Browse files
119915: Changed the dspace.entity.type textarea with a select to prevent incorrect values
1 parent 2ba3f0b commit 77b66a5

8 files changed

Lines changed: 100 additions & 0 deletions

File tree

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<select class="form-control" [(ngModel)]="mdValue?.newValue.value" (ngModelChange)="confirm.emit(false)">
2+
<option *ngFor="let entity of (entities$ | async)" [value]="entity.label === 'none' ? undefined : entity.label">
3+
{{ entity.label }}
4+
</option>
5+
</select>

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component.scss

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
import { DsoEditMetadataEntityFieldComponent } from './dso-edit-metadata-entity-field.component';
3+
import { EntityTypeDataServiceStub } from '../../../../shared/testing/entity-type-data.service.stub';
4+
import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service';
5+
6+
describe('DsoEditMetadataEntityFieldComponent', () => {
7+
let component: DsoEditMetadataEntityFieldComponent;
8+
let fixture: ComponentFixture<DsoEditMetadataEntityFieldComponent>;
9+
10+
let entityTypeService: EntityTypeDataServiceStub;
11+
12+
beforeEach(async () => {
13+
entityTypeService = new EntityTypeDataServiceStub();
14+
15+
await TestBed.configureTestingModule({
16+
declarations: [
17+
DsoEditMetadataEntityFieldComponent,
18+
],
19+
providers: [
20+
{ provide: EntityTypeDataService, useValue: entityTypeService },
21+
],
22+
}).compileComponents();
23+
24+
fixture = TestBed.createComponent(DsoEditMetadataEntityFieldComponent);
25+
component = fixture.componentInstance;
26+
fixture.detectChanges();
27+
});
28+
29+
it('should create', () => {
30+
expect(component).toBeTruthy();
31+
});
32+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { Component, OnInit } from '@angular/core';
2+
import { editMetadataValueFieldComponent } from '../dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field.decorator';
3+
import { EditMetadataValueFieldType } from '../dso-edit-metadata-field-type.enum';
4+
import { EntityTypeDataService } from '../../../../core/data/entity-type-data.service';
5+
import { Observable } from 'rxjs';
6+
import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
7+
import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
8+
import { AbstractDsoEditMetadataValueFieldComponent } from '../abstract-dso-edit-metadata-value-field.component';
9+
10+
/**
11+
* The component used to gather input for entity-type metadata fields
12+
*/
13+
@Component({
14+
selector: 'ds-dso-edit-metadata-entity-field',
15+
templateUrl: './dso-edit-metadata-entity-field.component.html',
16+
styleUrls: ['./dso-edit-metadata-entity-field.component.scss'],
17+
})
18+
@editMetadataValueFieldComponent(EditMetadataValueFieldType.ENTITY_TYPE)
19+
export class DsoEditMetadataEntityFieldComponent extends AbstractDsoEditMetadataValueFieldComponent implements OnInit {
20+
21+
/**
22+
* List of all the existing entity types
23+
*/
24+
entities$: Observable<ItemType[]>;
25+
26+
constructor(
27+
protected entityTypeService: EntityTypeDataService,
28+
) {
29+
super();
30+
}
31+
32+
ngOnInit(): void {
33+
this.entities$ = this.entityTypeService.findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
34+
getFirstSucceededRemoteListPayload(),
35+
);
36+
}
37+
38+
}

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-field-type.enum.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
*/
44
export enum EditMetadataValueFieldType {
55
PLAIN_TEXT = 'PLAIN_TEXT',
6+
ENTITY_TYPE = 'ENTITY_TYPE',
67
}

src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
146146
* Retrieves the {@link EditMetadataValueFieldType} to be displayed for the current field while in edit mode.
147147
*/
148148
getFieldType(): EditMetadataValueFieldType {
149+
if (this.mdField === 'dspace.entity.type') {
150+
return EditMetadataValueFieldType.ENTITY_TYPE;
151+
}
149152
return EditMetadataValueFieldType.PLAIN_TEXT;
150153
}
151154

src/app/dso-shared/dso-shared.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-e
1010
import { DsoEditMetadataValueFieldLoaderComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.component';
1111
import { DsoEditMetadataTextFieldComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-text-field/dso-edit-metadata-text-field.component';
1212
import { DsoEditMetadataValueFieldLoaderDirective } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-value-field-loader/dso-edit-metadata-value-field-loader.directive';
13+
import { DsoEditMetadataEntityFieldComponent } from './dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-entity-field/dso-edit-metadata-entity-field.component';
1314

1415
const ENTRY_COMPONENTS = [
1516
DsoEditMetadataTextFieldComponent,
17+
DsoEditMetadataEntityFieldComponent,
1618
];
1719

1820
@NgModule({
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { FindListOptions } from '../../core/data/find-list-options.model';
2+
import { FollowLinkConfig } from '../utils/follow-link-config.model';
3+
import { ItemType } from '../../core/shared/item-relationships/item-type.model';
4+
import { Observable } from 'rxjs';
5+
import { RemoteData } from '../../core/data/remote-data';
6+
import { PaginatedList } from '../../core/data/paginated-list.model';
7+
import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
8+
import { createPaginatedList } from './utils.test';
9+
10+
/**
11+
* Stub class {@link EntityTypeDataService}
12+
*/
13+
export class EntityTypeDataServiceStub {
14+
15+
public findAll(_options?: FindListOptions, _useCachedVersionIfAvailable?: boolean, _reRequestOnStale?: boolean, ..._linksToFollow: FollowLinkConfig<ItemType>[]): Observable<RemoteData<PaginatedList<ItemType>>> {
16+
return createSuccessfulRemoteDataObject$(createPaginatedList());
17+
}
18+
19+
}

0 commit comments

Comments
 (0)