diff --git a/frontend/components/MDM/AndroidLatestVersionWithTooltip/AndroidLatestVersionWithTooltip.tsx b/frontend/components/MDM/AndroidLatestVersionWithTooltip/AndroidLatestVersionWithTooltip.tsx index 7698dd0995..f82ec1cd9e 100644 --- a/frontend/components/MDM/AndroidLatestVersionWithTooltip/AndroidLatestVersionWithTooltip.tsx +++ b/frontend/components/MDM/AndroidLatestVersionWithTooltip/AndroidLatestVersionWithTooltip.tsx @@ -6,6 +6,7 @@ import { getPathWithQueryParams } from "utilities/url"; import { ANDROID_PLAY_STORE_URL } from "utilities/constants"; interface IAndroidLatestVersionWithTooltipProps { + /** e.g. com.android.chrome, Component will build link URL using this ID */ androidPlayStoreId: string; } diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tests.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tests.tsx index a10333051b..f53c74bd20 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tests.tsx +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tests.tsx @@ -24,7 +24,7 @@ describe("InstallerDetailsWidget", () => { version: "v1.2.3", isFma: false, isScriptPackage: false, - androidPlayStoreLink: undefined, + androidPlayStoreId: undefined, }; it("renders the package icon when installerType is 'package'", () => { @@ -110,7 +110,7 @@ describe("InstallerDetailsWidget", () => { ); diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tsx index a670041e0f..4b72d1ae50 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tsx +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/InstallerDetailsWidget/InstallerDetailsWidget.tsx @@ -46,12 +46,12 @@ const InstallerName = ({ name }: IInstallerNameProps) => { const renderInstallerDisplayText = ( installerType: string, isFma: boolean, - androidPlayStoreLink?: string + androidPlayStoreId?: string ) => { if (installerType === "package") { return isFma ? "Fleet-maintained" : "Custom package"; } - if (androidPlayStoreLink) { + if (androidPlayStoreId) { return "Google Play Store"; } return "App Store (VPP)"; @@ -66,7 +66,7 @@ interface IInstallerDetailsWidgetProps { sha256?: string | null; isFma: boolean; isScriptPackage: boolean; - androidPlayStoreLink?: string; + androidPlayStoreId?: string; } const InstallerDetailsWidget = ({ @@ -78,7 +78,7 @@ const InstallerDetailsWidget = ({ version, isFma, isScriptPackage, - androidPlayStoreLink: androidPlayStoreId, + androidPlayStoreId, }: IInstallerDetailsWidgetProps) => { const classNames = classnames(baseClass, className); diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/SoftwareInstallerCard.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/SoftwareInstallerCard.tsx index 216f97f2f5..b608fb08c3 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/SoftwareInstallerCard.tsx +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/SoftwareInstallerCard.tsx @@ -36,7 +36,6 @@ import { APP_STORE_APP_ACTION_OPTIONS, SOFTWARE_PACKAGE_ACTION_OPTIONS, downloadFile, - PLAY_STORE_APP_BASE_URL, } from "./helpers"; import InstallerStatusTable from "./InstallerStatusTable"; import InstallerPoliciesTable from "./InstallerPoliciesTable"; @@ -284,10 +283,6 @@ const SoftwareInstallerCard = ({ const showActions = isGlobalAdmin || isGlobalMaintainer || isTeamAdmin || isTeamMaintainer; - const androidPlayStoreLink = isAndroidPlayStoreApp - ? `${PLAY_STORE_APP_BASE_URL}${softwareInstaller?.app_store_id}` - : undefined; - return (
@@ -301,7 +296,11 @@ const SoftwareInstallerCard = ({ sha256={sha256} isFma={isFleetMaintainedApp} isScriptPackage={isScriptPackage} - androidPlayStoreLink={androidPlayStoreLink} + androidPlayStoreId={ + isAndroidPlayStoreApp + ? softwareInstaller?.app_store_id + : undefined + } />
{Array.isArray(automaticInstallPolicies) && diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/helpers.ts b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/helpers.ts index 9c5015d6a5..9acbf748d0 100644 --- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/helpers.ts +++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareInstallerCard/helpers.ts @@ -48,6 +48,3 @@ export const downloadFile = (url: string, fileName: string) => { // Clean up above-created "a" element downloadLink.remove(); }; - -export const PLAY_STORE_APP_BASE_URL = - "https://play.google.com/store/apps/details?id=";