Merge pull request #245 from ivareri/display_uuid

Display uuid on task description

Author: wurstbrot

src/app/component/task-description/task-description.component.html

@@ -10,6 +10,15 @@ <h1>
   </div>
 
   <mat-accordion multi="true">
+    <mat-expansion-panel>
+      <mat-expansion-panel-header>
+        <mat-panel-title>
+          <b>UUID</b>
+        </mat-panel-title>
+      </mat-expansion-panel-header>
+      <p [innerHTML]="currentTask.uuid"></p>
+    </mat-expansion-panel>
+
     <mat-expansion-panel [expanded]="true">
       <mat-expansion-panel-header>
         <mat-panel-title>

src/app/component/task-description/task-description.component.spec.ts

@@ -40,13 +40,22 @@ describe('TaskDescriptionComponent', () => {
     expect(heading.textContent).toContain(testSubDimension);
   });
 
+  it('check if UUID is being genenrated', () => {
+    const testUUID = '00000000-0000-0000-0000-000000000000';
+    component.currentTask.uuid = testUUID;
+    fixture.detectChanges();
+    const HTMLElement: HTMLElement = fixture.nativeElement;
+    const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
+    expect(contentDisplayedinParagraphTag[0].textContent).toContain(testUUID);
+  });
+
   it('check if description is being genenrated', () => {
     const testDescription = 'Sample Description';
     component.currentTask.description = testDescription;
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[0].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[1].textContent).toContain(
       testDescription
     );
   });
@@ -57,7 +66,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[1].textContent).toContain(testRisk);
+    expect(contentDisplayedinParagraphTag[2].textContent).toContain(testRisk);
   });
 
   it('check if measure is being genenrated', () => {
@@ -66,7 +75,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[2].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[3].textContent).toContain(
       testMeasure
     );
   });
@@ -77,7 +86,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[3].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[4].textContent).toContain(
       testImplementationGuide
     );
   });
@@ -88,7 +97,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[6].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[7].textContent).toContain(
       testEvidence
     );
   });
@@ -99,7 +108,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[7].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[8].textContent).toContain(
       testAssessment
     );
   });
@@ -110,7 +119,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[10].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[11].textContent).toContain(
       testComments
     );
   });
@@ -125,7 +134,7 @@ describe('TaskDescriptionComponent', () => {
     fixture.detectChanges();
     const HTMLElement: HTMLElement = fixture.nativeElement;
     const contentDisplayedinParagraphTag = HTMLElement.querySelectorAll('p')!;
-    expect(contentDisplayedinParagraphTag[9].textContent).toContain(
+    expect(contentDisplayedinParagraphTag[10].textContent).toContain(
       component.SAMMVersion +
         testSAMM[0] +
         component.ISOVersion +

src/app/component/task-description/task-description.component.ts

@@ -16,6 +16,7 @@ export interface taskDescription {
   level: string;
   tags: string[];
   taskName: string;
+  uuid: string;
   description: string;
   risk: string;
   measure: string;
@@ -47,6 +48,7 @@ export class TaskDescriptionComponent implements OnInit {
     level: '',
     tags: [''],
     taskName: '',
+    uuid: '',
     description: '',
     risk: '',
     measure: '',
@@ -107,6 +109,7 @@ export class TaskDescriptionComponent implements OnInit {
         data['description'],
         ''
       );
+      this.currentTask.uuid = this.defineStringValues(data['uuid'], '');
       this.currentTask.risk = this.defineStringValues(data['risk'], '');
       this.currentTask.tags = this.defineStringArrayValues(data['tags'], []);
       this.currentTask.measure = this.defineStringValues(data['measure'], '');