fixing tests.

depot · Jan 17, 2023 · a2937a4 · a2937a4
1 parent 36902b5
commit a2937a4
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.html b/frontend/src/app/components/fhir/datatypes/binary-text/binary-text.component.html
@@ -1,3 +1,3 @@
 <div>
- <pre>{{displayModel.content}}</pre>
+ <pre>{{displayModel?.content}}</pre>
 </div>
diff --git a/frontend/src/app/components/fhir/datatypes/coding/coding.component.html b/frontend/src/app/components/fhir/datatypes/coding/coding.component.html
@@ -1,6 +1,6 @@
 <div>
- <span>{{coding.display}}</span>
- <span *ngIf="has_additional_info" [title]="coding.system">
- ({{coding.code || '?'}})
+ <span>{{coding?.display}}</span>
+ <span *ngIf="has_additional_info" [title]="coding?.system">
+ ({{coding?.code || '?'}})
  </span>
 </div>
diff --git a/frontend/src/app/components/fhir/datatypes/html/html.component.ts b/frontend/src/app/components/fhir/datatypes/html/html.component.ts
@@ -13,7 +13,7 @@ export class HtmlComponent implements OnInit {
  constructor(private sanitized: DomSanitizer) { }
 
  ngOnInit(): void {
- this.contentMarkup = this.sanitized.bypassSecurityTrustHtml(this.displayModel.content);
+ this.contentMarkup = this.sanitized.bypassSecurityTrustHtml(this.displayModel?.content);
 
  }
 

diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.html b/frontend/src/app/components/fhir/datatypes/img/img.component.html
@@ -1,3 +1,3 @@
 <div>
- <img src="data:${{displayModel.content_type}};base64,${{displayModel.data}}" alt=""/>
+ <img src="data:${{displayModel?.content_type}};base64,${{displayModel?.data}}" alt=""/>
 </div>
diff --git a/frontend/src/app/components/fhir/datatypes/img/img.component.spec.ts b/frontend/src/app/components/fhir/datatypes/img/img.component.spec.ts
@@ -18,6 +18,8 @@ describe('ImgComponent', () => {
  });
 
  it('should create', () => {
+
+
  expect(component).toBeTruthy();
  });
 });
diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html b/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.html
@@ -1,7 +1,7 @@
 <div>
  <embed
  src="data:${{displayModel.content_type}};base64,${{displayModel.data}}"
- type="${{displayModel.content_type}}"
+ type="${{displayModel?.content_type}}"
  [style]="{
  width: '100%',
  height: height

diff --git a/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.ts b/frontend/src/app/components/fhir/datatypes/pdf/pdf.component.ts
@@ -14,8 +14,11 @@ export class PdfComponent implements OnInit {
 
  ngOnInit(): void {
  const maxHeight = 600;
- const contentHeight = (1111 * this.displayModel.data.length) / (24996 / 7.5);
- this.height = Math.min(maxHeight, contentHeight);
+ if (this.displayModel){
+ const contentHeight = (1111 * this.displayModel?.data.length) / (24996 / 7.5);
+ this.height = Math.min(maxHeight, contentHeight);
+ }
+
  }
 
 }
diff --git a/frontend/src/app/components/fhir/resources/binary/binary.component.html b/frontend/src/app/components/fhir/resources/binary/binary.component.html
@@ -1,8 +1,8 @@
 <ng-container [ngTemplateOutlet]="
- displayModel.content_type == 'application/pdf' ? showPdf :
- displayModel.content_type == 'image/jpeg' ? showImg :
- (displayModel.content_type == 'text/html' || displayModel.content_type == 'application/html') ? showHtml :
- (displayModel.content_type == 'application/xml' || displayModel.content_type == 'application/json') ? showText :
+ displayModel?.content_type == 'application/pdf' ? showPdf :
+ displayModel?.content_type == 'image/jpeg' ? showImg :
+ (displayModel?.content_type == 'text/html' || displayModel?.content_type == 'application/html') ? showHtml :
+ (displayModel?.content_type == 'application/xml' || displayModel?.content_type == 'application/json') ? showText :
  showEmpty
 "></ng-container>