From 85ac08c594bd991973387fc84d830a922b05184f Mon Sep 17 00:00:00 2001
From: Torben Lundsgaard <tl@tlamedia.dk>
Date: Thu, 23 Nov 2023 11:48:27 +0100
Subject: [PATCH] Refactor basic datalayer for simplicity and maintainability

---
 src/Frontend/BasicDatalayerData.php | 68 +++++++++--------------------
 1 file changed, 21 insertions(+), 47 deletions(-)

diff --git a/src/Frontend/BasicDatalayerData.php b/src/Frontend/BasicDatalayerData.php
index a0bed75..8e20a12 100644
--- a/src/Frontend/BasicDatalayerData.php
+++ b/src/Frontend/BasicDatalayerData.php
@@ -58,32 +58,38 @@ public function get_datalayer_content( array $datalayer ): array {
 			$datalayer['pagePostType'] = get_post_type();
 		}
 
-		if ( $this->options->get( 'general', 'datalayer_page_type' ) ) {
+		if ( $set_datalayer_page_type ) {
 			$datalayer['pageType'] = get_post_type();
 		}
 
 		if ( is_singular() ) {
-			$datalayer = $this->get_singular_datalayer_content( $datalayer );
-		}
+			if ( is_front_page() ) {
+				if ( $set_datalayer_post_type ) {
+					$datalayer['pagePostType'] = 'frontpage';
+				}
+				if ( $set_datalayer_page_type ) {
+					$datalayer['pageType'] = 'frontpage';
+				}
+			} elseif ( is_home() ) {
+				if ( $set_datalayer_post_type ) {
+					$datalayer['pagePostType'] = 'blog_home';
+				}
+				if ( $set_datalayer_page_type ) {
+					$datalayer['pageType'] = 'blog_home';
+				}
+			} elseif ( is_search() ) {
+				$datalayer = $this->get_site_search_datalayer_content( $datalayer, $set_datalayer_post_type, $set_datalayer_page_type );
+			}
 
-		if ( is_archive() || is_post_type_archive() ) {
+			$datalayer = $this->get_singular_datalayer_content( $datalayer );
+		} elseif ( is_archive() || is_post_type_archive() ) {
 			if ( ( is_tax() || is_category() ) && $this->options->get( 'general', 'datalayer_categories' ) ) {
 				$categories = get_the_category();
 				foreach ( $categories as $category ) {
 					$datalayer['pageCategory'][] = $category->slug;
 				}
 			}
-		}
-
-		if ( is_search() ) {
-			$datalayer = $this->get_site_search_datalayer_content( $datalayer, $set_datalayer_post_type, $set_datalayer_page_type );
-		}
-
-		if ( is_front_page() || is_home() ) {
-			$datalayer = $this->get_frontpage_datalayer_content( $datalayer, $set_datalayer_post_type, $set_datalayer_page_type );
-		}
-
-		if ( is_404() ) {
+		} elseif ( is_404() ) {
 			if ( $set_datalayer_post_type ) {
 				$datalayer['pagePostType'] = '404-error';
 			}
@@ -166,38 +172,6 @@ private function get_singular_datalayer_content( array $datalayer ): array {
 		return $datalayer;
 	}
 
-	/**
-	 * Get the dataLayer data for the frontpage and home page
-	 *
-	 * @param array $datalayer The datalayer.
-	 * @param bool  $set_datalayer_post_type Whether the pagePostType property is active.
-	 * @param bool  $set_datalayer_page_type Whether the pageType property is active.
-	 *
-	 * @return array
-	 */
-	private function get_frontpage_datalayer_content( array $datalayer, bool $set_datalayer_post_type, bool $set_datalayer_page_type ): array {
-
-		if ( is_front_page() ) {
-			if ( $set_datalayer_post_type ) {
-				$datalayer['pagePostType'] = 'frontpage';
-			}
-			if ( $set_datalayer_page_type ) {
-				$datalayer['pageType'] = 'frontpage';
-			}
-		}
-
-		if ( ! is_front_page() && is_home() ) {
-			if ( $set_datalayer_post_type ) {
-				$datalayer['pagePostType'] = 'blog_home';
-			}
-			if ( $set_datalayer_page_type ) {
-				$datalayer['pageType'] = 'blog_home';
-			}
-		}
-
-		return $datalayer;
-	}
-
 	/**
 	 * Get the dataLayer data for site search
 	 *