Skip to content

The open alternative to Salesforce, designed for AI.

Use default domain for marketplace app share link (#26666)

martmull95d4e0fc80cf
diff --git a/packages/twenty-front/src/modules/marketplace/hooks/useCopyMarketplaceAppLink.ts b/packages/twenty-front/src/modules/marketplace/hooks/useCopyMarketplaceAppLink.ts
index a0d0385e4a2..2d69d19c654 100644
--- a/packages/twenty-front/src/modules/marketplace/hooks/useCopyMarketplaceAppLink.ts
+++ b/packages/twenty-front/src/modules/marketplace/hooks/useCopyMarketplaceAppLink.ts
@@ -1,3 +1,6 @@
+import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
+import { useReadDefaultDomainFromConfiguration } from '@/domain-manager/hooks/useReadDefaultDomainFromConfiguration';
+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
import { SettingsPath } from 'twenty-shared/types';
import { getSettingsPath } from 'twenty-shared/utils';
@@ -6,15 +9,24 @@ import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
export const useCopyMarketplaceAppLink = () => {
const { t } = useLingui();
const { copyToClipboard } = useCopyToClipboard();
+ const { defaultDomain } = useReadDefaultDomainFromConfiguration();
+ const isMultiWorkspaceEnabled = useAtomStateValue(
+ isMultiWorkspaceEnabledState,
+ );
- const copyMarketplaceAppLink = (universalIdentifier: string) =>
- copyToClipboard(
- `${window.location.origin}${getSettingsPath(
- SettingsPath.AvailableApplicationDetail,
- { availableApplicationId: universalIdentifier },
- )}`,
- t`Link copied to clipboard`,
- );
+ const copyMarketplaceAppLink = (universalIdentifier: string) => {
+ const url = new URL(window.location.origin);
+
+ if (isMultiWorkspaceEnabled) {
+ url.hostname = defaultDomain;
+ }
+
+ url.pathname = getSettingsPath(SettingsPath.AvailableApplicationDetail, {
+ availableApplicationId: universalIdentifier,
+ });
+
+ copyToClipboard(url.toString(), t`Link copied to clipboard`);
+ };
return { copyMarketplaceAppLink };
};
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
index d6d99d5f416..88850049848 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationRegistrationShareLinkButtons.tsx
@@ -1,6 +1,7 @@
import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { isNonEmptyString } from '@sniptt/guards';
import { SettingsApplicationInstallPermissionValidationModal } from '@/marketplace/components/SettingsApplicationInstallPermissionValidationModal';
+import { useCopyMarketplaceAppLink } from '@/marketplace/hooks/useCopyMarketplaceAppLink';
import { useInstallMarketplaceAppWithPermissionValidation } from '@/marketplace/hooks/useInstallMarketplaceAppWithPermissionValidation';
import { getMarketplaceAppDefaultRoleManifest } from '@/marketplace/utils/getMarketplaceAppDefaultRoleManifest';
import { styled } from '@linaria/react';
@@ -16,7 +17,6 @@ import {
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { FindMarketplaceAppDetailDocument } from '~/generated-metadata/graphql';
-import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const StyledButtonGroup = styled.div`
display: flex;
@@ -38,7 +38,7 @@ export const SettingsApplicationRegistrationShareLinkButtons = ({
}) => {
const { t } = useLingui();
- const { copyToClipboard } = useCopyToClipboard();
+ const { copyMarketplaceAppLink } = useCopyMarketplaceAppLink();
const installable =
isDefined(isInstalled) && isDefined(universalIdentifier) && !isInstalled;
@@ -84,13 +84,10 @@ export const SettingsApplicationRegistrationShareLinkButtons = ({
{withCopyButton && (
<Button
startIcon={<IconCopy />}
- disabled={!shareLink}
- onClick={async () => {
- if (shareLink) {
- await copyToClipboard(
- `${window.location.origin}${shareLink}`,
- t`Sharing link copied to clipboard`,
- );
+ disabled={!isDefined(universalIdentifier)}
+ onClick={() => {
+ if (isDefined(universalIdentifier)) {
+ copyMarketplaceAppLink(universalIdentifier);
}
}}
variant="outline"
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
index 3ee18925601..c6b46a6e65a 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationRegistrationDistributionTab.tsx
@@ -52,6 +52,7 @@ export const SettingsApplicationRegistrationDistributionTab = ({
{isNpmSource && (
<SettingsApplicationRegistrationShareLinkButtons
shareLink={shareLink}
+ universalIdentifier={registration.universalIdentifier}
isNpmSource
withCopyButton
/>
@@ -82,6 +83,7 @@ export const SettingsApplicationRegistrationDistributionTab = ({
/>
<SettingsApplicationRegistrationShareLinkButtons
shareLink={shareLink}
+ universalIdentifier={registration.universalIdentifier}
withCopyButton
/>
</Section.Root>