ENGCOM-4440: Fix for issue #21510: Can't access backend indexers page after creating a custom index #21575

Author: sidolov

app/code/Magento/Indexer/Model/Indexer.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Indexer\Model;
 
 use Magento\Framework\Indexer\ActionFactory;
@@ -14,6 +15,8 @@
 use Magento\Framework\Indexer\StructureFactory;
 
 /**
+ * Indexer model.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
@@ -361,7 +364,7 @@ public function getLatestUpdated()
                 return $this->getView()->getUpdated();
             }
         }
-        return $this->getState()->getUpdated();
+        return $this->getState()->getUpdated() ?: '';
     }
 
     /**

app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php

@@ -164,7 +164,12 @@ public function testGetLatestUpdated($getViewIsEnabled, $getViewGetUpdated, $get
                 }
             }
         } else {
-            $this->assertEquals($getStateGetUpdated, $this->model->getLatestUpdated());
+            $getLatestUpdated = $this->model->getLatestUpdated();
+            $this->assertEquals($getStateGetUpdated, $getLatestUpdated);
+
+            if ($getStateGetUpdated === null) {
+                $this->assertNotNull($getLatestUpdated);
+            }
         }
     }
 
@@ -182,7 +187,8 @@ public function getLatestUpdatedDataProvider()
             [true, '', '06-Jan-1944'],
             [true, '06-Jan-1944', ''],
             [true, '', ''],
-            [true, '06-Jan-1944', '05-Jan-1944']
+            [true, '06-Jan-1944', '05-Jan-1944'],
+            [false, null, null],
         ];
     }