[MM-53702] Remove Downgrade Team Selection modal and all accompanying logic (#24059)
* Remove Downgrade Team Selection modal and all accompanying logic * fix linter * Fix i18n * Final pipeline fixes
Этот коммит содержится в:
@@ -42,7 +42,6 @@ func (api *API) InitTeam() {
|
||||
api.BaseRoutes.Team.Handle("", api.APISessionRequired(getTeam)).Methods("GET")
|
||||
api.BaseRoutes.Team.Handle("", api.APISessionRequired(updateTeam)).Methods("PUT")
|
||||
api.BaseRoutes.Team.Handle("", api.APISessionRequired(deleteTeam)).Methods("DELETE")
|
||||
api.BaseRoutes.Team.Handle("/except", api.APISessionRequired(softDeleteTeamsExcept)).Methods("DELETE")
|
||||
api.BaseRoutes.Team.Handle("/patch", api.APISessionRequired(patchTeam)).Methods("PUT")
|
||||
api.BaseRoutes.Team.Handle("/restore", api.APISessionRequired(restoreTeam)).Methods("POST")
|
||||
api.BaseRoutes.Team.Handle("/privacy", api.APISessionRequired(updateTeamPrivacy)).Methods("PUT")
|
||||
@@ -464,25 +463,6 @@ func deleteTeam(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
ReturnStatusOK(w)
|
||||
}
|
||||
|
||||
func softDeleteTeamsExcept(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.RequireTeamId()
|
||||
if c.Err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
if !c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), c.Params.TeamId, model.PermissionManageTeam) {
|
||||
c.SetPermissionError(model.PermissionManageTeam)
|
||||
return
|
||||
}
|
||||
|
||||
err := c.App.SoftDeleteAllTeamsExcept(c.Params.TeamId)
|
||||
if err != nil {
|
||||
c.Err = err
|
||||
}
|
||||
|
||||
ReturnStatusOK(w)
|
||||
}
|
||||
|
||||
func getTeamsForUser(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.RequireUserId()
|
||||
if c.Err != nil {
|
||||
|
||||
@@ -1096,7 +1096,6 @@ type AppIface interface {
|
||||
SetTeamIconFromFile(team *model.Team, file io.Reader) *model.AppError
|
||||
SetTeamIconFromMultiPartFile(teamID string, file multipart.File) *model.AppError
|
||||
SlackImport(c *request.Context, fileData multipart.File, fileSize int64, teamID string) (*model.AppError, *bytes.Buffer)
|
||||
SoftDeleteAllTeamsExcept(teamID string) *model.AppError
|
||||
SoftDeleteTeam(teamID string) *model.AppError
|
||||
Srv() *Server
|
||||
SubmitInteractiveDialog(c *request.Context, request model.SubmitDialogRequest) (*model.SubmitDialogResponse, *model.AppError)
|
||||
|
||||
@@ -16652,28 +16652,6 @@ func (a *OpenTracingAppLayer) SlackImport(c *request.Context, fileData multipart
|
||||
return resultVar0, resultVar1
|
||||
}
|
||||
|
||||
func (a *OpenTracingAppLayer) SoftDeleteAllTeamsExcept(teamID string) *model.AppError {
|
||||
origCtx := a.ctx
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SoftDeleteAllTeamsExcept")
|
||||
|
||||
a.ctx = newCtx
|
||||
a.app.Srv().Store().SetContext(newCtx)
|
||||
defer func() {
|
||||
a.app.Srv().Store().SetContext(origCtx)
|
||||
a.ctx = origCtx
|
||||
}()
|
||||
|
||||
defer span.Finish()
|
||||
resultVar0 := a.app.SoftDeleteAllTeamsExcept(teamID)
|
||||
|
||||
if resultVar0 != nil {
|
||||
span.LogFields(spanlog.Error(resultVar0))
|
||||
ext.Error.Set(span, true)
|
||||
}
|
||||
|
||||
return resultVar0
|
||||
}
|
||||
|
||||
func (a *OpenTracingAppLayer) SoftDeleteTeam(teamID string) *model.AppError {
|
||||
origCtx := a.ctx
|
||||
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SoftDeleteTeam")
|
||||
|
||||
@@ -133,33 +133,6 @@ func (a *App) AdjustTeamsFromProductLimits(teamLimits *model.TeamsLimits) *model
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) SoftDeleteAllTeamsExcept(teamID string) *model.AppError {
|
||||
teams, appErr := a.GetAllTeams()
|
||||
if appErr != nil {
|
||||
return appErr
|
||||
}
|
||||
|
||||
if teams == nil {
|
||||
return nil
|
||||
}
|
||||
cloudLimitsArchived := true
|
||||
patch := &model.TeamPatch{CloudLimitsArchived: &cloudLimitsArchived}
|
||||
for _, team := range teams {
|
||||
if team.Id != teamID {
|
||||
_, err := a.PatchTeam(team.Id, patch)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = a.SoftDeleteTeam(team.Id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *App) CreateTeam(c request.CTX, team *model.Team) (*model.Team, *model.AppError) {
|
||||
rteam, err := a.ch.srv.teamService.CreateTeam(team)
|
||||
if err != nil {
|
||||
|
||||
@@ -469,41 +469,6 @@ func TestAddUserToTeamByTeamId(t *testing.T) {
|
||||
|
||||
}
|
||||
|
||||
func TestSoftDeleteAllTeamsExcept(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
teams := []*model.Team{
|
||||
{
|
||||
DisplayName: "team-1",
|
||||
Name: "team-1",
|
||||
Email: "foo@foo.com",
|
||||
Type: model.TeamOpen,
|
||||
},
|
||||
}
|
||||
teamId := ""
|
||||
for _, create := range teams {
|
||||
team, err := th.App.CreateTeam(th.Context, create)
|
||||
require.Nil(t, err)
|
||||
teamId = team.Id
|
||||
}
|
||||
|
||||
err := th.App.SoftDeleteAllTeamsExcept(teamId)
|
||||
assert.Nil(t, err)
|
||||
allTeams, err := th.App.GetAllTeams()
|
||||
require.Nil(t, err)
|
||||
for _, team := range allTeams {
|
||||
if team.Id == teamId {
|
||||
require.Equal(t, int64(0), team.DeleteAt)
|
||||
require.Equal(t, false, team.CloudLimitsArchived)
|
||||
} else {
|
||||
require.NotEqual(t, int64(0), team.DeleteAt)
|
||||
require.Equal(t, true, team.CloudLimitsArchived)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func TestAdjustTeamsFromProductLimits(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
Ссылка в новой задаче
Block a user