MM-53029 - Remove default (true) for channelExport and Apps plugin (#23682)
* 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>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
d693f88043
Коммит
6063f51b0f
@@ -618,9 +618,6 @@ const defaultServerConfig: AdminConfig = {
|
|||||||
ClientDirectory: './client/plugins',
|
ClientDirectory: './client/plugins',
|
||||||
Plugins: {},
|
Plugins: {},
|
||||||
PluginStates: {
|
PluginStates: {
|
||||||
'com.mattermost.apps': {
|
|
||||||
Enable: true,
|
|
||||||
},
|
|
||||||
'com.mattermost.calls': {
|
'com.mattermost.calls': {
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
import {Page, ViewportSize} from '@playwright/test';
|
import {Page, ViewportSize} from '@playwright/test';
|
||||||
import * as dotenv from 'dotenv';
|
import * as dotenv from 'dotenv';
|
||||||
|
|
||||||
import {appsPluginId, callsPluginId} from '@e2e-support/constant';
|
import {callsPluginId} from '@e2e-support/constant';
|
||||||
|
|
||||||
dotenv.config();
|
dotenv.config();
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ const config: TestConfig = {
|
|||||||
ensurePluginsInstalled:
|
ensurePluginsInstalled:
|
||||||
typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string'
|
typeof process.env?.PW_ENSURE_PLUGINS_INSTALLED === 'string'
|
||||||
? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',')
|
? process.env.PW_ENSURE_PLUGINS_INSTALLED.split(',')
|
||||||
: [appsPluginId, callsPluginId],
|
: [callsPluginId],
|
||||||
haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false),
|
haClusterEnabled: parseBool(process.env.PW_HA_CLUSTER_ENABLED, false),
|
||||||
haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2),
|
haClusterNodeCount: parseNumber(process.env.PW_HA_CLUSTER_NODE_COUNT, 2),
|
||||||
haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster',
|
haClusterName: process.env.PW_HA_CLUSTER_NAME || 'mm_dev_cluster',
|
||||||
|
|||||||
@@ -807,9 +807,6 @@ func TestDiff(t *testing.T) {
|
|||||||
"com.mattermost.nps": {
|
"com.mattermost.nps": {
|
||||||
Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable,
|
Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable,
|
||||||
},
|
},
|
||||||
"com.mattermost.apps": {
|
|
||||||
Enable: true,
|
|
||||||
},
|
|
||||||
"com.mattermost.calls": {
|
"com.mattermost.calls": {
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
@@ -839,9 +836,6 @@ func TestDiff(t *testing.T) {
|
|||||||
"com.mattermost.newplugin": {
|
"com.mattermost.newplugin": {
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
"com.mattermost.apps": {
|
|
||||||
Enable: true,
|
|
||||||
},
|
|
||||||
"com.mattermost.calls": {
|
"com.mattermost.calls": {
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
@@ -863,9 +857,6 @@ func TestDiff(t *testing.T) {
|
|||||||
Path: "PluginSettings.PluginStates",
|
Path: "PluginSettings.PluginStates",
|
||||||
BaseVal: defaultConfigGen().PluginSettings.PluginStates,
|
BaseVal: defaultConfigGen().PluginSettings.PluginStates,
|
||||||
ActualVal: map[string]*model.PluginState{
|
ActualVal: map[string]*model.PluginState{
|
||||||
"com.mattermost.apps": {
|
|
||||||
Enable: true,
|
|
||||||
},
|
|
||||||
"com.mattermost.calls": {
|
"com.mattermost.calls": {
|
||||||
Enable: true,
|
Enable: true,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2933,16 +2933,6 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
|
|||||||
s.PluginStates[PluginIdNPS] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
|
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 {
|
if s.PluginStates[PluginIdCalls] == nil {
|
||||||
// Enable the calls plugin by default
|
// Enable the calls plugin by default
|
||||||
s.PluginStates[PluginIdCalls] = &PluginState{Enable: true}
|
s.PluginStates[PluginIdCalls] = &PluginState{Enable: true}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user