@eventcatalog/core 3.44.1 → 3.44.2

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-MFLSPCEA.js";
-import "../chunk-EPDZMVQ3.js";
+} from "../chunk-LIIOK6SZ.js";
+import "../chunk-THDZCUFV.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-DKKPJ3QM.js";
-import "../chunk-MFLSPCEA.js";
+} from "../chunk-BLJ5FRR3.js";
+import "../chunk-LIIOK6SZ.js";
 import "../chunk-DAOXTQVS.js";
-import "../chunk-EPDZMVQ3.js";
+import "../chunk-THDZCUFV.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-DKKPJ3QM.js → chunk-BLJ5FRR3.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-MFLSPCEA.js";
+} from "./chunk-LIIOK6SZ.js";
 import {
   countResources,
   serializeCounts

package/dist/{chunk-L26L4Y5J.js → chunk-IU3D7JRW.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EPDZMVQ3.js";
+} from "./chunk-THDZCUFV.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-MFLSPCEA.js → chunk-LIIOK6SZ.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EPDZMVQ3.js";
+} from "./chunk-THDZCUFV.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-3UVY6YHH.js → chunk-RUACTEJR.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-L26L4Y5J.js";
+} from "./chunk-IU3D7JRW.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-EPDZMVQ3.js → chunk-THDZCUFV.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-EPDZMVQ3.js";
+} from "./chunk-THDZCUFV.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -13,8 +13,8 @@ import {
 } from "./chunk-3H2RT3CM.js";
 import {
   log_build_default
-} from "./chunk-DKKPJ3QM.js";
-import "./chunk-MFLSPCEA.js";
+} from "./chunk-BLJ5FRR3.js";
+import "./chunk-LIIOK6SZ.js";
 import "./chunk-DAOXTQVS.js";
 import {
   catalogToAstro
@@ -28,13 +28,13 @@ import {
 } from "./chunk-B7HCX5HM.js";
 import {
   generate
-} from "./chunk-3UVY6YHH.js";
+} from "./chunk-RUACTEJR.js";
 import {
   logger
-} from "./chunk-L26L4Y5J.js";
+} from "./chunk-IU3D7JRW.js";
 import {
   VERSION
-} from "./chunk-EPDZMVQ3.js";
+} from "./chunk-THDZCUFV.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/generate.cjs

@@ -108,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-3UVY6YHH.js";
-import "./chunk-L26L4Y5J.js";
-import "./chunk-EPDZMVQ3.js";
+} from "./chunk-RUACTEJR.js";
+import "./chunk-IU3D7JRW.js";
+import "./chunk-THDZCUFV.js";
 import "./chunk-6QENHZZP.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "3.44.1";
+var version = "3.44.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-L26L4Y5J.js";
-import "../chunk-EPDZMVQ3.js";
+} from "../chunk-IU3D7JRW.js";
+import "../chunk-THDZCUFV.js";
 export {
   logger
 };

package/eventcatalog/src/components/EnvironmentDropdown.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, it } from 'vitest';
+import { buildEnvironmentUrl, findCurrentEnvironment } from './EnvironmentDropdown';
+
+const environments = [
+  {
+    name: 'Development',
+    url: 'https://example.com/event-catalog/dev',
+    shortName: 'Dev',
+  },
+  {
+    name: 'UAT',
+    url: 'https://example.com/event-catalog/uat',
+    shortName: 'UAT',
+  },
+  {
+    name: 'Production',
+    url: 'https://example.com/event-catalog/prod',
+    shortName: 'Prod',
+  },
+];
+
+describe('EnvironmentDropdown', () => {
+  it('finds the current environment when environments share an origin but use different base paths', () => {
+    expect(findCurrentEnvironment(environments, 'https://example.com/event-catalog/uat/services/foo')?.name).toBe('UAT');
+  });
+
+  it('builds environment urls by replacing the current environment base path', () => {
+    expect(
+      buildEnvironmentUrl(
+        'https://example.com/event-catalog/prod',
+        'https://example.com/event-catalog/uat/services/foo',
+        'https://example.com/event-catalog/uat'
+      )
+    ).toBe('https://example.com/event-catalog/prod/services/foo');
+  });
+
+  it('preserves search params and hashes when switching environments', () => {
+    expect(
+      buildEnvironmentUrl(
+        'https://example.com/event-catalog/prod',
+        'https://example.com/event-catalog/uat/services/foo?tab=messages#latest',
+        'https://example.com/event-catalog/uat'
+      )
+    ).toBe('https://example.com/event-catalog/prod/services/foo?tab=messages#latest');
+  });
+
+  it('keeps existing origin based environment switching for root catalogs', () => {
+    expect(
+      buildEnvironmentUrl('https://prod.example.com', 'https://uat.example.com/services/foo', 'https://uat.example.com')
+    ).toBe('https://prod.example.com/services/foo');
+  });
+
+  it('switches from a root catalog to a subpath catalog', () => {
+    expect(buildEnvironmentUrl('https://example.com/prod', 'https://example.com/services/foo', 'https://example.com')).toBe(
+      'https://example.com/prod/services/foo'
+    );
+  });
+
+  it('preserves the current path when the current environment is unknown', () => {
+    expect(buildEnvironmentUrl('https://example.com/prod', 'http://localhost:3000/services/foo')).toBe(
+      'https://example.com/prod/services/foo'
+    );
+  });
+});

