Skip to content
Permalink
Browse files
fix(text-value): resource-instance-form and display-edit components n…
…ow correctly display a paragraph text with line breaks (#584)
  • Loading branch information
mdelez committed Nov 11, 2021
1 parent a8badb1 commit be9d6f4ea76cfc90852237ff916bac8b4a7e99d3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
@@ -1,5 +1,5 @@
<span [ngSwitch]="property.objectType">
<app-text-value-as-string #createVal *ngSwitchCase="'ReadTextValueAsString'" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName" [textArea]="textArea"></app-text-value-as-string>
<app-text-value-as-string #createVal *ngSwitchCase="'ReadTextValueAsString'" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName" [guiElement]="textValueGuiEle"></app-text-value-as-string>
<app-text-value-as-xml #createVal *ngSwitchCase="'ReadTextValueAsXml'" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-text-value-as-xml>
<app-int-value #createVal *ngSwitchCase="constants.IntValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName"></app-int-value>
<app-boolean-value #createVal *ngSwitchCase="constants.BooleanValue" [mode]="mode" [valueRequiredValidator]="isRequiredProp" [parentForm]="parentForm" [formName]="formName" [moreSpace]="true"></app-boolean-value>
@@ -2,6 +2,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { Constants, ReadResource, ResourcePropertyDefinition } from '@dasch-swiss/dsp-js';
import { BaseValueDirective } from 'src/app/main/directive/base-value.directive';
import { ValueService } from '../../../services/value.service';

@Component({
selector: 'app-switch-properties',
@@ -23,19 +24,23 @@ export class SwitchPropertiesComponent implements OnInit {
@Input() isRequiredProp: boolean;

mode = 'create';
textArea = false;

// gui element in case of textValue
textValueGuiEle: 'simpleText' | 'textArea' | 'richText';

constants = Constants;

constructor() { }
constructor(
private _valueService: ValueService
) { }

ngOnInit(): void {

// the input isRequiredProp provided by KeyValuePair is stored as a number
// a conversion from a number to a boolean is required by the input valueRequiredValidator
this.isRequiredProp = !!+this.isRequiredProp;
if(this.property.guiElement === Constants.SalsahGui + Constants.HashDelimiter + 'Textarea') {
this.textArea = true;
}

this.textValueGuiEle = this._valueService.getTextValueGuiEle(this.property.guiElement);
}

saveNewValue() {
@@ -1,5 +1,5 @@
<span *ngIf="mode === 'read'; else showForm" class="read-mode-view">
<span class="rm-value" [innerHtml]="valueFormControl.value | appLinkify"></span>
<span class="rm-value text-value" [innerHtml]="valueFormControl.value | appLinkify" style="white-space: pre-wrap;"></span>
<span class="rm-comment" *ngIf="shouldShowComment">{{commentFormControl.value}}</span>
</span>
<ng-template #showForm>
@@ -6,6 +6,10 @@
display: block;
margin: 0px;
}

.rm-value.text-value {
white-space: pre-wrap;
}
}

.child-value-component,

0 comments on commit be9d6f4

Please sign in to comment.