The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Show one actionable admin banner per application configuration issue (#27991)
martmullfa802d450557
diff --git a/packages/twenty-front/src/generated-admin/graphql.ts b/packages/twenty-front/src/generated-admin/graphql.tsindex 24bd2707263..d41b6fa0ea7 100644--- a/packages/twenty-front/src/generated-admin/graphql.ts+++ b/packages/twenty-front/src/generated-admin/graphql.ts@@ -274,6 +274,7 @@ export enum AiModelTier {export type ApplicationRegistration = {__typename?: 'ApplicationRegistration';author?: Maybe<Scalars['String']['output']>;+ configurationIssues: Array<ApplicationRegistrationConfigurationIssue>;createdAt: Scalars['DateTime']['output'];galleryImagesUrls: Array<Scalars['String']['output']>;id: Scalars['UUID']['output'];@@ -295,6 +296,12 @@ export type ApplicationRegistration = {updatedAt: Scalars['DateTime']['output'];};+export enum ApplicationRegistrationConfigurationIssue {+ MISSING_OWNER_WORKSPACE = 'MISSING_OWNER_WORKSPACE',+ MISSING_REQUIRED_SERVER_VARIABLES = 'MISSING_REQUIRED_SERVER_VARIABLES',+ NOT_INSTALLED_ON_OWNER_WORKSPACE = 'NOT_INSTALLED_ON_OWNER_WORKSPACE'+}+export type ApplicationRegistrationInstalledWorkspaces = {__typename?: 'ApplicationRegistrationInstalledWorkspaces';hasMore: Scalars['Boolean']['output'];@@ -1460,7 +1467,7 @@ export type FindOneAdminApplicationRegistrationQueryVariables = Exact<{}>;-export type FindOneAdminApplicationRegistrationQuery = { __typename?: 'Query', findOneAdminApplicationRegistration: { __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 FindOneAdminApplicationRegistrationQuery = { __typename?: 'Query', findOneAdminApplicationRegistration: { __typename?: 'ApplicationRegistration', configurationIssues: Array<ApplicationRegistrationConfigurationIssue>, 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 GetAdminChatThreadMessagesQueryVariables = Exact<{workspaceId: Scalars['UUID']['input'];@@ -1649,7 +1656,7 @@ export const UpdateWorkspaceFeatureFlagDocument = {"kind":"Document","definitionexport const UpdateWorkspaceUsageLimitDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateWorkspaceUsageLimit"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"payload"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateUsageLimitInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateWorkspaceUsageLimit"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"payload"},"value":{"kind":"Variable","name":{"kind":"Name","value":"payload"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]} as unknown as DocumentNode<UpdateWorkspaceUsageLimitMutation, UpdateWorkspaceUsageLimitMutationVariables>;export const AdminPanelRecentUsersDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AdminPanelRecentUsers"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminPanelRecentUsers"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"avatarUrl"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceName"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceId"}},{"kind":"Field","name":{"kind":"Name","value":"workspaceLogo"}}]}}]}}]} as unknown as DocumentNode<AdminPanelRecentUsersQuery, AdminPanelRecentUsersQueryVariables>;export const AdminPanelTopWorkspacesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"AdminPanelTopWorkspaces"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"adminPanelTopWorkspaces"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"searchTerm"},"value":{"kind":"Variable","name":{"kind":"Name","value":"searchTerm"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"logoUrl"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"totalUsers"}},{"kind":"Field","name":{"kind":"Name","value":"subdomain"}}]}}]}}]} as unknown as DocumentNode<AdminPanelTopWorkspacesQuery, AdminPanelTopWorkspacesQueryVariables>;-export const FindOneAdminApplicationRegistrationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindOneAdminApplicationRegistration"},"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":"findOneAdminApplicationRegistration"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"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":"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<FindOneAdminApplicationRegistrationQuery, FindOneAdminApplicationRegistrationQueryVariables>;+export const FindOneAdminApplicationRegistrationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"FindOneAdminApplicationRegistration"},"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":"findOneAdminApplicationRegistration"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"ApplicationRegistrationFragment"}},{"kind":"Field","name":{"kind":"Name","value":"configurationIssues"}}]}}]}},{"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<FindOneAdminApplicationRegistrationQuery, FindOneAdminApplicationRegistrationQueryVariables>;export const GetAdminChatThreadMessagesDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAdminChatThreadMessages"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getAdminChatThreadMessages"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}},{"kind":"Argument","name":{"kind":"Name","value":"threadId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"threadId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"thread"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"conversationSize"}},{"kind":"Field","name":{"kind":"Name","value":"messageCount"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}},{"kind":"Field","name":{"kind":"Name","value":"messages"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"parts"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"type"}},{"kind":"Field","name":{"kind":"Name","value":"orderIndex"}},{"kind":"Field","name":{"kind":"Name","value":"textContent"}},{"kind":"Field","name":{"kind":"Name","value":"reasoningContent"}},{"kind":"Field","name":{"kind":"Name","value":"toolName"}},{"kind":"Field","name":{"kind":"Name","value":"toolCallId"}},{"kind":"Field","name":{"kind":"Name","value":"toolInput"}},{"kind":"Field","name":{"kind":"Name","value":"toolOutput"}},{"kind":"Field","name":{"kind":"Name","value":"state"}},{"kind":"Field","name":{"kind":"Name","value":"errorMessage"}}]}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}}]}}]}}]}}]} as unknown as DocumentNode<GetAdminChatThreadMessagesQuery, GetAdminChatThreadMessagesQueryVariables>;export const GetAdminWorkspaceChatThreadsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetAdminWorkspaceChatThreads"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getAdminWorkspaceChatThreads"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"workspaceId"},"value":{"kind":"Variable","name":{"kind":"Name","value":"workspaceId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"totalInputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"totalOutputTokens"}},{"kind":"Field","name":{"kind":"Name","value":"conversationSize"}},{"kind":"Field","name":{"kind":"Name","value":"messageCount"}},{"kind":"Field","name":{"kind":"Name","value":"createdAt"}},{"kind":"Field","name":{"kind":"Name","value":"updatedAt"}}]}}]}}]} as unknown as DocumentNode<GetAdminWorkspaceChatThreadsQuery, GetAdminWorkspaceChatThreadsQueryVariables>;export const GetServerAdminsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"GetServerAdmins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"getServerAdmins"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"firstName"}},{"kind":"Field","name":{"kind":"Name","value":"lastName"}},{"kind":"Field","name":{"kind":"Name","value":"canAccessFullAdminPanel"}},{"kind":"Field","name":{"kind":"Name","value":"canImpersonate"}}]}}]}}]} as unknown as DocumentNode<GetServerAdminsQuery, GetServerAdminsQueryVariables>;diff --git a/packages/twenty-front/src/modules/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId.ts b/packages/twenty-front/src/modules/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId.tsnew file mode 100644index 00000000000..d6536c5085a--- /dev/null+++ b/packages/twenty-front/src/modules/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId.ts@@ -0,0 +1,2 @@+export const CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID =+ 'claim-application-registration-ownership-modal';diff --git a/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/findOneAdminApplicationRegistration.ts b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/findOneAdminApplicationRegistration.tsindex 19d52eaf7c6..d5e4b3af586 100644--- a/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/findOneAdminApplicationRegistration.ts+++ b/packages/twenty-front/src/modules/settings/admin-panel/graphql/queries/findOneAdminApplicationRegistration.ts@@ -6,6 +6,7 @@ export const FIND_ONE_ADMIN_APPLICATION_REGISTRATION = gql`query FindOneAdminApplicationRegistration($id: String!) {findOneAdminApplicationRegistration(id: $id) {...ApplicationRegistrationFragment+ configurationIssues}}${APPLICATION_REGISTRATION_FRAGMENT}diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationConfigurationIssues.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationConfigurationIssues.tsxnew file mode 100644index 00000000000..9e7983cb723--- /dev/null+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationConfigurationIssues.tsx@@ -0,0 +1,203 @@+import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';+import { CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID } from '@/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId';+import { useDialog } from '@/ui/layout/dialog/hooks/useDialog';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { useQuery } from '@apollo/client/react';+import { styled } from '@linaria/react';+import { useLingui } from '@lingui/react/macro';+import { isNonEmptyString } from '@sniptt/guards';+import { Link, useLocation } from 'react-router-dom';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath, isDefined } from 'twenty-shared/utils';+import { InlineBanner } from 'twenty-ui/components/feedback';+import { themeCssVariables } from 'twenty-ui/theme';+import {+ ApplicationRegistrationConfigurationIssue,+ FindAdminApplicationRegistrationClaimsDocument,+ FindAdminApplicationRegistrationVariablesDocument,+ type FindOneAdminApplicationRegistrationQuery,+} from '~/generated-admin/graphql';++type AdminApplicationRegistration = Pick<+ FindOneAdminApplicationRegistrationQuery['findOneAdminApplicationRegistration'],+ 'id' | 'universalIdentifier' | 'ownerWorkspaceId' | 'configurationIssues'+>;++const StyledContainer = styled.div`+ display: flex;+ flex-direction: column;+ gap: ${themeCssVariables.spacing[2]};+`;++const MissingRequiredServerVariablesBanner = ({+ applicationRegistrationId,+}: {+ applicationRegistrationId: string;+}) => {+ const { t } = useLingui();+ const location = useLocation();+ const apolloAdminClient = useApolloAdminClient();++ const { data } = useQuery(FindAdminApplicationRegistrationVariablesDocument, {+ client: apolloAdminClient,+ variables: { applicationRegistrationId },+ });++ const missingVariableKeys = (+ data?.findAdminApplicationRegistrationVariables ?? []+ )+ .filter((variable) => variable.isRequired && !variable.isFilled)+ .map((variable) => variable.key)+ .join(', ');++ return (+ <InlineBanner+ status="error"+ action={+ <InlineBanner.Action+ href={`${location.pathname}${location.search}#config`}+ nativeButton={false}+ role="link"+ render={+ <Link+ to={{ search: location.search, hash: '#config' }}+ state={location.state}+ />+ }+ >{t`Configure`}</InlineBanner.Action>+ }+ >+ {isNonEmptyString(missingVariableKeys)+ ? t`Set the required server variables: ${missingVariableKeys}`+ : t`Set the required server variables`}+ </InlineBanner>+ );+};++const MissingOwnerWorkspaceBanner = () => {+ const { t } = useLingui();+ const { openDialog } = useDialog();++ return (+ <InlineBanner+ status="error"+ action={+ <InlineBanner.Action+ onClick={() =>+ openDialog(CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID)+ }+ >{t`Claim`}</InlineBanner.Action>+ }+ >{t`Claim this app: apps exposing a server route need an owner workspace`}</InlineBanner>+ );+};++const NotInstalledOnOwnerWorkspaceBanner = ({+ registration,+}: {+ registration: AdminApplicationRegistration;+}) => {+ const { t } = useLingui();+ const apolloAdminClient = useApolloAdminClient();+ const currentWorkspace = useAtomStateValue(currentWorkspaceState);++ const ownerWorkspaceId = registration.ownerWorkspaceId;++ const isOwnedByCurrentWorkspace =+ isDefined(ownerWorkspaceId) && ownerWorkspaceId === currentWorkspace?.id;++ const { data } = useQuery(FindAdminApplicationRegistrationClaimsDocument, {+ client: apolloAdminClient,+ variables: { applicationRegistrationId: registration.id },+ skip: !isDefined(ownerWorkspaceId) || isOwnedByCurrentWorkspace,+ });++ if (!isDefined(ownerWorkspaceId)) {+ return (+ <InlineBanner status="error">+ {t`Once claimed, install this app on its owner workspace to enable its server routes`}+ </InlineBanner>+ );+ }++ if (isOwnedByCurrentWorkspace) {+ const installPath = getSettingsPath(+ SettingsPath.AvailableApplicationDetail,+ { availableApplicationId: registration.universalIdentifier },+ );++ return (+ <InlineBanner+ status="error"+ action={+ <InlineBanner.Action+ href={installPath}+ nativeButton={false}+ role="link"+ render={<Link to={installPath} />}+ >{t`Install`}</InlineBanner.Action>+ }+ >{t`Install this app on this workspace, its owner, to enable its server routes`}</InlineBanner>+ );+ }++ const ownerWorkspaceDisplayName =+ data?.findAdminApplicationRegistrationClaims.find(+ (claim) => claim.workspaceId === ownerWorkspaceId,+ )?.workspaceDisplayName ?? ownerWorkspaceId;++ const ownerWorkspacePath = getSettingsPath(+ SettingsPath.AdminPanelWorkspaceDetail,+ { workspaceId: ownerWorkspaceId },+ );++ return (+ <InlineBanner+ status="error"+ action={+ <InlineBanner.Action+ href={ownerWorkspacePath}+ nativeButton={false}+ role="link"+ render={<Link to={ownerWorkspacePath} />}+ >{t`View workspace`}</InlineBanner.Action>+ }+ >{t`Install this app on its owner workspace ${ownerWorkspaceDisplayName} to enable its server routes`}</InlineBanner>+ );+};++export const SettingsAdminApplicationRegistrationConfigurationIssues = ({+ registration,+}: {+ registration: AdminApplicationRegistration;+}) => {+ if (registration.configurationIssues.length === 0) {+ return null;+ }++ return (+ <StyledContainer>+ {registration.configurationIssues.map((configurationIssue) => {+ switch (configurationIssue) {+ case ApplicationRegistrationConfigurationIssue.MISSING_REQUIRED_SERVER_VARIABLES:+ return (+ <MissingRequiredServerVariablesBanner+ key={configurationIssue}+ applicationRegistrationId={registration.id}+ />+ );+ case ApplicationRegistrationConfigurationIssue.MISSING_OWNER_WORKSPACE:+ return <MissingOwnerWorkspaceBanner key={configurationIssue} />;+ case ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE:+ return (+ <NotInstalledOnOwnerWorkspaceBanner+ key={configurationIssue}+ registration={registration}+ />+ );+ }+ })}+ </StyledContainer>+ );+};diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsxindex 70ce608be41..d9ccbd4b687 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDangerZone.tsx@@ -1,3 +1,5 @@+import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';+import { CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID } from '@/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { ConfirmationDialog } from '@/ui/layout/dialog/components/ConfirmationDialog';import { DialogInstance } from '@/ui/layout/dialog/components/DialogInstance';@@ -24,6 +26,7 @@ import {FindManyApplicationRegistrationsDocument,TransferApplicationRegistrationOwnershipDocument,} from '~/generated-metadata/graphql';+import { FindOneAdminApplicationRegistrationDocument } from '~/generated-admin/graphql';import { useNavigateSettings } from '~/hooks/useNavigateSettings';const DELETE_REGISTRATION_MODAL_ID = 'delete-application-registration-modal';@@ -31,9 +34,6 @@ const DELETE_REGISTRATION_MODAL_ID = 'delete-application-registration-modal';const TRANSFER_OWNERSHIP_MODAL_ID ='transfer-application-registration-ownership-modal';-const CLAIM_OWNERSHIP_MODAL_ID =- 'claim-application-registration-ownership-modal';-const DELETE_REGISTRATION_BUTTON_ID = 'delete-registration-button';const StyledActionButton = styled(Button)`@@ -60,6 +60,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({const navigate = useNavigateSettings();const { enqueueToast } = useToast();const { openDialog, closeDialog } = useDialog();+ const apolloAdminClient = useApolloAdminClient();const [isLoading, setIsLoading] = useState(false);const [isTransferring, setIsTransferring] = useState(false);@@ -177,19 +178,26 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({await claimOwnership({variables: { applicationRegistrationId },});- enqueueToast({- status: 'success',- children: t`Ownership claimed successfully`,- });- closeDialog(CLAIM_OWNERSHIP_MODAL_ID);} catch {enqueueToast({status: 'error',children: t`Failed to claim ownership.`,});++ return;} finally {setIsClaiming(false);}++ enqueueToast({+ status: 'success',+ children: t`Ownership claimed successfully`,+ });+ closeDialog(CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID);++ await apolloAdminClient.refetchQueries({+ include: [FindOneAdminApplicationRegistrationDocument],+ });};const confirmationValue = t`yes`;@@ -227,7 +235,11 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({? fromAdmin && (<ButtonstartIcon={<IconUserPlus />}- onClick={() => openDialog(CLAIM_OWNERSHIP_MODAL_ID)}+ onClick={() =>+ openDialog(+ CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID,+ )+ }variant="outline">{t`Claim ownership`}</Button>)@@ -259,7 +271,7 @@ export const SettingsAdminApplicationRegistrationDangerZone = ({/><ConfirmationDialog- dialogId={CLAIM_OWNERSHIP_MODAL_ID}+ dialogId={CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID}title={t`Claim ownership`}subtitle={<Trans>diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsxindex 487f6c3a245..16ce30da476 100644--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminApplicationRegistrationDetail.tsx@@ -21,6 +21,7 @@ import { SettingsApplicationRegistrationConfigTab } from '~/pages/settings/appliimport { SettingsApplicationRegistrationOAuthTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationOAuthTab';import { SettingsApplicationRegistrationDistributionTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab';import { SettingsApplicationRegistrationGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab';+import { SettingsAdminApplicationRegistrationConfigurationIssues } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationConfigurationIssues';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';@@ -40,18 +41,15 @@ export const SettingsAdminApplicationRegistrationDetail = () => {applicationRegistrationId: string;}>();- const { data, loading } = useQuery(- FindOneAdminApplicationRegistrationDocument,- {- client: apolloAdminClient,- variables: { id: applicationRegistrationId },- skip: !applicationRegistrationId,- },- );+ const { data } = useQuery(FindOneAdminApplicationRegistrationDocument, {+ client: apolloAdminClient,+ variables: { id: applicationRegistrationId },+ skip: !applicationRegistrationId,+ });const registration = data?.findOneAdminApplicationRegistration;- if (loading || !isDefined(registration)) {+ if (!isDefined(registration)) {return null;}@@ -87,10 +85,15 @@ export const SettingsAdminApplicationRegistrationDetail = () => {case 'general':default:return (- <SettingsApplicationRegistrationGeneralTab- registration={registration}- fromAdmin- />+ <>+ <SettingsAdminApplicationRegistrationConfigurationIssues+ registration={registration}+ />+ <SettingsApplicationRegistrationGeneralTab+ registration={registration}+ fromAdmin+ />+ </>);}};diff --git a/packages/twenty-front/src/pages/settings/admin-panel/__tests__/SettingsAdminApplicationRegistrationConfigurationIssues.test.tsx b/packages/twenty-front/src/pages/settings/admin-panel/__tests__/SettingsAdminApplicationRegistrationConfigurationIssues.test.tsxnew file mode 100644index 00000000000..3acc78b7e25--- /dev/null+++ b/packages/twenty-front/src/pages/settings/admin-panel/__tests__/SettingsAdminApplicationRegistrationConfigurationIssues.test.tsx@@ -0,0 +1,227 @@+import { MockedProvider } from '@apollo/client/testing/react';+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { Provider as JotaiProvider } from 'jotai';+import { MemoryRouter } from 'react-router-dom';++import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';+import { CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID } from '@/settings/admin-panel/apps/constants/ClaimApplicationRegistrationOwnershipModalId';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';+import {+ ApplicationRegistrationConfigurationIssue,+ FindAdminApplicationRegistrationClaimsDocument,+ FindAdminApplicationRegistrationVariablesDocument,+} from '~/generated-admin/graphql';+import { SettingsAdminApplicationRegistrationConfigurationIssues } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationConfigurationIssues';+import { mockCurrentWorkspace } from '~/testing/mock-data/users';++const mockOpenDialog = jest.fn();++jest.mock('@/ui/layout/dialog/hooks/useDialog', () => ({+ useDialog: () => ({ openDialog: mockOpenDialog, closeDialog: jest.fn() }),+}));++const APPLICATION_REGISTRATION_ID = 'a8a7d7a6-8f4e-4a43-9d5e-4f1f4b0c7e11';+const UNIVERSAL_IDENTIFIER = '0f6f3c1e-6c55-4e3a-9a59-7d2a3d4b5c6d';+const OTHER_WORKSPACE_ID = 'c2b8d1c4-3f0a-4f6e-8b2d-9e7f6a5b4c3d';++const buildVariable = ({+ key,+ isRequired,+ isFilled,+}: {+ key: string;+ isRequired: boolean;+ isFilled: boolean;+}) => ({+ __typename: 'ApplicationRegistrationVariable' as const,+ id: `${key}-id`,+ key,+ value: null,+ description: '',+ isSecret: true,+ isRequired,+ isDeprecated: false,+ isFilled,+ type: 'TEXT',+ options: null,+ createdAt: '2026-10-01T00:00:00.000Z',+ updatedAt: '2026-10-01T00:00:00.000Z',+});++const MOCKS = [+ {+ request: {+ query: FindAdminApplicationRegistrationVariablesDocument,+ variables: { applicationRegistrationId: APPLICATION_REGISTRATION_ID },+ },+ result: {+ data: {+ findAdminApplicationRegistrationVariables: [+ buildVariable({ key: 'API_KEY', isRequired: true, isFilled: false }),+ buildVariable({ key: 'API_URL', isRequired: true, isFilled: true }),+ buildVariable({+ key: 'OPTIONAL_KEY',+ isRequired: false,+ isFilled: false,+ }),+ ],+ },+ },+ },+ {+ request: {+ query: FindAdminApplicationRegistrationClaimsDocument,+ variables: { applicationRegistrationId: APPLICATION_REGISTRATION_ID },+ },+ result: {+ data: {+ findAdminApplicationRegistrationClaims: [+ {+ __typename: 'AdminApplicationRegistrationClaim' as const,+ workspaceId: OTHER_WORKSPACE_ID,+ workspaceDisplayName: 'Globex',+ },+ ],+ },+ },+ },+];++const renderConfigurationIssues = ({+ configurationIssues,+ ownerWorkspaceId = null,+}: {+ configurationIssues: ApplicationRegistrationConfigurationIssue[];+ ownerWorkspaceId?: string | null;+}) => {+ resetJotaiStore();+ jotaiStore.set(currentWorkspaceState.atom, mockCurrentWorkspace);++ return render(+ <I18nProvider i18n={i18n}>+ <JotaiProvider store={jotaiStore}>+ <MockedProvider mocks={MOCKS}>+ <MemoryRouter>+ <SettingsAdminApplicationRegistrationConfigurationIssues+ registration={{+ id: APPLICATION_REGISTRATION_ID,+ universalIdentifier: UNIVERSAL_IDENTIFIER,+ ownerWorkspaceId,+ configurationIssues,+ }}+ />+ </MemoryRouter>+ </MockedProvider>+ </JotaiProvider>+ </I18nProvider>,+ );+};++describe('SettingsAdminApplicationRegistrationConfigurationIssues', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ });++ it('renders nothing for a configured app', () => {+ const { container } = renderConfigurationIssues({+ configurationIssues: [],+ });++ expect(container).toBeEmptyDOMElement();+ });++ it('lists the required server variables left to set', async () => {+ renderConfigurationIssues({+ configurationIssues: [+ ApplicationRegistrationConfigurationIssue.MISSING_REQUIRED_SERVER_VARIABLES,+ ],+ });++ expect(+ await screen.findByText('Set the required server variables: API_KEY'),+ ).toBeVisible();+ expect(screen.getByRole('link', { name: 'Configure' })).toHaveAttribute(+ 'href',+ '/#config',+ );+ });++ it('asks to claim an unowned server route app before installing it', async () => {+ renderConfigurationIssues({+ configurationIssues: [+ ApplicationRegistrationConfigurationIssue.MISSING_OWNER_WORKSPACE,+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ ],+ });++ expect(+ screen.getByText(+ 'Claim this app: apps exposing a server route need an owner workspace',+ ),+ ).toBeVisible();+ expect(+ screen.getByText(+ 'Once claimed, install this app on its owner workspace to enable its server routes',+ ),+ ).toBeVisible();+ expect(+ screen.queryByRole('link', { name: 'Install' }),+ ).not.toBeInTheDocument();++ await userEvent.click(screen.getByRole('button', { name: 'Claim' }));++ expect(mockOpenDialog).toHaveBeenCalledTimes(1);+ expect(mockOpenDialog).toHaveBeenCalledWith(+ CLAIM_APPLICATION_REGISTRATION_OWNERSHIP_MODAL_ID,+ );+ });++ it('links to the install page when the current workspace owns the app', () => {+ renderConfigurationIssues({+ configurationIssues: [+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ ],+ ownerWorkspaceId: mockCurrentWorkspace.id,+ });++ expect(+ screen.getByText(+ 'Install this app on this workspace, its owner, to enable its server routes',+ ),+ ).toBeVisible();+ expect(screen.getByRole('link', { name: 'Install' })).toHaveAttribute(+ 'href',+ `/settings/applications/available/${UNIVERSAL_IDENTIFIER}`,+ );+ });++ it('links to the owner workspace when another workspace owns the app', async () => {+ renderConfigurationIssues({+ configurationIssues: [+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ ],+ ownerWorkspaceId: OTHER_WORKSPACE_ID,+ });++ expect(+ await screen.findByText(+ 'Install this app on its owner workspace Globex to enable its server routes',+ ),+ ).toBeVisible();+ expect(+ screen.getByRole('link', { name: 'View workspace' }),+ ).toHaveAttribute(+ 'href',+ `/settings/admin-panel/workspaces/${OTHER_WORKSPACE_ID}`,+ );+ expect(+ screen.queryByRole('link', { name: 'Install' }),+ ).not.toBeInTheDocument();+ });+});diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsxindex cbe06c595d1..727ad5e2165 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationConfigTab.tsx@@ -6,6 +6,7 @@ import {} from '~/generated-metadata/graphql';import {FindAdminApplicationRegistrationVariablesDocument,+ FindOneAdminApplicationRegistrationDocument,UpdateAdminApplicationRegistrationVariableDocument,} from '~/generated-admin/graphql';import { styled } from '@linaria/react';@@ -110,7 +111,10 @@ export const SettingsApplicationRegistrationConfigTab = ({UpdateAdminApplicationRegistrationVariableDocument,{client: apolloAdminClient,- refetchQueries: [FindAdminApplicationRegistrationVariablesDocument],+ refetchQueries: [+ FindAdminApplicationRegistrationVariablesDocument,+ FindOneAdminApplicationRegistrationDocument,+ ],},);diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsxindex 2209fde7632..cbc15ae86c1 100644--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationGeneralTab.tsx@@ -1,8 +1,5 @@import { type ApplicationRegistration } from '~/generated-metadata/graphql';-import { useLingui } from '@lingui/react/macro';-import { Link, useLocation } from 'react-router-dom';-import { InlineBanner } from 'twenty-ui/components/feedback';import { SettingsApplicationRegistrationGeneralInfo } from '~/pages/settings/applications/components/SettingsApplicationRegistrationGeneralInfo';import { SettingsAdminApplicationRegistrationClaims } from '~/pages/settings/admin-panel/SettingsAdminApplicationRegistrationClaims';@@ -17,29 +14,8 @@ export const SettingsApplicationRegistrationGeneralTab = ({registration: ApplicationRegistration;fromAdmin?: boolean;}) => {- const { t } = useLingui();- const location = useLocation();-return (<>- {!registration.isConfigured && fromAdmin && (- <InlineBanner- status="error"- action={- <InlineBanner.Action- href={`${location.pathname}${location.search}#config`}- nativeButton={false}- role="link"- render={- <Link- to={{ search: location.search, hash: '#config' }}- state={location.state}- />- }- >{t`Configure`}</InlineBanner.Action>- }- >{t`This app is not fully configured. Users won't be able to install it until all required server variables are set, and — for apps exposing a server route — until the app is claimed and installed on its owner workspace.`}</InlineBanner>- )}<SettingsApplicationRegistrationGeneralInfo registration={registration} />{fromAdmin && (<SettingsAdminApplicationRegistrationGeneralSwitchesdiff --git a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.tsindex 66e418e879a..0d8dd500c15 100644--- a/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/admin-panel/admin-panel-application-registration.resolver.ts@@ -3,6 +3,7 @@ import { Context, Int, Parent, ResolveField } from '@nestjs/graphql';import { AdminResolver } from 'src/engine/api/graphql/graphql-config/decorators/admin-resolver.decorator';import { ApplicationRegistrationAssetUrlService } from 'src/engine/core-modules/application/application-registration/application-registration-asset-url.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';import { type AdminApplicationRegistrationListItem } from 'src/engine/core-modules/application/application-registration/dtos/paginated-application-registrations.dto';import { getApplicationAuthorDisplayName } from 'src/engine/core-modules/application/application-registration/utils/get-application-author-display-name.util';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';@@ -25,9 +26,25 @@ export class AdminPanelApplicationRegistrationResolver {return registration.isConfigured;}- return context.loaders.isConfiguredLoader.load({- applicationRegistrationId: registration.id,- });+ const configurationIssues =+ await context.loaders.applicationRegistrationConfigurationIssuesLoader.load(+ { applicationRegistrationId: registration.id },+ );++ return configurationIssues.length === 0;+ }++ @ResolveField(() => [ApplicationRegistrationConfigurationIssue])+ async configurationIssues(+ @Parent()+ registration:+ | ApplicationRegistrationEntity+ | AdminApplicationRegistrationListItem,+ @Context() context: { loaders: IDataloaders },+ ): Promise<ApplicationRegistrationConfigurationIssue[]> {+ return context.loaders.applicationRegistrationConfigurationIssuesLoader.load(+ { applicationRegistrationId: registration.id },+ );}@ResolveField(() => Int)diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.tsindex 4a14252ea42..a7ab7d92682 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration-variable/application-registration-variable.service.ts@@ -9,6 +9,8 @@ import { In, Not, type EntityManager, type Repository } from 'typeorm';import { ApplicationRegistrationVariableEntity } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.entity';import { ApplicationRegistrationLookupService } from 'src/engine/core-modules/application/application-registration/application-registration-lookup/application-registration-lookup.service';import { ApplicationRegistrationEntity } from 'src/engine/core-modules/application/application-registration/application-registration.entity';+import { ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';+import { getApplicationRegistrationConfigurationIssues } from 'src/engine/core-modules/application/application-registration/utils/get-application-registration-configuration-issues.util';import { ApplicationEntity } from 'src/engine/core-modules/application/application.entity';import {ApplicationRegistrationException,@@ -174,13 +176,30 @@ export class ApplicationRegistrationVariableService {async isConfiguredBatch(applicationRegistrationIds: string[],): Promise<Map<string, boolean>> {+ const configurationIssuesByRegistrationId =+ await this.findConfigurationIssuesBatch(applicationRegistrationIds);++ return new Map(+ Array.from(+ configurationIssuesByRegistrationId,+ ([applicationRegistrationId, configurationIssues]) => [+ applicationRegistrationId,+ configurationIssues.length === 0,+ ],+ ),+ );+ }++ async findConfigurationIssuesBatch(+ applicationRegistrationIds: string[],+ ): Promise<Map<string, ApplicationRegistrationConfigurationIssue[]>> {if (!isNonEmptyArray(applicationRegistrationIds)) {return new Map();}const [requiredVariables,- registrationIdsExposingServerRoute,+ ownerWorkspaceIdByRegistrationIdExposingServerRoute,registrationIdsInstalledOnOwnerWorkspace,] = await Promise.all([this.variableRepository.find({@@ -189,7 +208,9 @@ export class ApplicationRegistrationVariableService {isRequired: true,},}),- this.findRegistrationIdsExposingServerRoute(applicationRegistrationIds),+ this.findOwnerWorkspaceIdByRegistrationIdExposingServerRoute(+ applicationRegistrationIds,+ ),this.findRegistrationIdsInstalledOnOwnerWorkspace(applicationRegistrationIds,),@@ -204,28 +225,42 @@ export class ApplicationRegistrationVariableService {return new Map(applicationRegistrationIds.map((applicationRegistrationId) => [applicationRegistrationId,- !registrationIdsWithUnfilledRequiredVariable.has(- applicationRegistrationId,- ) &&- (!registrationIdsExposingServerRoute.has(applicationRegistrationId) ||+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable:+ registrationIdsWithUnfilledRequiredVariable.has(+ applicationRegistrationId,+ ),+ exposesServerRoute:+ ownerWorkspaceIdByRegistrationIdExposingServerRoute.has(+ applicationRegistrationId,+ ),+ hasOwnerWorkspace: isDefined(+ ownerWorkspaceIdByRegistrationIdExposingServerRoute.get(+ applicationRegistrationId,+ ),+ ),+ isInstalledOnOwnerWorkspace:registrationIdsInstalledOnOwnerWorkspace.has(applicationRegistrationId,- )),+ ),+ }),]),);}- private async findRegistrationIdsExposingServerRoute(+ private async findOwnerWorkspaceIdByRegistrationIdExposingServerRoute(applicationRegistrationIds: string[],- ): Promise<Set<string>> {- const rows: { id: string }[] = await this.applicationRegistrationRepository- .createQueryBuilder('registration')- .select('registration.id', 'id')- .where('registration.id IN (:...applicationRegistrationIds)', {- applicationRegistrationIds,- })- .andWhere(- `EXISTS (+ ): Promise<Map<string, string | null>> {+ const rows: { id: string; ownerWorkspaceId: string | null }[] =+ await this.applicationRegistrationRepository+ .createQueryBuilder('registration')+ .select('registration.id', 'id')+ .addSelect('registration.ownerWorkspaceId', 'ownerWorkspaceId')+ .where('registration.id IN (:...applicationRegistrationIds)', {+ applicationRegistrationIds,+ })+ .andWhere(+ `EXISTS (SELECT 1FROM jsonb_array_elements(COALESCE(registration."manifest" -> 'logicFunctions', '[]'::jsonb)@@ -233,10 +268,10 @@ export class ApplicationRegistrationVariableService {WHERE logic_function -> 'serverRouteTriggerSettings' IS NOT NULLAND jsonb_typeof(logic_function -> 'serverRouteTriggerSettings') <> 'null')`,- )- .getRawMany();+ )+ .getRawMany();- return new Set(rows.map((row) => row.id));+ return new Map(rows.map((row) => [row.id, row.ownerWorkspaceId]));}private async findRegistrationIdsInstalledOnOwnerWorkspace(diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.tsindex 59246c03044..b6015af344d 100644--- a/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/application-registration.resolver.ts@@ -652,9 +652,12 @@ export class ApplicationRegistrationResolver {@Parent() registration: ApplicationRegistrationEntity,@Context() context: { loaders: IDataloaders },): Promise<boolean> {- return context.loaders.isConfiguredLoader.load({- applicationRegistrationId: registration.id,- });+ const configurationIssues =+ await context.loaders.applicationRegistrationConfigurationIssuesLoader.load(+ { applicationRegistrationId: registration.id },+ );++ return configurationIssues.length === 0;}@ResolveField(() => String, { nullable: true })diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum.tsnew file mode 100644index 00000000000..c6cbf68aea6--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum.ts@@ -0,0 +1,11 @@+import { registerEnumType } from '@nestjs/graphql';++export enum ApplicationRegistrationConfigurationIssue {+ MISSING_REQUIRED_SERVER_VARIABLES = 'MISSING_REQUIRED_SERVER_VARIABLES',+ MISSING_OWNER_WORKSPACE = 'MISSING_OWNER_WORKSPACE',+ NOT_INSTALLED_ON_OWNER_WORKSPACE = 'NOT_INSTALLED_ON_OWNER_WORKSPACE',+}++registerEnumType(ApplicationRegistrationConfigurationIssue, {+ name: 'ApplicationRegistrationConfigurationIssue',+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-registration-configuration-issues.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-registration-configuration-issues.util.spec.tsnew file mode 100644index 00000000000..3c5a1d696c9--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/__tests__/get-application-registration-configuration-issues.util.spec.ts@@ -0,0 +1,67 @@+import { ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';+import { getApplicationRegistrationConfigurationIssues } from 'src/engine/core-modules/application/application-registration/utils/get-application-registration-configuration-issues.util';++describe('getApplicationRegistrationConfigurationIssues', () => {+ it('should return no issue for a fully configured app without server route', () => {+ expect(+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable: false,+ exposesServerRoute: false,+ hasOwnerWorkspace: false,+ isInstalledOnOwnerWorkspace: false,+ }),+ ).toEqual([]);+ });++ it('should report missing required server variables', () => {+ expect(+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable: true,+ exposesServerRoute: false,+ hasOwnerWorkspace: true,+ isInstalledOnOwnerWorkspace: true,+ }),+ ).toEqual([+ ApplicationRegistrationConfigurationIssue.MISSING_REQUIRED_SERVER_VARIABLES,+ ]);+ });++ it('should report every step left for an unclaimed server route app', () => {+ expect(+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable: true,+ exposesServerRoute: true,+ hasOwnerWorkspace: false,+ isInstalledOnOwnerWorkspace: false,+ }),+ ).toEqual([+ ApplicationRegistrationConfigurationIssue.MISSING_REQUIRED_SERVER_VARIABLES,+ ApplicationRegistrationConfigurationIssue.MISSING_OWNER_WORKSPACE,+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ ]);+ });++ it('should only report the missing install for an owned server route app', () => {+ expect(+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable: false,+ exposesServerRoute: true,+ hasOwnerWorkspace: true,+ isInstalledOnOwnerWorkspace: false,+ }),+ ).toEqual([+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ ]);+ });++ it('should return no issue for a server route app installed on its owner workspace', () => {+ expect(+ getApplicationRegistrationConfigurationIssues({+ hasUnfilledRequiredServerVariable: false,+ exposesServerRoute: true,+ hasOwnerWorkspace: true,+ isInstalledOnOwnerWorkspace: true,+ }),+ ).toEqual([]);+ });+});diff --git a/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-registration-configuration-issues.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-registration-configuration-issues.util.tsnew file mode 100644index 00000000000..478569a4610--- /dev/null+++ b/packages/twenty-server/src/engine/core-modules/application/application-registration/utils/get-application-registration-configuration-issues.util.ts@@ -0,0 +1,39 @@+import { ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';++export const getApplicationRegistrationConfigurationIssues = ({+ hasUnfilledRequiredServerVariable,+ exposesServerRoute,+ hasOwnerWorkspace,+ isInstalledOnOwnerWorkspace,+}: {+ hasUnfilledRequiredServerVariable: boolean;+ exposesServerRoute: boolean;+ hasOwnerWorkspace: boolean;+ isInstalledOnOwnerWorkspace: boolean;+}): ApplicationRegistrationConfigurationIssue[] => {+ const configurationIssues: ApplicationRegistrationConfigurationIssue[] = [];++ if (hasUnfilledRequiredServerVariable) {+ configurationIssues.push(+ ApplicationRegistrationConfigurationIssue.MISSING_REQUIRED_SERVER_VARIABLES,+ );+ }++ if (!exposesServerRoute) {+ return configurationIssues;+ }++ if (!hasOwnerWorkspace) {+ configurationIssues.push(+ ApplicationRegistrationConfigurationIssue.MISSING_OWNER_WORKSPACE,+ );+ }++ if (!isInstalledOnOwnerWorkspace) {+ configurationIssues.push(+ ApplicationRegistrationConfigurationIssue.NOT_INSTALLED_ON_OWNER_WORKSPACE,+ );+ }++ return configurationIssues;+};diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.tsindex d0e4e39ed95..094c360c591 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.interface.ts@@ -5,13 +5,13 @@ import { type IndexMetadataConnectionLoaderPayload } from 'src/engine/dataloaderimport {type AgentsByRoleIdLoaderPayload,type ApiKeysByRoleIdLoaderPayload,+ type ApplicationRegistrationConfigurationIssuesLoaderPayload,type ApplicationRegistrationInstallCountLoaderPayload,type ApplicationTranslationCatalogLoaderPayload,type FieldMetadataLoaderPayload,type IndexFieldMetadataLoaderPayload,type IndexMetadataLoaderPayload,type SearchFieldMetadataLoaderPayload,- type IsConfiguredLoaderPayload,type MorphRelationLoaderPayload,type ApplicationAuthorIdentifiersLoaderPayload,type ObjectMetadataLoaderPayload,@@ -26,6 +26,7 @@ import {type ViewSortsByViewIdLoaderPayload,type WorkspaceMembersByRoleIdLoaderPayload,} from 'src/engine/dataloaders/dataloader.service';+import { type ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';import { type AgentDTO } from 'src/engine/metadata-modules/ai/ai-agent/dtos/agent.dto';import { type ApplicationAuthorIdentifiers } from 'src/engine/metadata-modules/application-translation-catalog/types/application-author-identifiers.type';@@ -125,7 +126,10 @@ export interface IDataloaders {ViewFilterGroupDTO[]>;- isConfiguredLoader: DataLoader<IsConfiguredLoaderPayload, boolean>;+ applicationRegistrationConfigurationIssuesLoader: DataLoader<+ ApplicationRegistrationConfigurationIssuesLoaderPayload,+ ApplicationRegistrationConfigurationIssue[]+ >;applicationRegistrationInstallCountLoader: DataLoader<ApplicationRegistrationInstallCountLoaderPayload,diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.tsindex de9c1812046..0a471a8f21b 100644--- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts+++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts@@ -9,6 +9,7 @@ import { type IndexMetadataInterface } from 'src/engine/metadata-modules/index-mimport { ApplicationRegistrationVariableService } from 'src/engine/core-modules/application/application-registration-variable/application-registration-variable.service';import { ApplicationRegistrationService } from 'src/engine/core-modules/application/application-registration/application-registration.service';+import { type ApplicationRegistrationConfigurationIssue } from 'src/engine/core-modules/application/application-registration/enums/application-registration-configuration-issue.enum';import { ApplicationTranslationCatalogService } from 'src/engine/metadata-modules/application-translation-catalog/services/application-translation-catalog.service';import { type FlatWorkspaceMember } from 'src/engine/core-modules/user/types/flat-workspace-member.type';import { type IDataloaders } from 'src/engine/dataloaders/dataloader.interface';@@ -154,7 +155,7 @@ export type RowLevelPermissionsByRoleIdLoaderPayload = {roleId: string;};-export type IsConfiguredLoaderPayload = {+export type ApplicationRegistrationConfigurationIssuesLoaderPayload = {applicationRegistrationId: string;};@@ -207,7 +208,8 @@ export class DataloaderService {const viewGroupsByViewIdLoader = this.createViewGroupsByViewIdLoader();const viewFilterGroupsByViewIdLoader =this.createViewFilterGroupsByViewIdLoader();- const isConfiguredLoader = this.createIsConfiguredLoader();+ const applicationRegistrationConfigurationIssuesLoader =+ this.createApplicationRegistrationConfigurationIssuesLoader();const applicationRegistrationInstallCountLoader =this.createApplicationRegistrationInstallCountLoader();const applicationAuthorIdentifiersLoader =@@ -238,7 +240,7 @@ export class DataloaderService {viewSortsByViewIdLoader,viewGroupsByViewIdLoader,viewFilterGroupsByViewIdLoader,- isConfiguredLoader,+ applicationRegistrationConfigurationIssuesLoader,applicationRegistrationInstallCountLoader,applicationAuthorIdentifiersLoader,applicationTranslationCatalogLoader,@@ -883,18 +885,24 @@ export class DataloaderService {});}- private createIsConfiguredLoader() {- return new DataLoader<IsConfiguredLoaderPayload, boolean>(- async (params: IsConfiguredLoaderPayload[]) => {- const ids = params.map((p) => p.applicationRegistrationId);-- const resultMap =- await this.applicationRegistrationVariableService.isConfiguredBatch(- ids,+ private createApplicationRegistrationConfigurationIssuesLoader() {+ return new DataLoader<+ ApplicationRegistrationConfigurationIssuesLoaderPayload,+ ApplicationRegistrationConfigurationIssue[]+ >(+ async (+ params: ApplicationRegistrationConfigurationIssuesLoaderPayload[],+ ) => {+ const configurationIssuesByRegistrationId =+ await this.applicationRegistrationVariableService.findConfigurationIssuesBatch(+ params.map((param) => param.applicationRegistrationId),);return params.map(- (p) => resultMap.get(p.applicationRegistrationId) ?? true,+ (param) =>+ configurationIssuesByRegistrationId.get(+ param.applicationRegistrationId,+ ) ?? [],);},);diff --git a/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-configuration-issues.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-configuration-issues.integration-spec.tsnew file mode 100644index 00000000000..e5cd6b6331a--- /dev/null+++ b/packages/twenty-server/test/integration/graphql/suites/admin-panel/admin-panel-application-registration-configuration-issues.integration-spec.ts@@ -0,0 +1,217 @@+import { randomUUID } from 'crypto';++import { gql } from 'graphql-tag';+import { type DataSource } from 'typeorm';++import { insertApplicationRegistrationVariable } from 'test/integration/metadata/suites/application-registration-variable/utils/insert-application-registration-variable.util';+import { makeAdminPanelApiRequest } from 'test/integration/twenty-config/utils/make-admin-panel-api-request.util';++import {+ SEED_APPLE_WORKSPACE_ID,+ SEED_YCOMBINATOR_WORKSPACE_ID,+} from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';++const FIND_ONE_ADMIN_APPLICATION_REGISTRATION = gql`+ query FindOneAdminApplicationRegistration($id: String!) {+ findOneAdminApplicationRegistration(id: $id) {+ id+ isConfigured+ configurationIssues+ }+ }+`;++const NAME_PREFIX = 'admin-panel-configuration-issues-integration-test';++type RegistrationSeed = {+ hasUnfilledRequiredVariable?: boolean;+ exposesServerRoute?: boolean;+ ownerWorkspaceId?: string;+ installedOnWorkspaceIds?: string[];+};++const SERVER_ROUTE_MANIFEST = {+ logicFunctions: [+ {+ universalIdentifier: randomUUID(),+ name: 'admin-panel-configuration-issues-integration-test-webhook',+ serverRouteTriggerSettings: {+ path: '/admin-panel-configuration-issues-integration-test',+ httpMethod: 'POST',+ isAuthRequired: false,+ },+ },+ ],+};++const REGISTRATION_SEEDS = {+ configured: {},+ 'missing-required-variable': {+ hasUnfilledRequiredVariable: true,+ },+ 'server-route-unclaimed': {+ hasUnfilledRequiredVariable: true,+ exposesServerRoute: true,+ },+ 'server-route-not-installed': {+ exposesServerRoute: true,+ ownerWorkspaceId: SEED_APPLE_WORKSPACE_ID,+ installedOnWorkspaceIds: [SEED_YCOMBINATOR_WORKSPACE_ID],+ },+ 'server-route-installed': {+ exposesServerRoute: true,+ ownerWorkspaceId: SEED_APPLE_WORKSPACE_ID,+ installedOnWorkspaceIds: [SEED_APPLE_WORKSPACE_ID],+ },+} satisfies Record<string, RegistrationSeed>;++type RegistrationSeedName = keyof typeof REGISTRATION_SEEDS;++describe('Admin panel application registration configuration issues (integration)', () => {+ let dataSource: DataSource;+ const registrationIdBySeedName = new Map<RegistrationSeedName, string>();+ const installedApplicationIds: string[] = [];++ beforeAll(async () => {+ dataSource = global.testDataSource;++ for (const [seedName, seed] of Object.entries(REGISTRATION_SEEDS) as [+ RegistrationSeedName,+ RegistrationSeed,+ ][]) {+ const id = randomUUID();++ await dataSource.query(+ `INSERT INTO core."applicationRegistration"+ (id, "universalIdentifier", name, "oAuthClientId",+ "oAuthRedirectUris", "oAuthScopes", "sourceType", "workspaceId",+ manifest)+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,+ [+ id,+ randomUUID(),+ `${NAME_PREFIX}-${seedName}`,+ randomUUID(),+ [],+ [],+ 'local',+ seed.ownerWorkspaceId ?? null,+ seed.exposesServerRoute === true+ ? JSON.stringify(SERVER_ROUTE_MANIFEST)+ : null,+ ],+ );++ registrationIdBySeedName.set(seedName, id);++ if (seed.hasUnfilledRequiredVariable === true) {+ const variableId = await insertApplicationRegistrationVariable({+ applicationRegistrationId: id,+ key: 'CONFIGURATION_ISSUES_REQUIRED_KEY',+ value: '',+ });++ await dataSource.query(+ `UPDATE core."applicationRegistrationVariable"+ SET "isRequired" = true WHERE id = $1`,+ [variableId],+ );+ }++ for (const workspaceId of seed.installedOnWorkspaceIds ?? []) {+ const applicationId = randomUUID();++ await dataSource.query(+ `INSERT INTO core."application"+ (id, "universalIdentifier", name, version, "sourcePath",+ "sourceType", "workspaceId", "applicationRegistrationId")+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,+ [+ applicationId,+ randomUUID(),+ `${NAME_PREFIX}-installed-app`,+ '1.0.0',+ '',+ 'local',+ workspaceId,+ id,+ ],+ );++ installedApplicationIds.push(applicationId);+ }+ }+ });++ afterAll(async () => {+ const registrationIds = Array.from(registrationIdBySeedName.values());++ await dataSource.query(+ `DELETE FROM core."application" WHERE id = ANY($1)`,+ [installedApplicationIds],+ );+ await dataSource.query(+ `DELETE FROM core."applicationRegistrationVariable"+ WHERE "applicationRegistrationId" = ANY($1)`,+ [registrationIds],+ );+ await dataSource.query(+ `DELETE FROM core."applicationRegistration" WHERE id = ANY($1)`,+ [registrationIds],+ );+ });++ const findRegistration = async (seedName: RegistrationSeedName) => {+ const response = await makeAdminPanelApiRequest({+ query: FIND_ONE_ADMIN_APPLICATION_REGISTRATION,+ variables: { id: registrationIdBySeedName.get(seedName) },+ });++ expect(response.body.errors).toBeUndefined();++ return response.body.data.findOneAdminApplicationRegistration;+ };++ it('reports no issue for a configured app', async () => {+ const registration = await findRegistration('configured');++ expect(registration.configurationIssues).toEqual([]);+ expect(registration.isConfigured).toBe(true);+ });++ it('reports unset required server variables', async () => {+ const registration = await findRegistration('missing-required-variable');++ expect(registration.configurationIssues).toEqual([+ 'MISSING_REQUIRED_SERVER_VARIABLES',+ ]);+ expect(registration.isConfigured).toBe(false);+ });++ it('reports every step left for an unclaimed server route app', async () => {+ const registration = await findRegistration('server-route-unclaimed');++ expect(registration.configurationIssues).toEqual([+ 'MISSING_REQUIRED_SERVER_VARIABLES',+ 'MISSING_OWNER_WORKSPACE',+ 'NOT_INSTALLED_ON_OWNER_WORKSPACE',+ ]);+ expect(registration.isConfigured).toBe(false);+ });++ it('reports a server route app installed on another workspace than its owner', async () => {+ const registration = await findRegistration('server-route-not-installed');++ expect(registration.configurationIssues).toEqual([+ 'NOT_INSTALLED_ON_OWNER_WORKSPACE',+ ]);+ expect(registration.isConfigured).toBe(false);+ });++ it('reports no issue for a server route app installed on its owner workspace', async () => {+ const registration = await findRegistration('server-route-installed');++ expect(registration.configurationIssues).toEqual([]);+ expect(registration.isConfigured).toBe(true);+ });+});