hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed relationship specific labels in modal and cleaned up existing code

Browse Source
This commit is contained in:
lotte
2020-01-02 13:46:31 +01:00
parent 3dfba2ad12
commit 3e9eb9eedc
10 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
resources/i18n/en.json5
View File

@@ -1557,31 +1557,31 @@
"submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Author": "Search for Authors",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Search for Authors",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Search for Journals",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Search for Journals",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Issue": "Search for Journal Issues",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Search for Journal Issues",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Volume": "Search for Journal Volumes",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Search for Journal Volumes",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding Agency": "Search for Funding Agencies",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding": "Search for Funding",
"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
"submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
"submission.sections.describe.relationship-lookup.title.Journal Issue": "Journal Issues",
"submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
"submission.sections.describe.relationship-lookup.title.Journal Volume": "Journal Volumes",
"submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
"submission.sections.describe.relationship-lookup.title.Journal": "Journals",
"submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
"submission.sections.describe.relationship-lookup.title.Author": "Authors",
"submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
"submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
"submission.sections.describe.relationship-lookup.title.Funding": "Funding",
"submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
"submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
@@ -1589,13 +1589,17 @@
"submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
"submission.sections.describe.relationship-lookup.selection-tab.title.Author": "Selected Authors",
"submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
"submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
"submission.sections.describe.relationship-lookup.selection-tab.title.Journal Volume": "Selected Journal Volume",
"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
"submission.sections.describe.relationship-lookup.selection-tab.title.Journal Issue": "Selected Issue",
"submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
"submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
"submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
"submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",

3
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
View File

@@ -248,7 +248,6 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
this.subs.push(item$.subscribe((item) => this.item = item));
const value = Object.assign(new MetadataValue(), this.model.value);
console.log(value);
if (hasValue(value) && value.isVirtual) {
this.relationshipValue$ = this.relationshipService.findById(value.virtualValue)
.pipe(
@@ -317,7 +316,6 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
* Open a modal where the user can select relationships to be added to item being submitted
*/
openLookup() {
console.log(this.model);
this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
size: 'lg'
});
@@ -328,7 +326,6 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
modalComp.repeatable = this.model.repeatable;
modalComp.listId = this.listId;
modalComp.relationshipOptions = this.model.relationship;
modalComp.label = this.model.label;
modalComp.metadataFields = this.model.metadataFields;
modalComp.item = this.item;
}

6
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
View File

@@ -1,5 +1,5 @@
<div class="modal-header">
<h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + label) | translate }}</h4>
<h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
<button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
(click)="modal.dismiss()">
<span aria-hidden="true">&times;</span>
@@ -7,7 +7,7 @@
</div>
<div class="modal-body">
<ngb-tabset>
<ngb-tab [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + label | translate">
<ngb-tab [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate">
<ng-template ngbTabContent>
<ds-dynamic-lookup-relation-search-tab
[selection$]="selection$"
@@ -27,7 +27,7 @@
<ds-dynamic-lookup-relation-selection-tab
[selection$]="selection$"
[listId]="listId"
[label]="label"
[relationshipType]="relationshipOptions.relationshipType"
[repeatable]="repeatable"
[context]="context"
(selectObject)="select($event)"

1
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
View File

@@ -34,7 +34,6 @@ import { Context } from '../../../../../core/shared/context.model';
* Represents a modal where the submitter can select items to be added as a certain relationship type to the object being submitted
*/
export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy {
label: string;
relationshipOptions: RelationshipOptions;
listId: string;
item;

2
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
View File

@@ -8,7 +8,7 @@
{{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
</div>
<div *ngIf="(selectionRD$ | async)?.payload.page.length >= 1">
<h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + label | translate}}</h3>
<h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
<ds-viewable-collection [objects]="selectionRD$ | async"
[selectable]="true"
[selectionConfig]="{ repeatable: repeatable, listId: listId }"

2
src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
View File

@@ -29,7 +29,7 @@ import { Context } from '../../../../../../core/shared/context.model';
* Tab for inside the lookup model that represents the currently selected relationships
*/
export class DsDynamicLookupRelationSelectionTabComponent {
@Input() label: string;
@Input() relationshipType: string;
@Input() listId: string;
@Input() repeatable: boolean;
@Input() selection$: Observable<ListableObject[]>;

7
src/app/shared/form/builder/form-builder.service.spec.ts
View File

@@ -435,13 +435,12 @@ describe('FormBuilderService test suite', () => {
expect((formModel[2] as DynamicRowGroupModel).get(0) instanceof DynamicTypeaheadModel).toBe(true);
});
fit('should return form\'s fields value from form model', () => {
it('should return form\'s fields value from form model', () => {
const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
let value = {} as any;
let value = {} as any;
console.log(service.getValueFromModel(formModel));
expect(service.getValueFromModel(formModel)).toEqual(value);
console.log('first test');
((formModel[0] as DynamicRowGroupModel).get(1) as DsDynamicInputModel).valueUpdates.next('test');
value = {

5
src/app/shared/form/builder/form-builder.service.ts
View File

@@ -124,6 +124,7 @@ export class FormBuilderService extends DynamicFormService {
const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): void => {
let iterateResult = Object.create({});
// Iterate over all group's controls
for (const controlModel of findGroupModel) {
@@ -139,7 +140,6 @@ export class FormBuilderService extends DynamicFormService {
if (this.isRowArrayGroup(controlModel)) {
for (const arrayItemModel of (controlModel as DynamicRowArrayModel).groups) {
iterateResult = mergeWith(iterateResult, iterateControlModels(arrayItemModel.group, arrayItemModel.index), customizer);
}
continue;
@@ -147,8 +147,6 @@ export class FormBuilderService extends DynamicFormService {
if (this.isArrayGroup(controlModel)) {
iterateResult[controlModel.name] = [];
console.log((controlModel as DynamicFormArrayModel).groups);
for (const arrayItemModel of (controlModel as DynamicFormArrayModel).groups) {
iterateResult[controlModel.name].push(iterateControlModels(arrayItemModel.group, arrayItemModel.index));
}
@@ -199,6 +197,7 @@ export class FormBuilderService extends DynamicFormService {
return iterateResult;
};
result = iterateControlModels(groupModel);
return result;

1
src/app/shared/form/builder/parsers/disabled-field-parser.ts
View File

@@ -8,7 +8,6 @@ import { DsDynamicDisabledModelConfig, DynamicDisabledModel } from '../ds-dynami
export class DisabledFieldParser extends FieldParser {
public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
console.log(fieldValue);
const emptyModelConfig: DsDynamicDisabledModelConfig = this.initModel(null, label);
this.setValues(emptyModelConfig, fieldValue);
return new DynamicDisabledModel(emptyModelConfig)

2
src/app/shared/form/builder/parsers/field-parser.ts
View File

@@ -32,8 +32,6 @@ export abstract class FieldParser {
public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
public parse() {
console.log(this.configData);
if (((this.getInitValueCount() > 1 && !this.configData.repeatable) || (this.configData.repeatable))
&& (this.configData.input.type !== 'list')
&& (this.configData.input.type !== 'tag')