Skip to content

The open alternative to Salesforce, designed for AI.

Fix admin panel app install counts and show suspended installs (#25158)

nitin924fd5eecae9
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
index 7362d97ff8c..bb2a207908f 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql
@@ -1906,6 +1906,7 @@ type VersionDistributionEntry {
type ApplicationRegistrationStats {
activeInstalls: Int!
+ suspendedInstalls: Int!
mostInstalledVersion: String
versionDistribution: [VersionDistributionEntry!]!
}
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
index 1a3d3ccb934..34dc089c80b 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts
@@ -1542,6 +1542,7 @@ export interface VersionDistributionEntry {
export interface ApplicationRegistrationStats {
activeInstalls: Scalars['Int']
+ suspendedInstalls: Scalars['Int']
mostInstalledVersion?: Scalars['String']
versionDistribution: VersionDistributionEntry[]
__typename: 'ApplicationRegistrationStats'
@@ -4977,6 +4978,7 @@ export interface VersionDistributionEntryGenqlSelection{
export interface ApplicationRegistrationStatsGenqlSelection{
activeInstalls?: boolean | number
+ suspendedInstalls?: boolean | number
mostInstalledVersion?: boolean | number
versionDistribution?: VersionDistributionEntryGenqlSelection
__typename?: boolean | number
diff --git a/packages/twenty-client-sdk/src/metadata/generated/types.ts b/packages/twenty-client-sdk/src/metadata/generated/types.ts
index 754611013ed..a66078ee623 100644
--- a/packages/twenty-client-sdk/src/metadata/generated/types.ts
+++ b/packages/twenty-client-sdk/src/metadata/generated/types.ts
@@ -3671,6 +3671,9 @@ export default {
"activeInstalls": [
26
],
+ "suspendedInstalls": [
+ 26
+ ],
"mostInstalledVersion": [
1
],
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index 87777def51f..1a0bacfb36e 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -289,6 +289,7 @@ export type ApplicationRegistrationStats = {
__typename?: 'ApplicationRegistrationStats';
activeInstalls: Scalars['Int']['output'];
mostInstalledVersion?: Maybe<Scalars['String']['output']>;
+ suspendedInstalls: Scalars['Int']['output'];
versionDistribution: Array<VersionDistributionEntry>;
};
@@ -1240,7 +1241,7 @@ export type FindAdminApplicationRegistrationStatsQueryVariables = Exact<{
}>;
-export type FindAdminApplicationRegistrationStatsQuery = { __typename?: 'Query', findAdminApplicationRegistrationStats: { __typename?: 'ApplicationRegistrationStats', activeInstalls: number, mostInstalledVersion?: string | null, versionDistribution: Array<{ __typename?: 'VersionDistributionEntry', version: string, count: number }> } };
+export type FindAdminApplicationRegistrationStatsQuery = { __typename?: 'Query', findAdminApplicationRegistrationStats: { __typename?: 'ApplicationRegistrationStats', activeInstalls: number, suspendedInstalls: number, mostInstalledVersion?: string | null, versionDistribution: Array<{ __typename?: 'VersionDistributionEntry', version: string, count: number }> } };
export type FindAdminApplicationRegistrationVariablesQueryVariables = Exact<{
applicationRegistrationId: Scalars['String']['input'];
@@ -1535,7 +1536,7 @@ export const UpdateAdminApplicationRegistrationDocument = {"kind":"Document","de
export const UpdateAdminApplicationRegistrationVariableDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateAdminApplicationRegistrationVariable"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateApplicationRegistrationVariableInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateAdminApplicationRegistrationVariable"},"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":"id"}},{"kind":"Field","name":{"kind":"Name","value":"key"}},{"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":"isFilled"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<UpdateAdminApplicationRegistrationVariableMutation, UpdateAdminApplicationRegistrationVariableMutationVariables>;
export const FindAdminApplicationRegistrationClaimsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindAdminApplicationRegistrationClaims"},"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":"findAdminApplicationRegistrationClaims"},"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":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceDisplayName"}}]}}]}}]} as unknown as DocumentNode<FindAdminApplicationRegistrationClaimsQuery, FindAdminApplicationRegistrationClaimsQueryVariables>;
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":"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 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 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>;
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
index faffd078c8b..c165078da79 100644
--- a/packages/twenty-front/src/generated-metadata/graphql.ts
+++ b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -416,6 +416,7 @@ export type ApplicationRegistrationStats = {
__typename?: 'ApplicationRegistrationStats';
activeInstalls: Scalars['Int']['output'];
mostInstalledVersion?: Maybe<Scalars['String']['output']>;
+ suspendedInstalls: Scalars['Int']['output'];
versionDistribution: Array<VersionDistributionEntry>;
};
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAdminApplicationRegistrationStats.ts b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAdminApplicationRegistrationStats.ts
index 3f0270ee0a2..34aff163719 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAdminApplicationRegistrationStats.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/graphql/queries/findAdminApplicationRegistrationStats.ts
@@ -4,6 +4,7 @@ export const FIND_ADMIN_APPLICATION_REGISTRATION_STATS = gql`
query FindAdminApplicationRegistrationStats($id: String!) {
findAdminApplicationRegistrationStats(id: $id) {
activeInstalls
+ suspendedInstalls
mostInstalledVersion
versionDistribution {
version
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
index f30a186633f..3788daae83d 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationGeneralStats.tsx
@@ -16,7 +16,7 @@ export const SettingsApplicationRegistrationGeneralStats = ({
<Section>
<H2Title
title={t`Install Stats`}
- description={t`Usage across all workspaces on this server`}
+ description={t`Usage across all non-deleted workspaces on this server`}
/>
<SettingsApplicationRegistrationInstallStats
registration={registration}
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstallStats.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstallStats.tsx
index 909b12e1e71..a64fdb233e7 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstallStats.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstallStats.tsx
@@ -1,4 +1,9 @@
-import { IconBrandDocker, IconChartBar, IconVersions } from 'twenty-ui/icon';
+import {
+ IconBrandDocker,
+ IconChartBar,
+ IconPlayerPause,
+ IconVersions,
+} from 'twenty-ui/icon';
import { useLingui } from '@lingui/react/macro';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { type ApplicationRegistration } from '~/generated-metadata/graphql';
@@ -35,9 +40,14 @@ export const SettingsApplicationRegistrationInstallStats = ({
const statsItems = [
{
Icon: IconBrandDocker,
- label: t`Active installs`,
+ label: t`Installs`,
value: stats?.activeInstalls ?? '—',
},
+ {
+ Icon: IconPlayerPause,
+ label: t`On suspended workspaces`,
+ value: stats?.suspendedInstalls ?? '—',
+ },
{
Icon: IconVersions,
label: t`Most installed version`,
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
index 398401dedce..8311fcb239a 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx
@@ -77,14 +77,11 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({
const hasMore = result?.hasMore ?? false;
const isSearching = debouncedSearchTerm.trim() !== '';
-
- // Don't render a misleading "no installs" state when the query actually failed
- if (isDefined(error)) {
- return null;
- }
+ const hasFailed = isDefined(error);
// The app is installed nowhere (as opposed to a search yielding no matches)
- const hasNoInstalls = totalCount === 0 && !isSearching && !loading;
+ const hasNoInstalls =
+ totalCount === 0 && !isSearching && !loading && !hasFailed;
if (hasNoInstalls) {
return null;
@@ -142,8 +139,14 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({
</StyledSearchInputContainer>
{loading ? (
<SettingsSectionSkeletonLoader />
+ ) : hasFailed ? (
+ <SettingsEmptyPlaceholder>{t`Couldn't load installed workspaces`}</SettingsEmptyPlaceholder>
) : workspaces.length === 0 ? (
- <SettingsEmptyPlaceholder>{t`No workspaces found`}</SettingsEmptyPlaceholder>
+ <SettingsEmptyPlaceholder>
+ {isSearching
+ ? t`No workspaces match this search`
+ : t`No workspaces found`}
+ </SettingsEmptyPlaceholder>
) : (
<Table>
<TableRow
@@ -187,7 +190,7 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({
</TableBody>
</Table>
)}
- {!isExpanded && totalCount > INITIAL_VISIBLE_WORKSPACES && (
+ {!hasFailed && !isExpanded && totalCount > INITIAL_VISIBLE_WORKSPACES && (
<StyledButtonContainer>
<Button
title={t`Show all`}
@@ -198,7 +201,7 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({
/>
</StyledButtonContainer>
)}
- {isExpanded && hasMore && (
+ {!hasFailed && isExpanded && hasMore && (
<StyledButtonContainer>
<Button
title={t`Show more`}
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 c3c1070c902..7c1f0b31392 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
@@ -7,7 +7,8 @@ import { isNonEmptyString } from '@sniptt/guards';
import * as bcrypt from 'bcrypt';
import { type Manifest } from 'twenty-shared/application';
import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
-import { ILike, IsNull, type FindOptionsWhere, type Repository } from 'typeorm';
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { IsNull, type FindOptionsWhere, type Repository } from 'typeorm';
import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
import { v4 } from 'uuid';
@@ -868,31 +869,50 @@ export class ApplicationRegistrationService {
private async computeStats(
applicationRegistrationId: string,
): Promise<ApplicationRegistrationStatsDTO> {
- const versionDistribution: { version: string; count: number }[] =
- await this.applicationRepository
- .createQueryBuilder('application')
- .select("COALESCE(application.version, 'unknown')", 'version')
- .addSelect('COUNT(*)::int', 'count')
- .where(
- 'application."applicationRegistrationId" = :applicationRegistrationId',
- { applicationRegistrationId },
- )
- .andWhere('application."deletedAt" IS NULL')
- .groupBy('version')
- .orderBy('count', 'DESC')
- .getRawMany();
-
- const activeInstalls = versionDistribution.reduce(
+ const rawVersionDistribution: {
+ version: string;
+ count: number;
+ suspendedCount: number;
+ }[] = await this.applicationRepository
+ .createQueryBuilder('application')
+ .select("COALESCE(application.version, 'unknown')", 'version')
+ .addSelect('COUNT(*)::int', 'count')
+ .addSelect(
+ `COUNT(*) FILTER (WHERE workspace."activationStatus" = :suspendedStatus)::int`,
+ 'suspendedCount',
+ )
+ .innerJoin('application.workspace', 'workspace')
+ .where(
+ 'application."applicationRegistrationId" = :applicationRegistrationId',
+ { applicationRegistrationId },
+ )
+ .andWhere('application."deletedAt" IS NULL')
+ .andWhere('workspace."deletedAt" IS NULL')
+ .setParameter('suspendedStatus', WorkspaceActivationStatus.SUSPENDED)
+ .groupBy('version')
+ .orderBy('count', 'DESC')
+ .getRawMany();
+
+ const activeInstalls = rawVersionDistribution.reduce(
(sum, entry) => sum + entry.count,
0,
);
- const mostInstalledVersion = versionDistribution[0]?.version ?? null;
+ const suspendedInstalls = rawVersionDistribution.reduce(
+ (sum, entry) => sum + entry.suspendedCount,
+ 0,
+ );
+
+ const mostInstalledVersion = rawVersionDistribution[0]?.version ?? null;
return {
activeInstalls,
+ suspendedInstalls,
mostInstalledVersion,
- versionDistribution,
+ versionDistribution: rawVersionDistribution.map((entry) => ({
+ version: entry.version,
+ count: entry.count,
+ })),
};
}
@@ -922,29 +942,29 @@ export class ApplicationRegistrationService {
): Promise<ApplicationRegistrationInstalledWorkspacesDTO> {
const trimmedSearch = searchTerm?.trim();
- const where: FindOptionsWhere<ApplicationEntity> = {
- applicationRegistrationId,
- };
+ const queryBuilder = this.applicationRepository
+ .createQueryBuilder('application')
+ .innerJoinAndSelect('application.workspace', 'workspace')
+ .where(
+ 'application."applicationRegistrationId" = :applicationRegistrationId',
+ { applicationRegistrationId },
+ )
+ .andWhere('application."deletedAt" IS NULL')
+ .andWhere('workspace."deletedAt" IS NULL')
+ .orderBy('workspace.displayName', 'ASC')
+ .addOrderBy('application.id', 'ASC')
+ .skip(offset)
+ .take(limit);
- const whereClauses: FindOptionsWhere<ApplicationEntity>[] =
- isDefined(trimmedSearch) && trimmedSearch.length > 0
- ? [
- {
- ...where,
- workspace: { displayName: ILike(`%${trimmedSearch}%`) },
- },
- { ...where, version: ILike(`%${trimmedSearch}%`) },
- ]
- : [where];
-
- const [applications, totalCount] =
- await this.applicationRepository.findAndCount({
- where: whereClauses,
- relations: { workspace: true },
- order: { workspace: { displayName: 'ASC' }, id: 'ASC' },
- skip: offset,
- take: limit,
- });
+ if (isDefined(trimmedSearch) && trimmedSearch.length > 0) {
+ queryBuilder.andWhere(
+ `(workspace."displayName" ILIKE :searchTerm
+ OR application."version" ILIKE :searchTerm)`,
+ { searchTerm: `%${trimmedSearch}%` },
+ );
+ }
+
+ const [applications, totalCount] = await queryBuilder.getManyAndCount();
const workspaces = applications.map((application) => ({
id: application.workspace.id,
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts
index 0a2098c65d7..9f41088c68e 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto.ts
@@ -14,6 +14,9 @@ export class ApplicationRegistrationStatsDTO {
@Field(() => Int)
activeInstalls: number;
+ @Field(() => Int)
+ suspendedInstalls: number;
+
@Field(() => String, { nullable: true })
mostInstalledVersion: string | null;
diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-stats.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-stats.integration-spec.ts
index 76a6329ebd3..cacd295453c 100644
--- a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-stats.integration-spec.ts
+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-stats.integration-spec.ts
@@ -20,6 +20,7 @@ const FIND_STATS = gql`
query FindAdminApplicationRegistrationStats($id: String!) {
findAdminApplicationRegistrationStats(id: $id) {
activeInstalls
+ suspendedInstalls
mostInstalledVersion
versionDistribution {
version
@@ -71,6 +72,8 @@ const FIND_ALL_REGISTRATIONS = gql`
const REGISTRATION_NAME = 'admin-panel-stats-integration-test-registration';
+const DELETED_WORKSPACE_ONLY_VERSION = '9.9.9';
+
type SeededApplication = {
id: string;
workspaceId: string;
@@ -80,6 +83,7 @@ type SeededApplication = {
describe('Admin panel application registration stats and installed workspaces (integration)', () => {
let dataSource: DataSource;
let applicationRegistrationId: string;
+ let deletedWorkspaceId: string;
const seededApplicationIds: string[] = [];
const insertApplication = async ({
@@ -149,6 +153,32 @@ describe('Admin panel application registration stats and installed workspaces (i
workspaceId: SEED_YCOMBINATOR_WORKSPACE_ID,
version: '1.0.0',
});
+
+ deletedWorkspaceId = randomUUID();
+
+ const [{ workspaceCustomApplicationId }] = await dataSource.query(
+ `SELECT "workspaceCustomApplicationId" FROM core."workspace" WHERE id = $1`,
+ [SEED_APPLE_WORKSPACE_ID],
+ );
+
+ await dataSource.query(
+ `INSERT INTO core."workspace"
+ (id, "displayName", subdomain, "activationStatus",
+ "workspaceCustomApplicationId", "deletedAt")
+ VALUES ($1, $2, $3, $4, $5, now())`,
+ [
+ deletedWorkspaceId,
+ 'admin-panel-stats-deleted-workspace',
+ `admin-panel-stats-deleted-${deletedWorkspaceId}`,
+ 'PENDING_CREATION',
+ workspaceCustomApplicationId,
+ ],
+ );
+
+ await insertApplication({
+ workspaceId: deletedWorkspaceId,
+ version: DELETED_WORKSPACE_ONLY_VERSION,
+ });
});
afterAll(async () => {
@@ -163,6 +193,10 @@ describe('Admin panel application registration stats and installed workspaces (i
`DELETE FROM core."applicationRegistration" WHERE id = $1`,
[applicationRegistrationId],
);
+
+ await dataSource.query(`DELETE FROM core."workspace" WHERE id = $1`, [
+ deletedWorkspaceId,
+ ]);
});
describe('findAdminApplicationRegistrationStats', () => {
@@ -178,6 +212,7 @@ describe('Admin panel application registration stats and installed workspaces (i
expect(stats).toBeDefined();
expect(stats.activeInstalls).toBe(3);
+ expect(stats.suspendedInstalls).toBe(0);
expect(stats.mostInstalledVersion).toBe('2.0.0');
const distributionByVersion = Object.fromEntries(
@@ -195,6 +230,24 @@ describe('Admin panel application registration stats and installed workspaces (i
expect(stats.versionDistribution[0].version).toBe('2.0.0');
});
+ it('excludes installs on soft-deleted workspaces', async () => {
+ const response = await makeAdminPanelAPIRequest({
+ query: FIND_STATS,
+ variables: { id: applicationRegistrationId },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const stats = response.body.data?.findAdminApplicationRegistrationStats;
+
+ expect(stats.activeInstalls).toBe(3);
+ expect(
+ stats.versionDistribution.map(
+ (entry: { version: string }) => entry.version,
+ ),
+ ).not.toContain(DELETED_WORKSPACE_ONLY_VERSION);
+ });
+
it('rejects a caller without the SECURITY permission flag', async () => {
const response = await makeAdminPanelAPIRequestWithGuestRole({
query: FIND_STATS,
@@ -263,6 +316,28 @@ describe('Admin panel application registration stats and installed workspaces (i
);
});
+ it('returns an empty result instead of erroring when a search only matches installs on soft-deleted workspaces', async () => {
+ const response = await makeAdminPanelAPIRequest({
+ query: FIND_INSTALLED_WORKSPACES,
+ variables: {
+ input: {
+ id: applicationRegistrationId,
+ offset: 0,
+ searchTerm: DELETED_WORKSPACE_ONLY_VERSION,
+ },
+ },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const result =
+ response.body.data?.findAdminApplicationRegistrationInstalledWorkspaces;
+
+ expect(result.totalCount).toBe(0);
+ expect(result.hasMore).toBe(false);
+ expect(result.workspaces).toHaveLength(0);
+ });
+
it('filters by application version via searchTerm', async () => {
const response = await makeAdminPanelAPIRequest({
query: FIND_INSTALLED_WORKSPACES,
@@ -347,4 +422,84 @@ describe('Admin panel application registration stats and installed workspaces (i
expect(response.body.data?.findAllApplicationRegistrations).toBeFalsy();
});
});
+
+ describe('suspended workspace installs', () => {
+ let suspendedWorkspaceId: string;
+ let suspendedApplicationId: string;
+
+ beforeAll(async () => {
+ suspendedWorkspaceId = randomUUID();
+
+ const [{ workspaceCustomApplicationId }] = await dataSource.query(
+ `SELECT "workspaceCustomApplicationId" FROM core."workspace" WHERE id = $1`,
+ [SEED_APPLE_WORKSPACE_ID],
+ );
+
+ await dataSource.query(
+ `INSERT INTO core."workspace"
+ (id, "displayName", subdomain, "activationStatus", "defaultRoleId",
+ "databaseSchema", "workspaceCustomApplicationId")
+ VALUES ($1, $2, $3, 'SUSPENDED', $4, $5, $6)`,
+ [
+ suspendedWorkspaceId,
+ 'admin-panel-stats-suspended-workspace',
+ `admin-panel-stats-suspended-${suspendedWorkspaceId}`,
+ randomUUID(),
+ 'admin_panel_stats_suspended',
+ workspaceCustomApplicationId,
+ ],
+ );
+
+ const { id } = await insertApplication({
+ workspaceId: suspendedWorkspaceId,
+ version: '2.0.0',
+ });
+
+ suspendedApplicationId = id;
+ });
+
+ afterAll(async () => {
+ await dataSource.query(`DELETE FROM core."application" WHERE id = $1`, [
+ suspendedApplicationId,
+ ]);
+ await dataSource.query(`DELETE FROM core."workspace" WHERE id = $1`, [
+ suspendedWorkspaceId,
+ ]);
+ });
+
+ it('counts them as installs and reports them separately', async () => {
+ const response = await makeAdminPanelAPIRequest({
+ query: FIND_STATS,
+ variables: { id: applicationRegistrationId },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const stats = response.body.data?.findAdminApplicationRegistrationStats;
+
+ expect(stats.activeInstalls).toBe(4);
+ expect(stats.suspendedInstalls).toBe(1);
+ });
+
+ it('lists them alongside installs on active workspaces', async () => {
+ const response = await makeAdminPanelAPIRequest({
+ query: FIND_INSTALLED_WORKSPACES,
+ variables: {
+ input: {
+ id: applicationRegistrationId,
+ offset: 0,
+ searchTerm: 'admin-panel-stats-suspended-workspace',
+ },
+ },
+ });
+
+ expect(response.body.errors).toBeUndefined();
+
+ const result =
+ response.body.data?.findAdminApplicationRegistrationInstalledWorkspaces;
+
+ expect(result.totalCount).toBe(1);
+ expect(result.workspaces[0].id).toBe(suspendedWorkspaceId);
+ });
+ });
});