Pass stage ID to inProgress controller

src/Controller/InstallerController.php

@@ -127,6 +127,8 @@ class InstallerController extends ControllerBase {
    *
    * @param string $project_id
    *   The project machine name.
+   * @param string|null $stage_id
+   *   (optional) The installer stage ID, if there is one. Defaults to NULL.
    *
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    *   Information about the project's require/install status.
@@ -138,20 +140,25 @@ class InstallerController extends ControllerBase {
    *   regularly so it can monitor the progress of the process and report which
    *   stage is taking place.
    */
-  public function inProgress(string $project_id): JsonResponse {
-    $requiring = $this->installer->getMetadata('requiring');
+  public function inProgress(string $project_id, ?string $stage_id = NULL): JsonResponse {
     // @see ::activateModule()
     $core_installing = $this->keyValue->get('installing');
+    if ($core_installing === $project_id) {
+      return new JsonResponse(['status' => self::STATUS_INSTALLING_PROJECT]);
+    }
     $return = ['status' => self::STATUS_IDLE];
 
-    if (isset($requiring['project_id']) && $requiring['project_id'] === $project_id) {
-      $return['status'] = self::STATUS_REQUIRING_PROJECT;
-      $return['phase'] = $requiring['phase'];
+    // If the installer is available, we're idle.
+    if ($this->installer->isAvailable()) {
+      return new JsonResponse($return);
     }
-    if ($core_installing === $project_id) {
-      $return['status'] = self::STATUS_INSTALLING_PROJECT;
+    elseif ($stage_id) {
+      $requiring = $this->installer->claim($stage_id)->getMetadata('requiring');
+      if (isset($requiring['project_id']) && $requiring['project_id'] === $project_id) {
+        $return['status'] = self::STATUS_REQUIRING_PROJECT;
+        $return['phase'] = $requiring['phase'];
+      }
     }
-
     return new JsonResponse($return);
   }
 

src/Routing/ProjectBrowserRoutes.php

@@ -129,10 +129,11 @@ class ProjectBrowserRoutes implements ContainerInjectionInterface {
       ],
     );
     $routes['project_browser.module.install_in_progress'] = new Route(
-      '/admin/modules/project_browser/install_in_progress/{project_id}',
+      '/admin/modules/project_browser/install_in_progress/{project_id}/{stage_id}',
       [
         '_controller' => InstallerController::class . '::inProgress',
         '_title' => 'Install in progress',
+        'stage_id' => NULL,
       ],
       [
         '_permission' => 'administer modules',

tests/src/Functional/InstallerControllerTest.php

@@ -523,7 +523,7 @@ class InstallerControllerTest extends BrowserTestBase {
       $expect_install['stage_id'] = $this->stageId;
     }
     $this->assertProjectBrowserTempStatus($expect_install, NULL);
-    $this->drupalGet("/admin/modules/project_browser/install_in_progress/$module");
+    $this->drupalGet("/admin/modules/project_browser/install_in_progress/$module/$this->stageId");
     $this->assertSame(sprintf('{"status":1,"phase":"%s"}', $phase), $this->getSession()->getPage()->getContent());
     $this->drupalGet('/admin/modules/project_browser/install_in_progress/metatag');
     $this->assertSame('{"status":0}', $this->getSession()->getPage()->getContent());