Content flagging systems console settings (#31411)
* Added enable/disable setting and feature flag * added rest of notifgication settings * Added backend for content flagging setting and populated notification values from server side defaults * WIP user selector * Added common reviewers UI * Added additonal reviewers section * WIP * WIP * Team table base * Added search in teams * Added search in teams * Added additional settings section * WIP * Inbtegrated reviewers settings * WIP * WIP * Added server side validation * cleanup * cleanup * [skip ci] * Some refactoring * type fixes * lint fix * test: add content flagging settings test file * test: add comprehensive unit tests for content flagging settings * enhanced tests * test: add test file for content flagging additional settings * test: add comprehensive unit tests for ContentFlaggingAdditionalSettingsSection * Added additoonal settings test * test: add empty test file for team reviewers section * test: add comprehensive unit tests for TeamReviewersSection component * test: update tests to handle async data fetching in team reviewers section * test: add empty test file for content reviewers component * feat: add comprehensive unit tests for ContentFlaggingContentReviewers component * Added ContentFlaggingContentReviewersContentFlaggingContentReviewers test * test: add notification settings test file for content flagging * test: add comprehensive unit tests for content flagging notification settings * Added ContentFlaggingNotificationSettingsSection tests * test: add user profile pill test file * test: add comprehensive unit tests for UserProfilePill component * refactor: Replace enzyme shallow with renderWithContext in user_profile_pill tests * Added UserProfilePill tests * test: add empty test file for content reviewers team option * test: add comprehensive unit tests for TeamOptionComponent * Added TeamOptionComponent tests * test: add empty test file for reason_option component * test: add comprehensive unit tests for ReasonOption component * Added ReasonOption tests * cleanup * Fixed i18n error * fixed e2e test lijnt issues * Updated test cases * Added snaoshot * Updated snaoshot * lint fix * lint fix * review fixes * updated snapshot * CI * Review fixes * Removed an test, updated comment * CI * Test update
Этот коммит содержится в:
Harshil Sharma
коммит произвёл
GitHub
GitHub
родитель
254f641182
Коммит
d1e5fdea2c
229
server/public/model/content_flagging_settings.go
Обычный файл
229
server/public/model/content_flagging_settings.go
Обычный файл
@@ -0,0 +1,229 @@
|
||||
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
||||
// See LICENSE.txt for license information.
|
||||
|
||||
package model
|
||||
|
||||
import "net/http"
|
||||
|
||||
type ContentFlaggingEvent string
|
||||
|
||||
const (
|
||||
EventFlagged ContentFlaggingEvent = "flagged"
|
||||
EventAssigned ContentFlaggingEvent = "assigned"
|
||||
EventContentRemoved ContentFlaggingEvent = "removed"
|
||||
EventContentDismissed ContentFlaggingEvent = "dismissed"
|
||||
)
|
||||
|
||||
type NotificationTarget string
|
||||
|
||||
const (
|
||||
TargetReviewers NotificationTarget = "reviewers"
|
||||
TargetAuthor NotificationTarget = "author"
|
||||
TargetReporter NotificationTarget = "reporter"
|
||||
)
|
||||
|
||||
type ContentFlaggingNotificationSettings struct {
|
||||
EventTargetMapping map[ContentFlaggingEvent][]NotificationTarget
|
||||
}
|
||||
|
||||
func (cfs *ContentFlaggingNotificationSettings) SetDefaults() {
|
||||
if cfs.EventTargetMapping == nil {
|
||||
cfs.EventTargetMapping = make(map[ContentFlaggingEvent][]NotificationTarget)
|
||||
}
|
||||
|
||||
if _, exists := cfs.EventTargetMapping[EventFlagged]; !exists {
|
||||
cfs.EventTargetMapping[EventFlagged] = []NotificationTarget{TargetReviewers}
|
||||
}
|
||||
|
||||
if _, exists := cfs.EventTargetMapping[EventAssigned]; !exists {
|
||||
cfs.EventTargetMapping[EventAssigned] = []NotificationTarget{TargetReviewers}
|
||||
}
|
||||
|
||||
if _, exists := cfs.EventTargetMapping[EventContentRemoved]; !exists {
|
||||
cfs.EventTargetMapping[EventContentRemoved] = []NotificationTarget{TargetReviewers, TargetAuthor, TargetReporter}
|
||||
}
|
||||
|
||||
if _, exists := cfs.EventTargetMapping[EventContentDismissed]; !exists {
|
||||
cfs.EventTargetMapping[EventContentDismissed] = []NotificationTarget{TargetReviewers, TargetReporter}
|
||||
}
|
||||
}
|
||||
|
||||
func (cfs *ContentFlaggingNotificationSettings) IsValid() *AppError {
|
||||
// Reviewers must be notified when content is flagged
|
||||
// Disabling this option is not allowed in the UI, so this check is for safety and consistency.
|
||||
|
||||
// Only valid events and targets are allowed
|
||||
for event, targets := range cfs.EventTargetMapping {
|
||||
if event != EventFlagged && event != EventAssigned && event != EventContentRemoved && event != EventContentDismissed {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.notification_settings.invalid_event", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
for _, target := range targets {
|
||||
if target != TargetReviewers && target != TargetAuthor && target != TargetReporter {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.notification_settings.invalid_target", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if cfs.EventTargetMapping[EventFlagged] == nil || len(cfs.EventTargetMapping[EventFlagged]) == 0 {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.notification_settings.reviewer_flagged_notification_disabled", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
// Search for the TargetReviewers in the EventFlagged event
|
||||
reviewerFound := false
|
||||
for _, target := range cfs.EventTargetMapping[EventFlagged] {
|
||||
if target == TargetReviewers {
|
||||
reviewerFound = true
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if !reviewerFound {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.notification_settings.reviewer_flagged_notification_disabled", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type TeamReviewerSetting struct {
|
||||
Enabled *bool
|
||||
ReviewerIds *[]string
|
||||
}
|
||||
|
||||
type ReviewerSettings struct {
|
||||
CommonReviewers *bool
|
||||
CommonReviewerIds *[]string
|
||||
TeamReviewersSetting *map[string]TeamReviewerSetting
|
||||
SystemAdminsAsReviewers *bool
|
||||
TeamAdminsAsReviewers *bool
|
||||
}
|
||||
|
||||
func (rs *ReviewerSettings) SetDefaults() {
|
||||
if rs.CommonReviewers == nil {
|
||||
rs.CommonReviewers = NewPointer(true)
|
||||
}
|
||||
|
||||
if rs.CommonReviewerIds == nil {
|
||||
rs.CommonReviewerIds = &[]string{}
|
||||
}
|
||||
|
||||
if rs.TeamReviewersSetting == nil {
|
||||
rs.TeamReviewersSetting = &map[string]TeamReviewerSetting{}
|
||||
}
|
||||
|
||||
if rs.SystemAdminsAsReviewers == nil {
|
||||
rs.SystemAdminsAsReviewers = NewPointer(false)
|
||||
}
|
||||
|
||||
if rs.TeamAdminsAsReviewers == nil {
|
||||
rs.TeamAdminsAsReviewers = NewPointer(true)
|
||||
}
|
||||
}
|
||||
|
||||
func (rs *ReviewerSettings) IsValid() *AppError {
|
||||
additionalReviewersEnabled := *rs.SystemAdminsAsReviewers || *rs.TeamAdminsAsReviewers
|
||||
|
||||
// If common reviewers are enabled, there must be at least one specified reviewer, or additional viewers be specified
|
||||
if *rs.CommonReviewers && (rs.CommonReviewerIds == nil || len(*rs.CommonReviewerIds) == 0) && !additionalReviewersEnabled {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.content_flagging.common_reviewers_not_set.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
// if additional reviewers are specified, no extra validation is needed in team specific settings as
|
||||
// settings team reviewers keeping team feature disabled is valid, as well as
|
||||
// enabling team feature and not specified reviews is fine as well (since additional reviewers are set)
|
||||
if !additionalReviewersEnabled {
|
||||
for _, setting := range *rs.TeamReviewersSetting {
|
||||
if *setting.Enabled && (setting.ReviewerIds == nil || len(*setting.ReviewerIds) == 0) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.content_flagging.team_reviewers_not_set.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type AdditionalContentFlaggingSettings struct {
|
||||
Reasons *[]string
|
||||
ReporterCommentRequired *bool
|
||||
ReviewerCommentRequired *bool
|
||||
HideFlaggedContent *bool
|
||||
}
|
||||
|
||||
func (acfs *AdditionalContentFlaggingSettings) SetDefaults() {
|
||||
if acfs.Reasons == nil {
|
||||
acfs.Reasons = &[]string{
|
||||
"Inappropriate content",
|
||||
"Sensitive data",
|
||||
"Security concern",
|
||||
"Harassment or abuse",
|
||||
"Spam or phishing",
|
||||
}
|
||||
}
|
||||
|
||||
if acfs.ReporterCommentRequired == nil {
|
||||
acfs.ReporterCommentRequired = NewPointer(true)
|
||||
}
|
||||
|
||||
if acfs.ReviewerCommentRequired == nil {
|
||||
acfs.ReviewerCommentRequired = NewPointer(true)
|
||||
}
|
||||
|
||||
if acfs.HideFlaggedContent == nil {
|
||||
acfs.HideFlaggedContent = NewPointer(true)
|
||||
}
|
||||
}
|
||||
|
||||
func (acfs *AdditionalContentFlaggingSettings) IsValid() *AppError {
|
||||
if acfs.Reasons == nil || len(*acfs.Reasons) == 0 {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.content_flagging.reasons_not_set.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type ContentFlaggingSettings struct {
|
||||
EnableContentFlagging *bool
|
||||
ReviewerSettings *ReviewerSettings
|
||||
NotificationSettings *ContentFlaggingNotificationSettings
|
||||
AdditionalSettings *AdditionalContentFlaggingSettings
|
||||
}
|
||||
|
||||
func (cfs *ContentFlaggingSettings) SetDefaults() {
|
||||
if cfs.EnableContentFlagging == nil {
|
||||
cfs.EnableContentFlagging = NewPointer(false)
|
||||
}
|
||||
|
||||
if cfs.NotificationSettings == nil {
|
||||
cfs.NotificationSettings = &ContentFlaggingNotificationSettings{
|
||||
EventTargetMapping: make(map[ContentFlaggingEvent][]NotificationTarget),
|
||||
}
|
||||
}
|
||||
|
||||
if cfs.ReviewerSettings == nil {
|
||||
cfs.ReviewerSettings = &ReviewerSettings{}
|
||||
}
|
||||
|
||||
if cfs.AdditionalSettings == nil {
|
||||
cfs.AdditionalSettings = &AdditionalContentFlaggingSettings{}
|
||||
}
|
||||
|
||||
cfs.NotificationSettings.SetDefaults()
|
||||
cfs.ReviewerSettings.SetDefaults()
|
||||
cfs.AdditionalSettings.SetDefaults()
|
||||
}
|
||||
|
||||
func (cfs *ContentFlaggingSettings) IsValid() *AppError {
|
||||
if err := cfs.NotificationSettings.IsValid(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := cfs.ReviewerSettings.IsValid(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := cfs.AdditionalSettings.IsValid(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
Ссылка в новой задаче
Block a user