The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
fix: validation link for access-domains deeplinks to Invite tab (#22845)
Brahm Lower2b0b62235e64
diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.tsindex fee98531099..94b0f35068f 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.service.ts@@ -86,6 +86,7 @@ export class ApprovedAccessDomainService {workspaceId: workspace.id,}),},+ hash: 'invite',});if (!isDefined(sender.userEmail)) {diff --git a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.tsindex ebb79bc87b7..359227144c8 100644--- a/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/approved-access-domain/services/approved-access-domain.spec.ts@@ -344,6 +344,7 @@ describe('ApprovedAccessDomainService', () => {wtdId: approvedAccessDomain.id,validationToken: 'signed.jwt.token',},+ hash: 'invite',});expect(emailService.send).toHaveBeenCalledWith({diff --git a/packages/twenty-server/src/engine/core-modules/domain/domain-server-config/utils/build-url-with-pathname-and-search-params.util.ts b/packages/twenty-server/src/engine/core-modules/domain/domain-server-config/utils/build-url-with-pathname-and-search-params.util.tsindex bea0a0b890a..f8053deb716 100644--- a/packages/twenty-server/src/engine/core-modules/domain/domain-server-config/utils/build-url-with-pathname-and-search-params.util.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/domain-server-config/utils/build-url-with-pathname-and-search-params.util.ts@@ -4,12 +4,14 @@ type BuildUrlWithPathnameAndSearchParamsProps = {baseUrl: URL;pathname?: string;searchParams?: Record<string, string | number | boolean>;+ hash?: string;};export const buildUrlWithPathnameAndSearchParams = ({baseUrl,pathname,searchParams,+ hash,}: BuildUrlWithPathnameAndSearchParamsProps) => {const url = baseUrl;@@ -21,5 +23,9 @@ export const buildUrlWithPathnameAndSearchParams = ({appendSearchParamsToUrl(url, searchParams);}+ if (hash) {+ url.hash = hash;+ }+return url;};diff --git a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/__test__/workspace-domains.service.spec.ts b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/__test__/workspace-domains.service.spec.tsindex 81edd7578ca..49cc3e6523a 100644--- a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/__test__/workspace-domains.service.spec.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/__test__/workspace-domains.service.spec.ts@@ -183,6 +183,38 @@ describe('WorkspaceDomainsService', () => {expect(result.searchParams.get('foo')).toBe('bar');expect(result.searchParams.get('baz')).toBe('123');});++ it('should set the hash if provided', () => {+ jest+ .spyOn(twentyConfigService, 'get')+ .mockImplementation((key: string) => {+ const env = {+ FRONTEND_URL: 'https://example.com',+ };++ // @ts-expect-error legacy noImplicitAny+ return env[key];+ });++ const result = workspaceDomainsService.buildWorkspaceURL({+ workspace: {+ subdomain: 'test',+ customDomain: null,+ isCustomDomainEnabled: false,+ },+ pathname: '/settings/members',+ searchParams: {+ wtdId: 'domain-id',+ },+ hash: 'invite',+ });++ expect(result.hash).toBe('#invite');+ expect(result.searchParams.get('wtdId')).toBe('domain-id');+ expect(result.toString()).toBe(+ 'https://example.com/settings/members?wtdId=domain-id#invite',+ );+ });});describe('getWorkspaceByOriginOrDefaultWorkspace', () => {diff --git a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.tsindex fb6ea4d8928..cfcc76461f8 100644--- a/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts+++ b/packages/twenty-server/src/engine/core-modules/domain/workspace-domains/services/workspace-domains.service.ts@@ -31,10 +31,12 @@ export class WorkspaceDomainsService {workspace,pathname,searchParams,+ hash,}: {workspace: WorkspaceDomainConfig;pathname?: string;searchParams?: Record<string, string | number | boolean>;+ hash?: string;}) {const workspaceUrls = this.getWorkspaceUrls(workspace);@@ -42,6 +44,7 @@ export class WorkspaceDomainsService {baseUrl: new URL(workspaceUrls.customUrl ?? workspaceUrls.subdomainUrl),pathname,searchParams,+ hash,});return url;