ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-16 21:53:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify click URL resolution logic

Browse Source
This commit is contained in:
gsxdsm
2026-03-02 21:30:49 -08:00
committed by gsxdsm
parent cf3d312eef
commit b2915f4de1
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/server/src/services/event-hook-service.ts
View File

@@ -588,31 +588,28 @@ export class EventHookService {
eventType: context.eventType, eventType: context.eventType,
}; };
// Build click URL with deep-link if project context is available // Resolve click URL: action-level overrides endpoint default
let clickUrl = action.clickUrl; let clickUrl = action.clickUrl || endpoint.defaultClickUrl;
if (!clickUrl && endpoint.defaultClickUrl) {
clickUrl = endpoint.defaultClickUrl; // Apply deep-link parameters to the resolved click URL
// If we have a project path and the click URL looks like the server URL, if (clickUrl && context.projectPath) {
// append deep-link path
if (context.projectPath && clickUrl) {
try { try {
const url = new URL(clickUrl); const url = new URL(clickUrl);
// Add featureId as query param for deep linking to board with feature output modal // Add featureId as query param for deep linking to board with feature output modal
if (context.featureId) { if (context.featureId) {
url.pathname = '/board'; url.pathname = '/board';
url.searchParams.set('featureId', context.featureId); url.searchParams.set('featureId', context.featureId);
} else if (context.projectPath) { } else {
url.pathname = '/board'; url.pathname = '/board';
} }
clickUrl = url.toString(); clickUrl = url.toString();
} catch (error) { } catch (error) {
// If URL parsing fails, log warning and use as-is // If URL parsing fails, log warning and use as-is
logger.warn( logger.warn(
`Failed to parse defaultClickUrl "${clickUrl}" for deep linking: ${error instanceof Error ? error.message : String(error)}` `Failed to parse click URL "${clickUrl}" for deep linking: ${error instanceof Error ? error.message : String(error)}`
); );
} }
} }
}
logger.info(`Executing ntfy hook "${hookName}" to endpoint "${endpoint.name}"`); logger.info(`Executing ntfy hook "${hookName}" to endpoint "${endpoint.name}"`);

11
apps/server/tests/unit/services/event-hook-service.test.ts
View File

@@ -1246,7 +1246,9 @@ describe('EventHookService', () => {
const options = mockFetch.mock.calls[0][1]; const options = mockFetch.mock.calls[0][1];
// Hook values should override endpoint defaults // Hook values should override endpoint defaults
expect(options.headers['Tags']).toBe('override-emoji,override-tag'); expect(options.headers['Tags']).toBe('override-emoji,override-tag');
expect(options.headers['Click']).toBe('https://override.example.com'); // Click URL uses hook-specific base URL with deep link params applied
expect(options.headers['Click']).toContain('https://override.example.com/board');
expect(options.headers['Click']).toContain('featureId=feat-1');
expect(options.headers['Priority']).toBe('5'); expect(options.headers['Priority']).toBe('5');
}); });
@@ -1359,7 +1361,7 @@ describe('EventHookService', () => {
expect(clickUrl).not.toContain('featureId='); expect(clickUrl).not.toContain('featureId=');
}); });
it('should use hook-specific click URL overriding default with featureId', async () => { it('should apply deep link params to hook-specific click URL', async () => {
mockFetch.mockResolvedValueOnce({ mockFetch.mockResolvedValueOnce({
ok: true, ok: true,
status: 200, status: 200,
@@ -1409,8 +1411,9 @@ describe('EventHookService', () => {
const options = mockFetch.mock.calls[0][1]; const options = mockFetch.mock.calls[0][1];
const clickUrl = options.headers['Click']; const clickUrl = options.headers['Click'];
// Should use the hook-specific click URL (not modified with featureId since it's a custom URL) // Should use the hook-specific click URL with deep link params applied
expect(clickUrl).toBe('https://custom.example.com/custom-page'); expect(clickUrl).toContain('https://custom.example.com/board');
expect(clickUrl).toContain('featureId=feat-789');
}); });
it('should preserve existing query params when adding featureId', async () => { it('should preserve existing query params when adding featureId', async () => {