From fb419e26b7729c9a5d58bfc2a47f8ea06401c1c4 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@photoprism.app>
Date: Sun, 8 Oct 2023 15:42:23 +0200
Subject: [PATCH] Settings: Enable delete feature by default #3801

Signed-off-by: Michael Mayer <michael@photoprism.app>
---
 internal/api/batch_test.go               | 6 +++---
 internal/config/client_config_test.go    | 6 +++---
 internal/customize/acl_test.go           | 2 +-
 internal/customize/settings.go           | 2 +-
 internal/customize/testdata/settings.yml | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/api/batch_test.go b/internal/api/batch_test.go
index 5211e192e..0fdf1bfbf 100644
--- a/internal/api/batch_test.go
+++ b/internal/api/batch_test.go
@@ -265,12 +265,12 @@ func TestBatchPhotosApprove(t *testing.T) {
 }
 
 func TestBatchPhotosDelete(t *testing.T) {
-	t.Run("feature disabled", func(t *testing.T) {
+	t.Run("ErrNoItemsSelected", func(t *testing.T) {
 		app, router, _ := NewApiTest()
 		BatchPhotosDelete(router)
 		r := PerformRequestWithBody(app, "POST", "/api/v1/batch/photos/delete", `{"photos": []}`)
 		val := gjson.Get(r.Body.String(), "error")
-		assert.Equal(t, i18n.Msg(i18n.ErrFeatureDisabled), val.String())
-		assert.Equal(t, http.StatusForbidden, r.Code)
+		assert.Equal(t, i18n.Msg(i18n.ErrNoItemsSelected), val.String())
+		assert.Equal(t, http.StatusBadRequest, r.Code)
 	})
 }
diff --git a/internal/config/client_config_test.go b/internal/config/client_config_test.go
index 0b3f65a67..d51ab8f2e 100644
--- a/internal/config/client_config_test.go
+++ b/internal/config/client_config_test.go
@@ -101,7 +101,7 @@ func TestConfig_ClientRoleConfig(t *testing.T) {
 			Account:   true,
 			Albums:    true,
 			Archive:   true,
-			Delete:    false,
+			Delete:    true,
 			Download:  true,
 			Edit:      true,
 			Estimates: true,
@@ -226,7 +226,7 @@ func TestConfig_ClientSessionConfig(t *testing.T) {
 		assert.True(t, f.Upload)
 		assert.True(t, f.Download)
 		assert.True(t, f.Services)
-		assert.False(t, f.Delete)
+		assert.True(t, f.Delete)
 		assert.True(t, f.Import)
 		assert.True(t, f.Library)
 		assert.True(t, f.Logs)
@@ -317,7 +317,7 @@ func TestConfig_ClientSessionConfig(t *testing.T) {
 		assert.True(t, f.Upload)
 		assert.True(t, f.Download)
 		assert.True(t, f.Services)
-		assert.False(t, f.Delete)
+		assert.True(t, f.Delete)
 		assert.True(t, f.Import)
 		assert.True(t, f.Library)
 		assert.True(t, f.Logs)
diff --git a/internal/customize/acl_test.go b/internal/customize/acl_test.go
index 70e94919f..62cfc5644 100644
--- a/internal/customize/acl_test.go
+++ b/internal/customize/acl_test.go
@@ -18,7 +18,7 @@ func TestSettings_ApplyACL(t *testing.T) {
 			Account:   true,
 			Albums:    true,
 			Archive:   true,
-			Delete:    false,
+			Delete:    true,
 			Download:  true,
 			Edit:      true,
 			Estimates: true,
diff --git a/internal/customize/settings.go b/internal/customize/settings.go
index 92ca9de04..e4839999c 100644
--- a/internal/customize/settings.go
+++ b/internal/customize/settings.go
@@ -77,7 +77,7 @@ func NewSettings(theme, lang string) *Settings {
 			Settings:  true,
 			Services:  true,
 			Account:   true,
-			Delete:    false,
+			Delete:    true,
 		},
 		Import: ImportSettings{
 			Path: RootPath,
diff --git a/internal/customize/testdata/settings.yml b/internal/customize/testdata/settings.yml
index 9e2162315..2b0284982 100755
--- a/internal/customize/testdata/settings.yml
+++ b/internal/customize/testdata/settings.yml
@@ -13,7 +13,7 @@ Features:
   Account: true
   Albums: true
   Archive: true
-  Delete: false
+  Delete: true
   Download: true
   Edit: true
   Estimates: true