Merge branch 'ISAICP-9042' into 'develop'

ISAICP-9042: Don't publish OSS Catalogue collection if OSS is disabled.

See merge request digit/digit-joinup-dev!1577

resources/runner/drupal.yml

@@ -38,6 +38,7 @@ drupal:
         - Custom error handler
         - Permissions
         - Null mail collector
+        - EU OSS Catalogue
       site-clone:
         - Main settings
         - Databases
@@ -116,6 +117,7 @@ drupal:
         - Custom queue services
         - Test mail collector
         - Monolog
+        - EU OSS Catalogue
       phpunit:
         - Main settings
         - Databases
@@ -133,6 +135,7 @@ drupal:
         - Verbose error logging
         - Custom queue services
         - Test mail collector
+        - EU OSS Catalogue
       prod:
         - Main settings
         - Site email

web/modules/custom/joinup_communities/joinup_oss_catalogue/joinup_oss_catalogue.deploy.php

@@ -17,9 +17,9 @@ function joinup_oss_catalogue_deploy_111200(): void {
   /** @var \Drupal\collection\Entity\CollectionInterface $collection */
   $collection = \Drupal::entityTypeManager()->getStorage('rdf_entity')
     ->load(OssCatalogueCollectionInterface::COLLECTION_ENTITY_ID);
-
+  $state = joinup_oss_catalogue_is_enabled() ? 'published' : 'draft';
   $collection
-    ?->set('field_ar_state', 'published')
+    ?->set('field_ar_state', $state)
       ->set('path', ['alias' => '/eu-oss-catalogue', 'pathauto' => 0])
       ->save();
 }