diff --git a/resources/i18n/en.json b/resources/i18n/en.json index a262a5933a..51079f94c0 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -129,28 +129,23 @@ "metadata": { "title": "DSpace Angular :: Metadata Registry", "head": "Metadata Registry", - "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema. You may extend the Dublin Core schema with additional fields or add new schemas to the registry.", + "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.", "schemas": { "table": { "namespace": "Namespace", - "name": "Name", - "caption": "List of metadata schemas" + "name": "Name" } } }, "schema": { "title": "DSpace Angular :: Metadata Schema", "head": "Metadata Schema", - "description": { - "part1": "This is the metadata schema for", - "part2": "You may add new or update existing metadata fields to this schema. Fields may also be selected for deletion or be moved to another schema." - }, + "description": "This is the metadata schema for \"{{namespace}}\".", "fields": { "head": "Schema metadata fields", "table": { "field": "Field", - "scopenote": "Scope Note", - "caption": "List of metadata fields" + "scopenote": "Scope Note" } } } diff --git a/src/app/+admin-page/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts similarity index 100% rename from src/app/+admin-page/admin-registries/admin-registries-routing.module.ts rename to src/app/+admin/admin-registries/admin-registries-routing.module.ts diff --git a/src/app/+admin-page/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts similarity index 100% rename from src/app/+admin-page/admin-registries/admin-registries.module.ts rename to src/app/+admin/admin-registries/admin-registries.module.ts diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html similarity index 91% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html index 29888d7e0f..d0c2bb5675 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.html +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html @@ -8,7 +8,6 @@
{{'admin.registries.metadata.schemas.table.namespace' | translate}} | diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts similarity index 73% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts index e243e806a2..981c253c3a 100644 --- a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts @@ -15,14 +15,14 @@ describe('MetadataRegistryComponent', () => { let metadataRegistryService: MetadataRegistryService; const mockSchemasList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", - "prefix": "dc", - "namespace": "http://dublincore.org/documents/dcmi-terms/" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", - "prefix": "mock", - "namespace": "http://dspace.org/mockschema" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); @@ -48,15 +48,15 @@ describe('MetadataRegistryComponent', () => { }); it('should contain two schemas', () => { - let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; + const tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement; expect(tbody.children.length).toBe(2); }); it('should contain the correct schemas', () => { - let dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; + const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(2)')).nativeElement; expect(dcName.textContent).toBe('dc'); - let mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; + const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(2)')).nativeElement; expect(mockName.textContent).toBe('mock'); }); diff --git a/src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts similarity index 100% rename from src/app/+admin-page/admin-registries/metadata-registry/metadata-registry.component.ts rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html similarity index 76% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html index b782562333..f07a6cc670 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.html +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html @@ -4,15 +4,11 @@
---|
{{'admin.registries.schema.fields.table.field' | translate}} | diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts similarity index 54% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts index 1d7e1cfff1..507684276e 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.spec.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts @@ -5,10 +5,11 @@ import { Observable } from 'rxjs/Observable'; import { RemoteData } from '../../../core/data/remote-data'; import { PaginatedList } from '../../../core/data/paginated-list'; import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; -import { TranslateModule } from '@ngx-translate/core'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CommonModule } from '@angular/common'; import { ActivatedRoute } from '@angular/router'; import { By } from '@angular/platform-browser'; +import { MockTranslateLoader } from '../../../shared/testing/mock-translate-loader'; describe('MetadataSchemaComponent', () => { let comp: MetadataSchemaComponent; @@ -16,51 +17,51 @@ describe('MetadataSchemaComponent', () => { let metadataRegistryService: MetadataRegistryService; const mockSchemasList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1", - "prefix": "dc", - "namespace": "http://dublincore.org/documents/dcmi-terms/" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1', + prefix: 'dc', + namespace: 'http://dublincore.org/documents/dcmi-terms/' }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2", - "prefix": "mock", - "namespace": "http://dspace.org/mockschema" + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2', + prefix: 'mock', + namespace: 'http://dspace.org/mockschema' } ]; const mockFieldsList = [ { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8", - "element": "contributor", - "qualifier": "advisor", - "scopenote": null, - "schema": mockSchemasList[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8', + element: 'contributor', + qualifier: 'advisor', + scopenote: null, + schema: mockSchemasList[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9", - "element": "contributor", - "qualifier": "author", - "scopenote": null, - "schema": mockSchemasList[0] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9', + element: 'contributor', + qualifier: 'author', + scopenote: null, + schema: mockSchemasList[0] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10", - "element": "contributor", - "qualifier": "editor", - "scopenote": "test scope note", - "schema": mockSchemasList[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10', + element: 'contributor', + qualifier: 'editor', + scopenote: 'test scope note', + schema: mockSchemasList[1] }, { - "self": "https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11", - "element": "contributor", - "qualifier": "illustrator", - "scopenote": null, - "schema": mockSchemasList[1] + self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11', + element: 'contributor', + qualifier: 'illustrator', + scopenote: null, + schema: mockSchemasList[1] } ]; const mockSchemas = Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList))); const metadataRegistryServiceStub = { getMetadataSchemas: () => mockSchemas, - getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema == schema)))), - getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix == schemaName)[0])) + getMetadataFieldsBySchema: (schema: MetadataSchema) => Observable.of(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))), + getMetadataSchemaByName: (schemaName: string) => Observable.of(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])) }; const schemaNameParam = 'mock'; const activatedRouteStub = { @@ -88,25 +89,20 @@ describe('MetadataSchemaComponent', () => { }); it('should contain the schema prefix in the header', () => { - let header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement; + const header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement; expect(header.textContent).toContain('mock'); }); - it('should contain the schema namespace in the description', () => { - let description: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #description')).nativeElement; - expect(description.textContent).toContain('http://dspace.org/mockschema'); - }); - it('should contain two fields', () => { - let tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; + const tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields>tbody')).nativeElement; expect(tbody.children.length).toBe(2); }); it('should contain the correct fields', () => { - let editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement; + const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement; expect(editorField.textContent).toBe('mock.contributor.editor'); - let illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; + const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement; expect(illustratorField.textContent).toBe('mock.contributor.illustrator'); }); }); diff --git a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts similarity index 92% rename from src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts rename to src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts index f84f1dcb13..bcb725d4ac 100644 --- a/src/app/+admin-page/admin-registries/metadata-schema/metadata-schema.component.ts +++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts @@ -13,6 +13,8 @@ import { MetadataSchema } from '../../../core/metadata/metadataschema.model'; }) export class MetadataSchemaComponent implements OnInit { + namespace; + metadataSchema: Observable
---|