MM-55403: fix remote marketplace visibility (#25426)

webapp/channels/src/components/admin_console/plugin_management/index.ts

@@ -15,7 +15,6 @@ import {
     disablePlugin,
 } from 'mattermost-redux/actions/admin';
 import {appsFeatureFlagEnabled} from 'mattermost-redux/selectors/entities/apps';
-import {streamlinedMarketplaceEnabled} from 'mattermost-redux/selectors/entities/preferences';
 import type {GenericAction} from 'mattermost-redux/types/actions';
 
 import PluginManagement from './plugin_management';
@@ -25,7 +24,6 @@ function mapStateToProps(state: any) {
         plugins: state.entities.admin.plugins,
         pluginStatuses: state.entities.admin.pluginStatuses,
         appsFeatureFlagEnabled: appsFeatureFlagEnabled(state),
-        streamlinedMarketplaceFlagEnabled: streamlinedMarketplaceEnabled(state),
     };
 }
 

webapp/channels/src/components/admin_console/plugin_management/plugin_management.test.tsx

@@ -91,7 +91,6 @@ describe('components/PluginManagement', () => {
             },
         },
         appsFeatureFlagEnabled: false,
-        streamlinedMarketplaceFlagEnabled: false,
         actions: {
             uploadPlugin: jest.fn(),
             installPluginFromUrl: jest.fn(),
@@ -235,7 +234,6 @@ describe('components/PluginManagement', () => {
             pluginStatuses: {},
             plugins: {},
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -326,7 +324,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -384,7 +381,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -502,7 +498,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),

webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx

@@ -420,7 +420,6 @@ type Props = BaseProps & {
     pluginStatuses: Record<string, PluginStatus>;
     plugins: any;
     appsFeatureFlagEnabled: boolean;
-    streamlinedMarketplaceFlagEnabled: boolean;
     actions: {
         uploadPlugin: (fileData: File, force: boolean) => any;
         removePlugin: (pluginId: string) => any;
@@ -1220,8 +1219,6 @@ export default class PluginManagement extends AdminSettings<Props, State> {
                                     onChange={this.handleChange}
                                     setByEnv={this.isSetByEnv('PluginSettings.EnableMarketplace')}
                                 />
-                                {!this.props.streamlinedMarketplaceFlagEnabled && (
-                                    <>
                                 <BooleanSetting
                                     id='enableRemoteMarketplace'
                                     label={
@@ -1257,8 +1254,6 @@ export default class PluginManagement extends AdminSettings<Props, State> {
                                 />
                             </>
                         )}
-                            </>
-                        )}
                         {pluginsContainer}
                     </SettingsGroup>
                     {overwriteUploadPluginModal}