Merge pull request #164 from GSA/feature/pointing_to_art_api_dev

ART Modal is Back!

Author: BuckinghamAJ

src/app/solicitation/summary/results-detail/art-modal/art-modal.component.html

@@ -1,4 +1,4 @@
-<p-button (click)="showDialog()" id="art" icon="pi pi-external-link" label="Take Action: Get 508 Language" class="btn usa-button usa-button--accent-warm"></p-button>
+<p-button (click)="showDialog()" id="art" icon="pi pi-external-link" label="Get 508 Language" class="btn usa-button usa-button--accent-warm"></p-button>
 <p-dialog header="Get 508 Language" 
      [(visible)]="visible"
      [style]="{width: '50vw'}" 

src/app/solicitation/summary/results-detail/art-modal/art-modal.component.spec.ts

@@ -35,4 +35,16 @@ describe('ArtIframeDialogComponent', () => {
   it('should create', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should clear art_body on clearAll', () => {
+    component.art_body = { someKey: 'someValue' };
+    component.clearAll();
+    expect(component.art_body).toEqual({});
+  });
+
+  it('should clear art_body on updateLanguage', () => {
+    component.art_body = { someKey: 'someValue' };
+    component.updateLanguage();
+    expect(component.art_body).toEqual({});
+  });
 });

src/app/solicitation/summary/results-detail/art-modal/art-modal.component.ts

