Rock: Form Actions Refresh

.windsurf/rules/formidable/frm-css.md

@@ -1,5 +1,5 @@
 ---
-trigger: "glob"
+trigger: glob
 globs: ["**/*.css", "**/*.scss", "**/*.less"]
 description: "WordPress CSS coding standards with Formidable Forms patterns. Auto-applies when working with CSS files."
 ---

classes/controllers/FrmFormActionsController.php

@@ -56,25 +56,25 @@ public static function register_actions() {
 			'email'             => 'FrmEmailAction',
 			'wppost'            => 'FrmDefPostAction',
 			'register'          => 'FrmDefRegAction',
-			'paypal'            => 'FrmDefPayPalAction',
-			'payment'           => 'FrmTransLiteAction',
 			'quiz'              => 'FrmDefQuizAction',
 			'quiz_outcome'      => 'FrmDefQuizOutcomeAction',
-			'mailchimp'         => 'FrmDefMlcmpAction',
+			'paypal'            => 'FrmDefPayPalAction',
+			'payment'           => 'FrmTransLiteAction',
 			'api'               => 'FrmDefApiAction',
-			'salesforce'        => 'FrmDefSalesforceAction',
+			'mailchimp'         => 'FrmDefMlcmpAction',
 			'activecampaign'    => 'FrmDefActiveCampaignAction',
 			'constantcontact'   => 'FrmDefConstContactAction',
 			'getresponse'       => 'FrmDefGetResponseAction',
-			'hubspot'           => 'FrmDefHubspotAction',
-			'zapier'            => 'FrmDefZapierAction',
-			'n8n'               => 'FrmDefN8NAction',
-			'twilio'            => 'FrmDefTwilioAction',
-			'highrise'          => 'FrmDefHighriseAction',
 			'mailpoet'          => 'FrmDefMailpoetAction',
-			'aweber'            => 'FrmDefAweberAction',
 			'convertkit'        => 'FrmDefConvertKitAction',
+			'aweber'            => 'FrmDefAweberAction',
+			'twilio'            => 'FrmDefTwilioAction',
+			'salesforce'        => 'FrmDefSalesforceAction',
+			'hubspot'           => 'FrmDefHubspotAction',
+			'highrise'          => 'FrmDefHighriseAction',
+			'zapier'            => 'FrmDefZapierAction',
 			'googlespreadsheet' => 'FrmDefGoogleSpreadsheetAction',
+			'n8n'               => 'FrmDefN8NAction',
 		);
 
 		$action_classes = apply_filters( 'frm_registered_form_actions', $action_classes );