package/eventcatalog/src/components/EnvironmentDropdown.tsx

@@ -11,20 +11,56 @@ interface EnvironmentDropdownProps {
   environments: Environment[];
 }
 
+const stripTrailingSlash = (pathname: string) => pathname.replace(/\/$/, '') || '/';
+
+const startsWithPath = (pathname: string, basePathname: string) =>
+  basePathname === '/' || pathname === basePathname || pathname.startsWith(`${basePathname}/`);
+
+export const findCurrentEnvironment = (environments: Environment[], currentHref: string) => {
+  const currentUrl = new URL(currentHref);
+
+  return (
+    environments
+      .filter((env) => {
+        const envUrl = new URL(env.url, currentUrl.href);
+        const envPathname = stripTrailingSlash(envUrl.pathname);
+
+        return envUrl.origin === currentUrl.origin && startsWithPath(currentUrl.pathname, envPathname);
+      })
+      .sort(
+        (a, b) =>
+          stripTrailingSlash(new URL(b.url, currentUrl.href).pathname).length -
+          stripTrailingSlash(new URL(a.url, currentUrl.href).pathname).length
+      )[0] || null
+  );
+};
+
+export const buildEnvironmentUrl = (environmentUrl: string, currentHref: string, currentEnvironmentUrl?: string) => {
+  const currentUrl = new URL(currentHref);
+  const targetUrl = new URL(environmentUrl, currentUrl.href);
+  const targetBasePathname = stripTrailingSlash(targetUrl.pathname);
+  const currentBasePathname = currentEnvironmentUrl
+    ? stripTrailingSlash(new URL(currentEnvironmentUrl, currentUrl.href).pathname)
+    : undefined;
+  const pathWithinEnvironment =
+    currentBasePathname && currentBasePathname !== '/' && startsWithPath(currentUrl.pathname, currentBasePathname)
+      ? currentUrl.pathname.slice(currentBasePathname.length)
+      : currentUrl.pathname;
+
+  targetUrl.pathname = `${targetBasePathname}${pathWithinEnvironment}`.replace(/\/+/g, '/');
+  targetUrl.search = currentUrl.search;
+  targetUrl.hash = currentUrl.hash;
+
+  return targetUrl.toString();
+};
+
 export const EnvironmentDropdown: React.FC<EnvironmentDropdownProps> = ({ environments }) => {
   const [isOpen, setIsOpen] = useState(false);
   const [currentEnvironment, setCurrentEnvironment] = useState<Environment | null>(null);
   const dropdownRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    // Check if current URL matches any environment
-    const currentUrl = window.location.origin;
-    const matchedEnv = environments.find((env) => {
-      // Normalize URLs for comparison
-      const envUrl = new URL(env.url).origin;
-      return envUrl === currentUrl;
-    });
-    setCurrentEnvironment(matchedEnv || null);
+    setCurrentEnvironment(findCurrentEnvironment(environments, window.location.href));
   }, [environments]);
 
   useEffect(() => {
@@ -99,11 +135,7 @@ export const EnvironmentDropdown: React.FC<EnvironmentDropdownProps> = ({ enviro
               href={env.url}
               onClick={(e) => {
                 e.preventDefault();
-                // Construct the full URL with the current path when clicked
-                const currentPath = window.location.pathname + window.location.search + window.location.hash;
-                const targetUrl = new URL(env.url);
-                targetUrl.pathname = currentPath;
-                window.location.href = targetUrl.toString();
+                window.location.href = buildEnvironmentUrl(env.url, window.location.href, currentEnvironment?.url);
               }}
               className={`block rounded-xl px-3 py-3 transition-colors ${
                 isCurrentEnv

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "3.44.1",
+  "version": "3.44.2",
   "publishConfig": {
     "access": "public"
   },