Alpha release Sep 20

composer.json

@@ -7,9 +7,9 @@
 		"wp-coding-standards/wpcs": "^3.0",
 		"phpcompatibility/phpcompatibility-wp": "^2.1",
 		"composer/installers": "^2.0",
-		"brainmaestro/composer-git-hooks": "^2.8",
-		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
-		"yoast/phpunit-polyfills": "^2.0",
+		"brainmaestro/composer-git-hooks": "^3.0",
+		"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
+		"yoast/phpunit-polyfills": "^3.0",
 		"phpunit/phpunit": "^7.0 || ^9.5",
 		"dms/phpunit-arraysubset-asserts": "^0.5.0"
 	},

includes/class-newspack-popups-criteria.php

@@ -62,7 +62,8 @@ public static function enqueue_scripts() {
 			self::SCRIPT_HANDLE,
 			'newspackPopupsCriteria',
 			[
-				'config' => self::get_criteria_config(),
+				'is_non_preview_user' => is_user_logged_in() && ! Newspack_Popups::is_user_admin(),
+				'config'              => self::get_criteria_config(),
 			]
 		);
 	}

includes/class-newspack-popups.php

@@ -89,6 +89,7 @@ public function __construct() {
 		add_filter( 'display_post_states', [ __CLASS__, 'display_post_states' ], 10, 2 );
 		add_action( 'save_post_' . self::NEWSPACK_POPUPS_CPT, [ __CLASS__, 'popup_default_fields' ], 10, 3 );
 		add_action( 'transition_post_status', [ __CLASS__, 'prevent_default_category_on_publish' ], 10, 3 );
+		add_action( 'transition_post_status', [ __CLASS__, 'store_activation_dates' ], 10, 3 );
 		add_action( 'pre_delete_term', [ __CLASS__, 'prevent_default_category_on_term_delete' ], 10, 2 );
 		add_filter( 'show_admin_bar', [ __CLASS__, 'show_admin_bar' ], 10, 2 ); // phpcs:ignore WordPressVIPMinimum.UserExperience.AdminBarRemoval.RemovalDetected
 		add_filter( 'newspack_blocks_should_deduplicate', [ __CLASS__, 'newspack_blocks_should_deduplicate' ], 10, 2 );
@@ -537,6 +538,30 @@ public static function register_meta() {
 			]
 		);
 
+		\register_meta(
+			'post',
+			'activation_date',
+			[
+				'object_subtype' => self::NEWSPACK_POPUPS_CPT,
+				'show_in_rest'   => true,
+				'type'           => 'string',
+				'single'         => true,
+				'auth_callback'  => '__return_true',
+			]
+		);
+
+		\register_meta(
+			'post',
+			'deactivation_date',
+			[
+				'object_subtype' => self::NEWSPACK_POPUPS_CPT,
+				'show_in_rest'   => true,
+				'type'           => 'string',
+				'single'         => true,
+				'auth_callback'  => '__return_true',
+			]
+		);
+
 		// Meta field for all post types.
 		\register_meta(
 			'post',
@@ -1020,6 +1045,25 @@ public static function prevent_default_category_on_publish( $new_status, $old_st
 		}
 	}
 
+	/**
+	 * Stores the activation date of the prompt.
+	 *
+	 * @param string $new_status New status.
+	 * @param string $old_status Old status.
+	 * @param bool   $post Post.
+	 */
+	public static function store_activation_dates( $new_status, $old_status, $post ) {
+		if ( self::NEWSPACK_POPUPS_CPT !== $post->post_type ) {
+			return;
+		}
+		if ( 'publish' !== $old_status && 'publish' === $new_status ) {
+			update_post_meta( $post->ID, 'activation_date', gmdate( 'Y-m-d H:i:s' ) );
+		}
+		if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+			update_post_meta( $post->ID, 'deactivation_date', gmdate( 'Y-m-d H:i:s' ) );
+		}
+	}
+
 	/**
 	 * When a category is deleted, any posts that have only that category assigned
 	 * are automatically assigned the site's default category (usually "Uncategorized").