Merge pull request #9850 from nextcloud/fix/noid/setup-check-empty-index

Fix wrong hint about missing indexes

2 files changed, 21 insertions, 11 deletions

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index a3155287ac6..1fa69819377 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -183,7 +183,7 @@
 							type: OC.SetupChecks.MESSAGE_TYPE_INFO
 						})
 					}
-					if (data.hasMissingIndexes) {
+					if (data.hasMissingIndexes.length > 0) {
 						var listOfMissingIndexes = "";
 						data.hasMissingIndexes.forEach(function(element){
 							listOfMissingIndexes += "<li>";
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index feef66c353e..b2a3ce2c4bf 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -157,7 +157,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -191,7 +192,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -226,7 +228,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -259,7 +262,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -290,7 +294,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -321,7 +326,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -352,7 +358,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: false,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -404,7 +411,8 @@ describe('OC.SetupChecks tests', function() {
 					hasPassedCodeIntegrityCheck: true,
 					isOpcacheProperlySetup: true,
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -436,7 +444,8 @@ describe('OC.SetupChecks tests', function() {
 					isOpcacheProperlySetup: false,
 					phpOpcacheDocumentation: 'https://example.org/link/to/doc',
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: true
+					hasFreeTypeSupport: true,
+					hasMissingIndexes: []
 				})
 			);
 
@@ -468,7 +477,8 @@ describe('OC.SetupChecks tests', function() {
 					isOpcacheProperlySetup: true,
 					phpOpcacheDocumentation: 'https://example.org/link/to/doc',
 					isSettimelimitAvailable: true,
-					hasFreeTypeSupport: false
+					hasFreeTypeSupport: false,
+					hasMissingIndexes: []
 				})
 			);