Merge pull request #3993 from cisagov/bug/CSET-2814

cisagov · Jul 19, 2024 · 83ef244 · 83ef244
2 parents ac0e110 + 4234aaf
commit 83ef244
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 47 deletions.
diff --git a/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts b/CSETWebNg/src/app/dialogs/about-acet/about-acet.component.ts
@@ -23,10 +23,8 @@
 ////////////////////////////////
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
-import { Observable } from 'rxjs';
 
 
 @Component({

diff --git a/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts b/CSETWebNg/src/app/dialogs/about-cf/about-cf.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 

diff --git a/CSETWebNg/src/app/dialogs/about-cie/about-cie.component.ts b/CSETWebNg/src/app/dialogs/about-cie/about-cie.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 

diff --git a/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.ts b/CSETWebNg/src/app/dialogs/about-cset/about-cset.component.ts
@@ -23,10 +23,8 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
-import { Observable } from 'rxjs';
 
 @Component({
   selector: 'app-about-cset',

diff --git a/CSETWebNg/src/app/dialogs/about-renew/about-renew.component.ts b/CSETWebNg/src/app/dialogs/about-renew/about-renew.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 

diff --git a/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts b/CSETWebNg/src/app/dialogs/about-rra/about-rra.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 

diff --git a/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.ts b/CSETWebNg/src/app/dialogs/about-tsa/about-tsa.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject, OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 @Component({

diff --git a/CSETWebNg/src/app/dialogs/about/about.component.ts b/CSETWebNg/src/app/dialogs/about/about.component.ts
@@ -23,7 +23,6 @@
 ////////////////////////////////
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { environment } from '../../../environments/environment';
 import { ConfigService } from '../../services/config.service';
 import { VersionService } from '../../services/version.service';
 

diff --git a/CSETWebNg/src/app/layout/top-menus/top-menus.component.html b/CSETWebNg/src/app/layout/top-menus/top-menus.component.html
@@ -117,10 +117,6 @@
                 <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
                 <span>{{ t('menu.help.cset user guide') }}</span>
             </a>
-            <!-- <a *ngIf="isGuideVisible('ACET')" mat-menu-item target="_blank" href="{{docUrl}}htmlhelp_acet/index.htm">
-                <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
-                <span>ACET</span>
-            </a> -->
             <a *ngIf="isGuideVisible('ACET')" mat-menu-item target="_blank" href="{{docUrl}}cdDocs_ACET/UserGuide.pdf">
                 <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
                 <span>ACET</span>
@@ -130,20 +126,11 @@
                 <span class="cset-icons-pdf-doc fs-base mr-2 align-middle"></span>
                 <span>ISE User Guide</span>
             </a>
-            <a *ngIf="isGuideVisible('CMMC')" mat-menu-item target="_blank" href="{{docUrl}}htmlhelp_cmmc/index.htm">
-                <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
-                <span>CMMC 1.0</span>
-            </a>
-            <button *ngIf="isGuideVisible('RRA')" mat-menu-item (click)="ransomwareReadiness()">
-                <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
-                <span>{{t('reports.core.rra.assessment full title')}}</span>
-            </button>
             <a *ngIf="isGuideVisible('TSA')" mat-menu-item target="_blank" href="{{docUrl}}htmlhelp_tsa/index.htm">
                 <span class="cset-icons-book-open fs-base mr-2 align-middle"></span>
                 <span>TSA</span>
             </a>
 
-
             <hr class="menu-divider" />
 
             <button mat-menu-item (click)="about()">

diff --git a/CSETWebNg/src/app/reports/ise-data/ise-data.component.ts b/CSETWebNg/src/app/reports/ise-data/ise-data.component.ts
@@ -30,7 +30,6 @@ import { NCUAService } from '../../services/ncua.service';
 import { GroupingDescriptionComponent } from '../../assessment/questions/grouping-description/grouping-description.component';
 import { ObservationsService } from '../../services/observations.service';
 import { AssessmentService } from '../../services/assessment.service';
-import { environment } from '../../../environments/environment';
 import { VersionService } from '../../services/version.service';
 
 

diff --git a/CSETWebNg/src/app/services/ncua.service.ts b/CSETWebNg/src/app/services/ncua.service.ts
@@ -33,12 +33,10 @@ import { ACETService } from './acet.service';
 import { IRPService } from './irp.service';
 import { MeritCheckComponent } from '../dialogs/ise-merit/merit-check.component';
 import { Answer } from '../models/questions.model';
-import { environment } from '../../../src/environments/environment';
 import { AuthenticationService } from './authentication.service';
 import { DateAdapter } from '@angular/material/core';
 import { TranslocoService } from '@ngneat/transloco';
 import { ReportService } from './report.service';
-import { DateTime } from 'luxon';
 import { VersionService } from './version.service';
 
 let headers = {

diff --git a/CSETWebNg/src/app/services/version.service.ts b/CSETWebNg/src/app/services/version.service.ts
@@ -1,12 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { BehaviorSubject, Observable, Subject, of } from 'rxjs';
-import { map, catchError } from 'rxjs/operators';
 import { ConfigService } from './config.service';
-import { environment } from '../../environments/environment';
-// import { AppVersion } from '../models/app-version';
-import { data } from 'jquery';
-import { version } from 'os';
 
 
 const headers = {

diff --git a/CSETWebNg/src/environments/environment.prod.ts b/CSETWebNg/src/environments/environment.prod.ts
@@ -23,12 +23,6 @@
 ////////////////////////////////
 export const environment = {
   production: true,
-  appUrl: '',
-  apiUrl: '',
-  docUrl: '',
-  csetGithubApiUrl: '',
   visibleVersion: '12.2.3.0',
-  version: '12.2.3.0',
-  helpContactEmail: '',
-  helpContactPhone: ''
+  version: '12.2.3.0'
 };
diff --git a/CSETWebNg/src/environments/environment.ts b/CSETWebNg/src/environments/environment.ts
@@ -28,13 +28,5 @@
 // The list of which env maps to which file can be found in `.angular-cli.json`.
 
 export const environment = {
-  production: false,
-  appUrl: 'http://localhost:4200/',
-  apiUrl: 'https://localhost:5001/api/',
-  docUrl: 'https://localhost:5001/Documents/',
-  csetGithubApiUrl: 'https://api.github.com/repos/cisagov/cset/releases/latest',
-  visibleVersion: '12.2.3.0',
-  version: '12.2.3.0',
-  helpContactEmail: 'cset@cisa.dhs.gov',
-  helpContactPhone: ''
+  production: false
 };