Fix Cypress journey regressions

Author: mossy426-cdc

cypress/e2e/journeys/flows/default-contact-type-link-color.cy.ts

@@ -73,9 +73,14 @@ const selectPrimeOption = (selector: string, label: string): void => {
 };
 
 const closeSampleDatasetOverlay = (): void => {
-  cy.get(byTestId(testIds.appSampleDatasetButton), { timeout: 120000 })
-    .should('be.visible')
-    .click({ force: true });
+  cy.get('body').then(($body) => {
+    const continueButton = $body.find(`${byTestId(testIds.appSampleDatasetButton)}:visible`);
+    if (!continueButton.length) return;
+
+    cy.get(byTestId(testIds.appSampleDatasetButton), { timeout: 120000 })
+      .should('be.visible')
+      .click({ force: true });
+  });
 
   cy.get('#overlay', { timeout: 15000 }).should('not.be.visible');
 };

cypress/support/journey-helpers.ts

@@ -92,8 +92,6 @@ export function visitAppAndAcceptEula(options: JourneyVisitOptions = {}): void {
   }
 
   cy.get('body').then(($body) => {
-    if (!resolvedOptions.skipDemoSession) return;
-
     const continueButton = $body.find(`${byTestId(testIds.appSampleDatasetButton)}:visible`);
     if (!continueButton.length) return;
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "MicrobeTrace",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve -c development",

package.json

@@ -36,9 +36,9 @@ Use it to validate generated WAR files before handing them to DevOps.
 
 ## Typical local flow
 
-`bash scripts/tomcat/run-war-smoke.sh --skip-build --war dist/MicrobeTrace_2.2.0.war --context ROOT`
+`bash scripts/tomcat/run-war-smoke.sh --skip-build --war dist/MicrobeTrace_2.2.1.war --context ROOT`
 
-`scripts/tomcat/run-war-smoke.cmd --skip-build --war dist\\MicrobeTrace_2.2.0.war --context ROOT`
+`scripts/tomcat/run-war-smoke.cmd --skip-build --war dist\\MicrobeTrace_2.2.1.war --context ROOT`
 
 ## Package.json shortcuts
 

scripts/tomcat/README.md

@@ -158,15 +158,15 @@ export class ColorMappingService {
     // For each distinct value, see if we have a color in the “history”
     const reservedColors = new Set<string>();
     distinctValues.forEach((value) => {
-      const existingColor = variableHistory[value] ?? storedColorsByValue[value];
+      const existingColor = storedColorsByValue[value] ?? variableHistory[value];
       if (typeof existingColor === 'string') {
         reservedColors.add(existingColor);
       }
     });
 
     const usedColors = new Set<string>();
     const mappedColors = distinctValues.map((value, index) => {
-      const existingColor = variableHistory[value] ?? storedColorsByValue[value];
+      const existingColor = storedColorsByValue[value] ?? variableHistory[value];
       if (typeof existingColor === 'string') {
         variableHistory[value] = existingColor;
         usedColors.add(existingColor);

src/app/contactTraceCommonServices/color-mapping.service.ts

@@ -859,7 +859,10 @@ export class FilesComponent extends BaseComponentDirective implements OnInit {
   }
 
   private dismissWelcomeOverlay() {
-    $('#overlay').stop(true, true).fadeOut('fast');
+    const overlay = $('#overlay');
+    overlay.addClass('overlay-hidden').css('pointer-events', 'none');
+    overlay.find('.dnd-input').css('pointer-events', 'none');
+    overlay.stop(true, true).fadeOut('fast');
     $('.ui-tabview-nav').stop(true, true).fadeTo('fast', 1);
     $('.m-portlet').stop(true, true).fadeTo('fast', 1);
   }

src/app/filesComponent/files-plugin.component.ts

@@ -597,7 +597,7 @@
                     <div id="link-color-value-row" class="form-group row" title="What color should the links be?">
                       <div class="col-5"><label for="link-color">Links</label></div>
                       <div class="col-7">
-                        <input type="color" id="link-color" class="form-control form-control-sm" [(ngModel)]="SelectedLinkColorVariable" (ngModelChange)="onLinkColorChanged()">
+                        <input type="color" id="link-color" class="form-control form-control-sm" [value]="SelectedLinkColorVariable" (input)="onLinkColorChanged($any($event.target).value)" (change)="onLinkColorChanged($any($event.target).value)">
                       </div>
                     </div>
                   }

src/app/microbe-trace-next-plugin.component.html

@@ -182,7 +182,7 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
     // messages to display in loading modal
     messages: string[] = [];
 
-    version: string = '2.2';
+    version: string = '2.2.1';
     auspiceUrlVal: string|null = '';
 
     private thresholdSubscription: Subscription;
@@ -208,6 +208,15 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
 
 
     // posts: BlockchainProofHashDto[] = new Array<BlockchainProofHashDto>();
+
+    private dismissWelcomeOverlay(duration: JQuery.Duration = 'slow'): void {
+        const overlay = $('#overlay');
+        overlay.addClass('overlay-hidden').css('pointer-events', 'none');
+        overlay.find('.dnd-input').css('pointer-events', 'none');
+        overlay.stop(true, true).fadeOut(duration);
+        $('.ui-tabview-nav').stop(true, true).fadeTo(duration, 1);
+        $('.m-portlet').stop(true, true).fadeTo(duration, 1);
+    }
     // Blockchaindata: BlockchainProofHashDto = new BlockchainProofHashDto();
     date: Date;
     // Inputdownloadblock: DownloadFilteredBlockDto = new DownloadFilteredBlockDto();
@@ -1517,9 +1526,7 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
 
         // this.homepageTabs[1].isActive = false;
         this.homepageTabs[0].isActive = true;
-        $('#overlay').fadeOut();
-        $('.ui-tabview-nav').fadeTo("slow", 1);
-        $('.m-portlet').fadeTo("slow", 1);
+        this.dismissWelcomeOverlay();
         this.showExport = false;
         this.showCenter = false;
         this.showPinAllNodes = false;
@@ -1651,9 +1658,7 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
      */
      public continueClicked() : void {
         // this._removeGlView('Files');
-        $('#overlay').fadeOut("slow");
-        $('.ui-tabview-nav').fadeTo("slow", 1);
-        $('.m-portlet').fadeTo("slow", 1);
+        this.dismissWelcomeOverlay();
     }
 
     /**
@@ -2607,8 +2612,17 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
         }
     }
 
-    public onLinkColorChanged(silent: boolean = false) : void {
+    public onLinkColorChanged(valueOrSilent: string | boolean | Event = false, silent: boolean = false) : void {
+        if (typeof valueOrSilent === 'string') {
+            this.SelectedLinkColorVariable = valueOrSilent;
+        } else if (valueOrSilent instanceof Event) {
+            this.SelectedLinkColorVariable = (valueOrSilent.target as HTMLInputElement | null)?.value ?? this.SelectedLinkColorVariable;
+        } else {
+            silent = valueOrSilent;
+        }
+
         this.commonService.session.style.widgets["link-color"] = this.SelectedLinkColorVariable;
+        this.commonService.GlobalSettingsModel.SelectedLinkColorVariable = this.SelectedLinkColorVariable;
 
         if(!silent) this.publishUpdateLinkColor();
 
@@ -2618,6 +2632,12 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
     onColorLinksByChanged(silent: boolean = false) {
         this.commonService.GlobalSettingsModel.SelectedColorLinksByVariable = this.SelectedColorLinksByVariable;
         this.commonService.session.style.widgets['link-color-variable'] = this.SelectedColorLinksByVariable;
+
+        if (this.SelectedColorLinksByVariable === 'None') {
+          this.SelectedLinkColorVariable = this.commonService.session.style.widgets["link-color"] || this.SelectedLinkColorVariable;
+          this.commonService.GlobalSettingsModel.SelectedLinkColorVariable = this.SelectedLinkColorVariable;
+          this.cdref.detectChanges();
+        }
 
         this.onLinkColorTableChanged(silent);
         if (this.isKeyTableDocked('link-color')) {
@@ -4394,9 +4414,7 @@ export class MicrobeTraceNextHomeComponent extends AppComponentBase implements A
               this.homepageTabs[0].isActive = true;
               console.log("Trying to launch");
               this.homepageTabs[0].componentRef.instance.launchClick();
-              $('#overlay').fadeOut();
-              $('.ui-tabview-nav').fadeTo("slow", 1);
-              $('.m-portlet').fadeTo("slow", 1);
+              this.dismissWelcomeOverlay();
             }
           });
           break;

src/app/microbe-trace-next-plugin.component.ts

@@ -1652,6 +1652,44 @@ export class BubbleComponent extends BaseComponentDirective implements OnInit, M
     return new XMLSerializer().serializeToString(doc.documentElement);
   }
 
+  private saveGeneratedFile(content: Blob | string, filename: string): void {
+    const browserWindow = window as Window & {
+      __mtTestSaveAs?: (content: Blob | string, filename: string) => void;
+    };
+
+    if (typeof browserWindow.__mtTestSaveAs === 'function') {
+      browserWindow.__mtTestSaveAs(content, filename);
+      return;
+    }
+
+    saveAs(content as any, filename);
+  }
+
+  private dataUrlToBlob(dataUrl: string): Blob {
+    const [metadata, payload = ''] = dataUrl.split(',');
+    const mimeType = metadata.match(/^data:([^;]+);base64$/)?.[1] || 'application/octet-stream';
+    const binary = atob(payload);
+    const bytes = new Uint8Array(binary.length);
+
+    for (let index = 0; index < binary.length; index++) {
+      bytes[index] = binary.charCodeAt(index);
+    }
+
+    return new Blob([bytes], { type: mimeType });
+  }
+
+  private exportRasterVisualization(): void {
+    const scale = Number(this.SelectedBubbleExportScaleVariable) || 1;
+    const dataUrl = this.cy.png({
+      full: true,
+      scale,
+      bg: '#ffffff',
+      output: 'base64uri',
+    });
+
+    this.saveGeneratedFile(this.dataUrlToBlob(dataUrl), `${this.BubbleExportFileName}.png`);
+  }
+
   exportVisualization() {
     const exportOptions: ExportOptions = {
       filename: this.BubbleExportFileName,
@@ -1670,7 +1708,7 @@ export class BubbleComponent extends BaseComponentDirective implements OnInit, M
 
       this.exportService.requestSVGExport([], content, true, false); 
     } else {
-      this.exportService.requestExport([this.cyContainer.nativeElement], true, false);
+      this.exportRasterVisualization();
     }
     this.exportOpen = false;
   }