Skip to content

The open alternative to Salesforce, designed for AI.

Put the workspace app detail page on the shared app detail layout (#29253)

nitine4d73f75fcfd
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationDetailPageLayout.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationDetailPageLayout.tsx
index c7c0ca12125..1efcc578093 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationDetailPageLayout.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationDetailPageLayout.tsx
@@ -9,6 +9,7 @@ import { isDefined } from 'twenty-shared/utils';
type SettingsApplicationDetailPageLayoutProps = {
applicationId?: string;
+ logoUrl?: string | null;
displayName: string;
links: BreadcrumbProps['links'];
tabs: SingleTabProps[];
@@ -20,6 +21,7 @@ type SettingsApplicationDetailPageLayoutProps = {
export const SettingsApplicationDetailPageLayout = ({
applicationId,
+ logoUrl,
displayName,
links,
tabs,
@@ -34,6 +36,7 @@ export const SettingsApplicationDetailPageLayout = ({
isDefined(applicationId) ? (
<AppChip
applicationId={applicationId}
+ logoUrl={logoUrl}
fallbackApplicationData={{ name: displayName }}
size="md"
chipOnly
diff --git a/packages/twenty-front/src/modules/settings/applications/hooks/useApplicationOverview.ts b/packages/twenty-front/src/modules/settings/applications/hooks/useApplicationOverview.ts
index af4a38510ff..2ff8b544b79 100644
--- a/packages/twenty-front/src/modules/settings/applications/hooks/useApplicationOverview.ts
+++ b/packages/twenty-front/src/modules/settings/applications/hooks/useApplicationOverview.ts
@@ -32,6 +32,7 @@ export const useApplicationOverview = ({
const marketplaceDetail = data?.findMarketplaceAppDetail;
return {
+ marketplaceDetail,
description: getApplicationDescriptionSummary(
marketplaceDetail?.description ?? resolvedDescription,
),
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
index 0a36c81067b..5b2c5e78bd2 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
@@ -1,10 +1,5 @@
-import { AppChip } from '@/applications/components/AppChip';
import { CurrentApplicationContext } from '@/applications/contexts/CurrentApplicationContext';
import { useRefetchOnApplicationOperation } from '@/applications/hooks/useRefetchOnApplicationOperation';
-import { useResolvedApplicationDescription } from '@/applications/hooks/useResolvedApplicationDescription';
-import { isTwentyStandardApplication } from '@/applications/utils/isTwentyStandardApplication';
-import { isWorkspaceCustomApplication } from '@/applications/utils/isWorkspaceCustomApplication';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { useUpgradeApplication } from '@/marketplace/hooks/useUpgradeApplication';
import { useInstalledBuiltInAccountApp } from '@/settings/applications/hooks/useInstalledBuiltInAccountApp';
import { useUninstallApplication } from '@/settings/applications/hooks/useUninstallApplication';
@@ -13,13 +8,9 @@ import { getSettingsMenuItemsForScope } from '@/settings/applications/utils/getS
import { APPLICATION_VARIABLES_TAB_ID } from '@/settings/applications/constants/ApplicationVariablesTabId';
import { getApplicationConfigurationTabId } from '@/settings/applications/utils/getApplicationConfigurationTabId';
import { hasApplicationVariablesTab } from '@/settings/applications/utils/hasApplicationVariablesTab';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
-import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
-import { SettingsTabBar } from '@/settings/components/layout/SettingsTabBar';
import { useSettingsActiveTabId } from '@/settings/components/layout/useSettingsActiveTabId';
import type { SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMutation, useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
@@ -30,9 +21,7 @@ import {
isDefined,
isNonEmptyArray,
} from 'twenty-shared/utils';
-import { InlineBanner } from 'twenty-ui/components/feedback';
import {
- IconAlertTriangle,
IconApps,
IconDeviceFloppy,
IconSettings,
@@ -43,9 +32,7 @@ import { Button } from 'twenty-ui/primitives/input';
import {
ApplicationRegistrationSourceType,
ApplicationVariableScope,
- FindMarketplaceAppDetailDocument,
FindOneApplicationDocument,
- IsApplicationStoppedDocument,
SettingsMenuItemScope,
UpdateOneApplicationVariableDocument,
} from '~/generated-metadata/graphql';
@@ -55,14 +42,14 @@ import { SettingsApplicationMissingConfigurationBanner } from '@/settings/applic
import { SettingsApplicationLoadErrorBanner } from '@/settings/applications/components/SettingsApplicationLoadErrorBanner';
import { SettingsApplicationNotFound } from '~/pages/settings/applications/components/SettingsApplicationNotFound';
import { SettingsBuiltInAccountAppDetails } from '~/pages/settings/applications/SettingsBuiltInAccountAppDetails';
-import { CUSTOM_APPLICATION_ILLUSTRATIONS } from '@/settings/applications/constants/CustomApplicationIllustrations';
-import { STANDARD_APPLICATION_ILLUSTRATIONS } from '@/settings/applications/constants/StandardApplicationIllustrations';
import { useApplicationHealthCheck } from '~/pages/settings/applications/hooks/useApplicationHealthCheck';
import { useApplicationVariablesDraft } from '@/settings/applications/hooks/useApplicationVariablesDraft';
import { SettingsApplicationCustomSettingsSection } from '@/settings/applications/components/SettingsApplicationCustomSettingsSection';
import { SettingsApplicationDetailGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab';
import { SettingsApplicationDetailVariablesTab } from '@/settings/applications/components/SettingsApplicationDetailVariablesTab';
-import { getApplicationDescriptionSummary } from '@/settings/applications/utils/getApplicationDescriptionSummary';
+import { SettingsApplicationDetailPageLayout } from '@/settings/applications/components/SettingsApplicationDetailPageLayout';
+import { SettingsApplicationStoppedBanner } from '@/settings/applications/components/SettingsApplicationStoppedBanner';
+import { useApplicationOverview } from '@/settings/applications/hooks/useApplicationOverview';
import { getApplicationHealthBanner } from '~/pages/settings/applications/utils/getApplicationHealthBanner';
import { getApplicationLookupStatus } from '~/pages/settings/applications/utils/getApplicationLookupStatus';
import { hasApplicationUpdate } from '@/settings/applications/utils/hasApplicationUpdate';
@@ -102,50 +89,17 @@ export const SettingsApplicationDetails = () => {
const isNotFound = applicationLookupStatus === 'not-found';
const isUnavailable = applicationLookupStatus === 'unavailable';
- const { data: detailData } = useQuery(FindMarketplaceAppDetailDocument, {
- variables: { universalIdentifier: application?.universalIdentifier ?? '' },
- skip: !application?.universalIdentifier,
- });
-
- const { data: isApplicationStoppedData } = useQuery(
- IsApplicationStoppedDocument,
- {
- variables: {
- applicationUniversalIdentifier: application?.universalIdentifier ?? '',
- },
- skip: !application?.universalIdentifier,
- // The kill switch is toggled server-side, a cached value would hide it.
- fetchPolicy: 'network-only',
- },
- );
-
- const isApplicationStopped =
- isApplicationStoppedData?.isApplicationStopped === true;
-
- const detail = detailData?.findMarketplaceAppDetail;
+ const {
+ marketplaceDetail: detail,
+ description,
+ coverImageUrl,
+ } = useApplicationOverview({ application });
const isMarketplaceApplication =
detail?.sourceType === ApplicationRegistrationSourceType.NPM;
- const currentWorkspace = useAtomStateValue(currentWorkspaceState);
- const isStandardApplication = isTwentyStandardApplication(application);
- const isCustomApplication = isWorkspaceCustomApplication(
- application,
- currentWorkspace,
- );
-
- const resolvedDescription = useResolvedApplicationDescription(application);
-
const displayName =
detail?.name ?? application?.name ?? t`Application details`;
- const description = detail?.description ?? resolvedDescription;
-
- const getCoverImageUrl = () => {
- if (detail?.galleryImages?.length) return detail.galleryImages[0];
- if (isStandardApplication) return STANDARD_APPLICATION_ILLUSTRATIONS[0];
- if (isCustomApplication) return CUSTOM_APPLICATION_ILLUSTRATIONS[0];
- return undefined;
- };
const handleUpgradeCompleted = useCallback(() => {
void refetch();
@@ -333,8 +287,8 @@ export const SettingsApplicationDetails = () => {
<SettingsApplicationDetailGeneralTab
application={application}
displayName={displayName}
- description={getApplicationDescriptionSummary(description)}
- coverImageUrl={getCoverImageUrl()}
+ description={description}
+ coverImageUrl={coverImageUrl}
marketplaceUniversalIdentifier={detail?.universalIdentifier}
isMarketplaceApplication={isMarketplaceApplication}
hasUpdate={hasUpdate}
@@ -382,21 +336,10 @@ export const SettingsApplicationDetails = () => {
return (
<CurrentApplicationContext.Provider value={application?.id ?? null}>
- <SettingsPageLayout
- title={displayName}
- icon={
- isDefined(application) ? (
- <AppChip
- applicationId={application.id}
- logoUrl={application.logoUrl}
- fallbackApplicationData={{
- name: displayName,
- }}
- size="md"
- chipOnly
- />
- ) : undefined
- }
+ <SettingsApplicationDetailPageLayout
+ applicationId={application?.id}
+ logoUrl={application?.logoUrl}
+ displayName={displayName}
links={[
{
children: t`Workspace`,
@@ -408,6 +351,9 @@ export const SettingsApplicationDetails = () => {
},
{ children: displayName },
]}
+ tabs={tabs}
+ tabListComponentInstanceId={APPLICATION_DETAIL_ID}
+ tabListAriaLabel={t`Application details`}
actionButton={
activeTabId === APPLICATION_VARIABLES_TAB_ID ? (
<Button
@@ -422,43 +368,27 @@ export const SettingsApplicationDetails = () => {
>{t`Save settings`}</Button>
) : undefined
}
- secondaryBar={
- isNotFound || isUnavailable || tabs.length <= 1 ? undefined : (
- <SettingsTabBar
- aria-label={t`Application details`}
- tabs={tabs}
- componentInstanceId={APPLICATION_DETAIL_ID}
- />
- )
- }
>
- <SettingsPageContainer overflow="visible">
- {isNonEmptyArray(missingRequiredApplicationVariables) &&
- isDefined(goToConfigurationTab) && (
- <SettingsApplicationMissingConfigurationBanner
- missingApplicationVariables={
- missingRequiredApplicationVariables
- }
- onConfigure={goToConfigurationTab}
- />
- )}
- {isDefined(healthBanner) && (
- <SettingsApplicationHealthBanner
- healthStatus={healthBanner.status}
- title={healthBanner.title}
- description={healthBanner.description}
- action={healthBannerButton}
+ {isNonEmptyArray(missingRequiredApplicationVariables) &&
+ isDefined(goToConfigurationTab) && (
+ <SettingsApplicationMissingConfigurationBanner
+ missingApplicationVariables={missingRequiredApplicationVariables}
+ onConfigure={goToConfigurationTab}
/>
)}
- {isApplicationStopped && (
- <InlineBanner
- status="warning"
- icon={<IconAlertTriangle aria-hidden="true" />}
- >{t`We are currently encountering issues with this app, its behavior may be degraded while we work on a fix.`}</InlineBanner>
- )}
- {renderActiveTabContent()}
- </SettingsPageContainer>
- </SettingsPageLayout>
+ {isDefined(healthBanner) && (
+ <SettingsApplicationHealthBanner
+ healthStatus={healthBanner.status}
+ title={healthBanner.title}
+ description={healthBanner.description}
+ action={healthBannerButton}
+ />
+ )}
+ <SettingsApplicationStoppedBanner
+ applicationUniversalIdentifier={application?.universalIdentifier}
+ />
+ {renderActiveTabContent()}
+ </SettingsApplicationDetailPageLayout>
</CurrentApplicationContext.Provider>
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/__stories__/SettingsApplicationDetails.stories.tsx b/packages/twenty-front/src/pages/settings/applications/__stories__/SettingsApplicationDetails.stories.tsx
index 321950b9b0e..d3779430a1c 100644
--- a/packages/twenty-front/src/pages/settings/applications/__stories__/SettingsApplicationDetails.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/__stories__/SettingsApplicationDetails.stories.tsx
@@ -16,7 +16,12 @@ import { isGoogleMessagingEnabledState } from '@/client-config/states/isGoogleMe
import { isMicrosoftCalendarEnabledState } from '@/client-config/states/isMicrosoftCalendarEnabledState';
import { isMicrosoftMessagingEnabledState } from '@/client-config/states/isMicrosoftMessagingEnabledState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { FeatureFlagKey } from '~/generated-metadata/graphql';
+import { isDefined } from 'twenty-shared/utils';
+import {
+ ApplicationRegistrationSourceType,
+ FeatureFlagKey,
+ type FindMarketplaceAppDetailQuery,
+} from '~/generated-metadata/graphql';
import { SettingsApplicationDetails } from '~/pages/settings/applications/SettingsApplicationDetails';
@@ -101,10 +106,41 @@ const USER_SETTINGS_MENU_ITEM = buildSettingsMenuItem({
scope: 'USER',
});
+const MARKETPLACE_APP_DETAIL: FindMarketplaceAppDetailQuery['findMarketplaceAppDetail'] =
+ {
+ __typename: 'MarketplaceAppDetail',
+ id: 'recorder-marketplace-id',
+ universalIdentifier: APPLICATION_ID,
+ name: 'Recorder Pro',
+ sourceType: ApplicationRegistrationSourceType.NPM,
+ sourcePackage: '@twenty/recorder',
+ latestAvailableVersion: '1.0.0',
+ isListed: true,
+ description: 'Records and transcribes every meeting.',
+ author: 'Twenty',
+ category: 'Productivity',
+ logoUrl: null,
+ websiteUrl: null,
+ aboutDescription: null,
+ pricingDescription: null,
+ termsUrl: null,
+ emailSupport: null,
+ issueReportUrl: null,
+ galleryImages: ['https://example.com/recorder-cover.png'],
+ installCount: 12,
+ defaultRoleUniversalIdentifier: null,
+ requestedCapabilities: [],
+ billsCredits: false,
+ objects: [],
+ roles: [],
+ };
+
const buildApplicationHandlers = ({
settingsMenuItems,
+ marketplaceAppDetail,
}: {
settingsMenuItems: ReturnType<typeof buildSettingsMenuItem>[];
+ marketplaceAppDetail?: FindMarketplaceAppDetailQuery['findMarketplaceAppDetail'];
}) => [
graphql.query('FindOneApplication', () =>
HttpResponse.json({
@@ -138,9 +174,15 @@ const buildApplicationHandlers = ({
}),
),
graphql.query('FindMarketplaceAppDetail', () =>
- HttpResponse.json({
- errors: [{ message: 'Not listed', extensions: { code: 'NOT_FOUND' } }],
- }),
+ HttpResponse.json(
+ isDefined(marketplaceAppDetail)
+ ? { data: { findMarketplaceAppDetail: marketplaceAppDetail } }
+ : {
+ errors: [
+ { message: 'Not listed', extensions: { code: 'NOT_FOUND' } },
+ ],
+ },
+ ),
),
graphql.query('IsApplicationStopped', () =>
HttpResponse.json({ data: { isApplicationStopped: false } }),
@@ -183,6 +225,40 @@ export default meta;
export type Story = StoryObj<typeof SettingsApplicationDetails>;
+export const MarketplaceListingFillsTheHeaderAndOverview: Story = {
+ parameters: {
+ msw: {
+ handlers: buildApplicationHandlers({
+ settingsMenuItems: [USER_SETTINGS_MENU_ITEM],
+ marketplaceAppDetail: MARKETPLACE_APP_DETAIL,
+ }),
+ },
+ },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByText(
+ 'Records and transcribes every meeting.',
+ undefined,
+ { timeout: 3000 },
+ ),
+ ).toBeVisible();
+ const breadcrumb = within(canvas.getByLabelText('Breadcrumb'));
+
+ expect(breadcrumb.getByRole('link', { name: 'Apps' })).toBeVisible();
+ expect(breadcrumb.getByText('Recorder Pro')).toBeVisible();
+ expect(
+ canvasElement.querySelector(
+ 'img[src="https://example.com/recorder-cover.png"]',
+ ),
+ ).not.toBeNull();
+ expect(
+ canvas.getByRole('button', { name: 'View in marketplace' }),
+ ).toBeVisible();
+ },
+};
+
export const VariablesTabIgnoresUserScope: Story = {
play: async ({ canvasElement }) => {
const canvas = within(canvasElement);