Skip to content

The open alternative to Salesforce, designed for AI.

Split installed app detail page into settings tabs (#26065)

martmull21e64ad56cac
diff --git a/packages/twenty-docs/developers/extend/apps/config/application.mdx b/packages/twenty-docs/developers/extend/apps/config/application.mdx
index 405c165bd46..555c8244125 100644
--- a/packages/twenty-docs/developers/extend/apps/config/application.mdx
+++ b/packages/twenty-docs/developers/extend/apps/config/application.mdx
@@ -40,7 +40,7 @@ Notes:
- Passing `defaultRoleUniversalIdentifier` explicitly is still supported for backward compatibility, but is deprecated in favor of `defineApplicationRole()`.
- `serverVariables` are instance-scoped configuration and secrets (e.g. API keys). Unlike `applicationVariables`, they declare no value in the manifest — the workspace operator fills them in from the app's settings, and they are injected into logic functions only once set.
- Both kinds of variable accept `isDeprecated: true`. Use it to retire a variable instead of deleting it: keeping the key declared preserves the stored value (deleting it destroys the value the operator entered), and the variable is still injected, so your code can fall back to it — `process.env.NEW_API_KEY ?? process.env.API_KEY`. A deprecated variable disappears from the app's settings once it has no value, and never counts toward the app's configuration check, so `isDeprecated` beats `isRequired`.
-- To render a custom configuration UI inside the app's **Settings** tab (in place of the default variable configuration section), declare a front component with [`defineSettingsFrontComponent()`](/developers/extend/apps/layout/front-components#custom-settings-component) in its own file. Only one is allowed per app. System-managed sections (auto-upgrade, App URL, connections) always remain visible.
+- To render a custom configuration UI as the app's **Settings** tab (in place of the default **Variables** tab), declare a front component with [`defineSettingsFrontComponent()`](/developers/extend/apps/layout/front-components#custom-settings-component) in its own file. Only one is allowed per app. System-managed sections (auto-upgrade, App URL, connections) stay in the app's **General** tab.
## Variable types
diff --git a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
index 1809b702be6..d2c4ee64cac 100644
--- a/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
+++ b/packages/twenty-docs/developers/extend/apps/layout/front-components.mdx
@@ -16,13 +16,13 @@ Front components can render in three locations within Twenty:
- **Side panel** — Non-headless front components open in the right-hand side panel. This is the default behavior when a front component is triggered from the command menu.
- **Widgets (dashboards and record pages)** — Front components can be embedded as widgets inside [page layouts](/developers/extend/apps/layout/page-layouts). When configuring a dashboard or a record page layout, users can add a front component widget.
-- **App settings** — Defined with [`defineSettingsFrontComponent()`](#custom-settings-component), the front component renders as a section inside the app's **Settings** tab, in place of the default variable configuration UI.
+- **App settings** — Defined with [`defineSettingsFrontComponent()`](#custom-settings-component), the front component is the whole content of the app's **Settings** tab, in place of the default **Variables** tab.
A front component on its own isn't reachable from the UI — you need to *surface* it. The three ways to do that are:
- **Pair it with a [command menu item](/developers/extend/apps/layout/command-menu-items)** — registers it in the command menu (Cmd+K) and, optionally, as a pinned quick-action.
- **Embed it as a widget in a [page layout](/developers/extend/apps/layout/page-layouts)** — places it on a record's detail page or dashboard.
-- **Define it with [`defineSettingsFrontComponent()`](#custom-settings-component)** — renders it as a section inside the app's **Settings** tab, in place of the default variable configuration UI.
+- **Define it with [`defineSettingsFrontComponent()`](#custom-settings-component)** — makes it the whole content of the app's **Settings** tab, in place of the default **Variables** tab.
## Basic example
@@ -85,9 +85,9 @@ Beyond commands, you can embed a front component directly into a record page by
## Custom settings component
-To replace the auto-generated variable configuration UI in your app's **Settings** tab with your own component, define it with `defineSettingsFrontComponent` instead of `defineFrontComponent`. It takes the same [configuration fields](#configuration-fields) (except `isHeadless`, which is not accepted since a settings component always renders visible UI) and additionally marks the component as the app's settings UI.
+To replace the auto-generated variable configuration UI with your own component, define it with `defineSettingsFrontComponent` instead of `defineFrontComponent`. It takes the same [configuration fields](#configuration-fields) (except `isHeadless`, which is not accepted since a settings component always renders visible UI) and additionally marks the component as the app's settings UI.
-The component renders as a section **inside** the Settings tab, not as a replacement for the whole tab. Twenty's system-managed sections — auto-upgrade, App URL, and connections — always render above it and cannot be overridden by the app.
+The component is the whole content of a dedicated **Settings** tab, and it replaces the auto-generated **Variables** tab: your app is expected to render its own variables. Twenty's system-managed sections — auto-upgrade, App URL, and connections — live in the app's **General** tab and cannot be overridden by the app.
```tsx src/front-components/app-settings.tsx
import { defineSettingsFrontComponent } from 'twenty-sdk/define';
@@ -109,7 +109,7 @@ export default defineSettingsFrontComponent({
});
```
-Only one settings front component is allowed per app; declaring more than one fails the build. When present, the app's **Settings** tab renders this component in place of the default variable configuration UI.
+Only one settings front component is allowed per app; declaring more than one fails the build. When present, the app gains a **Settings** tab rendering this component, in place of the default **Variables** tab.
## Headless vs non-headless
diff --git a/packages/twenty-docs/developers/extend/apps/layout/overview.mdx b/packages/twenty-docs/developers/extend/apps/layout/overview.mdx
index 31a740392a4..a7c1eb51a89 100644
--- a/packages/twenty-docs/developers/extend/apps/layout/overview.mdx
+++ b/packages/twenty-docs/developers/extend/apps/layout/overview.mdx
@@ -51,7 +51,7 @@ A Twenty app's **layout layer** is everything the user sees: where the app surfa
| **Record list** | A saved configuration for an object — visible columns, order, filters, groups | `defineView` |
| **Record detail page** | The tabs and widgets on a record page (your own object's, or a standard one) | `definePageLayout`, `definePageLayoutTab`, `definePageLayoutWidget` |
| **Inside any of the above** | A custom React widget — buttons, forms, dashboards, integrations | `defineFrontComponent` |
-| **App settings** | A custom configuration section inside the app's Settings tab, in place of the default variables UI | `defineSettingsFrontComponent` |
+| **App settings** | The app's Settings tab, in place of the default variables UI | `defineSettingsFrontComponent` |
| **Command menu (Cmd+K)** | A pinned quick action or hidden command | `defineCommandMenuItem` |
Front components run inside an isolated Web Worker using Remote DOM — they render *natively* in the page (not inside an iframe), but cannot reach the host page or DOM directly. Communication with Twenty happens through a message-passing host API.
diff --git a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx b/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
index dfad0a3aea0..0b172d93c12 100644
--- a/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
+++ b/packages/twenty-docs/developers/extend/apps/logic/connections.mdx
@@ -25,7 +25,7 @@ export default defineConnectionProvider({
displayName: 'Linear',
icon: 'IconBrandLinear',
// Optional: a logo bundled in your app's public/ folder, shown next to the
- // provider in the per-app settings tab.
+ // provider in the app's General tab.
logo: 'public/linear-logomark.svg',
type: 'oauth',
oauth: {
@@ -82,11 +82,11 @@ export default defineApplication({
Key points:
- `name` is the unique identifier string used in `listConnections({ providerName })` (kebab-case, must match `^[a-z][a-z0-9-]*$`).
-- `displayName` shows in the per-app settings tab and in the AI tool list.
-- `logo` is a path to an asset bundled in your app's `public/` folder, served through the app's public assets. When omitted, the settings tab falls back to a placeholder built from `displayName`.
+- `displayName` shows in the app's General tab and in the AI tool list.
+- `logo` is a path to an asset bundled in your app's `public/` folder, served through the app's public assets. When omitted, the General tab falls back to a placeholder built from `displayName`.
- `clientIdVariable` / `clientSecretVariable` are **names**, not values — they must match keys declared in `defineApplication.serverVariables`. The actual `client_id` and `client_secret` are entered by the server admin through the app registration UI, never committed to your repo.
- Use `serverVariables` (not `applicationVariables`) — OAuth credentials are server-wide and one OAuth app per Twenty server.
-- Until both `serverVariables` are filled in, the per-app settings tab shows a "needs server admin" hint and the "Add connection" button is disabled.
+- Until both `serverVariables` are filled in, the app's General tab shows a "needs server admin" hint and the "Add connection" button is disabled.
- `type: 'oauth'` is the only supported value today. The discriminator is forward-compatible: future types (`'pat'`, `'api-key'`, ...) will add new sub-config blocks alongside `oauth`.
The OAuth callback URL your provider needs to whitelist is:
diff --git a/packages/twenty-docs/developers/extend/apps/operations/publishing.mdx b/packages/twenty-docs/developers/extend/apps/operations/publishing.mdx
index af70792a348..306dbd55f29 100644
--- a/packages/twenty-docs/developers/extend/apps/operations/publishing.mdx
+++ b/packages/twenty-docs/developers/extend/apps/operations/publishing.mdx
@@ -83,7 +83,7 @@ To release an update:
1. Bump the `version` field in your `package.json` (e.g. `1.2.3` → `1.2.4`, `1.3.0`, or `2.0.0`)
2. Run `yarn twenty app:publish --private` (or `yarn twenty app:publish --private --remote production`)
-3. Workspaces that have the app installed and enabled auto-upgrade for it (in the app's Settings tab) are upgraded automatically in the background; the others will see the upgrade available in their settings
+3. Workspaces that have the app installed and enabled auto-upgrade for it (in the app's General tab) are upgraded automatically in the background; the others will see the upgrade available in their settings
<Note>
Pre-release tags work as expected: bumping `1.0.0-rc.1` → `1.0.0-rc.2` is allowed, and a final release like `1.0.0` is correctly recognized as higher than `1.0.0-rc.5`. The version in `package.json` must itself be a valid semver string.
diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
index b7f98a6012a..c4dac3abaeb 100644
--- a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
+++ b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -828,7 +828,11 @@ const createSettingsRouteElements = ({
element={<SettingsCustomDomainPage />}
/>
<Route
- path={SettingsPath.PublicDomain}
+ path={SettingsPath.ApplicationPublicDomainNew}
+ element={<SettingPublicDomain />}
+ />
+ <Route
+ path={SettingsPath.ApplicationPublicDomainDetail}
element={<SettingPublicDomain />}
/>
<Route path={SettingsPath.LegalDpa} element={<SettingsLegalDpa />} />
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
index 01396687b4a..e4fbb14c341 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationActionButton.tsx
@@ -1,118 +1,55 @@
-import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
-import { useModal } from '@/ui/layout/modal/hooks/useModal';
import { t } from '@lingui/core/macro';
-import { Trans } from '@lingui/react/macro';
-import { useId } from 'react';
-import { isDefined } from 'twenty-shared/utils';
-import { IconCheck, IconDownload, IconTrash, IconUpload } from 'twenty-ui/icon';
+import { Link } from 'react-router-dom';
+import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { IconDownload, IconSettings } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
type SettingsApplicationActionButtonProps = {
- isInstalled: boolean;
+ installedApplicationId?: string;
canInstallMarketplaceApps?: boolean;
onInstall?: () => void;
isInstalling?: boolean;
- hasUpdate?: boolean;
- latestAvailableVersion?: string;
- onUpgrade?: () => void;
- isUpgrading?: boolean;
- canBeUninstalled?: boolean;
- onUninstall?: () => void;
- isUninstalling?: boolean;
};
export const SettingsApplicationActionButton = ({
- isInstalled,
+ installedApplicationId,
canInstallMarketplaceApps,
onInstall,
isInstalling,
- hasUpdate,
- latestAvailableVersion,
- onUpgrade,
- isUpgrading,
- canBeUninstalled,
- onUninstall,
- isUninstalling,
}: SettingsApplicationActionButtonProps) => {
- const { openModal } = useModal();
- const uninstallModalId = useId();
-
- const confirmationValue = t`yes`;
-
- if (!canInstallMarketplaceApps) {
- return null;
- }
-
- if (!isInstalled || isInstalling) {
+ if (isDefined(installedApplicationId) && !isInstalling) {
return (
<Button
- startIcon={<IconDownload />}
+ startIcon={<IconSettings />}
variant="solid"
color="accent"
size="sm"
- onClick={onInstall}
- disabled={isInstalling}
- >
- {isInstalling ? t`Installing...` : t`Install`}
- </Button>
+ render={
+ <Link
+ to={getSettingsPath(SettingsPath.ApplicationDetail, {
+ applicationId: installedApplicationId,
+ })}
+ />
+ }
+ >{t`Open settings`}</Button>
);
}
- if (hasUpdate) {
- return (
- <Button
- startIcon={<IconUpload />}
- variant="outline"
- color="accent"
- size="sm"
- onClick={onUpgrade}
- disabled={isUpgrading}
- >
- {isUpgrading
- ? t`Upgrading...`
- : t`Upgrade to ${latestAvailableVersion ?? ''}`}
- </Button>
- );
- }
-
- if (canBeUninstalled && isDefined(onUninstall)) {
- return (
- <>
- <Button
- startIcon={<IconTrash />}
- variant="outline"
- color="danger"
- size="sm"
- onClick={() => openModal(uninstallModalId)}
- disabled={isUninstalling}
- >
- {isUninstalling ? t`Uninstalling...` : t`Uninstall`}
- </Button>
- <ConfirmationModal
- confirmationPlaceholder={confirmationValue}
- confirmationValue={confirmationValue}
- modalInstanceId={uninstallModalId}
- title={t`Uninstall Application?`}
- subtitle={
- <Trans>
- Please type {`"${confirmationValue}"`} to confirm you want to
- uninstall this application.
- </Trans>
- }
- onConfirmClick={onUninstall}
- confirmButtonText={t`Uninstall`}
- loading={isUninstalling}
- />
- </>
- );
+ if (!canInstallMarketplaceApps) {
+ return null;
}
return (
<Button
- startIcon={<IconCheck />}
- variant="outline"
+ startIcon={<IconDownload />}
+ variant="solid"
+ color="accent"
size="sm"
- disabled
- >{t`Installed`}</Button>
+ onClick={onInstall}
+ disabled={isInstalling}
+ >
+ {isInstalling ? t`Installing...` : t`Install`}
+ </Button>
);
};
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationOverviewCard.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationOverviewCard.tsx
new file mode 100644
index 00000000000..2c3424d02c4
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationOverviewCard.tsx
@@ -0,0 +1,121 @@
+import { AppChip } from '@/applications/components/AppChip';
+import { styled } from '@linaria/react';
+import { isNonEmptyString } from '@sniptt/guards';
+import { type ReactNode } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { Card } from 'twenty-ui/primitives/surfaces';
+import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme-constants';
+
+const COVER_WIDTH_PX = 272;
+const CARD_MIN_HEIGHT_PX = 150;
+
+const StyledCard = styled(Card)`
+ display: flex;
+ min-height: ${CARD_MIN_HEIGHT_PX}px;
+`;
+
+const StyledIdentity = styled.div`
+ box-sizing: border-box;
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[4]};
+ min-width: 0;
+ padding: ${themeCssVariables.spacing[4]};
+`;
+
+const StyledText = styled.div`
+ display: flex;
+ flex: 1;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[1]};
+ justify-content: center;
+ min-width: 0;
+`;
+
+const StyledName = styled.div`
+ color: ${themeCssVariables.font.color.primary};
+ font-weight: ${themeCssVariables.font.weight.medium};
+`;
+
+const StyledDescription = styled.div`
+ color: ${themeCssVariables.font.color.tertiary};
+ font-size: ${themeCssVariables.font.size.sm};
+ line-height: ${themeCssVariables.text.lineHeight.lg};
+ overflow-wrap: anywhere;
+`;
+
+const StyledActions = styled.div`
+ display: flex;
+ flex-wrap: wrap;
+ gap: ${themeCssVariables.spacing[2]};
+`;
+
+const StyledCover = styled.div`
+ background: ${themeCssVariables.background.secondary};
+ flex: 0 1 ${COVER_WIDTH_PX}px;
+ overflow: hidden;
+ position: relative;
+
+ @media (max-width: ${MOBILE_VIEWPORT}px) {
+ display: none;
+ }
+`;
+
+const StyledCoverImage = styled.img`
+ display: block;
+ height: 100%;
+ inset: 0;
+ object-fit: cover;
+ object-position: left top;
+ position: absolute;
+ width: 100%;
+`;
+
+type SettingsApplicationOverviewCardProps = {
+ applicationId?: string | null;
+ logoUrl?: string | null;
+ displayName: string;
+ description?: string;
+ coverImageUrl?: string;
+ actions?: ReactNode;
+};
+
+export const SettingsApplicationOverviewCard = ({
+ applicationId,
+ logoUrl,
+ displayName,
+ description,
+ coverImageUrl,
+ actions,
+}: SettingsApplicationOverviewCardProps) => {
+ return (
+ <StyledCard
+ rounded
+ fullWidth
+ backgroundColor={themeCssVariables.background.secondary}
+ >
+ <StyledIdentity>
+ <AppChip
+ applicationId={applicationId}
+ logoUrl={logoUrl}
+ fallbackApplicationData={{ name: displayName }}
+ size="xl"
+ chipOnly
+ />
+ <StyledText>
+ <StyledName>{displayName}</StyledName>
+ {isNonEmptyString(description) && (
+ <StyledDescription>{description}</StyledDescription>
+ )}
+ </StyledText>
+ {isDefined(actions) && <StyledActions>{actions}</StyledActions>}
+ </StyledIdentity>
+ {isNonEmptyString(coverImageUrl) && (
+ <StyledCover>
+ <StyledCoverImage src={coverImageUrl} alt="" aria-hidden />
+ </StyledCover>
+ )}
+ </StyledCard>
+ );
+};
diff --git a/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationUninstallButton.tsx b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationUninstallButton.tsx
new file mode 100644
index 00000000000..81229397201
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/applications/components/SettingsApplicationUninstallButton.tsx
@@ -0,0 +1,52 @@
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
+import { useModal } from '@/ui/layout/modal/hooks/useModal';
+import { t } from '@lingui/core/macro';
+import { Trans } from '@lingui/react/macro';
+import { useId } from 'react';
+import { IconTrash } from 'twenty-ui/icon';
+import { Button } from 'twenty-ui/primitives/input';
+
+type SettingsApplicationUninstallButtonProps = {
+ onUninstall: () => void;
+ isUninstalling?: boolean;
+};
+
+export const SettingsApplicationUninstallButton = ({
+ onUninstall,
+ isUninstalling,
+}: SettingsApplicationUninstallButtonProps) => {
+ const { openModal } = useModal();
+ const uninstallModalId = useId();
+
+ const confirmationValue = t`yes`;
+
+ return (
+ <>
+ <Button
+ startIcon={<IconTrash />}
+ variant="outline"
+ color="danger"
+ size="sm"
+ onClick={() => openModal(uninstallModalId)}
+ disabled={isUninstalling}
+ >
+ {isUninstalling ? t`Uninstalling...` : t`Uninstall`}
+ </Button>
+ <ConfirmationModal
+ confirmationPlaceholder={confirmationValue}
+ confirmationValue={confirmationValue}
+ modalInstanceId={uninstallModalId}
+ title={t`Uninstall Application?`}
+ subtitle={
+ <Trans>
+ Please type {`"${confirmationValue}"`} to confirm you want to
+ uninstall this application.
+ </Trans>
+ }
+ onConfirmClick={onUninstall}
+ confirmButtonText={t`Uninstall`}
+ loading={isUninstalling}
+ />
+ </>
+ );
+};
diff --git a/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationActionButton.stories.tsx b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationActionButton.stories.tsx
index ee98c675a51..e12fd7a3b75 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationActionButton.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationActionButton.stories.tsx
@@ -1,19 +1,20 @@
import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { fn } from 'storybook/test';
+import { expect, fn, within } from 'storybook/test';
import { SettingsApplicationActionButton } from '@/settings/applications/components/SettingsApplicationActionButton';
import { ComponentDecorator } from 'twenty-ui/testing';
+import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
import { RootDecorator } from '~/testing/decorators/RootDecorator';
+const INSTALLED_APPLICATION_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+
const meta: Meta<typeof SettingsApplicationActionButton> = {
title: 'Modules/Settings/Applications/SettingsApplicationActionButton',
component: SettingsApplicationActionButton,
- decorators: [RootDecorator, ComponentDecorator],
+ decorators: [RootDecorator, ComponentDecorator, MemoryRouterDecorator],
args: {
canInstallMarketplaceApps: true,
onInstall: fn(),
- onUpgrade: fn(),
- onUninstall: fn(),
},
};
@@ -21,21 +22,36 @@ export default meta;
type Story = StoryObj<typeof SettingsApplicationActionButton>;
export const Install: Story = {
- args: { isInstalled: false },
-};
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
-export const Installing: Story = {
- args: { isInstalled: false, isInstalling: true },
+ expect(
+ await canvas.findByRole('button', { name: /^Install\b/ }),
+ ).toBeEnabled();
+ },
};
-export const Upgrade: Story = {
- args: { isInstalled: true, hasUpdate: true, latestAvailableVersion: '2.1.0' },
-};
+export const Installing: Story = {
+ args: { isInstalling: true },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
-export const Uninstall: Story = {
- args: { isInstalled: true, canBeUninstalled: true },
+ expect(
+ await canvas.findByRole('button', { name: /^Installing\b/ }),
+ ).toBeDisabled();
+ },
};
export const Installed: Story = {
- args: { isInstalled: true },
+ args: { installedApplicationId: INSTALLED_APPLICATION_ID },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(
+ await canvas.findByRole('link', { name: /^Open settings\b/ }),
+ ).toHaveAttribute(
+ 'href',
+ `/settings/applications/${INSTALLED_APPLICATION_ID}`,
+ );
+ },
};
diff --git a/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationOverviewCard.stories.tsx b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationOverviewCard.stories.tsx
new file mode 100644
index 00000000000..66e7a2b565b
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/applications/components/__stories__/SettingsApplicationOverviewCard.stories.tsx
@@ -0,0 +1,73 @@
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import { expect, fn, within } from 'storybook/test';
+
+import { SettingsApplicationOverviewCard } from '@/settings/applications/components/SettingsApplicationOverviewCard';
+import { IconShoppingBag, IconTrash, IconUpload } from 'twenty-ui/icon';
+import { Button } from 'twenty-ui/primitives/input';
+import { ComponentDecorator } from 'twenty-ui/testing';
+import { RootDecorator } from '~/testing/decorators/RootDecorator';
+
+const meta: Meta<typeof SettingsApplicationOverviewCard> = {
+ title: 'Modules/Settings/Applications/SettingsApplicationOverviewCard',
+ component: SettingsApplicationOverviewCard,
+ decorators: [RootDecorator, ComponentDecorator],
+ args: {
+ displayName: 'Stripe',
+ description: 'The Stripe app lets you import customer data into your CRM.',
+ actions: (
+ <>
+ <Button
+ startIcon={<IconShoppingBag />}
+ variant="outline"
+ size="sm"
+ onClick={fn()}
+ >
+ See
+ </Button>
+ <Button
+ startIcon={<IconUpload />}
+ variant="outline"
+ color="accent"
+ size="sm"
+ onClick={fn()}
+ >
+ Upgrade
+ </Button>
+ <Button
+ startIcon={<IconTrash />}
+ variant="outline"
+ color="danger"
+ size="sm"
+ onClick={fn()}
+ >
+ Uninstall
+ </Button>
+ </>
+ ),
+ },
+};
+
+export default meta;
+type Story = StoryObj<typeof SettingsApplicationOverviewCard>;
+
+export const Default: Story = {
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(await canvas.findByText('Stripe')).toBeVisible();
+ expect(await canvas.findByRole('button', { name: /^See\b/ })).toBeVisible();
+ expect(
+ await canvas.findByRole('button', { name: /^Uninstall\b/ }),
+ ).toBeVisible();
+ },
+};
+
+export const WithoutActions: Story = {
+ args: { actions: undefined },
+ play: async ({ canvasElement }) => {
+ const canvas = within(canvasElement);
+
+ expect(await canvas.findByText('Stripe')).toBeVisible();
+ expect(canvas.queryByRole('button')).not.toBeInTheDocument();
+ },
+};
diff --git a/packages/twenty-front/src/modules/settings/applications/components/__tests__/SettingsApplicationActionButton.test.tsx b/packages/twenty-front/src/modules/settings/applications/components/__tests__/SettingsApplicationActionButton.test.tsx
index 3449c85b258..2d4c63a5244 100644
--- a/packages/twenty-front/src/modules/settings/applications/components/__tests__/SettingsApplicationActionButton.test.tsx
+++ b/packages/twenty-front/src/modules/settings/applications/components/__tests__/SettingsApplicationActionButton.test.tsx
@@ -1,47 +1,37 @@
import { i18n } from '@lingui/core';
import { I18nProvider } from '@lingui/react';
-import { render, screen, within } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
+import { MemoryRouter } from 'react-router-dom';
import { SettingsApplicationActionButton } from '@/settings/applications/components/SettingsApplicationActionButton';
+const INSTALLED_APPLICATION_ID = '20202020-1c25-4d02-bf25-6aeccf7ea419';
+
type RenderActionButtonOptions = {
- isInstalled?: boolean;
+ installedApplicationId?: string;
canInstallMarketplaceApps?: boolean;
onInstall?: () => void;
isInstalling?: boolean;
- hasUpdate?: boolean;
- latestAvailableVersion?: string;
- onUpgrade?: () => void;
- canBeUninstalled?: boolean;
- onUninstall?: () => void;
};
const renderActionButton = ({
- isInstalled = false,
+ installedApplicationId,
canInstallMarketplaceApps = true,
onInstall,
isInstalling,
- hasUpdate,
- latestAvailableVersion,
- onUpgrade,
- canBeUninstalled,
- onUninstall,
}: RenderActionButtonOptions = {}) =>
render(
- <I18nProvider i18n={i18n}>
- <SettingsApplicationActionButton
- isInstalled={isInstalled}
- canInstallMarketplaceApps={canInstallMarketplaceApps}
- onInstall={onInstall}
- isInstalling={isInstalling}
- hasUpdate={hasUpdate}
- latestAvailableVersion={latestAvailableVersion}
- onUpgrade={onUpgrade}
- canBeUninstalled={canBeUninstalled}
- onUninstall={onUninstall}
- />
- </I18nProvider>,
+ <MemoryRouter>
+ <I18nProvider i18n={i18n}>
+ <SettingsApplicationActionButton
+ installedApplicationId={installedApplicationId}
+ canInstallMarketplaceApps={canInstallMarketplaceApps}
+ onInstall={onInstall}
+ isInstalling={isInstalling}
+ />
+ </I18nProvider>
+ </MemoryRouter>,
);
describe('SettingsApplicationActionButton', () => {
@@ -72,57 +62,25 @@ describe('SettingsApplicationActionButton', () => {
).toBeDisabled();
});
- it('offers the upgrade when a newer version is available', async () => {
- const user = userEvent.setup();
- const onUpgrade = jest.fn();
-
- renderActionButton({
- isInstalled: true,
- hasUpdate: true,
- latestAvailableVersion: '2.0.0',
- onUpgrade,
- });
+ it('links to the application settings once installed', () => {
+ renderActionButton({ installedApplicationId: INSTALLED_APPLICATION_ID });
- await user.click(
- screen.getByRole('button', { name: /^Upgrade to 2\.0\.0\b/ }),
+ expect(
+ screen.getByRole('link', { name: /^Open settings\b/ }),
+ ).toHaveAttribute(
+ 'href',
+ `/settings/applications/${INSTALLED_APPLICATION_ID}`,
);
-
- expect(onUpgrade).toHaveBeenCalledTimes(1);
});
- it('asks for confirmation before uninstalling', async () => {
- const user = userEvent.setup();
- const onUninstall = jest.fn();
-
+ it('offers the settings link even without the applications permission', () => {
renderActionButton({
- isInstalled: true,
- canBeUninstalled: true,
- onUninstall,
+ installedApplicationId: INSTALLED_APPLICATION_ID,
+ canInstallMarketplaceApps: false,
});
- await user.click(screen.getByRole('button', { name: /^Uninstall\b/ }));
-
- const confirmationDialog = await screen.findByRole('dialog');
-
expect(
- within(confirmationDialog).getByText('Uninstall Application?'),
+ screen.getByRole('link', { name: /^Open settings\b/ }),
).toBeVisible();
- expect(onUninstall).not.toHaveBeenCalled();
-
- await user.type(
- within(confirmationDialog).getByPlaceholderText('yes'),
- 'yes',
- );
- await user.click(
- within(confirmationDialog).getByRole('button', { name: /^Uninstall\b/ }),
- );
-
- expect(onUninstall).toHaveBeenCalledTimes(1);
- });
-
- it('shows a disabled installed state when nothing else applies', () => {
- renderActionButton({ isInstalled: true });
-
- expect(screen.getByRole('button', { name: /^Installed\b/ })).toBeDisabled();
});
});
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
index e4ead8a07dd..80ec13c32a9 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingPublicDomain.tsx
@@ -2,19 +2,18 @@ import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsF
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
+import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { CheckPublicDomainValidRecordsEffect } from '@/settings/domains/components/CheckPublicDomainValidRecordsEffect';
import { SettingsDomainRecords } from '@/settings/domains/components/SettingsDomainRecords';
import { useCheckPublicDomainValidRecords } from '@/settings/domains/hooks/useCheckPublicDomainValidRecords';
-import { selectedApplicationIdForPublicDomainState } from '@/settings/domains/states/selectedApplicationIdForPublicDomainState';
-import { selectedPublicDomainState } from '@/settings/domains/states/selectedPublicDomainState';
import { getDomainValidationSchema } from '@/settings/domains/utils/getDomainValidationSchema';
import { TextInput } from '@/ui/input/components/TextInput';
-import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useMutation, useQuery } from '@apollo/client/react';
+import { isNonEmptyString } from '@sniptt/guards';
import { styled } from '@linaria/react';
import { Trans, useLingui } from '@lingui/react/macro';
import { useState } from 'react';
+import { useParams } from 'react-router-dom';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
import { Section } from 'twenty-ui/components';
@@ -26,6 +25,7 @@ import {
CreatePublicDomainDocument,
DeletePublicDomainDocument,
FindManyPublicDomainsDocument,
+ FindOneApplicationNameDocument,
} from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -53,12 +53,11 @@ const StyledRecordsWrapper = styled.div`
`;
export const SettingPublicDomain = () => {
- const [selectedPublicDomain, setSelectedPublicDomain] = useAtomState(
- selectedPublicDomainState,
- );
- const selectedApplicationIdForPublicDomain = useAtomStateValue(
- selectedApplicationIdForPublicDomainState,
- );
+ const { applicationId = '', publicDomainId } = useParams<{
+ applicationId: string;
+ publicDomainId: string;
+ }>();
+
const { t } = useLingui();
const navigate = useNavigateSettings();
const { enqueueToast } = useToast();
@@ -67,23 +66,59 @@ export const SettingPublicDomain = () => {
CreatePublicDomainDocument,
);
+ const {
+ data: publicDomainsData,
+ loading: publicDomainsLoading,
+ refetch: refetchPublicDomains,
+ } = useQuery(FindManyPublicDomainsDocument);
+
+ const isEditingPublicDomain = isDefined(publicDomainId);
+
+ // Scoped to the application in the URL: the query is workspace-wide, so a
+ // domain id from another application would otherwise be editable and
+ // deletable from this page.
+ const selectedPublicDomain = isEditingPublicDomain
+ ? publicDomainsData?.findManyPublicDomains?.find(
+ (publicDomain) =>
+ publicDomain.id === publicDomainId &&
+ publicDomain.applicationId === applicationId,
+ )
+ : undefined;
+
+ const isLoadingSelectedPublicDomain =
+ isEditingPublicDomain && publicDomainsLoading;
+ const isPublicDomainNotFound =
+ isEditingPublicDomain &&
+ !publicDomainsLoading &&
+ !isDefined(selectedPublicDomain);
+
+ const { data: applicationData } = useQuery(FindOneApplicationNameDocument, {
+ variables: { id: applicationId },
+ skip: !applicationId,
+ });
+
+ const applicationName =
+ applicationData?.findOneApplication?.name ?? t`Application`;
+
const [newPublicDomain, setNewPublicDomain] = useState<string | undefined>(
- selectedPublicDomain?.domain ?? '',
+ '',
);
const [newPublicDomainError, setNewPublicDomainError] = useState<
string | undefined
>(undefined);
- const { refetch: refetchPublicDomains } = useQuery(
- FindManyPublicDomainsDocument,
- );
-
const [deletePublicDomain] = useMutation(DeletePublicDomainDocument);
const { isLoading, publicDomainRecords, checkPublicDomainRecords } =
useCheckPublicDomainValidRecords();
+ // Also used once the create and delete mutations resolve, so it cannot be
+ // replaced by a Link.
+ // oxlint-disable-next-line twenty/no-navigate-prefer-link
+ const navigateToApplication = () =>
+ navigate(SettingsPath.ApplicationDetail, { applicationId });
+
const onDelete = async () => {
if (!selectedPublicDomain) {
return;
@@ -91,13 +126,13 @@ export const SettingPublicDomain = () => {
await deletePublicDomain({
variables: { domain: selectedPublicDomain.domain },
- onCompleted: () => {
+ onCompleted: async () => {
enqueueToast({
variant: 'success',
children: t`Custom domain successfully deleted`,
});
- navigate(SettingsPath.Applications);
- refetchPublicDomains();
+ await refetchPublicDomains();
+ navigateToApplication();
},
onError: (error) => enqueueToast(getToastOptionsFromError({ error })),
});
@@ -106,10 +141,7 @@ export const SettingPublicDomain = () => {
const validationSchema = getDomainValidationSchema();
const onCreate = async () => {
- if (
- !isDefined(newPublicDomain) ||
- !isDefined(selectedApplicationIdForPublicDomain)
- ) {
+ if (!isDefined(newPublicDomain) || !isNonEmptyString(applicationId)) {
return;
}
@@ -125,14 +157,15 @@ export const SettingPublicDomain = () => {
await createPublicDomain({
variables: {
domain: newPublicDomain,
- applicationId: selectedApplicationIdForPublicDomain,
+ applicationId,
},
- onCompleted: (data) => {
- setSelectedPublicDomain(data.createPublicDomain);
+ onCompleted: async () => {
enqueueToast({
variant: 'success',
children: t`Custom domain successfully created`,
});
+ await refetchPublicDomains();
+ navigateToApplication();
},
onError: (error) => {
setNewPublicDomainError(error.message);
@@ -141,6 +174,80 @@ export const SettingPublicDomain = () => {
});
};
+ const renderContent = () => {
+ if (isLoadingSelectedPublicDomain) {
+ return <SettingsSectionSkeletonLoader />;
+ }
+
+ if (isPublicDomainNotFound) {
+ return (
+ <Section.Root>
+ <Section.Header
+ title={t`Custom domain not found`}
+ description={t`This custom domain does not exist or does not belong to this application.`}
+ />
+ </Section.Root>
+ );
+ }
+
+ return (
+ <Section.Root>
+ <Section.Header
+ title={t`Custom Domain`}
+ description={t`Set the name of your custom domain and configure your DNS records.`}
+ />
+ {isDefined(selectedPublicDomain) && (
+ <CheckPublicDomainValidRecordsEffect
+ publicDomain={selectedPublicDomain}
+ />
+ )}
+ <StyledDomainFormWrapper>
+ <TextInput
+ value={selectedPublicDomain?.domain ?? newPublicDomain}
+ onChange={setNewPublicDomain}
+ error={newPublicDomainError}
+ type="text"
+ disabled={isDefined(selectedPublicDomain)}
+ placeholder="app.yourdomain.com"
+ fullWidth
+ />
+ {isDefined(selectedPublicDomain) && (
+ <StyledButtonGroupContainer>
+ <ButtonGroup>
+ <StyledButtonContainer>
+ <Button
+ loading={isLoading}
+ startIcon={<IconReload />}
+ onClick={() =>
+ checkPublicDomainRecords(selectedPublicDomain.domain)
+ }
+ type="button"
+ variant="outline"
+ >{t`Reload`}</Button>
+ </StyledButtonContainer>
+ <StyledButtonContainer>
+ <Button
+ startIcon={<IconTrash />}
+ aria-label={t`Delete`}
+ onClick={onDelete}
+ variant="outline"
+ />
+ </StyledButtonContainer>
+ </ButtonGroup>
+ </StyledButtonGroupContainer>
+ )}
+ </StyledDomainFormWrapper>
+ {isDefined(selectedPublicDomain) && publicDomainRecords?.domain && (
+ <StyledRecordsWrapper>
+ {isDefined(publicDomainRecords.records) && (
+ <SettingsDomainRecords records={publicDomainRecords.records} />
+ )}
+ </StyledRecordsWrapper>
+ )}
+ </Section.Root>
+ );
+ };
+
return (
<SettingsPageLayout
title={t`Custom Domain`}
@@ -153,72 +260,23 @@ export const SettingPublicDomain = () => {
children: <Trans>Apps</Trans>,
href: getSettingsPath(SettingsPath.Applications),
},
+ {
+ children: applicationName,
+ href: getSettingsPath(SettingsPath.ApplicationDetail, {
+ applicationId,
+ }),
+ },
{ children: <Trans>Custom Domain</Trans> },
]}
actionButton={
<SaveAndCancelButtons
- onCancel={() => navigate(SettingsPath.Applications)}
- isSaveDisabled={loading || isDefined(selectedPublicDomain)}
+ onCancel={navigateToApplication}
+ isSaveDisabled={loading || isEditingPublicDomain}
onSave={onCreate}
/>
}
>
- <SettingsPageContainer>
- <Section.Root>
- <Section.Header
- title={t`Custom Domain`}
- description={t`Set the name of your custom domain and configure your DNS records.`}
- />
- {isDefined(selectedPublicDomain) && (
- <CheckPublicDomainValidRecordsEffect
- publicDomain={selectedPublicDomain}
- />
- )}
- <StyledDomainFormWrapper>
- <TextInput
- value={newPublicDomain}
- onChange={setNewPublicDomain}
- error={newPublicDomainError}
- type="text"
- disabled={isDefined(selectedPublicDomain)}
- placeholder="app.yourdomain.com"
- fullWidth
- />
- {isDefined(selectedPublicDomain) && (
- <StyledButtonGroupContainer>
- <ButtonGroup>
- <StyledButtonContainer>
- <Button
- loading={isLoading}
- startIcon={<IconReload />}
- onClick={() =>
- checkPublicDomainRecords(selectedPublicDomain.domain)
- }
- type="button"
- variant="outline"
- >{t`Reload`}</Button>
- </StyledButtonContainer>
- <StyledButtonContainer>
- <Button
- startIcon={<IconTrash />}
- aria-label={t`Delete`}
- onClick={onDelete}
- variant="outline"
- />
- </StyledButtonContainer>
- </ButtonGroup>
- </StyledButtonGroupContainer>
- )}
- </StyledDomainFormWrapper>
- {isDefined(selectedPublicDomain) && publicDomainRecords?.domain && (
- <StyledRecordsWrapper>
- {isDefined(publicDomainRecords.records) && (
- <SettingsDomainRecords records={publicDomainRecords.records} />
- )}
- </StyledRecordsWrapper>
- )}
- </Section.Root>
- </SettingsPageContainer>
+ <SettingsPageContainer>{renderContent()}</SettingsPageContainer>
</SettingsPageLayout>
);
};
diff --git a/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx b/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
index afcaad81bc8..1d3492a5c02 100644
--- a/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/domains/components/SettingsPublicDomainsListCard.tsx
@@ -2,11 +2,9 @@ import { SettingsCard } from '@/settings/components/SettingsCard';
import { SettingsListCard } from '@/settings/components/SettingsListCard';
import { SettingPublicDomainRowDropdownMenu } from '@/settings/domains/components/SettingPublicDomainRowDropdownMenu';
import { useGetAddedRelativeDateDescription } from '@/settings/hooks/useGetAddedRelativeDateDescription';
-import { selectedApplicationIdForPublicDomainState } from '@/settings/domains/states/selectedApplicationIdForPublicDomainState';
-import { selectedPublicDomainState } from '@/settings/domains/states/selectedPublicDomainState';
-import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath } from 'twenty-shared/utils';
import { Status } from 'twenty-ui/primitives/data-display';
import { IconWorld } from 'twenty-ui/icon';
import { useQuery } from '@apollo/client/react';
@@ -27,11 +25,6 @@ export const SettingsPublicDomainsListCard = ({
const { getAddedRelativeDateDescription } =
useGetAddedRelativeDateDescription();
- const setSelectedPublicDomain = useSetAtomState(selectedPublicDomainState);
- const setSelectedApplicationIdForPublicDomain = useSetAtomState(
- selectedApplicationIdForPublicDomainState,
- );
-
const { data, loading } = useQuery(FindManyPublicDomainsDocument);
const publicDomains = data?.findManyPublicDomains?.filter(
@@ -42,17 +35,18 @@ export const SettingsPublicDomainsListCard = ({
return null;
}
- const navigateToCreate = () => {
- setSelectedPublicDomain(undefined);
- setSelectedApplicationIdForPublicDomain(applicationId);
- navigate(SettingsPath.PublicDomain);
- };
+ // The empty-state card and the footer button are plain buttons, they cannot
+ // carry a Link.
+ // oxlint-disable-next-line twenty/no-navigate-prefer-link
+ const navigateToCreate = () =>
+ navigate(SettingsPath.ApplicationPublicDomainNew, { applicationId });
if (publicDomains.length === 0) {
return (
<SettingsCard
title={t`Add Custom Domain`}
Icon={<IconWorld />}
+ // oxlint-disable-next-line twenty/no-navigate-prefer-link
onClick={navigateToCreate}
/>
);
@@ -66,11 +60,12 @@ export const SettingsPublicDomainsListCard = ({
getAddedRelativeDateDescription(createdAt)
}
RowIcon={IconWorld}
- onRowClick={(publicDomain: PublicDomain) => {
- setSelectedPublicDomain(publicDomain);
- setSelectedApplicationIdForPublicDomain(applicationId);
- navigate(SettingsPath.PublicDomain);
- }}
+ to={(publicDomain: PublicDomain) =>
+ getSettingsPath(SettingsPath.ApplicationPublicDomainDetail, {
+ applicationId,
+ publicDomainId: publicDomain.id,
+ })
+ }
RowRightComponent={({ item: publicDomain }) => (
<>
{!publicDomain.isValidated && (
diff --git a/packages/twenty-front/src/modules/settings/domains/states/selectedApplicationIdForPublicDomainState.ts b/packages/twenty-front/src/modules/settings/domains/states/selectedApplicationIdForPublicDomainState.ts
deleted file mode 100644
index b7cae31fd33..00000000000
--- a/packages/twenty-front/src/modules/settings/domains/states/selectedApplicationIdForPublicDomainState.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-
-export const selectedApplicationIdForPublicDomainState = createAtomState<
- string | undefined
->({
- key: 'selectedApplicationIdForPublicDomainState',
- defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/modules/settings/domains/states/selectedPublicDomainState.ts b/packages/twenty-front/src/modules/settings/domains/states/selectedPublicDomainState.ts
deleted file mode 100644
index 706ab47e3c1..00000000000
--- a/packages/twenty-front/src/modules/settings/domains/states/selectedPublicDomainState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { type PublicDomain } from '~/generated-metadata/graphql';
-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
-
-export const selectedPublicDomainState = createAtomState<
- PublicDomain | undefined
->({
- key: 'selectedPublicDomainState',
- defaultValue: undefined,
-});
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
index 0c4b3d7c2db..65c91a4c37a 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationConnectionDetail.tsx
@@ -140,7 +140,7 @@ export const SettingsApplicationConnectionDetail = () => {
SettingsPath.ApplicationDetail,
{ applicationId },
undefined,
- 'settings',
+ 'general',
);
const detailPath = getSettingsPath(SettingsPath.ApplicationConnectionDetail, {
applicationId,
@@ -187,7 +187,7 @@ export const SettingsApplicationConnectionDetail = () => {
{ applicationId },
undefined,
{ replace: true },
- 'settings',
+ 'general',
);
};
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
index 03aa31e1608..59653c43bee 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
@@ -1,17 +1,14 @@
-import { CurrentApplicationContext } from '@/applications/contexts/CurrentApplicationContext';
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 { useCopyMarketplaceAppLink } from '@/marketplace/hooks/useCopyMarketplaceAppLink';
-import { useInstallMarketplaceApp } from '@/marketplace/hooks/useInstallMarketplaceApp';
import { useUpgradeApplication } from '@/marketplace/hooks/useUpgradeApplication';
-import { SettingsApplicationActionButton } from '@/settings/applications/components/SettingsApplicationActionButton';
-import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { useUninstallApplication } from '@/settings/applications/hooks/useUninstallApplication';
-import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+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 { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
@@ -22,40 +19,40 @@ import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { useCallback } from 'react';
import { useParams } from 'react-router-dom';
-import { type Manifest } from 'twenty-shared/application';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath, isDefined } from 'twenty-shared/utils';
-import { InlineBanner } from 'twenty-ui/primitives/feedback';
import {
IconAlertTriangle,
- IconBox,
- IconInfoSquareRounded,
- IconLock,
+ IconAdjustments,
+ IconDeviceFloppy,
IconSettings,
+ IconVariable,
} from 'twenty-ui/icon';
+import { InlineBanner } from 'twenty-ui/primitives/feedback';
+import { Button } from 'twenty-ui/primitives/input';
import {
FindMarketplaceAppDetailDocument,
- FindMarketplaceAppManifestDocument,
FindOneApplicationDocument,
IsApplicationStoppedDocument,
- PermissionFlagType,
} from '~/generated-metadata/graphql';
-import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-import { SettingsSectionSkeletonLoader } from '@/settings/components/SettingsSectionSkeletonLoader';
import { CUSTOM_APPLICATION_ILLUSTRATIONS } from '~/pages/settings/applications/constants/CustomApplicationIllustrations';
import { STANDARD_APPLICATION_ILLUSTRATIONS } from '~/pages/settings/applications/constants/StandardApplicationIllustrations';
-import { useFindApplicationConnectionProviders } from '~/pages/settings/applications/hooks/useFindApplicationConnectionProviders';
-import { SettingsApplicationDetailAboutTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab';
-import { SettingsApplicationDetailContentTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailContentTab';
-import { SettingsApplicationDetailSettingsTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailSettingsTab';
-import { SettingsApplicationPermissionsTab } from '~/pages/settings/applications/tabs/SettingsApplicationPermissionsTab';
-import { applicationHasHttpTriggeredFunctions } from '~/pages/settings/applications/utils/applicationHasHttpTriggeredFunctions';
+import { useApplicationVariablesDraft } from '~/pages/settings/applications/hooks/useApplicationVariablesDraft';
+import { SettingsApplicationCustomSettingsSection } from '~/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection';
+import { SettingsApplicationDetailGeneralTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab';
+import { SettingsApplicationDetailVariablesTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailVariablesTab';
+import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
import { getDisplayedApplicationVariables } from '~/pages/settings/applications/utils/getDisplayedApplicationVariables';
import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
+import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
const APPLICATION_DETAIL_ID = 'application-detail-id';
+const GENERAL_TAB_ID = 'general';
+const VARIABLES_TAB_ID = 'variables';
+const CUSTOM_SETTINGS_TAB_ID = 'settings';
+
export const SettingsApplicationDetails = () => {
const { applicationId = '' } = useParams<{ applicationId: string }>();
@@ -73,19 +70,11 @@ export const SettingsApplicationDetails = () => {
const application = data?.findOneApplication;
- const { connectionProviders } =
- useFindApplicationConnectionProviders(applicationId);
-
const { data: detailData } = useQuery(FindMarketplaceAppDetailDocument, {
variables: { universalIdentifier: application?.universalIdentifier ?? '' },
skip: !application?.universalIdentifier,
});
- const { data: manifestData } = useQuery(FindMarketplaceAppManifestDocument, {
- variables: { universalIdentifier: application?.universalIdentifier ?? '' },
- skip: !application?.universalIdentifier,
- });
-
const { data: isApplicationStoppedData } = useQuery(
IsApplicationStoppedDocument,
{
@@ -102,9 +91,6 @@ export const SettingsApplicationDetails = () => {
isApplicationStoppedData?.isApplicationStopped === true;
const detail = detailData?.findMarketplaceAppDetail;
- const manifest = manifestData?.findMarketplaceAppDetail?.manifest as
- | Manifest
- | undefined;
const currentWorkspace = useAtomStateValue(currentWorkspaceState);
const isStandardApplication = isTwentyStandardApplication(application);
const isCustomApplication = isWorkspaceCustomApplication(
@@ -118,25 +104,14 @@ export const SettingsApplicationDetails = () => {
detail?.name ?? application?.name ?? t`Application details`;
const description = detail?.description ?? resolvedDescription;
- const getScreenshots = () => {
- if (detail?.galleryImages?.length) return detail.galleryImages;
- if (isStandardApplication) return STANDARD_APPLICATION_ILLUSTRATIONS;
- if (isCustomApplication) return CUSTOM_APPLICATION_ILLUSTRATIONS;
+ 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 screenshots = getScreenshots();
-
const { upgrade, isUpgrading } = useUpgradeApplication();
- const { copyMarketplaceAppLink } = useCopyMarketplaceAppLink();
-
- const { isInstalling } = useInstallMarketplaceApp({
- universalIdentifier: application?.universalIdentifier,
- });
-
- const canInstallMarketplaceApps = useHasPermissionFlag(
- PermissionFlagType.APPLICATIONS,
- );
const sourceType = application?.applicationRegistration?.sourceType;
const registrationId = detail?.id ?? application?.applicationRegistration?.id;
@@ -171,47 +146,41 @@ export const SettingsApplicationDetails = () => {
onCompleted: handleUninstallCompleted,
});
- const tabs: SingleTabProps[] = [
- { id: 'about', title: t`About`, Icon: IconInfoSquareRounded },
- { id: 'content', title: t`Content`, Icon: IconBox },
- {
- id: 'permissions',
- title: t`Permissions`,
- Icon: IconLock,
- tooltipContent: !isDefined(application?.defaultRoleId)
- ? t`No permission defined for this application`
- : undefined,
- disabled: !isDefined(application?.defaultRoleId),
- },
- (() => {
- const hasVariables =
- getDisplayedApplicationVariables(
- application?.applicationVariables ?? [],
- ).length > 0;
- const hasConnectionProviders = connectionProviders.length > 0;
- const hasHttpTriggeredFunctions =
- applicationHasHttpTriggeredFunctions(application);
- const canShowFunctionDomain = hasHttpTriggeredFunctions;
- const hasSettingsFrontComponent = isDefined(
- application?.settingsCustomTabFrontComponentId,
- );
- const hasNothingToConfigure =
- !hasVariables &&
- !hasConnectionProviders &&
- !canShowFunctionDomain &&
- !hasSettingsFrontComponent &&
- !isUpgradableApplicationSourceType(sourceType);
+ const displayedApplicationVariables = getDisplayedApplicationVariables(
+ application?.applicationVariables ?? [],
+ );
+
+ const {
+ draftApplicationVariables,
+ setApplicationVariableValue,
+ hasUnsavedApplicationVariables,
+ saveApplicationVariables,
+ isSavingApplicationVariables,
+ } = useApplicationVariablesDraft({
+ applicationId,
+ applicationVariables: displayedApplicationVariables,
+ });
+
+ const settingsFrontComponentId =
+ application?.settingsCustomTabFrontComponentId;
+ const hasCustomSettingsTab = isDefined(settingsFrontComponentId);
- return {
- id: 'settings',
- title: t`Settings`,
- Icon: IconSettings,
- tooltipContent: hasNothingToConfigure
- ? t`Nothing to configure for this application`
- : undefined,
- disabled: hasNothingToConfigure,
- };
- })(),
+ const tabs: SingleTabProps[] = [
+ { id: GENERAL_TAB_ID, title: t`General`, Icon: IconSettings },
+ // A custom settings tab lays out the application variables itself, so
+ // exposing them again would duplicate the same fields.
+ ...(!hasCustomSettingsTab && displayedApplicationVariables.length > 0
+ ? [{ id: VARIABLES_TAB_ID, title: t`Variables`, Icon: IconVariable }]
+ : []),
+ ...(hasCustomSettingsTab
+ ? [
+ {
+ id: CUSTOM_SETTINGS_TAB_ID,
+ title: t`Settings`,
+ Icon: IconAdjustments,
+ },
+ ]
+ : []),
];
const renderActiveTabContent = () => {
@@ -220,61 +189,35 @@ export const SettingsApplicationDetails = () => {
}
switch (activeTabId) {
- case 'about':
+ case GENERAL_TAB_ID:
return (
- <SettingsApplicationDetailAboutTab
- applicationId={application.id}
- logoUrl={application.logoUrl}
+ <SettingsApplicationDetailGeneralTab
+ application={application}
displayName={displayName}
- description={description}
- aboutDescription={detail?.aboutDescription ?? undefined}
- pricingDescription={detail?.pricingDescription ?? undefined}
- screenshots={screenshots}
- author={detail?.author ?? undefined}
- version={currentVersion ?? undefined}
- installCount={detail?.installCount}
- category={detail?.category ?? undefined}
- developerLinks={
- isDefined(detail)
- ? {
- websiteUrl: detail.websiteUrl ?? undefined,
- termsUrl: detail.termsUrl ?? undefined,
- emailSupport: detail.emailSupport ?? undefined,
- issueReportUrl: detail.issueReportUrl ?? undefined,
- }
- : undefined
- }
- onShare={
- isDefined(detail)
- ? () => copyMarketplaceAppLink(detail.universalIdentifier)
- : undefined
- }
+ description={getApplicationDescriptionSummary(description)}
+ coverImageUrl={getCoverImageUrl()}
+ marketplaceUniversalIdentifier={detail?.universalIdentifier}
+ hasUpdate={hasUpdate}
+ latestAvailableVersion={latestAvailableVersion ?? undefined}
+ onUpgrade={handleUpgrade}
+ isUpgrading={isUpgrading}
+ onUninstall={uninstall}
+ isUninstalling={isUninstalling}
/>
);
- case 'content':
+ case VARIABLES_TAB_ID:
return (
- <SettingsApplicationDetailContentTab
- applicationId={application.id}
- installedApplication={application}
- manifestContent={manifest}
- applicationInfo={{
- id: application.id,
- name: displayName,
- logoUrl: application.logoUrl,
- universalIdentifier: application.universalIdentifier,
- }}
+ <SettingsApplicationDetailVariablesTab
+ applicationVariables={draftApplicationVariables}
+ onVariableChange={setApplicationVariableValue}
/>
);
- case 'permissions':
- return (
- <SettingsApplicationPermissionsTab
- defaultRoleId={application.defaultRoleId}
+ case CUSTOM_SETTINGS_TAB_ID:
+ return hasCustomSettingsTab ? (
+ <SettingsApplicationCustomSettingsSection
+ frontComponentId={settingsFrontComponentId}
/>
- );
- case 'settings':
- return (
- <SettingsApplicationDetailSettingsTab application={application} />
- );
+ ) : null;
default:
return <></>;
}
@@ -309,19 +252,17 @@ export const SettingsApplicationDetails = () => {
{ children: displayName },
]}
actionButton={
- isDefined(application) ? (
- <SettingsApplicationActionButton
- isInstalled
- canInstallMarketplaceApps={canInstallMarketplaceApps}
- isInstalling={isInstalling}
- hasUpdate={hasUpdate}
- latestAvailableVersion={latestAvailableVersion ?? undefined}
- onUpgrade={handleUpgrade}
- isUpgrading={isUpgrading}
- canBeUninstalled={application.canBeUninstalled}
- onUninstall={uninstall}
- isUninstalling={isUninstalling}
- />
+ activeTabId === VARIABLES_TAB_ID ? (
+ <Button
+ startIcon={<IconDeviceFloppy />}
+ variant="solid"
+ color="accent"
+ size="sm"
+ onClick={saveApplicationVariables}
+ disabled={
+ !hasUnsavedApplicationVariables || isSavingApplicationVariables
+ }
+ >{t`Save settings`}</Button>
) : undefined
}
secondaryBar={
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
index a2d6ce19f28..a367ee89b45 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsAvailableApplicationDetails.tsx
@@ -3,7 +3,6 @@ import { CurrentApplicationContext } from '@/applications/contexts/CurrentApplic
import { SettingsApplicationInstallPermissionValidationModal } from '@/marketplace/components/SettingsApplicationInstallPermissionValidationModal';
import { useCopyMarketplaceAppLink } from '@/marketplace/hooks/useCopyMarketplaceAppLink';
import { useInstallMarketplaceAppWithPermissionValidation } from '@/marketplace/hooks/useInstallMarketplaceAppWithPermissionValidation';
-import { useUpgradeApplication } from '@/marketplace/hooks/useUpgradeApplication';
import { getMarketplaceAppDefaultRoleManifest } from '@/marketplace/utils/getMarketplaceAppDefaultRoleManifest';
import { SettingsApplicationActionButton } from '@/settings/applications/components/SettingsApplicationActionButton';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
@@ -32,14 +31,13 @@ import {
FindMarketplaceAppDetailDocument,
FindMarketplaceAppManifestDocument,
FindOneApplicationByUniversalIdentifierDocument,
+ FindOneApplicationDocument,
PermissionFlagType,
} from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { SettingsApplicationDetailAboutTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailAboutTab';
import { SettingsApplicationDetailContentTab } from '~/pages/settings/applications/tabs/SettingsApplicationDetailContentTab';
import { SettingsApplicationPermissionsTab } from '~/pages/settings/applications/tabs/SettingsApplicationPermissionsTab';
-import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
-import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
const AVAILABLE_APPLICATION_DETAIL_ID = 'available-application-detail';
@@ -62,7 +60,6 @@ export const SettingsAvailableApplicationDetails = () => {
universalIdentifier: availableApplicationId,
onCompleted: handleInstallCompleted,
});
- const { upgrade, isUpgrading } = useUpgradeApplication();
const { copyMarketplaceAppLink } = useCopyMarketplaceAppLink();
const canInstallMarketplaceApps = useHasPermissionFlag(
@@ -89,6 +86,16 @@ export const SettingsAvailableApplicationDetails = () => {
const application = applicationData?.findOneApplication;
+ const { data: installedApplicationData } = useQuery(
+ FindOneApplicationDocument,
+ {
+ variables: { id: application?.id ?? '' },
+ skip: !application?.id,
+ },
+ );
+
+ const installedApplication = installedApplicationData?.findOneApplication;
+
const detail = detailData?.findMarketplaceAppDetail;
const manifest = manifestData?.findMarketplaceAppDetail?.manifest as
| Manifest
@@ -99,36 +106,16 @@ export const SettingsAvailableApplicationDetails = () => {
const currentVersion = application?.version;
const latestAvailableVersion = detail?.latestAvailableVersion;
- const sourceType = detail?.sourceType;
- const isNpmApp = sourceType === ApplicationRegistrationSourceType.NPM;
- const registrationId = detail?.id;
+ const isNpmApp = detail?.sourceType === ApplicationRegistrationSourceType.NPM;
const sourcePackageUrl =
isNpmApp && detail?.sourcePackage
? `https://www.npmjs.com/package/${detail.sourcePackage}`
: undefined;
const isUnlisted = isDefined(detail) && !detail.isListed;
- const isAlreadyInstalled = isDefined(application);
const defaultRole = getMarketplaceAppDefaultRoleManifest(detail);
- const hasUpdate =
- isUpgradableApplicationSourceType(sourceType) &&
- isDefined(latestAvailableVersion) &&
- isDefined(currentVersion) &&
- isNewerSemver(latestAvailableVersion, currentVersion);
-
- const handleUpgrade = async () => {
- if (!isDefined(registrationId) || !isDefined(latestAvailableVersion)) {
- return;
- }
-
- await upgrade({
- appRegistrationId: registrationId,
- targetVersion: latestAvailableVersion,
- });
- };
-
const activeTabId = useAtomComponentStateValue(
activeTabIdComponentState,
AVAILABLE_APPLICATION_DETAIL_ID,
@@ -173,9 +160,13 @@ export const SettingsAvailableApplicationDetails = () => {
case 'content':
return (
<SettingsApplicationDetailContentTab
- applicationId={detail.universalIdentifier}
+ applicationId={
+ installedApplication?.id ?? detail.universalIdentifier
+ }
+ installedApplication={installedApplication ?? undefined}
manifestContent={manifest}
applicationInfo={{
+ id: installedApplication?.id,
name: displayName,
logoUrl: detail.logoUrl,
universalIdentifier: detail.universalIdentifier,
@@ -226,14 +217,10 @@ export const SettingsAvailableApplicationDetails = () => {
actionButton={
isDefined(detail) ? (
<SettingsApplicationActionButton
- isInstalled={isAlreadyInstalled}
+ installedApplicationId={application?.id}
canInstallMarketplaceApps={canInstallMarketplaceApps}
onInstall={requestInstall}
isInstalling={isInstalling}
- hasUpdate={hasUpdate}
- latestAvailableVersion={latestAvailableVersion ?? undefined}
- onUpgrade={handleUpgrade}
- isUpgrading={isUpgrading}
/>
) : undefined
}
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx b/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx
new file mode 100644
index 00000000000..64af44f7ce6
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useApplicationVariablesDraft.test.tsx
@@ -0,0 +1,183 @@
+import { gql, InMemoryCache } from '@apollo/client';
+import { MockedProvider } from '@apollo/client/testing/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
+import { type ReactNode } from 'react';
+import { ToastProvider } from 'twenty-ui/primitives/feedback';
+
+import {
+ type Application,
+ type ApplicationVariable,
+ FindOneApplicationDocument,
+ UpdateOneApplicationVariableDocument,
+} from '~/generated-metadata/graphql';
+import { useApplicationVariablesDraft } from '~/pages/settings/applications/hooks/useApplicationVariablesDraft';
+
+const APPLICATION_VARIABLE_FRAGMENT = gql`
+ fragment TestApplicationVariableFields on ApplicationVariable {
+ id
+ key
+ value
+ description
+ isSecret
+ }
+`;
+
+const VARIABLE_ID = 'var-1';
+const KEY = 'API_KEY';
+const OLD_VALUE = 'old';
+const NEW_VALUE = 'new';
+const LATER_VALUE = 'later';
+
+const buildApplicationVariable = (value: string): ApplicationVariable => ({
+ __typename: 'ApplicationVariable',
+ id: VARIABLE_ID,
+ key: KEY,
+ value,
+ description: '',
+ label: '',
+ isSecret: false,
+ isDeprecated: false,
+ type: 'TEXT',
+});
+
+const buildApplication = (
+ applicationId: string,
+ variableValue: string,
+): Application => ({
+ __typename: 'Application',
+ id: applicationId,
+ name: 'Test App',
+ description: null,
+ version: '1.0.0',
+ universalIdentifier: 'test-app',
+ applicationRegistrationId: null,
+ applicationRegistration: null,
+ canBeUninstalled: true,
+ autoUpgrade: false,
+ defaultRoleId: null,
+ settingsCustomTabFrontComponentId: null,
+ availablePackages: {},
+ applicationVariables: [buildApplicationVariable(variableValue)],
+ agents: [],
+ frontComponents: [],
+ commandMenuItems: [],
+ objects: [],
+ logicFunctions: [],
+});
+
+const renderVariablesDraft = (applicationId: string) => {
+ const cache = new InMemoryCache();
+
+ cache.writeQuery({
+ query: FindOneApplicationDocument,
+ variables: { id: applicationId },
+ data: { findOneApplication: buildApplication(applicationId, OLD_VALUE) },
+ });
+
+ const findOneApplicationMock = {
+ request: {
+ query: FindOneApplicationDocument,
+ variables: { id: applicationId },
+ },
+ result: {
+ data: {
+ findOneApplication: buildApplication(applicationId, NEW_VALUE),
+ },
+ },
+ // The hook watches the application and refetches it once the save
+ // completes, so the same request is issued more than once.
+ maxUsageCount: Number.POSITIVE_INFINITY,
+ };
+
+ const mocks = [
+ {
+ request: {
+ query: UpdateOneApplicationVariableDocument,
+ variables: { key: KEY, value: NEW_VALUE, applicationId },
+ },
+ result: { data: { updateOneApplicationVariable: true } },
+ },
+ findOneApplicationMock,
+ ];
+
+ const wrapper = ({ children }: { children: ReactNode }) => (
+ <MockedProvider mocks={mocks} cache={cache}>
+ <ToastProvider>{children}</ToastProvider>
+ </MockedProvider>
+ );
+
+ const { result } = renderHook(
+ () =>
+ useApplicationVariablesDraft({
+ applicationId,
+ applicationVariables: [buildApplicationVariable(OLD_VALUE)],
+ }),
+ { wrapper },
+ );
+
+ return { result, cache };
+};
+
+describe('useApplicationVariablesDraft', () => {
+ it('has nothing to save before an edit', () => {
+ const { result } = renderVariablesDraft('app-untouched');
+
+ expect(result.current.hasUnsavedApplicationVariables).toBe(false);
+ expect(result.current.draftApplicationVariables[0].value).toBe(OLD_VALUE);
+ });
+
+ it('keeps the edited value unsaved until it is saved', () => {
+ const { result } = renderVariablesDraft('app-edited');
+
+ act(() => {
+ result.current.setApplicationVariableValue(KEY, NEW_VALUE);
+ });
+
+ expect(result.current.draftApplicationVariables[0].value).toBe(NEW_VALUE);
+ expect(result.current.hasUnsavedApplicationVariables).toBe(true);
+ });
+
+ it('persists the edited value once saved', async () => {
+ const { result, cache } = renderVariablesDraft('app-saved');
+
+ act(() => {
+ result.current.setApplicationVariableValue(KEY, NEW_VALUE);
+ });
+
+ await act(async () => {
+ await result.current.saveApplicationVariables();
+ });
+
+ await waitFor(() => {
+ const cached = cache.readFragment<{ value: string }>({
+ id: cache.identify({
+ __typename: 'ApplicationVariable',
+ id: VARIABLE_ID,
+ }),
+ fragment: APPLICATION_VARIABLE_FRAGMENT,
+ });
+ expect(cached?.value).toBe(NEW_VALUE);
+ });
+
+ expect(result.current.hasUnsavedApplicationVariables).toBe(false);
+ });
+
+ it('keeps a value edited while the save is in flight', async () => {
+ const { result } = renderVariablesDraft('app-edited-during-save');
+
+ act(() => {
+ result.current.setApplicationVariableValue(KEY, NEW_VALUE);
+ });
+
+ await act(async () => {
+ const savePromise = result.current.saveApplicationVariables();
+
+ result.current.setApplicationVariableValue(KEY, LATER_VALUE);
+
+ await savePromise;
+ });
+
+ expect(result.current.draftApplicationVariables[0].value).toBe(LATER_VALUE);
+ expect(result.current.hasUnsavedApplicationVariables).toBe(true);
+ });
+});
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useUpdateOneApplicationVariable.test.tsx b/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useUpdateOneApplicationVariable.test.tsx
deleted file mode 100644
index 35af473c41b..00000000000
--- a/packages/twenty-front/src/pages/settings/applications/hooks/__tests__/useUpdateOneApplicationVariable.test.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { gql, InMemoryCache } from '@apollo/client';
-import { MockedProvider } from '@apollo/client/testing/react';
-import { act, renderHook, waitFor } from '@testing-library/react';
-import { type ReactNode } from 'react';
-
-import {
- type Application,
- FindOneApplicationDocument,
- UpdateOneApplicationVariableDocument,
-} from '~/generated-metadata/graphql';
-import { useUpdateOneApplicationVariable } from '~/pages/settings/applications/hooks/useUpdateOneApplicationVariable';
-
-const APPLICATION_VARIABLE_FRAGMENT = gql`
- fragment TestApplicationVariableFields on ApplicationVariable {
- id
- key
- value
- description
- isSecret
- }
-`;
-
-const VARIABLE_ID = 'var-1';
-const APP_ID = 'app-1';
-const KEY = 'API_KEY';
-const OLD_VALUE = 'old';
-const NEW_VALUE = 'new';
-
-const buildApplication = (variableValue: string): Application => ({
- __typename: 'Application',
- id: APP_ID,
- name: 'Test App',
- description: null,
- version: '1.0.0',
- universalIdentifier: 'test-app',
- applicationRegistrationId: null,
- applicationRegistration: null,
- canBeUninstalled: true,
- autoUpgrade: false,
- defaultRoleId: null,
- settingsCustomTabFrontComponentId: null,
- availablePackages: {},
- applicationVariables: [
- {
- __typename: 'ApplicationVariable',
- id: VARIABLE_ID,
- key: KEY,
- value: variableValue,
- description: '',
- label: '',
- isSecret: false,
- isDeprecated: false,
- type: 'TEXT',
- },
- ],
- agents: [],
- frontComponents: [],
- commandMenuItems: [],
- objects: [],
- logicFunctions: [],
-});
-
-describe('useUpdateOneApplicationVariable', () => {
- it('updates the cached ApplicationVariable value after the mutation completes', async () => {
- const cache = new InMemoryCache();
-
- cache.writeQuery({
- query: FindOneApplicationDocument,
- variables: { id: APP_ID },
- data: { findOneApplication: buildApplication(OLD_VALUE) },
- });
-
- const mocks = [
- {
- request: {
- query: UpdateOneApplicationVariableDocument,
- variables: { key: KEY, value: NEW_VALUE, applicationId: APP_ID },
- },
- result: { data: { updateOneApplicationVariable: true } },
- },
- {
- request: {
- query: FindOneApplicationDocument,
- variables: { id: APP_ID },
- },
- result: { data: { findOneApplication: buildApplication(NEW_VALUE) } },
- },
- ];
-
- const wrapper = ({ children }: { children: ReactNode }) => (
- <MockedProvider mocks={mocks} cache={cache}>
- {children}
- </MockedProvider>
- );
-
- const { result } = renderHook(() => useUpdateOneApplicationVariable(), {
- wrapper,
- });
-
- await act(async () => {
- await result.current.updateOneApplicationVariable({
- key: KEY,
- value: NEW_VALUE,
- applicationId: APP_ID,
- });
- });
-
- await waitFor(() => {
- const cached = cache.readFragment<{ value: string }>({
- id: cache.identify({
- __typename: 'ApplicationVariable',
- id: VARIABLE_ID,
- }),
- fragment: APPLICATION_VARIABLE_FRAGMENT,
- });
- expect(cached?.value).toBe(NEW_VALUE);
- });
- });
-});
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts
new file mode 100644
index 00000000000..7d30d25854d
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/hooks/useApplicationVariablesDraft.ts
@@ -0,0 +1,105 @@
+import { useAtomFamilyState } from '@/ui/utilities/state/jotai/hooks/useAtomFamilyState';
+import { useMutation, useQuery } from '@apollo/client/react';
+import { t } from '@lingui/core/macro';
+import { useState } from 'react';
+import { isDefined } from 'twenty-shared/utils';
+import { useToast } from 'twenty-ui/primitives/feedback';
+import {
+ type ApplicationVariable,
+ FindOneApplicationDocument,
+ UpdateOneApplicationVariableDocument,
+} from '~/generated-metadata/graphql';
+import { applicationVariablesDraftFamilyState } from '~/pages/settings/applications/states/applicationVariablesDraftFamilyState';
+
+export const useApplicationVariablesDraft = ({
+ applicationId,
+ applicationVariables,
+}: {
+ applicationId: string;
+ applicationVariables: ApplicationVariable[];
+}) => {
+ const [draftValueByKey, setDraftValueByKey] = useAtomFamilyState(
+ applicationVariablesDraftFamilyState,
+ applicationId,
+ );
+ const [updateOneApplicationVariable] = useMutation(
+ UpdateOneApplicationVariableDocument,
+ );
+ const { refetch: refetchApplication } = useQuery(FindOneApplicationDocument, {
+ variables: { id: applicationId },
+ skip: !applicationId,
+ });
+ const { enqueueToast } = useToast();
+ const [isSavingApplicationVariables, setIsSavingApplicationVariables] =
+ useState(false);
+
+ const draftApplicationVariables = applicationVariables.map(
+ (applicationVariable) => {
+ const draftValue = draftValueByKey[applicationVariable.key];
+
+ return isDefined(draftValue)
+ ? { ...applicationVariable, value: draftValue }
+ : applicationVariable;
+ },
+ );
+
+ const editedApplicationVariables = draftApplicationVariables.filter(
+ (draftApplicationVariable, index) =>
+ draftApplicationVariable.value !== applicationVariables[index].value,
+ );
+
+ const setApplicationVariableValue = (key: string, value: string) => {
+ setDraftValueByKey((previousDraftValueByKey) => ({
+ ...previousDraftValueByKey,
+ [key]: value,
+ }));
+ };
+
+ const saveApplicationVariables = async () => {
+ const submittedValueByKey = Object.fromEntries(
+ editedApplicationVariables.map(({ key, value }) => [key, value]),
+ );
+
+ setIsSavingApplicationVariables(true);
+
+ try {
+ await Promise.all(
+ Object.entries(submittedValueByKey).map(([key, value]) =>
+ updateOneApplicationVariable({
+ variables: { key, value, applicationId },
+ }),
+ ),
+ );
+
+ // A single refetch after every mutation settled, awaited before dropping
+ // the draft: per-mutation refetches can land out of order and write back
+ // a snapshot taken before the last write.
+ await refetchApplication();
+
+ // Only the entries that still hold what was submitted are dropped, so a
+ // variable edited again while the save was in flight keeps that edit.
+ setDraftValueByKey((previousDraftValueByKey) =>
+ Object.fromEntries(
+ Object.entries(previousDraftValueByKey).filter(
+ ([key, value]) => submittedValueByKey[key] !== value,
+ ),
+ ),
+ );
+ } catch {
+ enqueueToast({
+ variant: 'error',
+ children: t`Failed to save the app settings.`,
+ });
+ } finally {
+ setIsSavingApplicationVariables(false);
+ }
+ };
+
+ return {
+ draftApplicationVariables,
+ setApplicationVariableValue,
+ hasUnsavedApplicationVariables: editedApplicationVariables.length > 0,
+ saveApplicationVariables,
+ isSavingApplicationVariables,
+ };
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/hooks/useUpdateOneApplicationVariable.ts b/packages/twenty-front/src/pages/settings/applications/hooks/useUpdateOneApplicationVariable.ts
deleted file mode 100644
index 5dc13f53172..00000000000
--- a/packages/twenty-front/src/pages/settings/applications/hooks/useUpdateOneApplicationVariable.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useMutation } from '@apollo/client/react';
-import {
- FindOneApplicationDocument,
- UpdateOneApplicationVariableDocument,
-} from '~/generated-metadata/graphql';
-
-export const useUpdateOneApplicationVariable = () => {
- const [mutate] = useMutation(UpdateOneApplicationVariableDocument);
-
- const updateOneApplicationVariable = async ({
- key,
- value,
- applicationId,
- }: {
- key: string;
- value: string;
- applicationId: string;
- }) => {
- return await mutate({
- variables: { key, value, applicationId },
- refetchQueries: [
- { query: FindOneApplicationDocument, variables: { id: applicationId } },
- ],
- });
- };
-
- return { updateOneApplicationVariable };
-};
diff --git a/packages/twenty-front/src/pages/settings/applications/states/applicationVariablesDraftFamilyState.ts b/packages/twenty-front/src/pages/settings/applications/states/applicationVariablesDraftFamilyState.ts
new file mode 100644
index 00000000000..18aa2f27123
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/states/applicationVariablesDraftFamilyState.ts
@@ -0,0 +1,9 @@
+import { createAtomFamilyState } from '@/ui/utilities/state/jotai/utils/createAtomFamilyState';
+
+export const applicationVariablesDraftFamilyState = createAtomFamilyState<
+ Record<string, string>,
+ string
+>({
+ key: 'applicationVariablesDraftFamilyState',
+ defaultValue: {},
+});
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
similarity index 93%
rename from packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx
rename to packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
index a113c3c78d7..f8fb4e6af3a 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationGeneralSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection.tsx
@@ -8,7 +8,7 @@ import { IconRefresh } from 'twenty-ui/icon';
import { Card } from 'twenty-ui/primitives/surfaces';
import { UpdateApplicationDocument } from '~/generated-metadata/graphql';
-export const SettingsApplicationGeneralSection = ({
+export const SettingsApplicationAutoUpdateSection = ({
applicationId,
autoUpgrade,
}: {
@@ -37,7 +37,7 @@ export const SettingsApplicationGeneralSection = ({
return (
<Section.Root>
- <Section.Header title={t`General`} />
+ <Section.Header title={t`Auto update`} />
<Card rounded fullWidth>
<SettingsOptionCardContentSwitch
Icon={IconRefresh}
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
deleted file mode 100644
index fe0abbacb39..00000000000
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { styled } from '@linaria/react';
-import { t } from '@lingui/core/macro';
-import { useState } from 'react';
-import { type ApplicationVariableOption } from 'twenty-shared/application';
-import { Section } from 'twenty-ui/components';
-import { themeCssVariables } from 'twenty-ui/theme-constants';
-import { useDebouncedCallback } from 'use-debounce';
-import { type ApplicationVariable } from '~/generated-metadata/graphql';
-import { SettingsApplicationVariableInput } from '~/pages/settings/applications/components/SettingsApplicationVariableInput';
-import { SettingsApplicationVariableLabelRow } from '~/pages/settings/applications/components/SettingsApplicationVariableLabelRow';
-
-const StyledContainer = styled.div`
- display: flex;
- flex-direction: column;
- gap: ${themeCssVariables.spacing[4]};
-`;
-
-export const SettingsApplicationDetailEnvironmentVariablesTable = ({
- envVariables,
- onUpdate,
-}: {
- envVariables: ApplicationVariable[];
- onUpdate: (newEnv: Pick<ApplicationVariable, 'key' | 'value'>) => void;
- readonly?: boolean;
-}) => {
- const [editedEnvVariables, setEditedEnvVariables] = useState(envVariables);
- const onUpdateDebounced = useDebouncedCallback(
- (value: Pick<ApplicationVariable, 'key' | 'value'>) => {
- onUpdate(value);
- },
- 250,
- );
- const sectionDescription =
- editedEnvVariables.length > 0
- ? t`Set your application configuration variables`
- : t`No variables to set for this application`;
- return (
- <Section.Root>
- <Section.Header
- title={t`Configuration`}
- description={sectionDescription}
- />
- <StyledContainer>
- {editedEnvVariables.map((editedEnvVariable) => {
- return (
- <div key={editedEnvVariable.key}>
- <SettingsApplicationVariableLabelRow
- variableKey={editedEnvVariable.key}
- label={editedEnvVariable.label}
- isDeprecated={editedEnvVariable.isDeprecated}
- description={editedEnvVariable.description}
- tooltipId={`env-var-desc-${editedEnvVariable.key}`}
- />
- <SettingsApplicationVariableInput
- type={editedEnvVariable.type}
- value={editedEnvVariable.value}
- options={
- editedEnvVariable.options as
- | ApplicationVariableOption[]
- | null
- | undefined
- }
- onChange={(newValue) => {
- setEditedEnvVariables((prevState) =>
- prevState.map((val) => {
- if (val.key === editedEnvVariable.key) {
- return { ...val, value: newValue };
- }
- return val;
- }),
- );
- onUpdateDebounced({ ...editedEnvVariable, value: newValue });
- }}
- placeholder={t`Value`}
- />
- </div>
- );
- })}
- </StyledContainer>
- </Section.Root>
- );
-};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab.tsx
new file mode 100644
index 00000000000..62c8bf0f75c
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailGeneralTab.tsx
@@ -0,0 +1,136 @@
+import { SettingsApplicationOverviewCard } from '@/settings/applications/components/SettingsApplicationOverviewCard';
+import { SettingsApplicationUninstallButton } from '@/settings/applications/components/SettingsApplicationUninstallButton';
+import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
+import { t } from '@lingui/core/macro';
+import { isNonEmptyString } from '@sniptt/guards';
+import { SettingsPath } from 'twenty-shared/types';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+import { IconArrowUp, IconShoppingBag } from 'twenty-ui/icon';
+import { Button } from 'twenty-ui/primitives/input';
+import { Section } from 'twenty-ui/components';
+import {
+ type Application,
+ PermissionFlagType,
+} from '~/generated-metadata/graphql';
+import { useNavigateSettings } from '~/hooks/useNavigateSettings';
+import { SettingsApplicationAutoUpdateSection } from '~/pages/settings/applications/tabs/SettingsApplicationAutoUpdateSection';
+import { SettingsApplicationConnectionsSection } from '~/pages/settings/applications/tabs/SettingsApplicationConnectionsSection';
+import { SettingsApplicationFunctionDomainSection } from '~/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection';
+import { applicationHasHttpTriggeredFunctions } from '~/pages/settings/applications/utils/applicationHasHttpTriggeredFunctions';
+import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
+
+type SettingsApplicationDetailGeneralTabProps = {
+ application: Pick<
+ Application,
+ | 'id'
+ | 'logoUrl'
+ | 'autoUpgrade'
+ | 'canBeUninstalled'
+ | 'applicationRegistration'
+ | 'logicFunctions'
+ >;
+ displayName: string;
+ description?: string;
+ coverImageUrl?: string;
+ marketplaceUniversalIdentifier?: string;
+ hasUpdate: boolean;
+ latestAvailableVersion?: string;
+ onUpgrade: () => void;
+ isUpgrading: boolean;
+ onUninstall: () => void;
+ isUninstalling: boolean;
+};
+
+export const SettingsApplicationDetailGeneralTab = ({
+ application,
+ displayName,
+ description,
+ coverImageUrl,
+ marketplaceUniversalIdentifier,
+ hasUpdate,
+ latestAvailableVersion,
+ onUpgrade,
+ isUpgrading,
+ onUninstall,
+ isUninstalling,
+}: SettingsApplicationDetailGeneralTabProps) => {
+ const navigateSettings = useNavigateSettings();
+
+ const canManageApplications = useHasPermissionFlag(
+ PermissionFlagType.APPLICATIONS,
+ );
+
+ const isUpgradable = isUpgradableApplicationSourceType(
+ application.applicationRegistration?.sourceType,
+ );
+
+ const actions = [
+ ...(isNonEmptyString(marketplaceUniversalIdentifier)
+ ? [
+ <Button
+ key="see"
+ startIcon={<IconShoppingBag />}
+ variant="outline"
+ size="sm"
+ onClick={() =>
+ navigateSettings(SettingsPath.AvailableApplicationDetail, {
+ availableApplicationId: marketplaceUniversalIdentifier,
+ })
+ }
+ >{t`See`}</Button>,
+ ]
+ : []),
+ ...(canManageApplications && hasUpdate
+ ? [
+ <Button
+ key="upgrade"
+ startIcon={<IconArrowUp />}
+ variant="outline"
+ size="sm"
+ onClick={onUpgrade}
+ disabled={isUpgrading}
+ >
+ {isUpgrading
+ ? t`Upgrading...`
+ : t`Upgrade to ${latestAvailableVersion ?? ''}`}
+ </Button>,
+ ]
+ : []),
+ ...(canManageApplications && application.canBeUninstalled
+ ? [
+ <SettingsApplicationUninstallButton
+ key="uninstall"
+ onUninstall={onUninstall}
+ isUninstalling={isUninstalling}
+ />,
+ ]
+ : []),
+ ];
+
+ return (
+ <>
+ <Section.Root>
+ <SettingsApplicationOverviewCard
+ applicationId={application.id}
+ logoUrl={application.logoUrl}
+ displayName={displayName}
+ description={description}
+ coverImageUrl={coverImageUrl}
+ actions={isNonEmptyArray(actions) ? actions : undefined}
+ />
+ </Section.Root>
+ {isUpgradable && (
+ <SettingsApplicationAutoUpdateSection
+ applicationId={application.id}
+ autoUpgrade={application.autoUpgrade}
+ />
+ )}
+ {applicationHasHttpTriggeredFunctions(application) && (
+ <SettingsApplicationFunctionDomainSection
+ applicationId={application.id}
+ />
+ )}
+ <SettingsApplicationConnectionsSection applicationId={application.id} />
+ </>
+ );
+};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailSettingsTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailSettingsTab.tsx
deleted file mode 100644
index a6209f464f0..00000000000
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailSettingsTab.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { isDefined } from 'twenty-shared/utils';
-import { type Application } from '~/generated-metadata/graphql';
-import { useUpdateOneApplicationVariable } from '~/pages/settings/applications/hooks/useUpdateOneApplicationVariable';
-import { SettingsApplicationConnectionsSection } from '~/pages/settings/applications/tabs/SettingsApplicationConnectionsSection';
-import { SettingsApplicationCustomSettingsSection } from '~/pages/settings/applications/tabs/SettingsApplicationCustomSettingsSection';
-import { SettingsApplicationDetailEnvironmentVariablesTable } from '~/pages/settings/applications/tabs/SettingsApplicationDetailEnvironmentVariablesTable';
-import { SettingsApplicationFunctionDomainSection } from '~/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection';
-import { SettingsApplicationGeneralSection } from '~/pages/settings/applications/tabs/SettingsApplicationGeneralSection';
-import { applicationHasHttpTriggeredFunctions } from '~/pages/settings/applications/utils/applicationHasHttpTriggeredFunctions';
-import { getDisplayedApplicationVariables } from '~/pages/settings/applications/utils/getDisplayedApplicationVariables';
-import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
-
-export const SettingsApplicationDetailSettingsTab = ({
- application,
-}: {
- application?: Pick<
- Application,
- | 'applicationVariables'
- | 'id'
- | 'universalIdentifier'
- | 'canBeUninstalled'
- | 'autoUpgrade'
- | 'applicationRegistration'
- | 'logicFunctions'
- | 'settingsCustomTabFrontComponentId'
- >;
-}) => {
- const { updateOneApplicationVariable } = useUpdateOneApplicationVariable();
-
- const envVariables = getDisplayedApplicationVariables(
- application?.applicationVariables ?? [],
- );
-
- const hasHttpTriggeredFunctions =
- applicationHasHttpTriggeredFunctions(application);
-
- const isUpgradable = isUpgradableApplicationSourceType(
- application?.applicationRegistration?.sourceType,
- );
-
- const settingsFrontComponentId =
- application?.settingsCustomTabFrontComponentId;
-
- return (
- <>
- {isUpgradable && application?.id && (
- <SettingsApplicationGeneralSection
- applicationId={application.id}
- autoUpgrade={application.autoUpgrade}
- />
- )}
- {hasHttpTriggeredFunctions && application?.id && (
- <SettingsApplicationFunctionDomainSection
- applicationId={application.id}
- />
- )}
- {application?.id && (
- <SettingsApplicationConnectionsSection applicationId={application.id} />
- )}
- {isDefined(settingsFrontComponentId) ? (
- <SettingsApplicationCustomSettingsSection
- frontComponentId={settingsFrontComponentId}
- />
- ) : (
- <SettingsApplicationDetailEnvironmentVariablesTable
- envVariables={envVariables}
- onUpdate={({ key, value }) =>
- application?.id
- ? updateOneApplicationVariable({
- key,
- value,
- applicationId: application.id,
- })
- : null
- }
- />
- )}
- </>
- );
-};
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailVariablesTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailVariablesTab.tsx
new file mode 100644
index 00000000000..68d75cc231c
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationDetailVariablesTab.tsx
@@ -0,0 +1,62 @@
+import { styled } from '@linaria/react';
+import { t } from '@lingui/core/macro';
+import { type ApplicationVariableOption } from 'twenty-shared/application';
+import { Section } from 'twenty-ui/components';
+import { themeCssVariables } from 'twenty-ui/theme-constants';
+import { type ApplicationVariable } from '~/generated-metadata/graphql';
+import { SettingsApplicationVariableInput } from '~/pages/settings/applications/components/SettingsApplicationVariableInput';
+import { SettingsApplicationVariableLabelRow } from '~/pages/settings/applications/components/SettingsApplicationVariableLabelRow';
+
+const StyledContainer = styled.div`
+ display: flex;
+ flex-direction: column;
+ gap: ${themeCssVariables.spacing[4]};
+`;
+
+type SettingsApplicationDetailVariablesTabProps = {
+ applicationVariables: ApplicationVariable[];
+ onVariableChange: (key: string, value: string) => void;
+};
+
+export const SettingsApplicationDetailVariablesTab = ({
+ applicationVariables,
+ onVariableChange,
+}: SettingsApplicationDetailVariablesTabProps) => {
+ const sectionDescription =
+ applicationVariables.length > 0
+ ? t`Set your application configuration variables`
+ : t`No variables to set for this application`;
+
+ return (
+ <Section.Root>
+ <Section.Header title={t`Variables`} description={sectionDescription} />
+ <StyledContainer>
+ {applicationVariables.map((applicationVariable) => (
+ <div key={applicationVariable.key}>
+ <SettingsApplicationVariableLabelRow
+ variableKey={applicationVariable.key}
+ label={applicationVariable.label}
+ isDeprecated={applicationVariable.isDeprecated}
+ description={applicationVariable.description}
+ tooltipId={`env-var-desc-${applicationVariable.key}`}
+ />
+ <SettingsApplicationVariableInput
+ type={applicationVariable.type}
+ value={applicationVariable.value}
+ options={
+ applicationVariable.options as
+ | ApplicationVariableOption[]
+ | null
+ | undefined
+ }
+ onChange={(newValue) =>
+ onVariableChange(applicationVariable.key, newValue)
+ }
+ placeholder={t`Value`}
+ />
+ </div>
+ ))}
+ </StyledContainer>
+ </Section.Root>
+ );
+};
diff --git a/packages/twenty-shared/src/types/SettingsPath.ts b/packages/twenty-shared/src/types/SettingsPath.ts
index cf6a9e8972e..ed62d655faf 100644
--- a/packages/twenty-shared/src/types/SettingsPath.ts
+++ b/packages/twenty-shared/src/types/SettingsPath.ts
@@ -37,7 +37,6 @@ export enum SettingsPath {
NewUnsubscribeTopic = 'email/new-unsubscribe-topic',
UnsubscribeTopicDetail = 'email/unsubscribe-topic/:unsubscribeTopicId',
Unsubscribe = 'communications/unsubscribe',
- PublicDomain = 'applications/public-domain',
NewApprovedAccessDomain = 'security/approved-access-domain/new',
Community = 'community',
AI = 'ai',
@@ -52,6 +51,8 @@ export enum SettingsPath {
Applications = 'applications',
ApplicationDetail = 'applications/:applicationId',
ApplicationConnectionDetail = 'applications/:applicationId/connections/:connectedAccountId',
+ ApplicationPublicDomainNew = 'applications/:applicationId/public-domain/new',
+ ApplicationPublicDomainDetail = 'applications/:applicationId/public-domain/:publicDomainId',
ApplicationLogicFunctionDetail = 'applications/:applicationId/logicFunctions/:logicFunctionId',
ApplicationFrontComponentDetail = 'applications/:applicationId/frontComponents/:frontComponentId',
ApplicationCommandMenuItemDetail = 'applications/:applicationId/commandMenuItems/:commandMenuItemId',