The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Sort admin apps by attention and show author and install count (#27871)
martmullc2ea22127426
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 5a34415920f..e91421b2b30 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -312,9 +312,11 @@ export enum AiModelTier {export type ApplicationRegistration = {__typename?: 'ApplicationRegistration';+ author?: Maybe<Scalars['String']['output']>;createdAt: Scalars['DateTime']['output'];galleryImagesUrls: Array<Scalars['String']['output']>;id: Scalars['UUID']['output'];+ installCount: Scalars['Int']['output'];isConfigured: Scalars['Boolean']['output'];isListed: Scalars['Boolean']['output'];isPreInstalled: Scalars['Boolean']['output'];@@ -1387,7 +1389,7 @@ export type FindAllApplicationRegistrationsQueryVariables = Exact<{}>;-export type FindAllApplicationRegistrationsQuery = { __typename?: 'Query', findAllApplicationRegistrations: { __typename?: 'PaginatedApplicationRegistrations', totalCount: number, hasMore: boolean, registrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, logoUrl?: string | null, galleryImagesUrls: Array<string>, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, isListed: boolean, isVetted: boolean, isPreInstalled: boolean, isConfigured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string }> } };+export type FindAllApplicationRegistrationsQuery = { __typename?: 'Query', findAllApplicationRegistrations: { __typename?: 'PaginatedApplicationRegistrations', totalCount: number, hasMore: boolean, registrations: Array<{ __typename?: 'ApplicationRegistration', author?: string | null, installCount: number, id: string, universalIdentifier: string, name: string, logoUrl?: string | null, galleryImagesUrls: Array<string>, oAuthClientId: string, oAuthRedirectUris: Array<string>, oAuthScopes: Array<string>, sourceType: ApplicationRegistrationSourceType, sourcePackage?: string | null, latestAvailableVersion?: string | null, isListed: boolean, isVetted: boolean, isPreInstalled: boolean, isConfigured: boolean, ownerWorkspaceId?: string | null, createdAt: string, updatedAt: string }> } };export type CreateDatabaseConfigVariableMutationVariables = Exact<{key: Scalars['String']['input'];@@ -1704,7 +1706,7 @@ export const FindAdminApplicationRegistrationClaimsDocument = {"kind":"Document"export const FindAdminApplicationRegistrationInstalledWorkspacesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationInstalledWorkspaces"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"FindApplicationRegistrationInstalledWorkspacesInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAdminApplicationRegistrationInstalledWorkspaces"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"hasMore"}},{"kind":"Field","name":{"kind":"Name","value":"workspaces"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"displayName"}},{"kind":"Field","name":{"kind":"Name","value":"logo"}},{"kind":"Field","name":{"kind":"Name","value":"version"}}]}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationInstalledWorkspacesQuery, FindAdminApplicationRegistrationInstalledWorkspacesQueryVariables>;export const FindAdminApplicationRegistrationStatsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationStats"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAdminApplicationRegistrationStats"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"activeInstalls"}},{"kind":"Field","name":{"kind":"Name","value":"suspendedInstalls"}},{"kind":"Field","name":{"kind":"Name","value":"mostInstalledVersion"}},{"kind":"Field","name":{"kind":"Name","value":"versionDistribution"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"version"}},{"kind":"Field","name":{"kind":"Name","value":"count"}}]}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationStatsQuery, FindAdminApplicationRegistrationStatsQueryVariables>;export const FindAdminApplicationRegistrationVariablesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationVariables"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"applicationRegistrationId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAdminApplicationRegistrationVariables"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"applicationRegistrationId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"applicationRegistrationId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"kind":"Field","name":{"kind":"Name","value":"value"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"isSecret"}},{"kind":"Field","name":{"kind":"Name","value":"isRequired"}},{"kind":"Field","name":{"kind":"Name","value":"isDeprecated"}},{"kind":"Field","name":{"kind":"Name","value":"isFilled"}},{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"options"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationVariablesQuery, FindAdminApplicationRegistrationVariablesQueryVariables>;-export const FindAllApplicationRegistrationsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAllApplicationRegistrations"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"offset"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isPreInstalledOnly"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sourceTypes"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistrationSourceType"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isListed"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isConfigured"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAllApplicationRegistrations"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"Argument","name":{"kind":"Name","value":"offset"},"value":{"kind":"Variable","name":{"kind":"Name","value":"offset"}}},{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}},{"kind":"Argument","name":{"kind":"Name","value":"isPreInstalledOnly"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isPreInstalledOnly"}}},{"kind":"Argument","name":{"kind":"Name","value":"sourceTypes"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sourceTypes"}}},{"kind":"Argument","name":{"kind":"Name","value":"isListed"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isListed"}}},{"kind":"Argument","name":{"kind":"Name","value":"isConfigured"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isConfigured"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"registrations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"hasMore"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"galleryImagesUrls"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isVetted"}},{"kind":"Field","name":{"kind":"Name","value":"isPreInstalled"}},{"kind":"Field","name":{"kind":"Name","value":"isConfigured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>;+export const FindAllApplicationRegistrationsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAllApplicationRegistrations"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"limit"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"offset"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isPreInstalledOnly"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"sourceTypes"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistrationSourceType"}}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isListed"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"isConfigured"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAllApplicationRegistrations"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"limit"},"value":{"kind":"Variable","name":{"kind":"Name","value":"limit"}}},{"kind":"Argument","name":{"kind":"Name","value":"offset"},"value":{"kind":"Variable","name":{"kind":"Name","value":"offset"}}},{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}},{"kind":"Argument","name":{"kind":"Name","value":"isPreInstalledOnly"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isPreInstalledOnly"}}},{"kind":"Argument","name":{"kind":"Name","value":"sourceTypes"},"value":{"kind":"Variable","name":{"kind":"Name","value":"sourceTypes"}}},{"kind":"Argument","name":{"kind":"Name","value":"isListed"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isListed"}}},{"kind":"Argument","name":{"kind":"Name","value":"isConfigured"},"value":{"kind":"Variable","name":{"kind":"Name","value":"isConfigured"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"registrations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}},{"kind":"Field","name":{"kind":"Name","value":"author"}},{"kind":"Field","name":{"kind":"Name","value":"installCount"}}]}},{"kind":"Field","name":{"kind":"Name","value":"totalCount"}},{"kind":"Field","name":{"kind":"Name","value":"hasMore"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"ApplicationRegistrationFragment"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ApplicationRegistration"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"universalIdentifier"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"galleryImagesUrls"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthClientId"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthRedirectUris"}},{"kind":"Field","name":{"kind":"Name","value":"oAuthScopes"}},{"kind":"Field","name":{"kind":"Name","value":"sourceType"}},{"kind":"Field","name":{"kind":"Name","value":"sourcePackage"}},{"kind":"Field","name":{"kind":"Name","value":"latestAvailableVersion"}},{"kind":"Field","name":{"kind":"Name","value":"isListed"}},{"kind":"Field","name":{"kind":"Name","value":"isVetted"}},{"kind":"Field","name":{"kind":"Name","value":"isPreInstalled"}},{"kind":"Field","name":{"kind":"Name","value":"isConfigured"}},{"kind":"Field","name":{"kind":"Name","value":"ownerWorkspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]} as unknown as DocumentNode<FindAllApplicationRegistrationsQuery, FindAllApplicationRegistrationsQueryVariables>;export const CreateDatabaseConfigVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"CreateDatabaseConfigVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"createDatabaseConfigVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}}]}]}}]} as unknown as DocumentNode<CreateDatabaseConfigVariableMutation, CreateDatabaseConfigVariableMutationVariables>;export const DeleteDatabaseConfigVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"DeleteDatabaseConfigVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"deleteDatabaseConfigVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}}]}]}}]} as unknown as DocumentNode<DeleteDatabaseConfigVariableMutation, DeleteDatabaseConfigVariableMutationVariables>;export const UpdateDatabaseConfigVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateDatabaseConfigVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"key"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"value"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"JSON"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateDatabaseConfigVariable"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"key"},"value":{"kind":"Variable","name":{"kind":"Name","value":"key"}}},{"kind":"Argument","name":{"kind":"Name","value":"value"},"value":{"kind":"Variable","name":{"kind":"Name","value":"value"}}}]}]}}]} as unknown as DocumentNode<UpdateDatabaseConfigVariableMutation, UpdateDatabaseConfigVariableMutationVariables>;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsxindex e854698abe5..755bcacb58a 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/SettingsAdminApps.tsx@@ -14,11 +14,7 @@ import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { useState } from 'react';import { SettingsPath } from 'twenty-shared/types';-import {- assertUnreachable,- getSettingsPath,- isDefined,-} from 'twenty-shared/utils';+import { getSettingsPath, isDefined } from 'twenty-shared/utils';import { useToast } from 'twenty-ui/components/feedback';import { SearchInput } from 'twenty-ui/components/input';import { Section } from 'twenty-ui/components/layout';@@ -35,12 +31,15 @@ import { Button } from 'twenty-ui/primitives/input';import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { useDebounce } from 'use-debounce';import {- type ApplicationRegistrationFragmentFragment,ApplicationRegistrationSourceType,FindAllApplicationRegistrationsDocument,+ type FindAllApplicationRegistrationsQuery,SyncMarketplaceCatalogDocument,} from '~/generated-admin/graphql';+type AdminApplicationRegistration =+ FindAllApplicationRegistrationsQuery['findAllApplicationRegistrations']['registrations'][number];+const StyledTableContainer = styled.div`border-bottom: 1px solid ${themeCssVariables.border.color.light};margin-top: ${themeCssVariables.spacing[3]};@@ -52,8 +51,8 @@ const StyledShowMoreContainer = styled.div`margin-top: ${themeCssVariables.spacing[2]};`;-const TABLE_GRID = '1fr 100px 100px 100px 40px';-const TABLE_GRID_MOBILE = '3fr 3fr 1fr 1fr 40px';+const TABLE_GRID = '1fr 120px 100px 120px 100px 40px';+const TABLE_GRID_MOBILE = '3fr 2fr 2fr 2fr 2fr 40px';const PAGE_SIZE = 25;const SOURCE_TYPE_FILTER_OPTIONS: {@@ -163,27 +162,6 @@ export const SettingsAdminApps = () => {});};- const getFormattedSource = (- registration: ApplicationRegistrationFragmentFragment,- ) => {- switch (registration.sourceType) {- case ApplicationRegistrationSourceType.TARBALL: {- return 'Tarball';- }- case ApplicationRegistrationSourceType.NPM: {- return 'NPM';- }- case ApplicationRegistrationSourceType.OAUTH_ONLY: {- return 'OAuth';- }- case ApplicationRegistrationSourceType.LOCAL: {- return 'Local';- }- default:- return assertUnreachable(registration.sourceType);- }- };-return (<><Section.Root>@@ -288,8 +266,9 @@ export const SettingsAdminApps = () => {mobileGridAutoColumns={TABLE_GRID_MOBILE}><TableHeader>{t`Name`}</TableHeader>- <TableHeader align="right">{t`Source`}</TableHeader>- <TableHeader align="right">{t`Listed`}</TableHeader>+ <TableHeader>{t`Author`}</TableHeader>+ <TableHeader align="right">{t`Vetted`}</TableHeader>+ <TableHeader align="right">{t`Installs`}</TableHeader><TableHeader align="right">{t`Configured`}</TableHeader><TableHeader></TableHeader></TableRow>@@ -298,7 +277,6 @@ export const SettingsAdminApps = () => {<SettingsAdminAppsTableRowkey={registration.id}registration={registration}- getFormattedSource={getFormattedSource}/>))}</TableBody>@@ -322,15 +300,11 @@ export const SettingsAdminApps = () => {};type SettingsAdminAppsTableRowProps = {- registration: ApplicationRegistrationFragmentFragment;- getFormattedSource: (- registration: ApplicationRegistrationFragmentFragment,- ) => string;+ registration: AdminApplicationRegistration;};const SettingsAdminAppsTableRow = ({registration,- getFormattedSource,}: SettingsAdminAppsTableRowProps) => {const theme = useTheme();@@ -352,12 +326,11 @@ const SettingsAdminAppsTableRow = ({}}/></StyledNameTableCell>- <TableCell overflow="hidden" align="right">- {getFormattedSource(registration)}- </TableCell>+ <TableCell overflow="hidden">{registration.author ?? '—'}</TableCell><TableCell align="right">- {registration.isListed ? t`Yes` : t`No`}+ {registration.isVetted ? t`Yes` : t`No`}</TableCell>+ <TableCell align="right">{registration.installCount}</TableCell><TableCell align="right"><Tag color={registration.isConfigured ? 'green' : 'red'}>{registration.isConfigured ? t`Yes` : t`No`}diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsxindex e2876353964..9ff95012f4e 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/components/__stories__/SettingsAdminApps.stories.tsx@@ -53,6 +53,8 @@ const meta: Meta<typeof SettingsAdminApps> = {isPreInstalled: false,isConfigured: true,ownerWorkspaceId: null,+ author: 'Acme Corp',+ installCount: 3,createdAt: '2026-01-01T00:00:00.000Z',updatedAt: '2026-01-01T00:00:00.000Z',},@@ -133,3 +135,13 @@ export const FilterPanelTogglesStayOpen: Story = {await waitFor(() => expect(trigger).toHaveFocus());},};++export const DisplaysAuthorAndInstallCount: Story = {+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);++ expect(await canvas.findByText('Acme app')).toBeVisible();+ expect(canvas.getByText('Acme Corp')).toBeVisible();+ expect(canvas.getByText('3')).toBeVisible();+ },+};diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.ts b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.tsindex 978bd24d90c..730a2c4a0a8 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAllApplicationRegistrations.ts@@ -23,6 +23,8 @@ export const FIND_ALL_APPLICATION_REGISTRATIONS = gql`) {registrations {...ApplicationRegistrationFragment+ author+ installCount}totalCounthasMorediff --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.tsindex fc4e2e016b2..28d429ee3f3 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@@ -1,8 +1,9 @@-import { Context, Parent, ResolveField } from '@nestjs/graphql';+import { Context, Int, Parent, ResolveField } from '@nestjs/graphql';import { AdminResolver } from 'src/engine/api/graphql/graphql-config/decorators/admin-resolver.decorator';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 { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';@AdminResolver(() => ApplicationRegistrationEntity)@@ -13,14 +14,43 @@ export class AdminPanelApplicationRegistrationResolver {@ResolveField(() => Boolean)async isConfigured(- @Parent() registration: ApplicationRegistrationEntity,+ @Parent()+ registration:+ | ApplicationRegistrationEntity+ | AdminApplicationRegistrationListItem,@Context() context: { loaders: IDataloaders },): Promise<boolean> {+ if ('isConfigured' in registration) {+ return registration.isConfigured;+ }+return context.loaders.isConfiguredLoader.load({applicationRegistrationId: registration.id,});}+ @ResolveField(() => Int)+ async installCount(+ @Parent()+ registration:+ | ApplicationRegistrationEntity+ | AdminApplicationRegistrationListItem,+ @Context() context: { loaders: IDataloaders },+ ): Promise<number> {+ if ('installCount' in registration) {+ return registration.installCount;+ }++ return context.loaders.applicationRegistrationInstallCountLoader.load({+ applicationRegistrationId: registration.id,+ });+ }++ @ResolveField(() => String, { nullable: true })+ author(@Parent() registration: ApplicationRegistrationEntity): string | null {+ return registration.author;+ }+@ResolveField(() => String, { nullable: true })logoUrl(@Parent() registration: ApplicationRegistrationEntity,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.tsindex 631e571f024..4a14252ea42 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts@@ -3,7 +3,7 @@ import { InjectRepository } from '@nestjs/typeorm';import { type ServerVariables } from 'twenty-shared/application';import { FieldMetadataType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';import { In, Not, type EntityManager, type Repository } from 'typeorm';import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';@@ -174,69 +174,89 @@ export class ApplicationRegistrationVariableService {async isConfiguredBatch(applicationRegistrationIds: string[],): Promise<Map<string, boolean>> {- const [variables, registrations, installedApps] = await Promise.all([+ if (!isNonEmptyArray(applicationRegistrationIds)) {+ return new Map();+ }++ const [+ requiredVariables,+ registrationIdsExposingServerRoute,+ registrationIdsInstalledOnOwnerWorkspace,+ ] = await Promise.all([this.variableRepository.find({- where: { applicationRegistrationId: In(applicationRegistrationIds) },- }),- this.applicationRegistrationRepository.find({- where: { id: In(applicationRegistrationIds) },- select: { id: true, manifest: true, ownerWorkspaceId: true },- }),- this.applicationRepository.find({- where: { applicationRegistrationId: In(applicationRegistrationIds) },- select: { applicationRegistrationId: true, workspaceId: true },+ where: {+ applicationRegistrationId: In(applicationRegistrationIds),+ isRequired: true,+ },}),+ this.findRegistrationIdsExposingServerRoute(applicationRegistrationIds),+ this.findRegistrationIdsInstalledOnOwnerWorkspace(+ applicationRegistrationIds,+ ),]);- const result = new Map<string, boolean>();-- for (const id of applicationRegistrationIds) {- const registration = registrations.find(- (registration) => registration.id === id,- );-- const areVariablesConfigured = variables- .filter(- (variable) =>- variable.applicationRegistrationId === id && variable.isRequired,- )- .every((variable) => this.isVariableFilled(variable));-- const isInstalledOnOwnerWorkspace = installedApps.some(- (app) =>- app.applicationRegistrationId === id &&- app.workspaceId === registration?.ownerWorkspaceId,- );-- result.set(- id,- areVariablesConfigured &&- this.isServerRouteConfigured(- registration,- isInstalledOnOwnerWorkspace,- ),- );- }+ const registrationIdsWithUnfilledRequiredVariable = new Set(+ requiredVariables+ .filter((variable) => !this.isVariableFilled(variable))+ .map((variable) => variable.applicationRegistrationId),+ );- return result;+ return new Map(+ applicationRegistrationIds.map((applicationRegistrationId) => [+ applicationRegistrationId,+ !registrationIdsWithUnfilledRequiredVariable.has(+ applicationRegistrationId,+ ) &&+ (!registrationIdsExposingServerRoute.has(applicationRegistrationId) ||+ registrationIdsInstalledOnOwnerWorkspace.has(+ applicationRegistrationId,+ )),+ ]),+ );}- private isServerRouteConfigured(- registration: ApplicationRegistrationEntity | undefined,- isInstalledOnOwnerWorkspace: boolean,- ): boolean {- const hasServerRouteFunction =- registration?.manifest?.logicFunctions?.some((logicFunction) =>- isDefined(logicFunction.serverRouteTriggerSettings),- ) ?? false;-- if (!hasServerRouteFunction) {- return true;- }+ private async findRegistrationIdsExposingServerRoute(+ applicationRegistrationIds: string[],+ ): Promise<Set<string>> {+ const rows: { id: string }[] = await this.applicationRegistrationRepository+ .createQueryBuilder('registration')+ .select('registration.id', 'id')+ .where('registration.id IN (:...applicationRegistrationIds)', {+ applicationRegistrationIds,+ })+ .andWhere(+ `EXISTS (+ SELECT 1+ FROM jsonb_array_elements(+ COALESCE(registration."manifest" -> 'logicFunctions', '[]'::jsonb)+ ) AS logic_function+ WHERE logic_function -> 'serverRouteTriggerSettings' IS NOT NULL+ AND jsonb_typeof(logic_function -> 'serverRouteTriggerSettings') <> 'null'+ )`,+ )+ .getRawMany();++ return new Set(rows.map((row) => row.id));+ }- return (- isDefined(registration?.ownerWorkspaceId) && isInstalledOnOwnerWorkspace- );+ private async findRegistrationIdsInstalledOnOwnerWorkspace(+ applicationRegistrationIds: string[],+ ): Promise<Set<string>> {+ const rows: { id: string }[] = await this.applicationRepository+ .createQueryBuilder('application')+ .select('application."applicationRegistrationId"', 'id')+ .innerJoin(+ 'application.applicationRegistration',+ 'registration',+ 'registration."workspaceId" = application."workspaceId"',+ )+ .where(+ 'application."applicationRegistrationId" IN (:...applicationRegistrationIds)',+ { applicationRegistrationIds },+ )+ .getRawMany();++ return new Set(rows.map((row) => row.id));}private async findVariableOrThrow(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.tsindex 164cbf649aa..f621e73bcad 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@@ -46,6 +46,7 @@ import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/appliimport { 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 { 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';import {ApplicationException,@@ -300,9 +301,7 @@ export class ApplicationRegistrationService {APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT.map((column) => `registration.${column}`,),- )- .orderBy('registration.createdAt', 'DESC')- .addOrderBy('registration.id', 'ASC');+ );if (isPreInstalledOnly === true) {queryBuilder.andWhere('registration."isPreInstalled" = true');@@ -329,42 +328,89 @@ export class ApplicationRegistrationService {);}- // Configuration status is computed, not stored, so this filter paginates in memory- if (isDefined(isConfigured)) {- const allRegistrations = await queryBuilder.getMany();+ const matchingRegistrations = await queryBuilder.getMany();- const configuredStatuses =- await this.applicationRegistrationVariableService.isConfiguredBatch(- allRegistrations.map((registration) => registration.id),- );+ if (matchingRegistrations.length === 0) {+ return { registrations: [], totalCount: 0, hasMore: false };+ }- const filteredRegistrations = allRegistrations.filter(- (registration) =>- (configuredStatuses.get(registration.id) ?? false) === isConfigured,- );+ const matchingRegistrationIds = matchingRegistrations.map(+ (registration) => registration.id,+ );- return {- registrations: filteredRegistrations.slice(- safeOffset,- safeOffset + safeLimit,+ const [isConfiguredByRegistrationId, installCountByRegistrationId] =+ await Promise.all([+ this.applicationRegistrationVariableService.isConfiguredBatch(+ matchingRegistrationIds,),- totalCount: filteredRegistrations.length,- hasMore: safeOffset + safeLimit < filteredRegistrations.length,- };- }+ this.countInstalledWorkspacesByApplicationRegistrationIds(+ matchingRegistrationIds,+ ),+ ]);- const [registrations, totalCount] = await queryBuilder- .skip(safeOffset)- .take(safeLimit)- .getManyAndCount();+ const filteredRegistrations = isDefined(isConfigured)+ ? matchingRegistrations.filter(+ (registration) =>+ (isConfiguredByRegistrationId.get(registration.id) ?? false) ===+ isConfigured,+ )+ : matchingRegistrations;++ const sortedRegistrations = sortApplicationRegistrationsForAdmin({+ registrations: filteredRegistrations,+ isConfiguredByRegistrationId,+ installCountByRegistrationId,+ });return {- registrations,- totalCount,- hasMore: safeOffset + registrations.length < totalCount,+ registrations: sortedRegistrations+ .slice(safeOffset, safeOffset + safeLimit)+ .map((registration) => ({+ ...registration,+ isConfigured:+ isConfiguredByRegistrationId.get(registration.id) ?? false,+ installCount: installCountByRegistrationId.get(registration.id) ?? 0,+ })),+ totalCount: sortedRegistrations.length,+ hasMore: safeOffset + safeLimit < sortedRegistrations.length,};}+ async countInstalledWorkspacesByApplicationRegistrationIds(+ applicationRegistrationIds: string[],+ ): Promise<Map<string, number>> {+ if (!isNonEmptyArray(applicationRegistrationIds)) {+ return new Map();+ }++ const installCounts: {+ applicationRegistrationId: string;+ installCount: number;+ }[] = await this.applicationRepository+ .createQueryBuilder('application')+ .select(+ 'application."applicationRegistrationId"',+ 'applicationRegistrationId',+ )+ .addSelect('COUNT(*)::int', 'installCount')+ .innerJoin('application.workspace', 'workspace')+ .where(+ 'application."applicationRegistrationId" IN (:...applicationRegistrationIds)',+ { applicationRegistrationIds },+ )+ .andWhere('application."deletedAt" IS NULL')+ .andWhere('workspace."deletedAt" IS NULL')+ .groupBy('application."applicationRegistrationId"')+ .getRawMany();++ return new Map(+ installCounts.map(({ applicationRegistrationId, installCount }) => [+ applicationRegistrationId,+ installCount,+ ]),+ );+ }+async findOneByIdGlobal(id: string): Promise<ApplicationRegistrationEntity> {const registration = await this.applicationRegistrationRepository.findOne({select: APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT,diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto.tsindex 086b48cae7f..2db225d27af 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto.ts@@ -2,10 +2,16 @@ import { Field, Int, ObjectType } from '@nestjs/graphql';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+export type AdminApplicationRegistrationListItem =+ ApplicationRegistrationEntity & {+ isConfigured: boolean;+ installCount: number;+ };+@ObjectType('PaginatedApplicationRegistrations')export class PaginatedApplicationRegistrationsDTO {@Field(() => [ApplicationRegistrationEntity])- registrations: ApplicationRegistrationEntity[];+ registrations: AdminApplicationRegistrationListItem[];@Field(() => Int)totalCount: number;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/sort-application-registrations-for-admin.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/sort-application-registrations-for-admin.util.spec.tsnew file mode 100644index 00000000000..7f9483e0f85--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/sort-application-registrations-for-admin.util.spec.ts@@ -0,0 +1,168 @@+import { sortApplicationRegistrationsForAdmin } from 'src/engine/core-modules/application/application-registration/utils/sort-application-registrations-for-admin.util';++const buildRegistration = ({+ id,+ name = id,+ universalIdentifier = id,+ sourcePackage = null,+ isVetted = false,+ isListed = false,+}: {+ id: string;+ name?: string;+ universalIdentifier?: string;+ sourcePackage?: string | null;+ isVetted?: boolean;+ isListed?: boolean;+}) => ({ id, name, universalIdentifier, sourcePackage, isVetted, isListed });++const sortedIds = (+ registrations: ReturnType<typeof buildRegistration>[],+ {+ configuredIds = registrations.map((registration) => registration.id),+ installCounts = {},+ }: {+ configuredIds?: string[];+ installCounts?: Record<string, number>;+ } = {},+) =>+ sortApplicationRegistrationsForAdmin({+ registrations,+ isConfiguredByRegistrationId: new Map(+ registrations.map((registration) => [+ registration.id,+ configuredIds.includes(registration.id),+ ]),+ ),+ installCountByRegistrationId: new Map(Object.entries(installCounts)),+ }).map((registration) => registration.id);++describe('sortApplicationRegistrationsForAdmin', () => {+ it('puts vetted registrations first', () => {+ const registrations = [+ buildRegistration({ id: 'community' }),+ buildRegistration({ id: 'vetted', isVetted: true }),+ ];++ expect(sortedIds(registrations)).toEqual(['vetted', 'community']);+ });++ it('puts registrations missing configuration before configured ones', () => {+ const registrations = [+ buildRegistration({ id: 'configured' }),+ buildRegistration({ id: 'not-configured' }),+ ];++ expect(sortedIds(registrations, { configuredIds: ['configured'] })).toEqual(+ ['not-configured', 'configured'],+ );+ });++ it('puts listed registrations last', () => {+ const registrations = [+ buildRegistration({ id: 'listed', isListed: true }),+ buildRegistration({ id: 'not-listed' }),+ ];++ expect(sortedIds(registrations)).toEqual(['not-listed', 'listed']);+ });++ it('puts packages published by Twenty before community ones', () => {+ const registrations = [+ buildRegistration({ id: 'community', sourcePackage: 'twenty-app-acme' }),+ buildRegistration({ id: 'unpackaged' }),+ buildRegistration({ id: 'twenty', sourcePackage: '@twentyhq/slack' }),+ ];++ expect(sortedIds(registrations)).toEqual([+ 'twenty',+ 'community',+ 'unpackaged',+ ]);+ });++ it('orders by install count, then name, then universal identifier', () => {+ const registrations = [+ buildRegistration({+ id: 'b-same-name',+ name: 'Same',+ universalIdentifier: 'b',+ }),+ buildRegistration({ id: 'zebra', name: 'zebra' }),+ buildRegistration({+ id: 'a-same-name',+ name: 'same',+ universalIdentifier: 'a',+ }),+ buildRegistration({ id: 'popular', name: 'Popular' }),+ ];++ expect(sortedIds(registrations, { installCounts: { popular: 3 } })).toEqual(+ ['popular', 'a-same-name', 'b-same-name', 'zebra'],+ );+ });++ it('applies vetted, configuration, listed, provenance, then installs', () => {+ const registrations = [+ buildRegistration({ id: 'community-configured-listed', isListed: true }),+ buildRegistration({ id: 'community-configured-unlisted' }),+ buildRegistration({+ id: 'community-not-configured',+ isListed: true,+ }),+ buildRegistration({+ id: 'twenty-configured-unlisted',+ sourcePackage: '@twentyhq/linear',+ }),+ buildRegistration({+ id: 'vetted-configured-listed',+ isVetted: true,+ isListed: true,+ }),+ buildRegistration({+ id: 'vetted-configured-unlisted',+ isVetted: true,+ }),+ buildRegistration({ id: 'vetted-not-configured', isVetted: true }),+ ];++ expect(+ sortedIds(registrations, {+ configuredIds: [+ 'community-configured-listed',+ 'community-configured-unlisted',+ 'twenty-configured-unlisted',+ 'vetted-configured-listed',+ 'vetted-configured-unlisted',+ ],+ installCounts: { 'community-configured-listed': 10 },+ }),+ ).toEqual([+ 'vetted-not-configured',+ 'vetted-configured-unlisted',+ 'vetted-configured-listed',+ 'community-not-configured',+ 'twenty-configured-unlisted',+ 'community-configured-unlisted',+ 'community-configured-listed',+ ]);+ });++ it('does not mutate the input array', () => {+ const registrations = [+ buildRegistration({ id: 'community' }),+ buildRegistration({ id: 'vetted', isVetted: true }),+ ];++ sortApplicationRegistrationsForAdmin({+ registrations,+ isConfiguredByRegistrationId: new Map(),+ installCountByRegistrationId: new Map(),+ });++ expect(registrations.map((registration) => registration.id)).toEqual([+ 'community',+ 'vetted',+ ]);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/is-twenty-application-package.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/is-twenty-application-package.util.tsnew file mode 100644index 00000000000..c0fb3270b88--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/is-twenty-application-package.util.ts@@ -0,0 +1,9 @@+import { isNonEmptyString } from '@sniptt/guards';++const TWENTY_APPLICATION_PACKAGE_SCOPE = '@twentyhq/';++export const isTwentyApplicationPackage = (+ sourcePackage: string | null | undefined,+): boolean =>+ isNonEmptyString(sourcePackage) &&+ sourcePackage.startsWith(TWENTY_APPLICATION_PACKAGE_SCOPE);diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/sort-application-registrations-for-admin.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/sort-application-registrations-for-admin.util.tsnew file mode 100644index 00000000000..7a1976fa48d--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/sort-application-registrations-for-admin.util.ts@@ -0,0 +1,67 @@+import { type ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { isTwentyApplicationPackage } from 'src/engine/core-modules/application/application-registration/utils/is-twenty-application-package.util';++type AdminSortableApplicationRegistration = Pick<+ ApplicationRegistrationEntity,+ | 'id'+ | 'universalIdentifier'+ | 'name'+ | 'sourcePackage'+ | 'isVetted'+ | 'isListed'+>;++export const sortApplicationRegistrationsForAdmin = <+ TRegistration extends AdminSortableApplicationRegistration,+>({+ registrations,+ isConfiguredByRegistrationId,+ installCountByRegistrationId,+}: {+ registrations: TRegistration[];+ isConfiguredByRegistrationId: Map<string, boolean>;+ installCountByRegistrationId: Map<string, number>;+}): TRegistration[] => {+ return [...registrations].sort((left, right) => {+ if (left.isVetted !== right.isVetted) {+ return left.isVetted ? -1 : 1;+ }++ const isLeftConfigured = isConfiguredByRegistrationId.get(left.id) ?? false;+ const isRightConfigured =+ isConfiguredByRegistrationId.get(right.id) ?? false;++ if (isLeftConfigured !== isRightConfigured) {+ return isLeftConfigured ? 1 : -1;+ }++ if (left.isListed !== right.isListed) {+ return left.isListed ? 1 : -1;+ }++ const isLeftFromTwenty = isTwentyApplicationPackage(left.sourcePackage);+ const isRightFromTwenty = isTwentyApplicationPackage(right.sourcePackage);++ if (isLeftFromTwenty !== isRightFromTwenty) {+ return isLeftFromTwenty ? -1 : 1;+ }++ const installCountDifference =+ (installCountByRegistrationId.get(right.id) ?? 0) -+ (installCountByRegistrationId.get(left.id) ?? 0);++ if (installCountDifference !== 0) {+ return installCountDifference;+ }++ const nameComparison = left.name.localeCompare(right.name, undefined, {+ sensitivity: 'base',+ });++ if (nameComparison !== 0) {+ return nameComparison;+ }++ return left.universalIdentifier.localeCompare(right.universalIdentifier);+ });+};diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.tsindex bbaa1add968..d0e4e39ed95 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts@@ -5,6 +5,7 @@ import { type IndexMetadataConnectionLoaderPayload } from 'src/engine/dataloaderimport {type AgentsByRoleIdLoaderPayload,type ApiKeysByRoleIdLoaderPayload,+ type ApplicationRegistrationInstallCountLoaderPayload,type ApplicationTranslationCatalogLoaderPayload,type FieldMetadataLoaderPayload,type IndexFieldMetadataLoaderPayload,@@ -126,6 +127,11 @@ export interface IDataloaders {isConfiguredLoader: DataLoader<IsConfiguredLoaderPayload, boolean>;+ applicationRegistrationInstallCountLoader: DataLoader<+ ApplicationRegistrationInstallCountLoaderPayload,+ number+ >;+applicationAuthorIdentifiersLoader: DataLoader<ApplicationAuthorIdentifiersLoaderPayload,ApplicationAuthorIdentifiersdiff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.module.tsindex 5935fd95f65..736e02722da 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.module.ts@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';import { ApplicationTranslationCatalogModule } from 'src/engine/metadata-modules/application-translation-catalog/application-translation-catalog.module';+import { ApplicationRegistrationModule } from 'src/engine/core-modules/application/application-registration/application-registration.module';import { ApplicationRegistrationVariableModule } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.module';import { DataloaderService } from 'src/engine/dataloaders/dataloader.service';import { FieldMetadataConnectionLoaderFactory } from 'src/engine/dataloaders/factories/field-metadata-connection-loader.factory';@@ -14,6 +15,7 @@ import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cacheimports: [ApplicationTranslationCatalogModule,WorkspaceManyOrAllFlatEntityMapsCacheModule,+ ApplicationRegistrationModule,ApplicationRegistrationVariableModule,RowLevelPermissionModule,WorkspaceCacheModule,diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.tsindex 8366a3df90b..de9c1812046 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts@@ -8,6 +8,7 @@ import { isDefined } from 'twenty-shared/utils';import { type IndexMetadataInterface } from 'src/engine/metadata-modules/index-metadata/interfaces/index-metadata.interface';import { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';+import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';@@ -157,6 +158,10 @@ export type IsConfiguredLoaderPayload = {applicationRegistrationId: string;};+export type ApplicationRegistrationInstallCountLoaderPayload = {+ applicationRegistrationId: string;+};+export type ApplicationAuthorIdentifiersLoaderPayload = {workspaceId: string;};@@ -172,6 +177,7 @@ export class DataloaderService {constructor(private readonly flatEntityMapsCacheService: WorkspaceManyOrAllFlatEntityMapsCacheService,private readonly applicationRegistrationVariableService: ApplicationRegistrationVariableService,+ private readonly applicationRegistrationService: ApplicationRegistrationService,private readonly applicationTranslationCatalogService: ApplicationTranslationCatalogService,private readonly fieldMetadataConnectionLoaderFactory: FieldMetadataConnectionLoaderFactory,private readonly indexMetadataConnectionLoaderFactory: IndexMetadataConnectionLoaderFactory,@@ -202,6 +208,8 @@ export class DataloaderService {const viewFilterGroupsByViewIdLoader =this.createViewFilterGroupsByViewIdLoader();const isConfiguredLoader = this.createIsConfiguredLoader();+ const applicationRegistrationInstallCountLoader =+ this.createApplicationRegistrationInstallCountLoader();const applicationAuthorIdentifiersLoader =this.createApplicationAuthorIdentifiersLoader();const applicationTranslationCatalogLoader =@@ -231,6 +239,7 @@ export class DataloaderService {viewGroupsByViewIdLoader,viewFilterGroupsByViewIdLoader,isConfiguredLoader,+ applicationRegistrationInstallCountLoader,applicationAuthorIdentifiersLoader,applicationTranslationCatalogLoader,workspaceMembersByRoleIdLoader,@@ -891,6 +900,24 @@ export class DataloaderService {);}+ private createApplicationRegistrationInstallCountLoader() {+ return new DataLoader<+ ApplicationRegistrationInstallCountLoaderPayload,+ number+ >(async (params: ApplicationRegistrationInstallCountLoaderPayload[]) => {+ const installCountByRegistrationId =+ await this.applicationRegistrationService.countInstalledWorkspacesByApplicationRegistrationIds(+ params.map((param) => param.applicationRegistrationId),+ );++ return params.map(+ (param) =>+ installCountByRegistrationId.get(param.applicationRegistrationId) ??+ 0,+ );+ });+ }+private createApplicationAuthorIdentifiersLoader() {return new DataLoader<ApplicationAuthorIdentifiersLoaderPayload,diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registrations-order.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registrations-order.integration-spec.tsnew file mode 100644index 00000000000..8968005e7fc--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registrations-order.integration-spec.ts@@ -0,0 +1,316 @@+import { randomUUID } from 'crypto';++import { gql } from 'graphql-tag';+import { type DataSource } from 'typeorm';++import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';+import { makeAdminPanelApiRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';++import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++const FIND_ALL_REGISTRATIONS = gql`+ query FindAllApplicationRegistrations(+ $limit: Int+ $offset: Int+ $searchTerm: String+ ) {+ findAllApplicationRegistrations(+ limit: $limit+ offset: $offset+ searchTerm: $searchTerm+ ) {+ totalCount+ hasMore+ registrations {+ id+ name+ author+ installCount+ isConfigured+ }+ }+ }+`;++const NAME_PREFIX = 'admin-panel-order-integration-test';+const INSTALLED_AUTHOR = 'Admin panel order integration author';++type RegistrationSeed = {+ suffix: string;+ isVetted?: boolean;+ isListed?: boolean;+ sourcePackage?: string;+ hasUnfilledRequiredVariable?: boolean;+ exposesServerRoute?: boolean;+ ownerWorkspaceId?: string;+ installedOnWorkspaceIds?: string[];+ author?: string;+};++const SERVER_ROUTE_MANIFEST = {+ logicFunctions: [+ {+ universalIdentifier: randomUUID(),+ name: 'admin-panel-order-integration-test-webhook',+ serverRouteTriggerSettings: {+ path: '/admin-panel-order-integration-test',+ httpMethod: 'POST',+ isAuthRequired: false,+ },+ },+ ],+};++const REGISTRATION_SEEDS: RegistrationSeed[] = [+ {+ suffix: 'vetted-not-configured',+ isVetted: true,+ hasUnfilledRequiredVariable: true,+ },+ {+ suffix: 'vetted-server-route-unclaimed',+ isVetted: true,+ exposesServerRoute: true,+ },+ {+ suffix: 'vetted-configured-unlisted',+ isVetted: true,+ },+ {+ suffix: 'vetted-configured-listed',+ isVetted: true,+ isListed: true,+ author: INSTALLED_AUTHOR,+ installedOnWorkspaceIds: [SEED_APPLE_WORKSPACE_ID],+ },+ {+ suffix: 'community-not-configured-listed',+ isListed: true,+ hasUnfilledRequiredVariable: true,+ },+ {+ suffix: 'community-configured-twenty-package',+ sourcePackage: '@twentyhq/admin-panel-order-integration-test',+ },+ {+ suffix: 'community-server-route-installed',+ exposesServerRoute: true,+ ownerWorkspaceId: SEED_APPLE_WORKSPACE_ID,+ installedOnWorkspaceIds: [SEED_APPLE_WORKSPACE_ID],+ },+ {+ suffix: 'community-configured-alpha',+ },+ {+ suffix: 'community-configured-beta',+ },+ {+ suffix: 'community-configured-listed',+ isListed: true,+ },+];++const buildName = (suffix: string) => `${NAME_PREFIX}-${suffix}`;++describe('Admin panel application registrations ordering (integration)', () => {+ let dataSource: DataSource;+ const registrationIdBySuffix = new Map<string, string>();+ const installedApplicationIds: string[] = [];++ const insertInstalledApplication = async ({+ applicationRegistrationId,+ workspaceId,+ }: {+ applicationRegistrationId: string;+ workspaceId: string;+ }) => {+ const id = randomUUID();++ await dataSource.query(+ `INSERT INTO core."application"+ (id, "universalIdentifier", name, version, "sourcePath",+ "sourceType", "workspaceId", "applicationRegistrationId")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,+ [+ id,+ randomUUID(),+ buildName('installed-app'),+ '1.0.0',+ '',+ 'local',+ workspaceId,+ applicationRegistrationId,+ ],+ );++ installedApplicationIds.push(id);+ };++ beforeAll(async () => {+ dataSource = global.testDataSource;++ for (const seed of REGISTRATION_SEEDS) {+ const id = randomUUID();++ await dataSource.query(+ `INSERT INTO core."applicationRegistration"+ (id, "universalIdentifier", name, "oAuthClientId",+ "oAuthRedirectUris", "oAuthScopes", "sourceType", "sourcePackage",+ "isVetted", "isListed", author, "workspaceId", manifest)+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`,+ [+ id,+ randomUUID(),+ buildName(seed.suffix),+ randomUUID(),+ [],+ [],+ 'local',+ seed.sourcePackage ?? null,+ seed.isVetted ?? false,+ seed.isListed ?? false,+ seed.author ?? null,+ seed.ownerWorkspaceId ?? null,+ seed.exposesServerRoute === true+ ? JSON.stringify(SERVER_ROUTE_MANIFEST)+ : null,+ ],+ );++ registrationIdBySuffix.set(seed.suffix, id);++ if (seed.hasUnfilledRequiredVariable === true) {+ const variableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId: id,+ key: 'ADMIN_PANEL_ORDER_REQUIRED_KEY',+ value: '',+ });++ await dataSource.query(+ `UPDATE core."applicationRegistrationVariable"+ SET "isRequired" = true WHERE id = $1`,+ [variableId],+ );+ }++ for (const workspaceId of seed.installedOnWorkspaceIds ?? []) {+ await insertInstalledApplication({+ applicationRegistrationId: id,+ workspaceId,+ });+ }+ }+ });++ afterAll(async () => {+ const registrationIds = Array.from(registrationIdBySuffix.values());++ await dataSource.query(+ `DELETE FROM core."application" WHERE id = ANY($1)`,+ [installedApplicationIds],+ );+ await dataSource.query(+ `DELETE FROM core."applicationRegistrationVariable"+ WHERE "applicationRegistrationId" = ANY($1)`,+ [registrationIds],+ );+ await dataSource.query(+ `DELETE FROM core."applicationRegistration" WHERE id = ANY($1)`,+ [registrationIds],+ );+ });++ const findRegistrationsByName = async () => {+ const response = await makeAdminPanelApiRequest({+ query: FIND_ALL_REGISTRATIONS,+ variables: { limit: 25, offset: 0, searchTerm: NAME_PREFIX },+ });++ expect(response.body.errors).toBeUndefined();++ return Object.fromEntries(+ response.body.data?.findAllApplicationRegistrations.registrations.map(+ (registration: {+ name: string;+ author: string | null;+ installCount: number;+ isConfigured: boolean;+ }) => [registration.name, registration],+ ),+ );+ };++ it('orders vetted, not configured, unlisted, Twenty packages, most installed, then by name', async () => {+ const response = await makeAdminPanelApiRequest({+ query: FIND_ALL_REGISTRATIONS,+ variables: { limit: 25, offset: 0, searchTerm: NAME_PREFIX },+ });++ expect(response.body.errors).toBeUndefined();++ const result = response.body.data?.findAllApplicationRegistrations;++ expect(result.totalCount).toBe(REGISTRATION_SEEDS.length);+ expect(result.hasMore).toBe(false);+ expect(+ result.registrations.map(+ (registration: { name: string }) => registration.name,+ ),+ ).toEqual(REGISTRATION_SEEDS.map((seed) => buildName(seed.suffix)));+ });++ it('paginates the sorted list in memory', async () => {+ const response = await makeAdminPanelApiRequest({+ query: FIND_ALL_REGISTRATIONS,+ variables: { limit: 3, offset: 3, searchTerm: NAME_PREFIX },+ });++ expect(response.body.errors).toBeUndefined();++ const result = response.body.data?.findAllApplicationRegistrations;++ expect(result.totalCount).toBe(REGISTRATION_SEEDS.length);+ expect(result.hasMore).toBe(true);+ expect(+ result.registrations.map(+ (registration: { name: string }) => registration.name,+ ),+ ).toEqual(+ REGISTRATION_SEEDS.slice(3, 6).map((seed) => buildName(seed.suffix)),+ );+ });++ it('exposes the install count and the author of each registration', async () => {+ const registrationsByName = await findRegistrationsByName();++ const installedRegistration =+ registrationsByName[buildName('vetted-configured-listed')];++ expect(installedRegistration.installCount).toBe(1);+ expect(installedRegistration.author).toBe(INSTALLED_AUTHOR);+ expect(installedRegistration.isConfigured).toBe(true);++ const notConfiguredRegistration =+ registrationsByName[buildName('vetted-not-configured')];++ expect(notConfiguredRegistration.installCount).toBe(0);+ expect(notConfiguredRegistration.author).toBeNull();+ expect(notConfiguredRegistration.isConfigured).toBe(false);+ });++ it('treats a server-route app as configured only once installed on its owner workspace', async () => {+ const registrationsByName = await findRegistrationsByName();++ const unclaimedRegistration =+ registrationsByName[buildName('vetted-server-route-unclaimed')];++ expect(unclaimedRegistration.installCount).toBe(0);+ expect(unclaimedRegistration.isConfigured).toBe(false);++ const installedRegistration =+ registrationsByName[buildName('community-server-route-installed')];++ expect(installedRegistration.installCount).toBe(1);+ expect(installedRegistration.isConfigured).toBe(true);+ });+});