diff --git a/e2e-tests/playwright/support/server/default_config.ts b/e2e-tests/playwright/support/server/default_config.ts index bc2b54730e..0ffcdac005 100644 --- a/e2e-tests/playwright/support/server/default_config.ts +++ b/e2e-tests/playwright/support/server/default_config.ts @@ -618,9 +618,6 @@ const defaultServerConfig: AdminConfig = { ClientDirectory: './client/plugins', Plugins: {}, PluginStates: { - 'com.mattermost.apps': { - Enable: true, - }, 'com.mattermost.calls': { Enable: true, }, diff --git a/e2e-tests/playwright/test.config.ts b/e2e-tests/playwright/test.config.ts index e0f8eb9055..1149b84d71 100644 --- a/e2e-tests/playwright/test.config.ts +++ b/e2e-tests/playwright/test.config.ts @@ -4,7 +4,7 @@ import {Page, ViewportSize} from '@playwright/test'; import * as dotenv from 'dotenv'; -import {appsPluginId, callsPluginId} from '@e2e-support/constant'; +import {callsPluginId} from '@e2e-support/constant'; dotenv.config(); @@ -47,7 +47,7 @@ const config: TestConfig = { ensurePluginsInstalled: typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string' ? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',') - : [appsPluginId, callsPluginId], + : [callsPluginId], haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false), haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2), haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster', diff --git a/server/config/diff_test.go b/server/config/diff_test.go index 4f9d8cdf4f..b3dd7bcf29 100644 --- a/server/config/diff_test.go +++ b/server/config/diff_test.go @@ -807,9 +807,6 @@ func TestDiff(t *testing.T) { "com.mattermost.nps": { Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable, }, - "com.mattermost.apps": { - Enable: true, - }, "com.mattermost.calls": { Enable: true, }, @@ -839,9 +836,6 @@ func TestDiff(t *testing.T) { "com.mattermost.newplugin": { Enable: true, }, - "com.mattermost.apps": { - Enable: true, - }, "com.mattermost.calls": { Enable: true, }, @@ -863,9 +857,6 @@ func TestDiff(t *testing.T) { Path: "PluginSettings.PluginStates", BaseVal: defaultConfigGen().PluginSettings.PluginStates, ActualVal: map[string]*model.PluginState{ - "com.mattermost.apps": { - Enable: true, - }, "com.mattermost.calls": { Enable: true, }, diff --git a/server/public/model/config.go b/server/public/model/config.go index 758feba539..6d4c63a147 100644 --- a/server/public/model/config.go +++ b/server/public/model/config.go @@ -2933,16 +2933,6 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) { s.PluginStates[PluginIdNPS] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics} } - if s.PluginStates[PluginIdChannelExport] == nil && BuildEnterpriseReady == "true" { - // Enable the channel export plugin by default - s.PluginStates[PluginIdChannelExport] = &PluginState{Enable: true} - } - - if s.PluginStates[PluginIdApps] == nil { - // Enable the Apps plugin by default - s.PluginStates[PluginIdApps] = &PluginState{Enable: true} - } - if s.PluginStates[PluginIdCalls] == nil { // Enable the calls plugin by default s.PluginStates[PluginIdCalls] = &PluginState{Enable: true}