Skip to content

Commit

Permalink
Revert "Revert "Set BoardsProduct FF to on by default" (mattermost#22177
Browse files Browse the repository at this point in the history
)" (mattermost#22213)

This reverts commit aa61f8d.

Co-authored-by: Mattermost Build <[email protected]>
  • Loading branch information
agnivade and mattermost-build authored Feb 10, 2023
1 parent 1cb1d8b commit 9f7e361
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions config/diff_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ func TestDiff(t *testing.T) {
Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable,
},
"focalboard": {
Enable: true,
Enable: false,
},
"playbooks": {
Enable: true,
Expand Down Expand Up @@ -846,7 +846,7 @@ func TestDiff(t *testing.T) {
Enable: true,
},
"focalboard": {
Enable: true,
Enable: false,
},
"playbooks": {
Enable: true,
Expand Down Expand Up @@ -876,7 +876,7 @@ func TestDiff(t *testing.T) {
BaseVal: defaultConfigGen().PluginSettings.PluginStates,
ActualVal: map[string]*model.PluginState{
"focalboard": {
Enable: true,
Enable: false,
},
"playbooks": {
Enable: true,
Expand Down
4 changes: 2 additions & 2 deletions model/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -2867,8 +2867,8 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
}

if s.PluginStates[PluginIdFocalboard] == nil {
// Enable the focalboard plugin by default
s.PluginStates[PluginIdFocalboard] = &PluginState{Enable: true}
// Disable the focalboard plugin by default
s.PluginStates[PluginIdFocalboard] = &PluginState{Enable: false}
}

if s.PluginStates[PluginIdApps] == nil {
Expand Down
4 changes: 2 additions & 2 deletions model/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,11 @@ func TestConfigDefaultChannelExportPluginState(t *testing.T) {
}

func TestConfigDefaultFocalboardPluginState(t *testing.T) {
t.Run("should enable Focalboard plugin by default", func(t *testing.T) {
t.Run("should not enable Focalboard plugin by default", func(t *testing.T) {
c1 := Config{}
c1.SetDefaults()

assert.True(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
assert.False(t, c1.PluginSettings.PluginStates["focalboard"].Enable)
})

t.Run("should not re-enable focalboard plugin after it has been disabled", func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion model/feature_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func (f *FeatureFlags) SetDefaults() {
f.InsightsEnabled = true
f.CommandPalette = false
f.CallsEnabled = true
f.BoardsProduct = false
f.BoardsProduct = true
f.SendWelcomePost = true
f.PostPriority = true
f.PeopleProduct = false
Expand Down
1 change: 1 addition & 0 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ COVERMODE=$8

PACKAGES_COMMA=$(echo $PACKAGES | tr ' ' ',')
export MM_SERVER_PATH=$PWD
export MM_FEATUREFLAGS_BoardsProduct=false

echo "Packages to test: $PACKAGES"
echo "GOFLAGS: $GOFLAGS"
Expand Down

0 comments on commit 9f7e361

Please sign in to comment.