ENG-0000 - Another Locator Context Fix

I apologize to the Universe.
alertlogic · Jul 28, 2023 · 6297f4e · 6297f4e
1 parent 2b29896
commit 6297f4e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lib/nucleus/src/common/types/al-locator.types.ts b/lib/nucleus/src/common/types/al-locator.types.ts
@@ -600,11 +600,13 @@ export class AlLocatorMatrix implements AlLocationContext
                     if ( ! correctedLocationId ) {
                         correctedLocationId = alternatives[0];
                     }
-                    this.residency = AlInsightLocations[correctedLocationId].residency;
+                    this.residency = AlInsightLocations[correctedLocationId].residency || this.residency;
                     this.locationId = correctedLocationId;
                     if ( debug ) {
                         notes.push( `overrode location/residency by insight location ${this.locationId}` );
                     }
+                } else {
+                    this.residency = AlInsightLocations[this.locationId].residency || this.residency;
                 }
             }
         }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@al/core",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "Node Enterprise Packages for Alert Logic (NEPAL) Core Library",
   "main": "./bundles/al-core-nucleus.es5.js",
   "types": "./types/al-core-nucleus.d.ts",

diff --git a/tests/common/al-locator.spec.ts b/tests/common/al-locator.spec.ts
@@ -179,6 +179,16 @@ describe( 'AlLocatorMatrix', () => {
             expect( context.locator.resolveURL( AlLocation.InsightAPI, "/aims/v1/2/accounts" ) ).toEqual( "https://api.cloudinsight.alertlogic.co.uk/aims/v1/2/accounts" );
         } );
 
+        it("should infer correct context/sibling nodes for production URLs given a residency-agnostic URL and bound location", () => {
+            context.target( `https://console.alertlogic.com/#/deployments-adr/2`, null, `defender-uk-newport`, [ 'defender-uk-newport', 'insight-eu-ireland' ] );
+            let matching = context.locator.getNode( AlLocation.IncidentsUI );
+            expect( typeof( matching ) ).toBe("object");
+            expect( matching.environment ).toEqual( 'production' );
+            expect( matching.residency ).toEqual( 'EMEA' );
+            expect( matching.uri ).toEqual( "https://console.incidents.alertlogic.co.uk" );
+            expect( context.locator.resolveURL( AlLocation.InsightAPI, "/aims/v1/2/accounts" ) ).toEqual( "https://api.cloudinsight.alertlogic.co.uk/aims/v1/2/accounts" );
+        } );
+
         it("should infer correct context/sibling nodes for integration URLs", () => {
 
             //  Context inferred from integration URL