The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Paginate admin panel app registrations list (#22734)
martmull7381038452fd
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 504f58ee176..7d9cf00b9d1 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -325,7 +325,8 @@ export enum FeatureFlagKey {export type FindApplicationRegistrationInstalledWorkspacesInput = {id: Scalars['String']['input'];- page?: Scalars['Int']['input'];+ limit?: Scalars['Int']['input'];+ offset?: Scalars['Int']['input'];searchTerm?: InputMaybe<Scalars['String']['input']>;};@@ -576,6 +577,13 @@ export type MutationUpdateWorkspaceFeatureFlagArgs = {workspaceId: Scalars['UUID']['input'];};+export type PaginatedApplicationRegistrations = {+ __typename?: 'PaginatedApplicationRegistrations';+ hasMore: Scalars['Boolean']['output'];+ registrations: Array<ApplicationRegistration>;+ totalCount: Scalars['Int']['output'];+};+export type Query = {__typename?: 'Query';adminPanelRecentUsers: Array<AdminPanelRecentUser>;@@ -583,7 +591,7 @@ export type Query = {findAdminApplicationRegistrationInstalledWorkspaces: ApplicationRegistrationInstalledWorkspaces;findAdminApplicationRegistrationStats: ApplicationRegistrationStats;findAdminApplicationRegistrationVariables: Array<ApplicationRegistrationVariableDto>;- findAllApplicationRegistrations: Array<ApplicationRegistration>;+ findAllApplicationRegistrations: PaginatedApplicationRegistrations;findOneAdminApplicationRegistration: ApplicationRegistration;getAdminAiModels: AdminAiModels;getAdminAiUsageByWorkspace: Array<UsageBreakdownItem>;@@ -635,6 +643,14 @@ export type QueryFindAdminApplicationRegistrationVariablesArgs = {};+export type QueryFindAllApplicationRegistrationsArgs = {+ isPreInstalledOnly?: InputMaybe<Scalars['Boolean']['input']>;+ limit?: InputMaybe<Scalars['Int']['input']>;+ offset?: InputMaybe<Scalars['Int']['input']>;+ searchTerm?: InputMaybe<Scalars['String']['input']>;+};++export type QueryFindOneAdminApplicationRegistrationArgs = {id: Scalars['String']['input'];};@@ -1096,10 +1112,15 @@ export type FindAdminApplicationRegistrationVariablesQueryVariables = Exact<{export type FindAdminApplicationRegistrationVariablesQuery = { __typename?: 'Query', findAdminApplicationRegistrationVariables: Array<{ __typename?: 'ApplicationRegistrationVariableDTO', id: string, key: string, value?: string | null, description: string, isSecret: boolean, isRequired: boolean, isFilled: boolean, type: string, options?: any | null, createdAt: string, updatedAt: string }> };-export type FindAllApplicationRegistrationsQueryVariables = Exact<{ [key: string]: never; }>;+export type FindAllApplicationRegistrationsQueryVariables = Exact<{+ limit?: InputMaybe<Scalars['Int']['input']>;+ offset?: InputMaybe<Scalars['Int']['input']>;+ searchTerm?: InputMaybe<Scalars['String']['input']>;+ isPreInstalledOnly?: InputMaybe<Scalars['Boolean']['input']>;+}>;-export type FindAllApplicationRegistrationsQuery = { __typename?: 'Query', findAllApplicationRegistrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, logoUrl?: string | null, 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', hasMore: boolean, registrations: Array<{ __typename?: 'ApplicationRegistration', id: string, universalIdentifier: string, name: string, logoUrl?: string | null, 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'];@@ -1342,7 +1363,7 @@ export const UpdateAdminApplicationRegistrationVariableDocument = {"kind":"Documexport 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":"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"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"findAllApplicationRegistrations"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}}]}}]}},{"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":"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"}}}],"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":"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 3de05adbd02..f7a78e98774 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@@ -1,5 +1,6 @@import { ApplicationDisplay } from '@/applications/components/ApplicationDisplay';import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';+import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';@@ -14,9 +15,19 @@ import { useMutation, useQuery } from '@apollo/client/react';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { type ReactNode, useContext, useState } from 'react';-import { assertUnreachable, getSettingsPath } from 'twenty-shared/utils';+import { useDebounce } from 'use-debounce';+import {+ assertUnreachable,+ getSettingsPath,+ isDefined,+} from 'twenty-shared/utils';import { SettingsPath } from 'twenty-shared/types';-import { IconChevronRight, IconPinned, IconRefresh } from 'twenty-ui/icon';+import {+ IconChevronRight,+ IconDotsVertical,+ IconPinned,+ IconRefresh,+} from 'twenty-ui/icon';import { H2Title } from 'twenty-ui/typography';import { Button, SearchInput } from 'twenty-ui/input';import { Section } from 'twenty-ui/layout';@@ -35,18 +46,36 @@ const StyledTableContainer = styled.div`margin-top: ${themeCssVariables.spacing[3]};`;+const StyledShowMoreContainer = styled.div`+ display: flex;+ justify-content: center;+ margin-top: ${themeCssVariables.spacing[2]};+`;+const TABLE_GRID = '1fr 100px 100px 100px 40px';const TABLE_GRID_MOBILE = '3fr 3fr 1fr 1fr 40px';+const PAGE_SIZE = 25;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 { data } = useQuery(FindAllApplicationRegistrationsDocument, {- client: apolloAdminClient,- });+ const { data, loading, fetchMore } = useQuery(+ FindAllApplicationRegistrationsDocument,+ {+ client: apolloAdminClient,+ notifyOnNetworkStatusChange: true,+ variables: {+ limit: PAGE_SIZE,+ offset: 0,+ searchTerm: debouncedSearchQuery,+ isPreInstalledOnly: showPreInstalledOnly,+ },+ },+ );const [syncMarketplaceCatalog, { loading: isSyncing }] = useMutation(SyncMarketplaceCatalogDocument,@@ -66,27 +95,35 @@ export const SettingsAdminApps = () => {}};- const registrations = data?.findAllApplicationRegistrations ?? [];+ const registrations = [+ ...(data?.findAllApplicationRegistrations.registrations ?? []),+ ].sort((a, b) => Number(a.isConfigured) - Number(b.isConfigured));- const query = searchQuery.trim().toLowerCase();+ const hasMore = data?.findAllApplicationRegistrations.hasMore ?? false;- const filtered = registrations- .filter((registration) => {- if (showPreInstalledOnly && !registration.isPreInstalled) {- return false;- }-- if (query.length === 0) {- return true;- }+ const handleShowMore = () => {+ fetchMore({+ variables: {+ limit: PAGE_SIZE,+ offset: registrations.length,+ },+ updateQuery: (previousData, { fetchMoreResult }) => {+ if (!isDefined(fetchMoreResult)) {+ return previousData;+ }- return (- registration.name.toLowerCase().includes(query) ||- (registration.sourcePackage ?? '').toLowerCase().includes(query) ||- registration.universalIdentifier.toLowerCase().includes(query)- );- })- .toSorted((a, b) => Number(a.isConfigured) - Number(b.isConfigured));+ return {+ findAllApplicationRegistrations: {+ ...fetchMoreResult.findAllApplicationRegistrations,+ registrations: [+ ...previousData.findAllApplicationRegistrations.registrations,+ ...fetchMoreResult.findAllApplicationRegistrations.registrations,+ ],+ },+ };+ },+ });+ };const getFormattedSource = (registration: ApplicationRegistrationFragmentFragment,@@ -159,29 +196,47 @@ export const SettingsAdminApps = () => {/>)}/>- <StyledTableContainer>- <Table>- <TableRow- gridAutoColumns={TABLE_GRID}- mobileGridAutoColumns={TABLE_GRID_MOBILE}- >- <TableHeader>{t`Name`}</TableHeader>- <TableHeader align="right">{t`Source`}</TableHeader>- <TableHeader align="right">{t`Listed`}</TableHeader>- <TableHeader align="right">{t`Configured`}</TableHeader>- <TableHeader></TableHeader>- </TableRow>- <TableBody>- {filtered.map((registration) => (- <SettingsAdminAppsTableRow- key={registration.id}- registration={registration}- getFormattedSource={getFormattedSource}- />- ))}- </TableBody>- </Table>- </StyledTableContainer>+ {loading && registrations.length === 0 ? (+ <SettingsEmptyPlaceholder>{t`Loading apps...`}</SettingsEmptyPlaceholder>+ ) : registrations.length === 0 ? (+ <SettingsEmptyPlaceholder>{t`No apps found`}</SettingsEmptyPlaceholder>+ ) : (+ <StyledTableContainer>+ <Table>+ <TableRow+ gridAutoColumns={TABLE_GRID}+ mobileGridAutoColumns={TABLE_GRID_MOBILE}+ >+ <TableHeader>{t`Name`}</TableHeader>+ <TableHeader align="right">{t`Source`}</TableHeader>+ <TableHeader align="right">{t`Listed`}</TableHeader>+ <TableHeader align="right">{t`Configured`}</TableHeader>+ <TableHeader></TableHeader>+ </TableRow>+ <TableBody>+ {registrations.map((registration) => (+ <SettingsAdminAppsTableRow+ key={registration.id}+ registration={registration}+ getFormattedSource={getFormattedSource}+ />+ ))}+ </TableBody>+ </Table>+ </StyledTableContainer>+ )}+ {hasMore && (+ <StyledShowMoreContainer>+ <Button+ title={t`Show more`}+ Icon={IconDotsVertical}+ onClick={handleShowMore}+ disabled={loading}+ size="small"+ variant="secondary"+ />+ </StyledShowMoreContainer>+ )}</Section></>);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 82e35e01ebf..97de5755923 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@@ -3,9 +3,22 @@ import { gql } from '@apollo/client';import { APPLICATION_REGISTRATION_FRAGMENT } from '@/settings/application-registrations/graphql/fragments/applicationRegistrationFragment';export const FIND_ALL_APPLICATION_REGISTRATIONS = gql`- query FindAllApplicationRegistrations {- findAllApplicationRegistrations {- ...ApplicationRegistrationFragment+ query FindAllApplicationRegistrations(+ $limit: Int+ $offset: Int+ $searchTerm: String+ $isPreInstalledOnly: Boolean+ ) {+ findAllApplicationRegistrations(+ limit: $limit+ offset: $offset+ searchTerm: $searchTerm+ isPreInstalledOnly: $isPreInstalledOnly+ ) {+ registrations {+ ...ApplicationRegistrationFragment+ }+ hasMore}}${APPLICATION_REGISTRATION_FRAGMENT}diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsxindex 18d26ddd866..398401dedce 100644--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationInstalledWorkspaces.tsx@@ -11,6 +11,7 @@ import { Section } from 'twenty-ui/layout';import { OverflowingTextWithTooltip } from 'twenty-ui/surfaces';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { SettingsEmptyPlaceholder } from '@/settings/components/SettingsEmptyPlaceholder';import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';@@ -25,6 +26,7 @@ import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';import { SettingsPath } from 'twenty-shared/types';const INITIAL_VISIBLE_WORKSPACES = 3;+const SHOW_MORE_PAGE_SIZE = 20;const INSTALLED_WORKSPACES_GRID_TEMPLATE_COLUMNS = '1fr 120px';const StyledSection = styled(Section)`@@ -52,7 +54,6 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({const [searchTerm, setSearchTerm] = useState('');const [debouncedSearchTerm] = useDebounce(searchTerm, 300);const [isExpanded, setIsExpanded] = useState(false);- const [currentPage, setCurrentPage] = useState(1);const applicationRegistrationId = registration.id;@@ -63,7 +64,6 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({variables: {input: {id: applicationRegistrationId,- page: 1,searchTerm: debouncedSearchTerm,},},@@ -96,18 +96,16 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({const handleSearchChange = (nextSearchTerm: string) => {setSearchTerm(nextSearchTerm);- setCurrentPage(1);setIsExpanded(false);};const handleShowMore = () => {- const nextPage = currentPage + 1;-fetchMore({variables: {input: {id: applicationRegistrationId,- page: nextPage,+ limit: SHOW_MORE_PAGE_SIZE,+ offset: workspaces.length,searchTerm: debouncedSearchTerm,},},@@ -129,8 +127,6 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({};},});-- setCurrentPage(nextPage);};return (@@ -146,6 +142,8 @@ export const SettingsApplicationRegistrationInstalledWorkspaces = ({</StyledSearchInputContainer>{loading ? (<SettingsSectionSkeletonLoader />+ ) : workspaces.length === 0 ? (+ <SettingsEmptyPlaceholder>{t`No workspaces found`}</SettingsEmptyPlaceholder>) : (<Table><TableRowdiff --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.tsindex 0ba1355127e..269851750dd 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@@ -55,6 +55,7 @@ import { ApplicationRegistrationService } from 'src/engine/core-modules/applicatimport { 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';import { FindApplicationRegistrationInstalledWorkspacesInput } from 'src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input';+import { PaginatedApplicationRegistrationsDTO } from 'src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto';import { UpdateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/update-application-registration.input';import {BACKFILL_APPLICATION_INSTALLATION_JOB_NAME,@@ -105,8 +106,6 @@ import { ModelsDevProviderSuggestionDTO } from './dtos/models-dev-provider-suggeimport { QueueMetricsDataDTO } from './dtos/queue-metrics-data.dto';import { SetMaintenanceModeInput } from './dtos/set-maintenance-mode.input';-const INSTALLED_WORKSPACES_PAGE_SIZE = 10;-@UsePipes(ResolverValidationPipe)@AdminResolver()@UseFilters(@@ -480,11 +479,23 @@ export class AdminPanelResolver {}@UseGuards(AdminPanelGuard)- @Query(() => [ApplicationRegistrationEntity])- async findAllApplicationRegistrations(): Promise<- ApplicationRegistrationEntity[]- > {- return this.applicationRegistrationService.findAll();+ @Query(() => PaginatedApplicationRegistrationsDTO)+ async findAllApplicationRegistrations(+ @Args('limit', { type: () => Int, nullable: true, defaultValue: 25 })+ limit: number,+ @Args('offset', { type: () => Int, nullable: true, defaultValue: 0 })+ offset: number,+ @Args('searchTerm', { type: () => String, nullable: true })+ searchTerm?: string,+ @Args('isPreInstalledOnly', { type: () => Boolean, nullable: true })+ isPreInstalledOnly?: boolean,+ ): Promise<PaginatedApplicationRegistrationsDTO> {+ return this.applicationRegistrationService.findAll({+ limit,+ offset,+ searchTerm,+ isPreInstalledOnly,+ });}@UseGuards(AdminPanelGuard)@@ -838,14 +849,15 @@ export class AdminPanelResolver {@Args('input'){id,- page,+ limit,+ offset,searchTerm,}: FindApplicationRegistrationInstalledWorkspacesInput,): Promise<ApplicationRegistrationInstalledWorkspacesDTO> {return this.applicationRegistrationService.getInstalledWorkspacesGlobal(id,- page ?? 1,- INSTALLED_WORKSPACES_PAGE_SIZE,+ limit,+ offset,searchTerm,);}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 4536eb656ad..f169a0229de 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@@ -19,6 +19,7 @@ import {ApplicationRegistrationExceptionCode,} from 'src/engine/core-modules/application/application-registration/application-registration.exception';import { type ApplicationRegistrationInstalledWorkspacesDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-installed-workspaces.dto';+import { type PaginatedApplicationRegistrationsDTO } from 'src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto';import { type ApplicationRegistrationStatsDTO } from 'src/engine/core-modules/application/application-registration/dtos/application-registration-stats.dto';import { type CreateApplicationRegistrationInput } from 'src/engine/core-modules/application/application-registration/dtos/create-application-registration.input';import { type PublicApplicationRegistrationDTO } from 'src/engine/core-modules/application/application-registration/dtos/public-application-registration.dto';@@ -38,6 +39,8 @@ import { MARKETPLACE_VETTED_APPLICATIONS } from 'src/engine/core-modules/applicaconst BCRYPT_SALT_ROUNDS = 10;+const MAX_APPLICATION_REGISTRATIONS_PAGE_SIZE = 100;+const APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT: (keyof ApplicationRegistrationEntity)[] =['id',@@ -119,11 +122,57 @@ export class ApplicationRegistrationService {});}- async findAll(): Promise<ApplicationRegistrationEntity[]> {- return this.applicationRegistrationRepository.find({- select: APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT,- order: { createdAt: 'DESC' },- });+ async findAll({+ limit,+ offset,+ searchTerm,+ isPreInstalledOnly,+ }: {+ limit: number;+ offset: number;+ searchTerm?: string;+ isPreInstalledOnly?: boolean;+ }): Promise<PaginatedApplicationRegistrationsDTO> {+ const safeLimit = Math.min(+ Math.max(limit, 1),+ MAX_APPLICATION_REGISTRATIONS_PAGE_SIZE,+ );+ const safeOffset = Math.max(offset, 0);++ const trimmedSearch = searchTerm?.trim();++ const queryBuilder = this.applicationRegistrationRepository+ .createQueryBuilder('registration')+ .select(+ APPLICATION_REGISTRATION_WITHOUT_MANIFEST_SELECT.map(+ (column) => `registration.${column}`,+ ),+ )+ .orderBy('registration.createdAt', 'DESC')+ .addOrderBy('registration.id', 'ASC')+ .skip(safeOffset)+ .take(safeLimit);++ if (isPreInstalledOnly === true) {+ queryBuilder.andWhere('registration."isPreInstalled" = true');+ }++ if (isDefined(trimmedSearch) && trimmedSearch.length > 0) {+ queryBuilder.andWhere(+ `(registration.name ILIKE :searchTerm+ OR registration."sourcePackage" ILIKE :searchTerm+ OR registration."universalIdentifier"::text ILIKE :searchTerm)`,+ { searchTerm: `%${trimmedSearch}%` },+ );+ }++ const [registrations, totalCount] = await queryBuilder.getManyAndCount();++ return {+ registrations,+ totalCount,+ hasMore: safeOffset + registrations.length < totalCount,+ };}async findOneById(@@ -582,29 +631,26 @@ export class ApplicationRegistrationService {// across all workspaces, so ownership is not enforced.async getInstalledWorkspacesGlobal(applicationRegistrationId: string,- page: number,- pageSize: number,+ limit: number,+ offset: number,searchTerm?: string,): Promise<ApplicationRegistrationInstalledWorkspacesDTO> {await this.findOneByIdGlobal(applicationRegistrationId);return this.computeInstalledWorkspaces(applicationRegistrationId,- page,- pageSize,+ limit,+ offset,searchTerm,);}private async computeInstalledWorkspaces(applicationRegistrationId: string,- page: number,- pageSize: number,+ limit: number,+ offset: number,searchTerm?: string,): Promise<ApplicationRegistrationInstalledWorkspacesDTO> {- const safePage = page < 1 ? 1 : page;- const offset = (safePage - 1) * pageSize;-const trimmedSearch = searchTerm?.trim();const where: FindOptionsWhere<ApplicationEntity> = {@@ -628,7 +674,7 @@ export class ApplicationRegistrationService {relations: { workspace: true },order: { workspace: { displayName: 'ASC' }, id: 'ASC' },skip: offset,- take: pageSize,+ take: limit,});const workspaces = applications.map((application) => ({diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/constants/installed-workspaces-pagination.constant.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/constants/installed-workspaces-pagination.constant.tsnew file mode 100644index 00000000000..905a2b4360d--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/constants/installed-workspaces-pagination.constant.ts@@ -0,0 +1,2 @@+export const INSTALLED_WORKSPACES_DEFAULT_LIMIT = 10;+export const INSTALLED_WORKSPACES_DEFAULT_OFFSET = 0;diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input.tsindex d605311fc22..44527e19e58 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/find-application-registration-installed-workspaces.input.ts@@ -1,6 +1,18 @@import { Field, InputType, Int } from '@nestjs/graphql';-import { IsInt, IsOptional, IsString, MaxLength, Min } from 'class-validator';+import {+ IsInt,+ IsOptional,+ IsString,+ Max,+ MaxLength,+ Min,+} from 'class-validator';++import {+ INSTALLED_WORKSPACES_DEFAULT_LIMIT,+ INSTALLED_WORKSPACES_DEFAULT_OFFSET,+} from 'src/engine/core-modules/application/application-registration/constants/installed-workspaces-pagination.constant';@InputType()export class FindApplicationRegistrationInstalledWorkspacesInput {@@ -8,11 +20,16 @@ export class FindApplicationRegistrationInstalledWorkspacesInput {@IsString()id: string;- @Field(() => Int, { defaultValue: 1 })+ @Field(() => Int, { defaultValue: INSTALLED_WORKSPACES_DEFAULT_LIMIT })@IsInt()@Min(1)- @IsOptional()- page?: number;+ @Max(100)+ limit: number;++ @Field(() => Int, { defaultValue: INSTALLED_WORKSPACES_DEFAULT_OFFSET })+ @IsInt()+ @Min(0)+ offset: number;@Field({ nullable: true })@IsString()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.tsnew file mode 100644index 00000000000..086b48cae7f--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto.ts@@ -0,0 +1,15 @@+import { Field, Int, ObjectType } from '@nestjs/graphql';++import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';++@ObjectType('PaginatedApplicationRegistrations')+export class PaginatedApplicationRegistrationsDTO {+ @Field(() => [ApplicationRegistrationEntity])+ registrations: ApplicationRegistrationEntity[];++ @Field(() => Int)+ totalCount: number;++ @Field(() => Boolean)+ hasMore: boolean;+}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.tsindex ffecb44b3a6..76a6329ebd3 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@@ -46,6 +46,31 @@ const FIND_INSTALLED_WORKSPACES = gql`}`;+const FIND_ALL_REGISTRATIONS = gql`+ query FindAllApplicationRegistrations(+ $limit: Int+ $offset: Int+ $searchTerm: String+ $isPreInstalledOnly: Boolean+ ) {+ findAllApplicationRegistrations(+ limit: $limit+ offset: $offset+ searchTerm: $searchTerm+ isPreInstalledOnly: $isPreInstalledOnly+ ) {+ totalCount+ hasMore+ registrations {+ id+ name+ }+ }+ }+`;++const REGISTRATION_NAME = 'admin-panel-stats-integration-test-registration';+type SeededApplication = {id: string;workspaceId: string;@@ -101,7 +126,7 @@ describe('Admin panel application registration stats and installed workspaces (i[applicationRegistrationId,randomUUID(),- 'admin-panel-stats-integration-test-registration',+ REGISTRATION_NAME,randomUUID(),[],[],@@ -187,7 +212,7 @@ describe('Admin panel application registration stats and installed workspaces (iit('returns installed workspaces ordered by display name with totalCount and hasMore', async () => {const response = await makeAdminPanelAPIRequest({query: FIND_INSTALLED_WORKSPACES,- variables: { input: { id: applicationRegistrationId, page: 1 } },+ variables: { input: { id: applicationRegistrationId, offset: 0 } },});expect(response.body.errors).toBeUndefined();@@ -219,7 +244,7 @@ describe('Admin panel application registration stats and installed workspaces (ivariables: {input: {id: applicationRegistrationId,- page: 1,+ offset: 0,searchTerm: APPLE_WORKSPACE_DISPLAY_NAME,},},@@ -244,7 +269,7 @@ describe('Admin panel application registration stats and installed workspaces (ivariables: {input: {id: applicationRegistrationId,- page: 1,+ offset: 0,searchTerm: '1.0.0',},},@@ -266,7 +291,7 @@ describe('Admin panel application registration stats and installed workspaces (iit('rejects a caller without the SECURITY permission flag', async () => {const response = await makeAdminPanelAPIRequestWithGuestRole({query: FIND_INSTALLED_WORKSPACES,- variables: { input: { id: applicationRegistrationId, page: 1 } },+ variables: { input: { id: applicationRegistrationId, offset: 0 } },});expect(response.body.errors).toBeDefined();@@ -275,4 +300,51 @@ describe('Admin panel application registration stats and installed workspaces (i).toBeFalsy();});});++ describe('findAllApplicationRegistrations', () => {+ it('filters registrations by name via searchTerm', async () => {+ const response = await makeAdminPanelAPIRequest({+ query: FIND_ALL_REGISTRATIONS,+ variables: { limit: 25, offset: 0, searchTerm: REGISTRATION_NAME },+ });++ expect(response.body.errors).toBeUndefined();++ const result = response.body.data?.findAllApplicationRegistrations;++ expect(result.totalCount).toBe(1);+ expect(result.hasMore).toBe(false);+ expect(result.registrations).toHaveLength(1);+ expect(result.registrations[0].id).toBe(applicationRegistrationId);+ expect(result.registrations[0].name).toBe(REGISTRATION_NAME);+ });++ it('returns no registrations when searchTerm matches nothing', async () => {+ const response = await makeAdminPanelAPIRequest({+ query: FIND_ALL_REGISTRATIONS,+ variables: {+ limit: 25,+ offset: 0,+ searchTerm: 'no-registration-matches-this-search-term',+ },+ });++ expect(response.body.errors).toBeUndefined();++ const result = response.body.data?.findAllApplicationRegistrations;++ expect(result.totalCount).toBe(0);+ expect(result.registrations).toHaveLength(0);+ });++ it('rejects a caller without the SECURITY permission flag', async () => {+ const response = await makeAdminPanelAPIRequestWithGuestRole({+ query: FIND_ALL_REGISTRATIONS,+ variables: { limit: 25, offset: 0 },+ });++ expect(response.body.errors).toBeDefined();+ expect(response.body.data?.findAllApplicationRegistrations).toBeFalsy();+ });+ });});diff --git a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-server-version.integration-spec.ts.snap b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-server-version.integration-spec.ts.snapindex 3c51360e12e..e4b42227a35 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-server-version.integration-spec.ts.snap+++ b/packages/twenty-server/test/integration/metadata/suites/application/__snapshots__/failing-upload-application-server-version.integration-spec.ts.snap@@ -7,7 +7,7 @@ exports[`Publish application is gated by the instance server version rejects pub"subCode": "SERVER_VERSION_INCOMPATIBLE","userFriendlyMessage": "This app requires a newer version of the Twenty server. Please upgrade your server or use a compatible app version.",},- "message": "App requires Twenty server >=999.0.0 but this server is 2.20.0.",+ "message": "App requires Twenty server >=<version> but this server is <version>.","name": "UserInputError",}`;diff --git a/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-server-version.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-server-version.integration-spec.tsindex ee494c8e50f..af37e22bcc8 100644--- a/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-server-version.integration-spec.ts+++ b/packages/twenty-server/test/integration/metadata/suites/application/failing-upload-application-server-version.integration-spec.ts@@ -3,6 +3,7 @@ import { buildBaseManifest } from 'test/integration/metadata/suites/application/import { cleanupApplicationAndAppRegistration } from 'test/integration/metadata/suites/application/utils/cleanup-application-and-app-registration.util';import { createAppTarball } from 'test/integration/metadata/suites/application/utils/create-app-tarball.util';import { uploadAppTarball } from 'test/integration/metadata/suites/application/utils/upload-app-tarball.util';+import { scrubSemverVersions } from 'test/utils/scrub-semver-versions.util';import { v4 as uuidv4 } from 'uuid';// The upload flow runs cache-lock retries with real delays, so fake timers@@ -51,6 +52,9 @@ describe('Publish application is gated by the instance server version', () => {expectToFail: true,});- expectOneNotInternalServerErrorSnapshot({ errors });+ expectOneNotInternalServerErrorSnapshot({+ errors,+ normalizeMessage: scrubSemverVersions,+ });});});