Refactor block registration logic safeguard for new posts

tibiii · tibiii · commit 196a9ac879a0 · 2025-10-10T21:38:17.000+03:00
diff --git a/build/blocks/best-time-to-visit/index.asset.php b/build/blocks/best-time-to-visit/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '2b200e13d729a8d62fdc');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => '2ee11f439b51bef61641');
diff --git a/build/blocks/best-time-to-visit/index.js b/build/blocks/best-time-to-visit/index.js
diff --git a/build/blocks/facts-country-wrapper/index.asset.php b/build/blocks/facts-country-wrapper/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '8aaac2d5dd4044a39061');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => '39044bad57cfe8226c34');
diff --git a/build/blocks/facts-country-wrapper/index.js b/build/blocks/facts-country-wrapper/index.js
diff --git a/build/blocks/facts-regions-wrapper/index.asset.php b/build/blocks/facts-regions-wrapper/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '1f64b90a181d7d691357');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => '34572c44df9e601f674d');
diff --git a/build/blocks/facts-regions-wrapper/index.js b/build/blocks/facts-regions-wrapper/index.js
diff --git a/build/blocks/safety/index.asset.php b/build/blocks/safety/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '306fb6ca2ecf63df9071');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => 'efd36bb29a74acbe5602');
diff --git a/build/blocks/safety/index.js b/build/blocks/safety/index.js
diff --git a/build/blocks/visa/index.asset.php b/build/blocks/visa/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-i18n'), 'version' => '8a509deb7dce647b2f59');
+<?php return array('dependencies' => array('wp-i18n'), 'version' => '63e3a2855a99ab141c24');
diff --git a/build/blocks/visa/index.js b/build/blocks/visa/index.js
diff --git a/src/blocks/best-time-to-visit/index.js b/src/blocks/best-time-to-visit/index.js
@@ -133,11 +133,21 @@ wp.domReady(() => {
         const postType = select('core/editor')?.getCurrentPostType();
         const postSlug = select('core/editor')?.getEditedPostSlug();
 
-        if (!postType || !postSlug) {
+        if (!postType) {
             return false;
         }
 
-        if (supportedPostTypes.includes(postType) || ((postType === 'wp_template' || postType === 'wp_template_part') && (postSlug.includes('destination') || postSlug.includes('country') || postSlug.includes('region')))) {
+        const isTemplateContext =
+            postType === 'wp_template' || postType === 'wp_template_part';
+
+        if (
+            supportedPostTypes.includes(postType) ||
+            (isTemplateContext &&
+                postSlug &&
+                (postSlug.includes('destination') ||
+                    postSlug.includes('country') ||
+                    postSlug.includes('region')))
+        ) {
             registerBestTimeToVisitVariation();
             registered = true;
         }
diff --git a/src/blocks/facts-country-wrapper/index.js b/src/blocks/facts-country-wrapper/index.js
@@ -138,11 +138,21 @@ wp.domReady(() => {
         const postType = select('core/editor')?.getCurrentPostType();
         const postSlug = select('core/editor')?.getEditedPostSlug();
 
-        if (!postType || !postSlug) {
+        if (!postType) {
             return false;
         }
 
-        if (supportedPostTypes.includes(postType) || ((postType === 'wp_template' || postType === 'wp_template_part') && (postSlug.includes('destination') || postSlug.includes('country') || postSlug.includes('region')))) {
+        const isTemplateContext =
+            postType === 'wp_template' || postType === 'wp_template_part';
+
+        if (
+            supportedPostTypes.includes(postType) ||
+            (isTemplateContext &&
+                postSlug &&
+                (postSlug.includes('destination') ||
+                    postSlug.includes('country') ||
+                    postSlug.includes('region')))
+        ) {
             registerFactsCountryWrapperVariation();
             registered = true;
         }
diff --git a/src/blocks/facts-regions-wrapper/index.js b/src/blocks/facts-regions-wrapper/index.js
@@ -138,11 +138,21 @@ wp.domReady(() => {
         const postType = select('core/editor')?.getCurrentPostType();
         const postSlug = select('core/editor')?.getEditedPostSlug();
 
-        if (!postType || !postSlug) {
+        if (!postType) {
             return false;
         }
 
-        if (supportedPostTypes.includes(postType) || ((postType === 'wp_template' || postType === 'wp_template_part') && (postSlug.includes('destination') || postSlug.includes('country') || postSlug.includes('region')))) {
+        const isTemplateContext =
+            postType === 'wp_template' || postType === 'wp_template_part';
+
+        if (
+            supportedPostTypes.includes(postType) ||
+            (isTemplateContext &&
+                postSlug &&
+                (postSlug.includes('destination') ||
+                    postSlug.includes('country') ||
+                    postSlug.includes('region')))
+        ) {
             registerFactsRegionsWrapperVariation();
             registered = true;
         }
diff --git a/src/blocks/safety/index.js b/src/blocks/safety/index.js
@@ -147,11 +147,21 @@ wp.domReady(() => {
         const postType = select('core/editor')?.getCurrentPostType();
         const postSlug = select('core/editor')?.getEditedPostSlug();
 
-        if (!postType || !postSlug) {
+        if (!postType) {
             return false;
         }
 
-        if (supportedPostTypes.includes(postType) || ((postType === 'wp_template' || postType === 'wp_template_part') && (postSlug.includes('destination') || postSlug.includes('country') || postSlug.includes('region')))) {
+        const isTemplateContext =
+            postType === 'wp_template' || postType === 'wp_template_part';
+
+        if (
+            supportedPostTypes.includes(postType) ||
+            (isTemplateContext &&
+                postSlug &&
+                (postSlug.includes('destination') ||
+                    postSlug.includes('country') ||
+                    postSlug.includes('region')))
+        ) {
             if (!registeredSafety) {
                 registerSafetyVariation();
                 registeredSafety = true;
diff --git a/src/blocks/visa/index.js b/src/blocks/visa/index.js
@@ -147,11 +147,21 @@ wp.domReady(() => {
         const postType = select('core/editor')?.getCurrentPostType();
         const postSlug = select('core/editor')?.getEditedPostSlug();
 
-        if (!postType || !postSlug) {
+        if (!postType) {
             return false;
         }
 
-        if (supportedPostTypes.includes(postType) || ((postType === 'wp_template' || postType === 'wp_template_part') && (postSlug.includes('destination') || postSlug.includes('country') || postSlug.includes('region')))) {
+        const isTemplateContext =
+            postType === 'wp_template' || postType === 'wp_template_part';
+
+        if (
+            supportedPostTypes.includes(postType) ||
+            (isTemplateContext &&
+                postSlug &&
+                (postSlug.includes('destination') ||
+                    postSlug.includes('country') ||
+                    postSlug.includes('region')))
+        ) {
             registerVisaVariation();
             registered = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<?php return array('dependencies' => array('wp-i18n'), 'version' => '2b200e13d729a8d62fdc');`
	`1`	`+<?php return array('dependencies' => array('wp-i18n'), 'version' => '2ee11f439b51bef61641');`