Merge branch 'release/1.4.4'

README.md

@@ -68,7 +68,7 @@ To start local development stack:
 ## License
 This project is licensed under [GPL2](https://github.com/dpc-sdp/tide_site/blob/master/LICENSE.txt)
 
-# DRUSH
+## DRUSH
 The Drush command `tide-site-env-domain-update`, alias `tide-si-domup`, will
 update one or more taxonomy terms in the Sites vocabulary with new Domains.
 This command expects an environment variable `FE_DOMAINS` to exist. The var
@@ -83,3 +83,11 @@ on pipes. The key being the tid and value being a list of domains separated by
 
 This command can be used to ensure the preview and url enhancer features will
 work on headless sites on non production environments.
+
+## Attribution
+Single Digital Presence offers government agencies an open and flexible toolkit to build websites quickly and cost-effectively.
+<p align="center"><a href="https://www.vic.gov.au/what-single-digital-presence-offers" target="_blank"><img src="docs/SDP_Logo_VicGov_RGB.jpg" alt="SDP logo" height="150"></a></p>
+
+The Department of Premier and Cabinet partnered with Salsa Digital to deliver Single Digital Presence. As long-term supporters of open government approaches, they were integral to the establishment of SDP as an open source platform.
+<p align="center"><a href="https://salsadigital.com.au/" target="_blank"><img src="docs/Salsa.png" alt="Salsa logo" height="150"></a></p>
+

src/AliasStorageHelper.php

@@ -7,7 +7,6 @@
 use Drupal\Core\Url;
 use Drupal\node\NodeInterface;
 use Drupal\path_alias\PathAliasInterface;
-use Drupal\pathauto\AliasUniquifierInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 /**
@@ -34,13 +33,6 @@ class AliasStorageHelper {
    */
   protected $entityTypeManager;
 
-  /**
-   * The Alias uniquifier service.
-   *
-   * @var \Drupal\pathauto\AliasUniquifierInterface
-   */
-  protected $aliasUniquifier;
-
   /**
    * AliasStorageHelper constructor.
    *
@@ -54,29 +46,6 @@ public function __construct(TideSiteHelper $helper, EntityTypeManagerInterface $
     $this->entityTypeManager = $entity_type_manager;
   }
 
-  /**
-   * Set the Alias Uniquifier service.
-   *
-   * @param \Drupal\pathauto\AliasUniquifierInterface $alias_uniquifier
-   *   The service.
-   */
-  public function setAliasUniquifier(AliasUniquifierInterface $alias_uniquifier) {
-    $this->aliasUniquifier = $alias_uniquifier;
-  }
-
-  /**
-   * Get the Alias Uniquifier service.
-   *
-   * @return \Drupal\pathauto\AliasUniquifierInterface
-   *   The service.
-   */
-  public function getAliasUniquifier() {
-    if (empty($this->aliasUniquifier)) {
-      $this->setAliasUniquifier($this->container->get('pathauto.alias_uniquifier'));
-    }
-    return $this->aliasUniquifier;
-  }
-
   /**
    * Check if an alias is a site alias.
    *
@@ -186,7 +155,6 @@ public function createSiteAliases(PathAliasInterface $path, NodeInterface $node
     /** @var \Drupal\Core\Entity\EntityStorageInterface $path_storage */
     $path_storage = $this->entityTypeManager->getStorage('path_alias');
     if ($node) {
-      $this->getAliasUniquifier();
       /** @var string[] $aliases */
       $aliases = $this->getAllSiteAliases($path, $node);
 
@@ -285,14 +253,20 @@ public function regenerateNodeSiteAliases(NodeInterface $node, array $site_ids =
     // Collect all existing aliases of the node.
     $aliases = [];
     $path_aliases = $this->loadAll(['path' => '/node/' . $node->id()]);
-    foreach ($path_aliases as $path) {
-      // Group them by language and original alias without site prefix.
-      $alias = $this->getPathAliasWithoutSitePrefix(['alias' => $path->getAlias()]);
-      $aliases[$path->language()->getId() . ':' . $alias] = $path;
+    // If no path aliases exist, just generate them respectively.
+    if (empty($path_aliases)) {
+      $this->container->get('pathauto.generator')->createEntityAlias($node, 'insert');
     }
-    // Regenerate aliases.
-    foreach ($aliases as $path) {
-      $this->createSiteAliases($path, $node, $site_ids);
+    else {
+      foreach ($path_aliases as $path) {
+        // Group them by language and original alias without site prefix.
+        $alias = $this->getPathAliasWithoutSitePrefix(['alias' => $path->getAlias()]);
+        $aliases[$path->language()->getId() . ':' . $alias] = $path;
+      }
+      // Regenerate aliases.
+      foreach ($aliases as $path) {
+        $this->createSiteAliases($path, $node, $site_ids);
+      }
     }
   }