IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-53029 - Remove default (true) for channelExport and Apps plugin (#23682)

Browse Source 
* remove default (true) for channelExport and Apps plugin

* readd constant, still used

* more cleanup of constants

* revert usage, constants changes

* update tests expecting Apps on by default

* remove defaults from tests

* revert package-lock.json

---------

Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Scott Bishel 2023-06-13 17:48:11 -06:00 committed by GitHub
parent d693f88043
commit 6063f51b0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e-tests/playwright/support/server/default_config.ts
View File

@ -618,9 +618,6 @@ const defaultServerConfig: AdminConfig = {
ClientDirectory: './client/plugins',
Plugins: {},
PluginStates: {
'com.mattermost.apps': {
Enable: true,
},
'com.mattermost.calls': {
Enable: true,
},

4
e2e-tests/playwright/test.config.ts
View File

@ -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',

9
server/config/diff_test.go
View File

@ -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,
},

10
server/public/model/config.go
View File

@ -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}