Skip to content

The open alternative to Salesforce, designed for AI.

Add source, listed and configured filters to admin app list (#24779)

martmull4883eaabf0e0
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.ts
index 17ff69b36ed..144126f2fb7 100644
--- a/packages/twenty-front/src/generated-admin/graphql.ts
+++ b/packages/twenty-front/src/generated-admin/graphql.ts
@@ -752,10 +752,13 @@ export type QueryFindAdminApplicationRegistrationVariablesArgs = {
export type QueryFindAllApplicationRegistrationsArgs = {
+ isConfigured?: InputMaybe<Scalars['Boolean']['input']>;
+ isListed?: InputMaybe<Scalars['Boolean']['input']>;
isPreInstalledOnly?: InputMaybe<Scalars['Boolean']['input']>;
limit?: InputMaybe<Scalars['Int']['input']>;
offset?: InputMaybe<Scalars['Int']['input']>;
searchTerm?: InputMaybe<Scalars['String']['input']>;
+ sourceTypes?: InputMaybe<Array<ApplicationRegistrationSourceType>>;
};
@@ -1238,10 +1241,13 @@ export type FindAllApplicationRegistrationsQueryVariables = Exact<{
offset?: InputMaybe<Scalars['Int']['input']>;
searchTerm?: InputMaybe<Scalars['String']['input']>;
isPreInstalledOnly?: InputMaybe<Scalars['Boolean']['input']>;
+ sourceTypes?: InputMaybe<Array<ApplicationRegistrationSourceType> | ApplicationRegistrationSourceType>;
+ isListed?: InputMaybe<Scalars['Boolean']['input']>;
+ isConfigured?: InputMaybe<Scalars['Boolean']['input']>;
}>;
-export type FindAllApplicationRegistrationsQuery = { __typename?: 'Query', findAllApplicationRegistrations: { __typename?: 'PaginatedApplicationRegistrations', 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', 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'];
@@ -1517,7 +1523,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":"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"}}}],"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"}}}],"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":"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":"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.tsx
index 04633693e09..767e0cf8c34 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
@@ -6,6 +6,7 @@ import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSectionLabel } from '@/ui/layout/dropdown/components/DropdownMenuSectionLabel';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableCell } from '@/ui/layout/table/components/TableCell';
@@ -56,12 +57,31 @@ const TABLE_GRID = '1fr 100px 100px 100px 40px';
const TABLE_GRID_MOBILE = '3fr 3fr 1fr 1fr 40px';
const PAGE_SIZE = 25;
+const SOURCE_TYPE_FILTER_OPTIONS: {
+ sourceType: ApplicationRegistrationSourceType;
+ label: string;
+}[] = [
+ { sourceType: ApplicationRegistrationSourceType.NPM, label: 'NPM' },
+ { sourceType: ApplicationRegistrationSourceType.TARBALL, label: 'Tarball' },
+ { sourceType: ApplicationRegistrationSourceType.OAUTH_ONLY, label: 'OAuth' },
+ { sourceType: ApplicationRegistrationSourceType.LOCAL, label: 'Local' },
+];
+
export const SettingsAdminApps = () => {
const apolloAdminClient = useApolloAdminClient();
const { enqueueSuccessSnackBar, enqueueErrorSnackBar } = useSnackBar();
const [searchQuery, setSearchQuery] = useState('');
const [debouncedSearchQuery] = useDebounce(searchQuery, 300);
const [showPreInstalledOnly, setShowPreInstalledOnly] = useState(false);
+ const [sourceTypeFilters, setSourceTypeFilters] = useState<
+ ApplicationRegistrationSourceType[]
+ >([ApplicationRegistrationSourceType.NPM]);
+ const [isListedFilter, setIsListedFilter] = useState<boolean | undefined>(
+ undefined,
+ );
+ const [isConfiguredFilter, setIsConfiguredFilter] = useState<
+ boolean | undefined
+ >(undefined);
const { data, loading, fetchMore } = useQuery(
FindAllApplicationRegistrationsDocument,
@@ -73,10 +93,26 @@ export const SettingsAdminApps = () => {
offset: 0,
searchTerm: debouncedSearchQuery,
isPreInstalledOnly: showPreInstalledOnly,
+ sourceTypes:
+ sourceTypeFilters.length > 0 ? sourceTypeFilters : undefined,
+ isListed: isListedFilter,
+ isConfigured: isConfiguredFilter,
},
},
);
+ const toggleSourceTypeFilter = (
+ sourceType: ApplicationRegistrationSourceType,
+ ) => {
+ setSourceTypeFilters((currentFilters) =>
+ currentFilters.includes(sourceType)
+ ? currentFilters.filter(
+ (currentSourceType) => currentSourceType !== sourceType,
+ )
+ : [...currentFilters, sourceType],
+ );
+ };
+
const [syncMarketplaceCatalog, { loading: isSyncing }] = useMutation(
SyncMarketplaceCatalogDocument,
{ client: apolloAdminClient },
@@ -95,9 +131,10 @@ export const SettingsAdminApps = () => {
}
};
- const registrations = [
- ...(data?.findAllApplicationRegistrations.registrations ?? []),
- ].sort((a, b) => Number(a.isConfigured) - Number(b.isConfigured));
+ const registrations =
+ data?.findAllApplicationRegistrations.registrations ?? [];
+
+ const totalCount = data?.findAllApplicationRegistrations.totalCount ?? 0;
const hasMore = data?.findAllApplicationRegistrations.hasMore ?? false;
@@ -166,7 +203,7 @@ export const SettingsAdminApps = () => {
<Section>
<H2Title
title={t`All App Registrations`}
- description={t`All application registrations across the platform, including orphaned marketplace apps`}
+ description={t`All application registrations across the platform, including orphaned marketplace apps (${totalCount} matching)`}
/>
<SearchInput
placeholder={t`Search registrations...`}
@@ -190,6 +227,60 @@ export const SettingsAdminApps = () => {
text={t`Pre-installed only`}
toggleSize="small"
/>
+ <DropdownMenuSectionLabel label={t`Source`} />
+ {SOURCE_TYPE_FILTER_OPTIONS.map(({ sourceType, label }) => (
+ <MenuItemToggle
+ key={sourceType}
+ onToggleChange={() =>
+ toggleSourceTypeFilter(sourceType)
+ }
+ toggled={sourceTypeFilters.includes(sourceType)}
+ text={label}
+ toggleSize="small"
+ />
+ ))}
+ <DropdownMenuSectionLabel label={t`Listed`} />
+ <MenuItemToggle
+ onToggleChange={() =>
+ setIsListedFilter(
+ isListedFilter === true ? undefined : true,
+ )
+ }
+ toggled={isListedFilter === true}
+ text={t`Listed`}
+ toggleSize="small"
+ />
+ <MenuItemToggle
+ onToggleChange={() =>
+ setIsListedFilter(
+ isListedFilter === false ? undefined : false,
+ )
+ }
+ toggled={isListedFilter === false}
+ text={t`Not listed`}
+ toggleSize="small"
+ />
+ <DropdownMenuSectionLabel label={t`Configured`} />
+ <MenuItemToggle
+ onToggleChange={() =>
+ setIsConfiguredFilter(
+ isConfiguredFilter === true ? undefined : true,
+ )
+ }
+ toggled={isConfiguredFilter === true}
+ text={t`Configured`}
+ toggleSize="small"
+ />
+ <MenuItemToggle
+ onToggleChange={() =>
+ setIsConfiguredFilter(
+ isConfiguredFilter === false ? undefined : false,
+ )
+ }
+ toggled={isConfiguredFilter === false}
+ text={t`Not configured`}
+ toggleSize="small"
+ />
</DropdownMenuItemsContainer>
</DropdownContent>
}
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.ts
index 97de5755923..978bd24d90c 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
@@ -8,16 +8,23 @@ export const FIND_ALL_APPLICATION_REGISTRATIONS = gql`
$offset: Int
$searchTerm: String
$isPreInstalledOnly: Boolean
+ $sourceTypes: [ApplicationRegistrationSourceType!]
+ $isListed: Boolean
+ $isConfigured: Boolean
) {
findAllApplicationRegistrations(
limit: $limit
offset: $offset
searchTerm: $searchTerm
isPreInstalledOnly: $isPreInstalledOnly
+ sourceTypes: $sourceTypes
+ isListed: $isListed
+ isConfigured: $isConfigured
) {
registrations {
...ApplicationRegistrationFragment
}
+ totalCount
hasMore
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
index d6dcdb1fe3b..79859b469cf 100644
--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel.resolver.ts
@@ -61,6 +61,7 @@ import { UpdateApplicationRegistrationVariableInput } from 'src/engine/core-modu
import { ApplicationRegistrationClaimService } from 'src/engine/core-modules/application/application-registration/application-registration-claim.service';
import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';
import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';
+import { ApplicationRegistrationSourceType } from 'src/engine/core-modules/application/application-registration/enums/application-registration-source-type.enum';
import { AdminApplicationRegistrationClaimDTO } from 'src/engine/core-modules/application/application-registration/dtos/admin-application-registration-claim.dto';
import { ApplicationRegistrationInstalledWorkspacesDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-installed-workspaces.dto';
import { ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';
@@ -496,12 +497,24 @@ export class AdminPanelResolver {
searchTerm?: string,
@Args('isPreInstalledOnly', { type: () => Boolean, nullable: true })
isPreInstalledOnly?: boolean,
+ @Args('sourceTypes', {
+ type: () => [ApplicationRegistrationSourceType],
+ nullable: true,
+ })
+ sourceTypes?: ApplicationRegistrationSourceType[],
+ @Args('isListed', { type: () => Boolean, nullable: true })
+ isListed?: boolean,
+ @Args('isConfigured', { type: () => Boolean, nullable: true })
+ isConfigured?: boolean,
): Promise<PaginatedApplicationRegistrationsDTO> {
return this.applicationRegistrationService.findAll({
limit,
offset,
searchTerm,
isPreInstalledOnly,
+ sourceTypes,
+ isListed,
+ isConfigured,
});
}
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 aa4a7873199..c3c1070c902 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
@@ -6,7 +6,7 @@ import crypto from 'crypto';
import { isNonEmptyString } from '@sniptt/guards';
import * as bcrypt from 'bcrypt';
import { type Manifest } from 'twenty-shared/application';
-import { isDefined } from 'twenty-shared/utils';
+import { isDefined, isNonEmptyArray } from 'twenty-shared/utils';
import { ILike, IsNull, type FindOptionsWhere, type Repository } from 'typeorm';
import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
import { v4 } from 'uuid';
@@ -216,11 +216,17 @@ export class ApplicationRegistrationService {
offset,
searchTerm,
isPreInstalledOnly,
+ sourceTypes,
+ isListed,
+ isConfigured,
}: {
limit: number;
offset: number;
searchTerm?: string;
isPreInstalledOnly?: boolean;
+ sourceTypes?: ApplicationRegistrationSourceType[];
+ isListed?: boolean;
+ isConfigured?: boolean;
}): Promise<PaginatedApplicationRegistrationsDTO> {
const safeLimit = Math.min(
Math.max(limit, 1),
@@ -238,14 +244,24 @@ export class ApplicationRegistrationService {
),
)
.orderBy('registration.createdAt', 'DESC')
- .addOrderBy('registration.id', 'ASC')
- .skip(safeOffset)
- .take(safeLimit);
+ .addOrderBy('registration.id', 'ASC');
if (isPreInstalledOnly === true) {
queryBuilder.andWhere('registration."isPreInstalled" = true');
}
+ if (isNonEmptyArray(sourceTypes)) {
+ queryBuilder.andWhere('registration."sourceType" IN (:...sourceTypes)', {
+ sourceTypes,
+ });
+ }
+
+ if (isDefined(isListed)) {
+ queryBuilder.andWhere('registration."isListed" = :isListed', {
+ isListed,
+ });
+ }
+
if (isDefined(trimmedSearch) && trimmedSearch.length > 0) {
queryBuilder.andWhere(
`(registration.name ILIKE :searchTerm
@@ -255,7 +271,35 @@ export class ApplicationRegistrationService {
);
}
- const [registrations, totalCount] = await queryBuilder.getManyAndCount();
+ // Configuration status is computed from variables and installs, not stored
+ // on the registration, so this filter paginates in memory.
+ if (isDefined(isConfigured)) {
+ const allRegistrations = await queryBuilder.getMany();
+
+ const configuredStatuses =
+ await this.applicationRegistrationVariableService.isConfiguredBatch(
+ allRegistrations.map((registration) => registration.id),
+ );
+
+ const filteredRegistrations = allRegistrations.filter(
+ (registration) =>
+ (configuredStatuses.get(registration.id) ?? false) === isConfigured,
+ );
+
+ return {
+ registrations: filteredRegistrations.slice(
+ safeOffset,
+ safeOffset + safeLimit,
+ ),
+ totalCount: filteredRegistrations.length,
+ hasMore: safeOffset + safeLimit < filteredRegistrations.length,
+ };
+ }
+
+ const [registrations, totalCount] = await queryBuilder
+ .skip(safeOffset)
+ .take(safeLimit)
+ .getManyAndCount();
return {
registrations,