@@ -170,24 +170,27 @@ public static function form_action_groups() {
 				'name'    => '',
 				'icon'    => 'frmfont frm_shuffle_icon',
 				'actions' => array(
+					'on_submit',
 					'email',
 					'wppost',
 					'register',
 					'quiz',
 					'quiz_outcome',
-					'twilio',
+					'api',
+					'googlespreadsheet',
+					'n8n',
 				),
 			),
 			'payment'   => array(
-				'name'    => __( 'eCommerce', 'formidable' ),
+				'name'    => __( 'E-Commerce', 'formidable' ),
 				'icon'    => 'frmfont frm_credit_card_alt_icon',
 				'actions' => array(
 					'paypal',
 					'payment',
 				),
 			),
 			'marketing' => array(
-				'name'    => __( 'Email Marketing', 'formidable' ),
+				'name'    => __( 'Marketing', 'formidable' ),
 				'icon'    => 'frmfont frm_mail_bulk_icon',
 				'actions' => array(
 					'mailchimp',
@@ -197,6 +200,7 @@ public static function form_action_groups() {
 					'aweber',
 					'mailpoet',
 					'convertkit',
+					'twilio',
 				),
 			),
 			'crm'       => array(
@@ -220,6 +224,7 @@ private static function get_crm_actions() {
 		$crm_actions = array(
 			'salesforce',
 			'hubspot',
+			'zapier',
 		);
 
 		// Only include Highrise when the add-on is active.
@@ -302,16 +307,26 @@ public static function show_action_icon_link( $action_control, $allowed ) {
 			}
 		}//end if
 
-		// HTML to include on the icon.
-		$icon_atts = array();
+		include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_icon.php';
+	}
 
-		if ( $action_control->action_options['color'] !== 'var(--primary-700)' ) {
-			$icon_atts = array(
+	/**
+	 * Get the HTML attributes for the action icon.
+	 *
+	 * @since x.x
+	 *
+	 * @param object $action_control
+	 *
+	 * @return array
+	 */
+	public static function get_action_icon_atts( $action_control ) {
+		if ( 'var(--primary-700)' !== $action_control->action_options['color'] ) {
+			return array(
 				'style' => '--primary-700:' . $action_control->action_options['color'],
 			);
 		}
 
-		include FrmAppHelper::plugin_path() . '/classes/views/frm-form-actions/_action_icon.php';
+		return array();
 	}
 
 	/**
@@ -380,6 +395,10 @@ public static function list_actions( $form, $values ) {
 
 		self::maybe_show_limit_warning( $form->id, $form_actions );
 
+		echo '<p class="frm-mb-lg frm-no-actions-message' . ( $form_actions ? ' frm_hidden' : '' ) . '"> '
+		. esc_html__( 'No actions have been added yet. Select an action above to get started.', 'formidable' )
+		. '</p>';
+
 		foreach ( $form_actions as $action ) {
 			if ( ! isset( $action_map[ $action->post_excerpt ] ) ) {
 				// Don't try and show settings if action no longer exists
@@ -459,8 +478,14 @@ public static function add_form_action() {
 		$action_control = self::get_form_actions( $action_type );
 		$action_control->_set( $action_key );
 
-		$form_id     = FrmAppHelper::get_param( 'form_id', '', 'post', 'absint' );
-		$form_action = $action_control->prepare_new( $form_id );
+		$form_id         = FrmAppHelper::get_param( 'form_id', '', 'post', 'absint' );
+		$form_action     = $action_control->prepare_new( $form_id );
+		$existing_titles = (array) FrmAppHelper::get_post_param( 'existing_titles', array(), 'sanitize_text_field' );
+
+		if ( $existing_titles ) {
+			$form_action->post_title = self::get_unique_action_title( $form_action->post_title, $existing_titles );
+		}
+
 		$use_logging = self::should_show_log_message( $action_type );
 		$values      = array();
 		$form        = self::fields_to_values( $form_id, $values );
@@ -469,6 +494,27 @@ public static function add_form_action() {
 		wp_die();
 	}
 
+	/**
+	 * Returns the first available title not in $existing_titles, appending " (2)", " (3)", etc. if needed.
+	 *
+	 * @since x.x
+	 *
+	 * @param string   $base_title      Default action title from the action type.
+	 * @param string[] $existing_titles Titles currently visible in the form editor.
+	 *
+	 * @return string
+	 */
+	private static function get_unique_action_title( $base_title, array $existing_titles ) {
+		$taken = array_flip( $existing_titles );
+		$title = $base_title;
+
+		for ( $n = 2; isset( $taken[ $title ] ); $n++ ) {
+			$title = $base_title . ' (' . $n . ')';
+		}
+
+		return $title;
+	}
+
 	public static function fill_action() {
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 		check_ajax_referer( 'frm_ajax', 'nonce' );

classes/controllers/FrmFormsController.php

@@ -1522,17 +1522,17 @@ private static function get_settings_tabs( $values ) {
 				'name'     => __( 'General', 'formidable' ),
 				'title'    => __( 'General Form Settings', 'formidable' ),
 				'function' => array( self::class, 'advanced_settings' ),
-				'icon'     => 'frmfont frm_settings_icon',
+				'icon'     => 'frmfont frm_small_settings_icon',
 			),
 			'email'       => array(
 				'name'     => __( 'Actions & Notifications', 'formidable' ),
 				'function' => array( 'FrmFormActionsController', 'email_settings' ),
 				'id'       => 'frm_notification_settings',
-				'icon'     => 'frmfont frm_mail_bulk_icon',
+				'icon'     => 'frmfont frm_notification_check_icon',
 			),
 			'permissions' => array(
 				'name'       => __( 'Form Permissions', 'formidable' ),
-				'icon'       => 'frmfont frm_lock_closed_icon',
+				'icon'       => 'frmfont frm_lock_closed2_icon',
 				'html_class' => 'frm_show_upgrade_tab frm_noallow',
 				'data'       => array(
 					'medium'     => 'permissions',
@@ -1544,7 +1544,7 @@ private static function get_settings_tabs( $values ) {
 			),
 			'scheduling'  => array(
 				'name'       => __( 'Form Scheduling', 'formidable' ),
-				'icon'       => 'frmfont frm_calendar_icon',
+				'icon'       => 'frmfont frm_schedule_icon',
 				'html_class' => 'frm_show_upgrade_tab frm_noallow',
 				'data'       => array(
 					'medium'     => 'scheduling',
@@ -1557,17 +1557,17 @@ private static function get_settings_tabs( $values ) {
 				'name'     => __( 'Buttons', 'formidable' ),
 				'class'    => self::class,
 				'function' => 'buttons_settings',
-				'icon'     => 'frmfont frm_button_icon',
+				'icon'     => 'frmfont frm-buttons-style',
 			),
 			'landing'     => array(
 				'name'       => __( 'Form Landing Page', 'formidable' ),
-				'icon'       => 'frmfont frm_file_text_icon',
+				'icon'       => 'frmfont frm_cross_device_icon',
 				'html_class' => 'frm_show_upgrade_tab frm_noallow',
 				'data'       => FrmAppHelper::get_landing_page_upgrade_data_params(),
 			),
 			'chat'        => array(
 				'name'       => __( 'Conversational Forms', 'formidable' ),
-				'icon'       => 'frmfont frm_chat_forms_icon',
+				'icon'       => 'frmfont frm_chat_bubbles_icon',
 				'html_class' => 'frm_show_upgrade_tab frm_noallow',
 				'data'       => FrmAppHelper::get_upgrade_data_params(
 					'chat',
@@ -1597,7 +1597,7 @@ private static function get_settings_tabs( $values ) {
 				'name'     => __( 'Customize HTML', 'formidable' ),
 				'class'    => self::class,
 				'function' => 'html_settings',
-				'icon'     => 'frmfont frm_code_icon',
+				'icon'     => 'frmfont frm_code2_icon',
 			),
 		);
 

classes/helpers/FrmAddonsHelper.php

@@ -232,7 +232,7 @@ public static function add_addon_attributes( $addon ) {
 	 * @return string
 	 */
 	private static function prepare_single_addon_classes( $addon ) {
-		$class_names   = array( 'frm-card-item frm-flex-col' );
+		$class_names   = array( 'frm-card-item frm-card-item--outlined frm-flex-col' );
 		$class_names[] = 'plugin-card-' . $addon['slug'];
 		$class_names[] = 'frm-addon-' . $addon['status']['type'];
 

classes/models/FrmFormAction.php

@@ -158,6 +158,8 @@ public function __construct( $id_base, $name, $action_options = array(), $contro
 			'group'       => $id_base,
 			'color'       => '',
 			'keywords'    => '',
+			'description' => '',
+			'is_new'      => false,
 		);
 
 		$action_options          = apply_filters( 'frm_' . $id_base . '_action_options', $action_options );
@@ -968,9 +970,10 @@ public static function action_conditions_met( $action, $entry ) {
 	 */
 	public static function default_action_opts( $class = '' ) {
 		return array(
-			'classes' => 'frmfont ' . $class,
-			'active'  => false,
-			'limit'   => 0,
+			'classes'     => 'frmfont ' . $class,
+			'active'      => false,
+			'limit'       => 0,
+			'description' => '',
 		);
 	}
 

classes/models/FrmOnSubmitAction.php

@@ -20,13 +20,14 @@ class FrmOnSubmitAction extends FrmFormAction {
 
 	public function __construct() {
 		$action_ops = array(
-			'classes'  => 'frmfont frm_checkmark_icon',
-			'active'   => true,
-			'event'    => array( 'create' ),
-			'limit'    => 99,
-			'priority' => 9,
-			'color'    => 'rgb(66, 193, 178)',
-			'keywords' => __( 'redirect, success, confirmation, submit', 'formidable' ),
+			'classes'     => 'frmfont frm_checkmark_circle_icon',
+			'active'      => true,
+			'event'       => array( 'create' ),
+			'limit'       => 99,
+			'priority'    => 9,
+			'color'       => '#42C1B2',
+			'keywords'    => __( 'redirect, success, confirmation, submit', 'formidable' ),
+			'description' => __( 'Success messages', 'formidable' ),
 		);
 		$action_ops = apply_filters( 'frm_' . self::$slug . '_control_settings', $action_ops );
 

classes/views/frm-form-actions/_action_icon.php

@@ -2,28 +2,47 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	die( 'You are not allowed to call this page directly.' );
 }
+
+$single_action_attrs = array_merge(
+	$data,
+	array(
+		'href'            => 'javascript:void(0)',
+		'class'           => $classes . ' button frm-button-secondary frm-button-sm frm-with-icon frm-ml-auto-force frm-fadein-down-short',
+		'data-limit'      => $action_control->action_options['limit'],
+		'data-actiontype' => $action_control->id_base,
+	)
+);
 ?>
-<li class="frm-action <?php echo esc_attr( $group_class . ( isset( $data['data-upgrade'] ) ? ' frm-not-installed' : '' ) ); ?>">
-	<a href="javascript:void(0)" class="<?php echo esc_attr( $classes ); ?>"
-		data-limit="<?php echo esc_attr( $action_control->action_options['limit'] ); ?>"
-		data-actiontype="<?php echo esc_attr( $action_control->id_base ); ?>"
-		<?php FrmAppHelper::array_to_html_params( $data, true ); ?>
-		>
-		<span class="frm-outer-circle">
-			<span class="frm-inner-circle<?php echo esc_attr( str_contains( $action_control->action_options['classes'], 'frm-inverse' ) ? ' frm-inverse' : '' ); ?>" <?php
-				FrmAppHelper::array_to_html_params( $icon_atts, true );
-			?>>
-				<?php FrmAppHelper::icon_by_class( $action_control->action_options['classes'], $icon_atts ); ?>
-			</span>
+<li class="frm-card-item frm-card-item--outlined frm-action<?php echo esc_attr( $group_class . ( isset( $data['data-upgrade'] ) ? ' frm-not-installed' : '' ) ); ?>">
+	<div class="frm-h-stack-xs frm-w-full">
+		<span class="frm-border-icon">
+			<?php FrmAppHelper::icon_by_class( $action_control->action_options['classes'], FrmFormActionsController::get_action_icon_atts( $action_control ) ); ?>
 		</span>
-		<?php echo esc_html( str_replace( 'Add to ', '', $action_control->name ) ); ?>
-		<?php if ( ! empty( $action_control->action_options['keywords'] ) ) { ?>
-			<span class="frm_hidden">
+
+		<div class="frm-flex-col">
+			<h3 class="frm-h-stack-xs frm-text-md frm-capitalize">
 				<?php
-				// Include keywords for the action search.
-				echo esc_html( $action_control->action_options['keywords'] );
+				if ( isset( $data['data-upgrade'] ) && ! isset( $data['data-oneclick'] ) ) {
+					FrmAppHelper::icon_by_class( 'frmfont frm_lock_icon frm_svg15', array( 'aria-label' => __( 'Lock icon', 'formidable' ) ) );
+				}
 				?>
-			</span>
+				<span class="frm-font-medium"><?php echo esc_html( str_replace( 'Add to ', '', $action_control->name ) ); ?></span>
+				<?php if ( ! empty( $action_control->action_options['is_new'] ) ) { ?>
+					<?php FrmAppHelper::show_pill_text(); ?>
+				<?php } ?>
+			</h3>
+			<?php if ( ! empty( $action_control->action_options['description'] ) ) { ?>
+				<p class="frm-line-clamp-2"><?php echo esc_html( $action_control->action_options['description'] ); ?></p>
+			<?php } ?>
+		</div>
+
+		<a <?php FrmAppHelper::array_to_html_params( $single_action_attrs, true ); ?>>
+			<?php FrmAppHelper::icon_by_class( 'frmfont frm_plus_icon' ); ?>
+			<span><?php echo esc_html_x( 'Add', 'form action', 'formidable' ); ?></span>
+		</a>
+
+		<?php if ( ! empty( $action_control->action_options['keywords'] ) ) { ?>
+			<span class="frm_hidden"><?php echo esc_html( $action_control->action_options['keywords'] ); ?></span>
 		<?php } ?>
-	</a>
+	</div>
 </li>