Changed RRA mini user guide. Grouped Results nav nodes.

CSETWebNg/src/app/app.module.ts

@@ -318,7 +318,7 @@ import { RraAnswerCountsComponent } from './assessment/results/mat-rra/rra-answe
 import { RraAnswerDistributionComponent } from './assessment/results/mat-rra/rra-answer-distribution/rra-answer-distribution.component';
 import { RraAnswerComplianceComponent } from './assessment/results/mat-rra/rra-answer-compliance/rra-answer-compliance.component';
 import { RraQuestionsScoringComponent } from './assessment/results/mat-rra/rra-questions-scoring/rra-questions-scoring.component';
-import { RraTutorialComponent } from './dialogs/rra-tutorial/rra-tutorial.component';
+import { RraMiniUserGuideComponent } from './dialogs/rra-mini-user-guide/rra-mini-user-guide.component';
 
 
 @NgModule({
@@ -591,7 +591,7 @@ import { RraTutorialComponent } from './dialogs/rra-tutorial/rra-tutorial.compon
         RraAnswerDistributionComponent,
         RraAnswerComplianceComponent,
         RraQuestionsScoringComponent,
-        RraTutorialComponent
+        RraMiniUserGuideComponent
     ],
     providers: [
         ConfigService,

CSETWebNg/src/app/dialogs/rra-tutorial/rra-tutorial.component.html → CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.html

@@ -29,7 +29,34 @@
 
     <mat-dialog-content class="oy-auto p-3 pr-0 d-flex flex-column flex-11a w-100">
 
-        <app-tutorial-rra [showNav]="false"></app-tutorial-rra>
+        <div style="max-width: 50rem">
+            <h3>Accessing the Ransomware Readiness Assessment (RRA)</h3>
+            <p>To use the RRA first follow the CSET installation instructions to properly install CSET.</p>
+            <p>Then do the following:</p>
+            <p>1. Login or start the CSET application</p>
+            <p>2. Start a new assessment</p>
+            <img src="assets/images/RRA/tutorial/ug1.png" style="width: 600px">
+            <p>Figure: New Assessment</p>
+
+
+            <span><br clear="all" /> </span>
+            <p>3. Select Maturity Model within the
+                Assessment Configuration screen (this is the first screen you’re presented with after selecting “New
+                Assessment”)</p>
+
+            <img src="assets/images/RRA/tutorial/ug2.png" style="width: 600px">
+            <p>Figure: Select Maturity Model</p>
+
+
+            <p>4. Select Ransomware Readiness Assessment
+                from the Maturity Model screen</p>
+            <img src="assets/images/RRA/tutorial/ug3.png" style="width: 600px">
+            <p>Figure: Select Ransomware Readiness Assessment</p>
+
+            <p>5. Now you are set to complete the RRA
+                assessment. Review the tutorial for additional instruction.
+            </p>
+        </div>
 
     </mat-dialog-content>
 

CSETWebNg/src/app/dialogs/rra-tutorial/rra-tutorial.component.ts → CSETWebNg/src/app/dialogs/rra-mini-user-guide/rra-mini-user-guide.component.ts

@@ -9,18 +9,18 @@ import { ConfigService } from '../../services/config.service';
  * 
  */
 @Component({
-  selector: 'app-rra-tutorial',
-  templateUrl: './rra-tutorial.component.html',
+  selector: 'app-rra-mini-user-guide',
+  templateUrl: './rra-mini-user-guide.component.html',
   // tslint:disable-next-line:use-host-property-decorator
   host: { class: 'd-flex flex-column flex-11a' }
 })
-export class RraTutorialComponent {
+export class RraMiniUserGuideComponent {
 
   /**
    * Constructor.
    */
   constructor(
-    private dialog: MatDialogRef<RraTutorialComponent>,
+    private dialog: MatDialogRef<RraMiniUserGuideComponent>,
     public configSvc: ConfigService,
     @Inject(MAT_DIALOG_DATA) public data: any
   ) { }

CSETWebNg/src/app/layout/layoutmain/layout-main.component.ts

@@ -43,7 +43,7 @@ import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
 import { ExcelExportComponent } from '../../dialogs/excel-export/excel-export.component';
 import { AggregationService } from '../../services/aggregation.service';
 import { FileUploadClientService } from '../../services/file-client.service';
-import { RraTutorialComponent } from '../../dialogs/rra-tutorial/rra-tutorial.component';
+import { RraMiniUserGuideComponent } from '../../dialogs/rra-mini-user-guide/rra-mini-user-guide.component';
 
 declare var $: any;
 
@@ -138,7 +138,7 @@ export class LayoutMainComponent implements OnInit, AfterViewInit {
     if (this.dialog.openDialogs[0]) {
       return;
     }
-    this.dialogRef = this.dialog.open(RraTutorialComponent);
+    this.dialogRef = this.dialog.open(RraMiniUserGuideComponent);
     this.dialogRef
       .afterClosed()
       .subscribe();

CSETWebNg/src/app/services/navigation.service.ts

@@ -885,81 +885,101 @@ export class NavigationService {
 
     // Results - Standards
     {
-      displayText: 'Analysis Dashboard', pageId: 'dashboard', level: 1, path: 'assessment/{:id}/results/dashboard',
+      displayText: 'Standards Results', pageId: 'standards-results-node', level: 1,
+      condition: () => {
+        return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
+      }
+    },
+    {
+      displayText: 'Analysis Dashboard', pageId: 'dashboard', level: 2, path: 'assessment/{:id}/results/dashboard',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
       }
     },
 
 
     {
-      displayText: 'Control Priorities', pageId: 'ranked-questions', level: 1, path: 'assessment/{:id}/results/ranked-questions',
+      displayText: 'Control Priorities', pageId: 'ranked-questions', level: 2, path: 'assessment/{:id}/results/ranked-questions',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
       }
     },
     {
-      displayText: 'Standards Summary', pageId: 'standards-summary', level: 1, path: 'assessment/{:id}/results/standards-summary',
+      displayText: 'Standards Summary', pageId: 'standards-summary', level: 2, path: 'assessment/{:id}/results/standards-summary',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
       }
     },
     {
-      displayText: 'Ranked Categories', pageId: 'standards-ranked', level: 1, path: 'assessment/{:id}/results/standards-ranked',
+      displayText: 'Ranked Categories', pageId: 'standards-ranked', level: 2, path: 'assessment/{:id}/results/standards-ranked',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
       }
     },
     {
-      displayText: 'Results By Category', pageId: 'standards-results', level: 1, path: 'assessment/{:id}/results/standards-results',
+      displayText: 'Results By Category', pageId: 'standards-results', level: 2, path: 'assessment/{:id}/results/standards-results',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseStandard;
       }
     },
 
     // Results - Components
     {
-      displayText: 'Components Summary', pageId: 'components-summary', level: 1, path: 'assessment/{:id}/results/components-summary',
+      displayText: 'Components Results', pageId: 'components-results-node', level: 1,
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
       }
     },
     {
-      displayText: 'Ranked Components By Category', pageId: 'components-ranked', level: 1, path: 'assessment/{:id}/results/components-ranked',
+      displayText: 'Components Summary', pageId: 'components-summary', level: 2, path: 'assessment/{:id}/results/components-summary',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
       }
     },
     {
-      displayText: 'Component Results By Category', pageId: 'components-results', level: 1, path: 'assessment/{:id}/results/components-results',
+      displayText: 'Ranked Components By Category', pageId: 'components-ranked', level: 2, path: 'assessment/{:id}/results/components-ranked',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
       }
     },
     {
-      displayText: 'Components By Component Type', pageId: 'components-types', level: 1, path: 'assessment/{:id}/results/components-types',
+      displayText: 'Component Results By Category', pageId: 'components-results', level: 2, path: 'assessment/{:id}/results/components-results',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
       }
     },
     {
-      displayText: 'Network Warnings', pageId: 'components-warnings', level: 1, path: 'assessment/{:id}/results/components-warnings',
+      displayText: 'Components By Component Type', pageId: 'components-types', level: 2, path: 'assessment/{:id}/results/components-types',
+      condition: () => {
+        return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
+      }
+    },
+    {
+      displayText: 'Network Warnings', pageId: 'components-warnings', level: 2, path: 'assessment/{:id}/results/components-warnings',
       condition: () => {
         return !!this.assessSvc.assessment && this.assessSvc.assessment?.UseDiagram;
       }
     },
 
     // ACET results pages
     {
-      displayText: 'ACET Maturity Results', pageId: 'acet-maturity', level: 1, path: 'assessment/{:id}/results/acet-maturity',
+      displayText: 'ACET Results', pageId: 'acet-results-node', level: 1,
+      condition: () => {
+        return !!this.assessSvc.assessment
+          && this.assessSvc.assessment?.UseMaturity
+          && this.assessSvc.usesMaturityModel('ACET');
+      }
+    },
+    {
+      displayText: 'ACET Maturity Results', pageId: 'acet-maturity', level: 2, path: 'assessment/{:id}/results/acet-maturity',
       condition: () => {
         return !!this.assessSvc.assessment
           && this.assessSvc.assessment?.UseMaturity
           && this.assessSvc.usesMaturityModel('ACET');
       }
     },
     {
-      displayText: 'ACET Dashboard', pageId: 'acet-dashboard', level: 1, path: 'assessment/{:id}/results/acet-dashboard',
+      displayText: 'ACET Dashboard', pageId: 'acet-dashboard', level: 2, path: 'assessment/{:id}/results/acet-dashboard',
       condition: () => {
         return !!this.assessSvc.assessment
           && this.assessSvc.assessment?.UseMaturity