fix: feed filter condition

Author: girishpanchal30

includes/admin/feedzy-rss-feeds-admin.php

@@ -486,10 +486,6 @@ function closeModal(e) {
 						if (e.key === "Escape") closeModal();
 					});
 
-					jQuery('.fz-conditions').on('click', '.fz-action-btn.is-upsell', function (event) {
-						openModal('#feedzy-add-filter-condition');
-						event.preventDefault();
-					});
 				});
 			</script>
 			<div id="feedzy-add-new-import" class="wp-core-ui feedzy-modal" style="display:none;">

includes/util/feedzy-rss-feeds-conditions.php

@@ -247,10 +247,6 @@ public function is_condition_met( $condition, $value ): bool {
 	 * @return bool True if the conditions are met, false otherwise.
 	 */
 	public function evaluate_conditions( $default_value, $attrs, $item, $feed_url, $index ): bool {
-		if ( feedzy_is_new() && ! feedzy_is_pro() ) {
-			return $default_value;
-		}
-
 		if ( ! isset( $attrs['filters'] ) || empty( $attrs['filters'] ) ) {
 			return $default_value;
 		}

js/Conditions/ConditionsControl.js

@@ -72,11 +72,14 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 		});
 	};
 
+	const el = document.querySelector('.editor-sidebar__panel-tabs');
 	const addCondition = () => {
 		if (!isPro && 1 <= conditions.conditions.length) {
 			// the Inspector panel use sticky position with their own stacking context,
 			// which causes them to appear above our popup overlay. We set their z-index to 0 so the popup covers them.
-			document.querySelector('.editor-sidebar__panel-tabs').style.zIndex = 0;
+			if (el) {
+				el.style.zIndex = 0;
+			}
 			setModelOpen(true);
 			return;
 		}
@@ -132,7 +135,9 @@ const ConditionsControl = ({ conditions, setConditions }) => {
 	};
 
 	const closeModal = () => {
-		document.querySelector('.editor-sidebar__panel-tabs').style.zIndex = 1;
+		if (el) {
+			el.style.zIndex = 0;
+		}
 		setModelOpen(false)
 	}
 

js/Conditions/index.js

@@ -28,27 +28,18 @@ const App = () => {
 	});
 
 	useEffect(() => {
-		if (!feedzyData.isPro) {
-			setConditions(dummyConditions);
-			return;
-		}
-
 		const field = document.getElementById('feed-post-filters-conditions');
 		if (field && field.value) {
 			const parsedConditions = JSON.parse(field.value);
 			setConditions(
-				parsedConditions && parsedConditions.conditions
+				parsedConditions && parsedConditions.conditions.length
 					? parsedConditions
-					: { conditions: [], match: 'all' }
+					: dummyConditions
 			);
 		}
 	}, []);
 
 	useEffect(() => {
-		if (!feedzyData.isPro) {
-			return;
-		}
-
 		document.getElementById('feed-post-filters-conditions').value =
 			JSON.stringify(conditions);
 	}, [conditions]);