Skip to content

The open alternative to Salesforce, designed for AI.

Flag available updates for tarball apps in the installed apps list (#28021)

martmull0477bc17c3e1
diff --git a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
index c24079cf929..ede3adc6930 100644
--- a/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/SettingsApplicationDetails.tsx
@@ -55,12 +55,11 @@ import { SettingsApplicationDetailVariablesTab } from '~/pages/settings/applicat
import { getApplicationDescriptionSummary } from '~/pages/settings/applications/utils/getApplicationDescriptionSummary';
import { getApplicationHealthBanner } from '~/pages/settings/applications/utils/getApplicationHealthBanner';
import { getApplicationLookupStatus } from '~/pages/settings/applications/utils/getApplicationLookupStatus';
+import { hasApplicationUpdate } from '~/pages/settings/applications/utils/hasApplicationUpdate';
import { isUuidFormat } from '~/pages/settings/applications/utils/isUuidFormat';
import { getDisplayedApplicationVariables } from '~/pages/settings/applications/utils/getDisplayedApplicationVariables';
import { getMissingRequiredApplicationVariables } from '~/pages/settings/applications/utils/getMissingRequiredApplicationVariables';
import { getWorkspaceSettingsMenuItems } from '~/pages/settings/applications/utils/getWorkspaceSettingsMenuItems';
-import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
-import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
const APPLICATION_DETAIL_ID = 'application-detail-id';
@@ -153,11 +152,11 @@ export const SettingsApplicationDetails = () => {
detail?.latestAvailableVersion ??
application?.applicationRegistration?.latestAvailableVersion;
- const hasUpdate =
- isUpgradableApplicationSourceType(sourceType) &&
- isDefined(latestAvailableVersion) &&
- isDefined(currentVersion) &&
- isNewerSemver(latestAvailableVersion, currentVersion);
+ const hasUpdate = hasApplicationUpdate({
+ sourceType,
+ currentVersion,
+ latestAvailableVersion,
+ });
const handleUpgrade = async () => {
if (!isDefined(latestAvailableVersion)) {
diff --git a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
index 8f9b3723b68..00f436d121f 100644
--- a/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/components/SettingsApplicationsTable.tsx
@@ -6,7 +6,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { useState } from 'react';
import { SettingsPath } from 'twenty-shared/types';
-import { getSettingsPath, isDefined } from 'twenty-shared/utils';
+import { getSettingsPath } from 'twenty-shared/utils';
import { SearchInput } from 'twenty-ui/components/input';
import { Section } from 'twenty-ui/components/layout';
import { IconChevronRight } from 'twenty-ui/icon';
@@ -17,7 +17,7 @@ import {
SettingsApplicationTableRow,
} from '~/pages/settings/applications/components/SettingsApplicationTableRow';
import { type ApplicationWithoutRelation } from '@/applications/types/ApplicationWithoutRelation';
-import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
+import { hasApplicationUpdate } from '~/pages/settings/applications/utils/hasApplicationUpdate';
const StyledTableRowsContainer = styled.div`
border-bottom: 1px solid ${themeCssVariables.border.color.light};
@@ -91,18 +91,12 @@ export const SettingsApplicationsTable = ({
</SettingsEmptyPlaceholder>
)}
{filteredApplications.map((application) => {
- const isNpmApp =
- application.applicationRegistration?.sourceType ===
- ApplicationRegistrationSourceType.NPM;
-
- const latestVersion =
- application.applicationRegistration?.latestAvailableVersion;
-
- const hasUpdate =
- isNpmApp &&
- isDefined(latestVersion) &&
- isDefined(application.version) &&
- isNewerSemver(latestVersion, application.version);
+ const hasUpdate = hasApplicationUpdate({
+ sourceType: application.applicationRegistration?.sourceType,
+ currentVersion: application.version,
+ latestAvailableVersion:
+ application.applicationRegistration?.latestAvailableVersion,
+ });
return (
<SettingsApplicationTableRow
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/__tests__/hasApplicationUpdate.test.ts b/packages/twenty-front/src/pages/settings/applications/utils/__tests__/hasApplicationUpdate.test.ts
new file mode 100644
index 00000000000..f0a1cca9c68
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/utils/__tests__/hasApplicationUpdate.test.ts
@@ -0,0 +1,61 @@
+import { ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
+import { hasApplicationUpdate } from '~/pages/settings/applications/utils/hasApplicationUpdate';
+
+describe('hasApplicationUpdate', () => {
+ it.each([
+ ApplicationRegistrationSourceType.NPM,
+ ApplicationRegistrationSourceType.TARBALL,
+ ])(
+ 'reports an update for a %s app behind its latest version',
+ (sourceType) => {
+ expect(
+ hasApplicationUpdate({
+ sourceType,
+ currentVersion: '0.1.0',
+ latestAvailableVersion: '0.2.0',
+ }),
+ ).toBe(true);
+ },
+ );
+
+ it.each([
+ ApplicationRegistrationSourceType.LOCAL,
+ ApplicationRegistrationSourceType.OAUTH_ONLY,
+ undefined,
+ ])('never reports an update for a %s app', (sourceType) => {
+ expect(
+ hasApplicationUpdate({
+ sourceType,
+ currentVersion: '0.1.0',
+ latestAvailableVersion: '0.2.0',
+ }),
+ ).toBe(false);
+ });
+
+ it('reports no update when the app is already on the latest version', () => {
+ expect(
+ hasApplicationUpdate({
+ sourceType: ApplicationRegistrationSourceType.TARBALL,
+ currentVersion: '0.2.0',
+ latestAvailableVersion: '0.2.0',
+ }),
+ ).toBe(false);
+ });
+
+ it('reports no update when either version is unknown', () => {
+ expect(
+ hasApplicationUpdate({
+ sourceType: ApplicationRegistrationSourceType.TARBALL,
+ currentVersion: null,
+ latestAvailableVersion: '0.2.0',
+ }),
+ ).toBe(false);
+ expect(
+ hasApplicationUpdate({
+ sourceType: ApplicationRegistrationSourceType.TARBALL,
+ currentVersion: '0.1.0',
+ latestAvailableVersion: null,
+ }),
+ ).toBe(false);
+ });
+});
diff --git a/packages/twenty-front/src/pages/settings/applications/utils/hasApplicationUpdate.ts b/packages/twenty-front/src/pages/settings/applications/utils/hasApplicationUpdate.ts
new file mode 100644
index 00000000000..0cade6b1181
--- /dev/null
+++ b/packages/twenty-front/src/pages/settings/applications/utils/hasApplicationUpdate.ts
@@ -0,0 +1,18 @@
+import { isDefined } from 'twenty-shared/utils';
+import { type ApplicationRegistrationSourceType } from '~/generated-metadata/graphql';
+import { isNewerSemver } from '~/pages/settings/applications/utils/isNewerSemver';
+import { isUpgradableApplicationSourceType } from '~/pages/settings/applications/utils/isUpgradableApplicationSourceType';
+
+export const hasApplicationUpdate = ({
+ sourceType,
+ currentVersion,
+ latestAvailableVersion,
+}: {
+ sourceType: ApplicationRegistrationSourceType | null | undefined;
+ currentVersion: string | null | undefined;
+ latestAvailableVersion: string | null | undefined;
+}): boolean =>
+ isUpgradableApplicationSourceType(sourceType) &&
+ isDefined(latestAvailableVersion) &&
+ isDefined(currentVersion) &&
+ isNewerSemver(latestAvailableVersion, currentVersion);