diff --git a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx index 30149ff0691df..bc16aa9807dd8 100644 --- a/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx +++ b/apps/meteor/client/views/marketplace/components/AppInstallModal/AppInstallModal.tsx @@ -3,10 +3,8 @@ import { useTranslation } from '@rocket.chat/ui-contexts'; import React from 'react'; import MarkdownText from '../../../../components/MarkdownText'; -import type { MarketplaceRouteContext } from '../../hooks/useAppsCountQuery'; type AppsInstallationModalProps = { - context: MarketplaceRouteContext; enabled: number; limit: number; appName: string; @@ -16,7 +14,6 @@ type AppsInstallationModalProps = { }; const AppInstallationModal = ({ - context, enabled, limit, appName, @@ -28,24 +25,23 @@ const AppInstallationModal = ({ const getTitle = () => { if (enabled === limit) { - return context === 'private' ? t('Private_apps_limit_reached') : t('App_limit_reached'); + return t('App_limit_reached'); } if (enabled > limit) { - return context === 'private' ? t('Private_apps_limit_exceeded') : t('App_limit_exceeded'); + return t('App_limit_exceeded'); } - return t('Apps_Currently_Enabled', { context: context === 'private' ? context : '', enabled, limit }); + return t('Apps_Currently_Enabled', { context: '', enabled, limit }); }; const getContent = () => { if (enabled === limit) { - return t('Enable_of_limit_apps_currently_enabled', { context: context === 'private' ? context : '', enabled, limit, appName }); + return t('Enable_of_limit_apps_currently_enabled', { context: '', enabled, limit, appName }); } if (enabled > limit) { return t('Enable_of_limit_apps_currently_enabled_exceeded', { - ...(context === 'private' && { context }), enabled, limit, exceed: enabled - limit + 1, @@ -53,10 +49,10 @@ const AppInstallationModal = ({ }); } - return t('Workspaces_on_Community_edition_install_app', { context: context === 'private' ? context : '', enabled, limit }); + return t('Workspaces_on_Community_edition_install_app', { context: '', enabled, limit }); }; - const confirmButtonOverlimitLabel = context === 'private' ? t('Upload_anyway') : t('Install_anyway'); + const confirmButtonOverLimitLabel = t('Install_anyway'); return ( <> @@ -76,7 +72,7 @@ const AppInstallationModal = ({ diff --git a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx index ab5962150f041..42bf388648941 100644 --- a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx +++ b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx @@ -129,7 +129,6 @@ export function useAppInstallationHandler({ setModal( void; isInstalling: boolean } => { const reloadAppsList = useAppsReload(); - const openExternalLink = useExternalLink(); const setModal = useSetModal(); const router = useRouter(); const appCountQuery = useAppsCountQuery('private'); - const manageSubscriptionUrl = useCheckoutUrl()({ target: 'marketplace-app-install', action: 'Enable_unlimited_apps' }); const uploadAppEndpoint = useUpload('/apps'); const uploadUpdateEndpoint = useUpload('/apps/update'); @@ -126,25 +121,7 @@ export const useInstallApp = (file: File): { install: () => void; isInstalling: return cancelAction(); } - if (appCountQuery.data.hasUnlimitedApps) { - return uploadFile(appFile, manifest); - } - - setModal( - uploadFile(appFile, manifest)} - handleEnableUnlimitedApps={() => { - openExternalLink(manageSubscriptionUrl); - setModal(null); - setInstalling(false); - }} - />, - ); + return uploadFile(appFile, manifest); }; return { install, isInstalling }; diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json index dc5c68ed59ef1..15e2f6c8c8763 100644 --- a/packages/i18n/src/locales/en.i18n.json +++ b/packages/i18n/src/locales/en.i18n.json @@ -6343,8 +6343,6 @@ "Upload_anyway": "Upload anyway", "App_limit_reached": "App limit reached", "App_limit_exceeded": "App limit exceeded", - "Private_apps_limit_reached": "Private apps limit reached", - "Private_apps_limit_exceeded": "Private apps limit exceeded", "Disable_at_least_more_apps": "You will need to disable at least {{numberOfExceededApps}} other apps or upgrade to a Premium plan to enable this app.", "Community_Private_apps_limit_exceeded": "Community app limit has been exceeded.", "Theme_match_system": "Match system", diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json index 7e499585e667e..cb83013f86d78 100644 --- a/packages/i18n/src/locales/es.i18n.json +++ b/packages/i18n/src/locales/es.i18n.json @@ -4920,8 +4920,6 @@ "Theme_dark": "Oscuro", "Theme_dark_description": "Reduzca la fatiga ocular en condiciones de poca luz minimizando la cantidad de luz emitida por la pantalla.", "Workspaces_on_Community_edition_install_app": "Los espacios de trabajo comunitarios pueden tener hasta {{limit}} {{context}} aplicaciones habilitadas. Actualiza a un plan Premium para habilitar un número ilimitado de aplicaciones.", - "Private_apps_limit_reached": "Límite de aplicaciones privadas alcanzado", - "Private_apps_limit_exceeded": "Límite de aplicaciones privadas superado", "Disable_at_least_more_apps": "Tendrás que desactivar al menos {{numberOfExceededApps}} aplicaciones o actualizar a un plan Premium para activar esta aplicación.", "Join_your_team": "Únete a tu equipo", "Create_a_password": "Crear una contraseña", @@ -5066,7 +5064,6 @@ "MAC_InfoText": "Contactos Activos Mensuales (MAC). El número de contactos únicos de Omnichannel con quienes se interactuó durante un mes de facturación", "CountMAC_InfoText": "Contactos Activos Mensuales (MAC). El número de contactos únicos de Omnichannel con quienes se interactuó durante un mes calendario", "ActiveSessions_InfoText": "Total de conexiones concurrentes. Un usuario puede estar conectado varias veces. El servicio de presencia de usuario se deshabilita cuando el total llega a 200 conexiones para prevenir problemas de rendimiento", - "Apps_InfoText": "Comunidad permite hasta {{privateAppsMaxCount}} aplicaciones privadas y {{marketplaceAppsMaxCount}} aplicaciones de la tienda ser habilitadas", "Remove_RocketChat_Watermark_InfoText": "La marca de agua es removida automticamente cuando una licencia de paga es activada", "Remove_RocketChat_Watermark": "Remover marca de agua de Rocket.Chat", "High_scalabaility": "Alta escalabilidad", diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json index 245c97a0af716..48ad712432cc4 100644 --- a/packages/i18n/src/locales/fi.i18n.json +++ b/packages/i18n/src/locales/fi.i18n.json @@ -5640,8 +5640,6 @@ "Upload_anyway": "Lataa silti", "App_limit_reached": "Sovellusraja saavutettu", "App_limit_exceeded": "Sovellusraja ylitetty", - "Private_apps_limit_reached": "Yksityisten sovellusten raja saavutettu", - "Private_apps_limit_exceeded": "Yksityisten sovellusten raja ylitetty", "Disable_at_least_more_apps": "Poista käytöstä vähintään {{numberOfExceededApps}} muuta sovellusta tai päivitä yritysversioon, jotta voit ottaa tämän sovelluksen käyttöön.", "Community_Private_apps_limit_exceeded": "Yhteisöversion sovellusraja on ylitetty.", "Theme_match_system": "Järjestelmän mukaan", diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json index e1301cb9005dd..4073310b1bb9a 100644 --- a/packages/i18n/src/locales/hi-IN.i18n.json +++ b/packages/i18n/src/locales/hi-IN.i18n.json @@ -5930,8 +5930,6 @@ "Upload_anyway": "फिर भी अपलोड करें", "App_limit_reached": "ऐप की सीमा पूरी हो गई", "App_limit_exceeded": "ऐप की सीमा पार हो गई", - "Private_apps_limit_reached": "निजी ऐप्स की सीमा पूरी हो गई", - "Private_apps_limit_exceeded": "निजी ऐप्स की सीमा पार हो गई", "Disable_at_least_more_apps": "इस ऐप को सक्षम करने के लिए आपको कम से कम {{numberOfExceededApps}} अन्य ऐप्स को अक्षम करना होगा या प्रीमियम प्लान में अपग्रेड करना होगा।", "Community_Private_apps_limit_exceeded": "सामुदायिक ऐप की सीमा पार हो गई है.", "Theme_match_system": "मिलान प्रणाली", @@ -6107,7 +6105,6 @@ "MAC_InfoText": "(मैक) बिलिंग माह के दौरान जुड़े अद्वितीय सर्वचैनल संपर्कों की संख्या।", "CountMAC_InfoText": "(मैक) कैलेंडर माह के दौरान जुड़े अद्वितीय ओमनीचैनल संपर्कों की संख्या।", "ActiveSessions_InfoText": "कुल समवर्ती कनेक्शन. एक ही यूजर को कई बार कनेक्ट किया जा सकता है। प्रदर्शन समस्याओं को रोकने के लिए उपयोगकर्ता उपस्थिति सेवा 200 या उससे अधिक पर अक्षम है।", - "Apps_InfoText": "समुदाय {{privateAppsMaxCount}} निजी ऐप्स और {{marketplaceAppsMaxCount}} मार्केटप्लेस ऐप्स को सक्षम करने की अनुमति देता है", "Remove_RocketChat_Watermark_InfoText": "सशुल्क लाइसेंस सक्रिय होने पर वॉटरमार्क स्वचालित रूप से हटा दिया जाता है।", "Remove_RocketChat_Watermark": "रॉकेट.चैट वॉटरमार्क हटाएँ", "High_scalabaility": "उच्च मापनीयता", diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json index bbb216ba65f6f..c4236be0acd9e 100644 --- a/packages/i18n/src/locales/it.i18n.json +++ b/packages/i18n/src/locales/it.i18n.json @@ -3368,8 +3368,6 @@ "subscription.callout.privateApps": "applicazioni private installate", "subscription.callout.marketplaceApps": "applicazioni del marketplace installate", "subscription.callout.monthlyActiveContacts": "contatti attivi mensili", - "Private_apps_limit_reached": "Limite di app private raggiunto", - "Private_apps_limit_exceeded": "Limite di app private superato", "Time": "Tempo", "This_attachment_is_not_supported": "Formato dell'allegato non supportato", "Send_transcript": "Invia la trascrizione", diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json index 4b166c159bf78..a130b7b9dde22 100644 --- a/packages/i18n/src/locales/no.i18n.json +++ b/packages/i18n/src/locales/no.i18n.json @@ -4523,8 +4523,6 @@ "Upload_anyway": "Last opp allikevel", "App_limit_reached": "Appgrensen er nådd", "App_limit_exceeded": "Appgrensen er overskredet", - "Private_apps_limit_reached": "Grensen for private apper er nådd", - "Private_apps_limit_exceeded": "Grensen for private apper er overskredet", "Community_Private_apps_limit_exceeded": "Grensen for Community-apper er overskredet.", "Theme_high_contrast": "Høy kontrast", "Highlighted_chosen_word": "Uthevet valgt ord", diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json index da5160f58b695..6199a40ba505e 100644 --- a/packages/i18n/src/locales/sv.i18n.json +++ b/packages/i18n/src/locales/sv.i18n.json @@ -5647,8 +5647,6 @@ "Upload_anyway": "Ladda upp ändå", "App_limit_reached": "App-gränsen har nåtts", "App_limit_exceeded": "App-gränsen har överskridits", - "Private_apps_limit_reached": "Gränsen för privata appar har nåtts", - "Private_apps_limit_exceeded": "Gränsen för privata appar har överskridits", "Disable_at_least_more_apps": "Du måste inaktivera minst {{numberOfExceededApps}} andra appar eller uppgradera till Enterprise för att aktivera den här appen.", "Community_Private_apps_limit_exceeded": "Gränsen för appar i Community Edition har överskridits.", "Theme_match_system": "Matchningssystem",