Skip to content

The open alternative to Salesforce, designed for AI.

Fix application author display when the manifest carries an npm-style author object (#27918)

martmull998ecea47c35
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts
index 28d429ee3f3..66e418e879a 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts
@@ -4,6 +4,7 @@ import { AdminResolver } from 'src/engine/api/graphql/graphql-config/decorators/
import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.service';
import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
import { type AdminApplicationRegistrationListItem } from 'src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto';
+import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';
import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';
@AdminResolver(() => ApplicationRegistrationEntity)
@@ -48,7 +49,7 @@ export class AdminPanelApplicationRegistrationResolver {
@ResolveField(() => String, { nullable: true })
author(@Parent() registration: ApplicationRegistrationEntity): string | null {
- return registration.author;
+ return getApplicationAuthorDisplayName(registration.author);
}
@ResolveField(() => String, { nullable: true })
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts
index e853626d4a7..24bd7a13541 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-marketplace/marketplace-query.service.ts
@@ -21,6 +21,7 @@ import {
ApplicationRegistrationExceptionCode,
} from 'src/engine/core-modules/application/application-registration/application-registration.exception';
import { ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';
+import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';
import { ApplicationService } from 'src/engine/core-modules/application/application.service';
@Injectable()
@@ -116,9 +117,9 @@ export class MarketplaceQueryService {
registration.manifest?.application?.description ??
undefined,
author:
- registration.author ??
- registration.manifest?.application?.author ??
- undefined,
+ getApplicationAuthorDisplayName(
+ registration.author ?? registration.manifest?.application?.author,
+ ) ?? undefined,
category:
registration.category ??
registration.manifest?.application?.category ??
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
index 78ec6381117..a747c734f7b 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.service.ts
@@ -45,6 +45,7 @@ import {
import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
import { buildRegistrationManifestUpdateFields } from 'src/engine/core-modules/application/application-registration/utils/build-registration-manifest-update-fields.util';
import { fromManifestApplicationToDisplayFields } from 'src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util';
+import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';
import { serializeApplicationRegistrationForBroadcast } from 'src/engine/core-modules/application/application-registration/utils/serialize-application-registration-for-broadcast.util';
import { sortApplicationRegistrationsForAdmin } from 'src/engine/core-modules/application/application-registration/utils/sort-application-registrations-for-admin.util';
import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';
@@ -1058,7 +1059,7 @@ export class ApplicationRegistrationService {
sourcePackage: registration.sourcePackage,
isVetted: registration.isVetted,
description: registration.description,
- author: registration.author,
+ author: getApplicationAuthorDisplayName(registration.author),
category: registration.category,
logoUrl:
this.applicationRegistrationAssetUrlService.buildLogoUrl(registration),
@@ -1242,7 +1243,7 @@ export class ApplicationRegistrationService {
logoUrl:
this.applicationRegistrationAssetUrlService.buildLogoUrl(registration),
description: registration.description,
- author: registration.author,
+ author: getApplicationAuthorDisplayName(registration.author),
isOwned: isDefined(registration.ownerWorkspaceId),
};
}
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-author-display-name.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-author-display-name.util.spec.ts
new file mode 100644
index 00000000000..772927ca877
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-author-display-name.util.spec.ts
@@ -0,0 +1,52 @@
+import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';
+
+describe('getApplicationAuthorDisplayName', () => {
+ it('should return a plain author string as is', () => {
+ expect(getApplicationAuthorDisplayName('Excelium Tech')).toBe(
+ 'Excelium Tech',
+ );
+ });
+
+ it('should trim surrounding whitespace', () => {
+ expect(getApplicationAuthorDisplayName(' Excelium Tech ')).toBe(
+ 'Excelium Tech',
+ );
+ });
+
+ it('should return the name of a serialized npm-style author object', () => {
+ expect(
+ getApplicationAuthorDisplayName(
+ '{"name":"akacores","url":"https://github.com/akacores"}',
+ ),
+ ).toBe('akacores');
+ });
+
+ it('should return the name of an npm-style author object', () => {
+ expect(
+ getApplicationAuthorDisplayName({
+ name: 'akacores',
+ email: '[email protected]',
+ }),
+ ).toBe('akacores');
+ });
+
+ it('should return null for an author object without a name', () => {
+ expect(
+ getApplicationAuthorDisplayName('{"url":"https://github.com/akacores"}'),
+ ).toBeNull();
+ expect(getApplicationAuthorDisplayName({ url: 'https://x.y' })).toBeNull();
+ });
+
+ it('should keep a string that only looks like JSON', () => {
+ expect(getApplicationAuthorDisplayName('{not json')).toBe('{not json');
+ });
+
+ it('should return null for empty or non-string values', () => {
+ expect(getApplicationAuthorDisplayName(null)).toBeNull();
+ expect(getApplicationAuthorDisplayName(undefined)).toBeNull();
+ expect(getApplicationAuthorDisplayName('')).toBeNull();
+ expect(getApplicationAuthorDisplayName(' ')).toBeNull();
+ expect(getApplicationAuthorDisplayName(42)).toBeNull();
+ expect(getApplicationAuthorDisplayName(['akacores'])).toBeNull();
+ });
+});
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util.ts
index c34e55eda2f..2092c1a779e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/from-manifest-application-to-display-fields.util.ts
@@ -1,5 +1,6 @@
import { type ApplicationManifest } from 'twenty-shared/application';
+import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';
import { type ApplicationRegistrationGalleryImage } from 'src/engine/core-modules/application/application-registration/types/application-registration-gallery-image.type';
import { toGalleryImagePaths } from 'src/engine/core-modules/application/application-registration/utils/to-gallery-image-paths.util';
@@ -8,7 +9,7 @@ export const fromManifestApplicationToDisplayFields = (
) => ({
logo: application?.logo ?? application?.logoUrl ?? null,
description: application?.description ?? null,
- author: application?.author ?? null,
+ author: getApplicationAuthorDisplayName(application?.author),
category: application?.category ?? null,
websiteUrl: application?.websiteUrl ?? null,
aboutDescription: application?.aboutDescription ?? null,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util.ts
new file mode 100644
index 00000000000..ec777840960
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util.ts
@@ -0,0 +1,35 @@
+import { isNonEmptyString } from '@sniptt/guards';
+import { isPlainObject, parseJson } from 'twenty-shared/utils';
+
+const getAuthorNameFromObject = (author: Record<string, unknown>) =>
+ isNonEmptyString(author.name) && author.name.trim().length > 0
+ ? author.name.trim()
+ : null;
+
+export const getApplicationAuthorDisplayName = (
+ author: unknown,
+): string | null => {
+ if (isPlainObject(author)) {
+ return getAuthorNameFromObject(author);
+ }
+
+ if (!isNonEmptyString(author)) {
+ return null;
+ }
+
+ const trimmedAuthor = author.trim();
+
+ if (trimmedAuthor.length === 0) {
+ return null;
+ }
+
+ if (!trimmedAuthor.startsWith('{')) {
+ return trimmedAuthor;
+ }
+
+ const parsedAuthor = parseJson<unknown>(trimmedAuthor);
+
+ return isPlainObject(parsedAuthor)
+ ? getAuthorNameFromObject(parsedAuthor)
+ : trimmedAuthor;
+};