@@ -177,7 +177,7 @@ export class ArtIframeDialogComponent {
   }
 
   processCategory(category){
-    console.log('category (processCategory):', category)
+    console.debug('category (processCategory):', category)
 
     let artBody = {}
 
@@ -202,16 +202,16 @@ export class ArtIframeDialogComponent {
       artBody[category.art_api] = true
     }
 
-    console.log('Art Body (processCategory):', artBody)
+    console.debug('Art Body (processCategory):', artBody)
 
     return artBody
 
   }
 
   createARTBody(){
     // Make ART JSON body in structure shown above
-    //console.log('selected Categories:', this.selectedCategories)
-    //console.log('selected SubCategories:', this.selectedSubcategories)
+    //console.debug('selected Categories:', this.selectedCategories)
+    //console.debug('selected SubCategories:', this.selectedSubcategories)
 
     this.categories.forEach(category => {
 
@@ -226,8 +226,8 @@ export class ArtIframeDialogComponent {
 
   onSubmit(): void {
     // Process ART data here
-    console.log('Selected Categories:', this.selectedCategories)
-    console.log('Selected Subcategories:', this.selectedSubcategories)
+    console.debug('Selected Categories:', this.selectedCategories)
+    console.debug('Selected Subcategories:', this.selectedSubcategories)
 
     if (this.selectedCategories.length === 0 && this.selectedSubcategories.length === 0) {
       this.alert_display = 'inherit'
@@ -239,32 +239,34 @@ export class ArtIframeDialogComponent {
 
     this.createARTBody()
 
-    console.log('Art Body:', this.art_body)
+    console.debug('Art Body:', this.art_body)
 
 
     this.artService.getArtLanguage(this.art_body)
       .subscribe({
         next: data => {
-          console.log('Art Language Data:', data)
+          console.debug('Art Language Data:', data)
           this.art_language = data;
 
           if (data) {
             this.display = 'inherit'
             this.solicitationService.postSolicitationART(this.solicitationId, data).subscribe({
-              next: (response) => console.log('Post Solicitation ART Response:', response),
+              next: (response) => console.debug('Post Solicitation ART Response:', response),
               error: (error) => console.error('Post Solicitation ART Error:', error)
             })
 
           }
 
+          this.art_body = {};
+
         },
         error: error => {
           let errors: string[] = [];
 
           const replaceFieldNames = (error: string, fieldNames: { [key: string]: string }): string => {
             return error.replace(/'([^']+)'/g, (match, p1) => {
-              console.log('Match:', match)
-              console.log('P1:', p1)
+              console.debug('Match:', match)
+              console.debug('P1:', p1)
               const parts = p1.split('.');
               const art_api = parts[parts.length - 1];
               return fieldNames[art_api] ? `'${fieldNames[art_api]}'` : match;
@@ -283,14 +285,15 @@ export class ArtIframeDialogComponent {
         }
       });
 
-      console.log('Art Language:', this.art_language)
+      console.debug('Art Language:', this.art_language)
   }
 
   clearAll() {
     this.selectedCategories = [];
     this.selectedSubcategories = [];
     this.display = 'none';
     this.art_language = null;
+    this.art_body = {};
 
     this.categories.forEach(category => {
       category.isChecked = false
@@ -319,7 +322,7 @@ export class ArtIframeDialogComponent {
   }
 
   onCategoryChange(selected) {
-    console.log('Selected:', selected)
+    console.debug('Selected:', selected)
 
     this.selectedCategories = selected.selectedCategories;
     let parent = selected.parent;
@@ -332,13 +335,13 @@ export class ArtIframeDialogComponent {
 
     } 
 
-    console.log('Selected Subcategories:', this.selectedSubcategories)
+    console.debug('Selected Subcategories:', this.selectedSubcategories)
   }
 
   copyToClipBoard(elem) {
     navigator.clipboard.writeText(elem.innerText)
       .then(() => {
-        console.log('Text copied to clipboard');
+        console.debug('Text copied to clipboard');
         // Additional code after copying to clipboard
       })
       .catch((error) => {
@@ -371,6 +374,7 @@ export class ArtIframeDialogComponent {
     }
 
     this.art_language = []; // Remove art language
+    this.art_body = {}; // Remove art body
     this.display = 'none';
   }
 

src/app/solicitation/summary/results-detail/results-detail.component.html

@@ -24,14 +24,17 @@ <h1 class="font-sans-xl margin-bottom-2">{{solicitation.title}}</h1>
               <div *ngIf="solicitation.reviewRec !== 'Compliant'">
                 <div class="grid-row padding-top-2">
                   <div class="tablet:grid-col-8">
+                    <!-- 
                     <a class="btn usa-button usa-button--accent-warm" 
                     href="https://app.buyaccessible.gov/"
                     target="_blank"
                     rel="noopener noreferrer">
                     <i class="pi pi-external-link"></i>Get 508 Language</a>
+                    -->
                     <!-- Hotfix: Commented out the following line to prevent the ART modal from appearing for time being
-                      <app-art-modal></app-art-modal>
+                     
                     -->
+                    <app-art-modal></app-art-modal>
                   </div>
                 </div>
               </div>

src/environments/environment.dev.ts

@@ -8,7 +8,7 @@ export const environment = {
   SERVER_URL: 'https://srt-server-dev.app.cloud.gov/api',
   EMAIL_NOTIFICATION: true,
   FILE_UPLOAD_API: 'http://srt-server-dev.app.cloud.gov/file/upload',
-  ART_API_SERVER:'https://art-api.app.cloud.gov',
+  ART_API_SERVER:'https://art-api-dev.app.cloud.gov',
   USE_CLIENT_EMAIL: true,
   ENVIRONMENT: 'dev',
   feature_flags: {

src/environments/environment.local.ts

@@ -9,7 +9,7 @@ export const environment = {
   SERVER_URL: 'http://localhost:3000/api',
   EMAIL_NOTIFICATION: true,
   FILE_UPLOAD_API: 'http://localhost:3000/file/upload',
-  ART_API_SERVER:'https://art-api.app.cloud.gov',
+  ART_API_SERVER:'https://art-api-dev.app.cloud.gov',
   needToken: false,
   USE_CLIENT_EMAIL: true,
   ENVIRONMENT: 'local',

src/environments/environment.staging.ts

@@ -8,7 +8,7 @@ export const environment = {
   SERVER_URL: 'https://srt-server-staging.app.cloud.gov/api',
   EMAIL_NOTIFICATION: true,
   FILE_UPLOAD_API: 'http://srt-server-staging.app.cloud.gov/file/upload',
-  ART_API_SERVER:'https://art-api.app.cloud.gov',
+  ART_API_SERVER:'https://art-api-dev.app.cloud.gov',
   USE_CLIENT_EMAIL: true,
   ENVIRONMENT: 'staging',
   feature_flags: {