New Add-Ons Page

.eslintrc.json

@@ -36,6 +36,11 @@
 	},
 	"plugins": ["react", "jsx-a11y", "sonarjs", "cypress", "no-jquery", "compat"],
 	"settings": {
+		"import/resolver": {
+			"webpack": {
+				"config": "webpack.config.js"
+			}
+		},
 		"react": {
 			"pragma": "wp"
 		}

classes/controllers/FrmAddonsController.php

@@ -5,11 +5,88 @@
 
 class FrmAddonsController {
 
+	/**
+	 * @var string
+	 */
+	const SCRIPT_HANDLE = 'frm-addons-page';
+
+	/**
+	 * @var array
+	 */
+	private static $categories = array();
+
+	/**
+	 * @var string
+	 */
+	private static $request_addon_url;
+
 	/**
 	 * @var string
 	 */
 	protected static $plugin;
 
+	/**
+	 * @since x.x
+	 */
+	public static function load_admin_hooks() {
+		add_action( 'admin_menu', __CLASS__ . '::menu', 100 );
+		add_filter( 'pre_set_site_transient_update_plugins', __CLASS__ . '::check_update' );
+
+		if ( FrmAppHelper::is_admin_page( 'formidable-addons' ) ) {
+			self::$request_addon_url = 'https://connect.formidableforms.com/add-on-request/';
+
+			add_action( 'admin_enqueue_scripts', __CLASS__ . '::enqueue_assets', 15 );
+			add_filter( 'frm_show_footer_links', '__return_false' );
+		}
+	}
+
+	/**
+	 * Enqueues the Add-Ons page scripts and styles.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	public static function enqueue_assets() {
+		$plugin_url      = FrmAppHelper::plugin_url();
+		$version         = FrmAppHelper::plugin_version();
+		$js_dependencies = array(
+			'wp-i18n',
+			// This prevents a console error "wp.hooks is undefined" in WP versions older than 5.7.
+			'wp-hooks',
+			'formidable_dom',
+		);
+
+		// Enqueue styles that needed.
+		wp_enqueue_style( 'formidable-admin' );
+		wp_enqueue_style( 'formidable-grids' );
+
+		// Register and enqueue Add-Ons page style.
+		wp_register_style( self::SCRIPT_HANDLE, $plugin_url . '/css/admin/addons-page.css', array(), $version );
+		wp_enqueue_style( self::SCRIPT_HANDLE );
+
+		// Register and enqueue Add-Ons page script.
+		wp_register_script( self::SCRIPT_HANDLE, $plugin_url . '/js/addons-page.js', $js_dependencies, $version, true );
+		wp_localize_script( self::SCRIPT_HANDLE, 'frmAddonsVars', self::get_js_variables() );
+		wp_enqueue_script( self::SCRIPT_HANDLE );
+
+		FrmAppHelper::dequeue_extra_global_scripts();
+	}
+
+	/**
+	 * Get the Add-Ons page JS variables as an array.
+	 *
+	 * @since x.x
+	 *
+	 * @return array
+	 */
+	private static function get_js_variables() {
+		return array(
+			'proIsIncluded'   => FrmAppHelper::pro_is_included(),
+			'addonRequestURL' => self::$request_addon_url,
+		);
+	}
+
 	/**
 	 * @return void
 	 */
@@ -19,7 +96,7 @@ public static function menu() {
 		}
 
 		$label = __( 'Add-Ons', 'formidable' );
-		$label = '<span style="color:#1da867">' . $label . '</span>';
+		$label = '<span style="color:#3FCA89">' . $label . '</span>';
 
 		add_submenu_page( 'formidable', 'Formidable | ' . __( 'Add-Ons', 'formidable' ), $label, 'frm_view_forms', 'formidable-addons', 'FrmAddonsController::list_addons' );
 
@@ -46,11 +123,13 @@ public static function menu() {
 	 */
 	public static function list_addons() {
 		FrmAppHelper::include_svg();
-		$installed_addons = apply_filters( 'frm_installed_addons', array() );
-		$license_type     = '';
 
-		$addons = self::get_api_addons();
-		$errors = array();
+		$view_path         = FrmAppHelper::plugin_path() . '/classes/views/addons/';
+		$installed_addons  = apply_filters( 'frm_installed_addons', array() );
+		$addons            = self::get_api_addons();
+		$errors            = array();
+		$license_type      = '';
+		$request_addon_url = self::$request_addon_url;
 
 		if ( isset( $addons['error'] ) ) {
 			$api          = new FrmFormApi();
@@ -61,19 +140,111 @@ public static function list_addons() {
 
 		$pro    = array(
 			'pro' => array(
-				'title'    => 'Formidable Forms Pro',
-				'slug'     => 'formidable-pro',
-				'released' => '2011-02-05',
-				'docs'     => 'knowledgebase/',
-				'excerpt'  => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.',
+				'title'      => 'Formidable Forms Pro',
+				'slug'       => 'formidable-pro',
+				'released'   => '2011-02-05',
+				'docs'       => 'knowledgebase/',
+				'categories' => array( 'basic', 'plus', 'business', 'elite' ),
+				'excerpt'    => 'Create calculators, surveys, smart forms, and data-driven applications. Build directories, real estate listings, job boards, and much more.',
 			),
 		);
 		$addons = $pro + $addons;
 		self::prepare_addons( $addons );
 
 		$pricing = FrmAppHelper::admin_upgrade_link( 'addons' );
 
-		include FrmAppHelper::plugin_path() . '/classes/views/addons/list.php';
+		self::organize_and_get_categories();
+		$categories = self::$categories;
+
+		include $view_path . 'index.php';
+	}
+
+	/**
+	 * Organize and set categories.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	protected static function organize_and_get_categories() {
+		unset( self::$categories['strategy11'] );
+		ksort( self::$categories );
+
+		$bottom_categories = array();
+		$plans             = FrmFormsHelper::get_license_types(
+			array(
+				'include_all' => false,
+				'case_lower'  => true,
+			)
+		);
+
+		// Extract the elements to move
+		foreach ( $plans as $plan ) {
+			if ( isset( self::$categories[ $plan ] ) ) {
+				$bottom_categories[ $plan ] = self::$categories[ $plan ];
+				unset( self::$categories[ $plan ] );
+			}
+		}
+
+		$special_categories = array();
+		if ( 'elite' !== self::license_type() ) {
+			$special_categories['available-addons'] = array(
+				'name'  => __( 'Available', 'formidable' ),
+				// To be assigned via JavaScript.
+				'count' => 0,
+			);
+		}
+
+		$special_categories['active-addons'] = array(
+			'name'  => __( 'Active', 'formidable' ),
+			// To be assigned via JavaScript.
+			'count' => 0,
+		);
+
+		$special_categories['all-items'] = array(
+			'name'  => __( 'All Add-Ons', 'formidable' ),
+			// To be assigned via JavaScript.
+			'count' => 0,
+		);
+
+		self::$categories = array_merge(
+			$special_categories,
+			self::$categories,
+			$bottom_categories
+		);
+	}
+
+	/**
+	 * Organize and set categories.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $addon The addon array that will be modified by reference.
+	 * @return void
+	 */
+	protected static function set_categories( &$addon ) {
+		if ( ! isset( $addon['categories'] ) ) {
+			return;
+		}
+
+		$addon['category-slugs'] = array();
+
+		foreach ( $addon['categories'] as $category ) {
+			$category      = FrmFormsHelper::convert_legacy_package_names( $category );
+			$category_slug = sanitize_title( $category );
+
+			// Add the slug to the new array.
+			$addon['category-slugs'][] = $category_slug;
+
+			if ( ! isset( self::$categories[ $category_slug ] ) ) {
+				self::$categories[ $category_slug ] = array(
+					'name'  => $category,
+					'count' => 0,
+				);
+			}
+
+			++self::$categories[ $category_slug ]['count'];
+		}
 	}
 
 	/**
@@ -618,9 +789,11 @@ protected static function prepare_addons( &$addons ) {
 			if ( ! isset( $addon['link'] ) ) {
 				$addon['link'] = 'downloads/' . $slug . '/';
 			}
-			self::prepare_addon_link( $addon['link'] );
 
+			self::prepare_addon_link( $addon['link'] );
 			self::set_addon_status( $addon );
+			self::set_categories( $addon );
+
 			$addons[ $id ] = $addon;
 		}//end foreach
 	}
@@ -1441,7 +1614,7 @@ public static function show_conditional_action_button( $atts ) {
 	 *
 	 * @return void
 	 */
-	protected static function addon_upgrade_link( $addon, $upgrade_link ) {
+	public static function addon_upgrade_link( $addon, $upgrade_link ) {
 		$atts         = is_array( $upgrade_link ) ? $upgrade_link : array();
 		$upgrade_link = is_array( $upgrade_link ) ? $upgrade_link['link'] : $upgrade_link;
 

classes/controllers/FrmFormTemplatesController.php

@@ -494,7 +494,7 @@ private static function organize_and_set_categories() {
 
 		// Filter out certain and redundant categories.
 		// 'PayPal', 'Stripe', and 'Twilio' are included elsewhere and should be ignored in this context.
-		$redundant_cats = array_merge( array( 'PayPal', 'Stripe', 'Twilio' ), FrmFormsHelper::ignore_template_categories() );
+		$redundant_cats = array_merge( array( 'PayPal', 'Stripe', 'Twilio' ), FrmFormsHelper::get_license_types() );
 		foreach ( $redundant_cats as $redundant_cat ) {
 			$category_slug = sanitize_title( $redundant_cat );
 			unset( self::$categories[ $category_slug ] );
@@ -522,7 +522,7 @@ private static function organize_and_set_categories() {
 				'count' => 0,
 			);
 		}
-		$special_categories['all-templates']  = array(
+		$special_categories['all-items']      = array(
 			'name'  => __( 'All Templates', 'formidable' ),
 			'count' => self::get_template_count(),
 		);

classes/controllers/FrmHooksController.php

@@ -128,10 +128,6 @@ public static function load_admin_hooks() {
 		add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' );
 		add_action( 'current_screen', 'FrmAppController::filter_admin_notices' );
 
-		// Addons Controller.
-		add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
-		add_filter( 'pre_set_site_transient_update_plugins', 'FrmAddonsController::check_update' );
-
 		// Entries Controller.
 		add_action( 'admin_menu', 'FrmEntriesController::menu', 12 );
 		add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 );
@@ -204,6 +200,7 @@ public static function load_admin_hooks() {
 		FrmStrpLiteHooksController::load_admin_hooks();
 		FrmSMTPController::load_hooks();
 		FrmOnboardingWizardController::load_admin_hooks();
+		FrmAddonsController::load_admin_hooks();
 		new FrmPluginSearch();
 	}