Rock: Redesigned forms list

classes/controllers/FrmAppController.php

@@ -730,9 +730,20 @@ public static function admin_js() {
 
 		wp_register_script( 'formidable_admin', $plugin_url . '/js/formidable_admin.js', self::get_admin_js_dependencies(), $version, true );
 
+		wp_register_script(
+			'formidable_forms_list',
+			$plugin_url . '/js/admin/forms-list.js',
+			array(
+				'formidable_dom',
+			),
+			$version,
+			true
+		);
+
 		if ( FrmAppHelper::on_form_listing_page() ) {
 			// For the existing page dropdown in the Form embed modal.
 			wp_enqueue_script( 'jquery-ui-autocomplete' );
+			wp_enqueue_script( 'formidable_forms_list' );
 		}
 
 		wp_register_script( 'bootstrap-multiselect', $plugin_url . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip', 'popper' ), '2.0', true );

classes/controllers/FrmFormsController.php

@@ -48,6 +48,13 @@ public static function maybe_load_listing_hooks() {
 		add_filter( 'manage_toplevel_page_formidable_sortable_columns', 'FrmFormsController::get_sortable_columns' );
 	}
 
+	/**
+	 * Runs on admin head of the formidable forms page.
+	 *
+	 * @since x.x This adds screen options.
+	 *
+	 * @return void
+	 */
 	public static function head() {
 		if ( wp_is_mobile() ) {
 			wp_enqueue_script( 'jquery-touch-punch' );
@@ -1243,6 +1250,13 @@ public static function get_columns( $columns ) {
 
 		$columns['created_at'] = esc_html__( 'Date', 'formidable' );
 
+		if ( 'trash' !== FrmAppHelper::simple_get( 'form_type' ) ) {
+			$columns['settings'] = '<div class="frm-forms-list-settings-btn-wrapper"><a href="#" class="frm-forms-list-settings-btn">';
+			$columns['settings'] .= FrmAppHelper::icon_by_class( 'frmfont frm_settings_icon', array( 'echo' => false ) );
+			$columns['settings'] .= ( '<span class="screen-reader-text">' . esc_html__( 'List settings', 'formidable' ) . '</span>' );
+			$columns['settings'] .= '</a></div>';
+		}
+
 		add_screen_option(
 			'per_page',
 			array(
@@ -1301,6 +1315,9 @@ public static function hidden_columns( $hidden_columns ) {
 	 * @return mixed
 	 */
 	public static function save_per_page( $save, $option, $value ) {
+		// phpcs:ignore WordPress.Security.NonceVerification.Missing
+		update_user_option( get_current_user_id(), 'frm_forms_show_desc', ! empty( $_POST['frm_forms_show_desc'] ) );
+
 		if ( $option === 'formidable_page_formidable_per_page' ) {
 			return (int) $value;
 		}
@@ -3694,6 +3711,58 @@ function () {
 		);
 	}
 
+	/**
+	 * Prints necessary templates for the forms list page.
+	 *
+	 * @since x.x
+	 *
+	 * @return void
+	 */
+	public static function print_forms_list_templates() {
+		if ( ! FrmAppHelper::on_form_listing_page() ) {
+			return;
+		}
+
+		$screen = get_current_screen();
+
+		if ( ! $screen ) {
+			return;
+		}
+
+		$columns             = get_column_headers( $screen );
+		$hidden              = get_hidden_columns( $screen );
+		$skip_cols           = array( 'cb', 'name', 'settings' );
+		$per_page            = get_user_option( 'formidable_page_formidable_per_page' );
+		$show_screen_options = $screen->show_screen_options();
+
+		if ( $per_page < 1 ) {
+			$per_page = 20;
+		}
+
+		include FrmAppHelper::plugin_path() . '/classes/views/frm-forms/forms-list-settings.php';
+	}
+
+	/**
+	 * Adds custom screen options.
+	 *
+	 * @since x.x
+	 *
+	 * @param string $settings_html Settings HTML.
+	 *
+	 * @return string
+	 */
+	public static function add_screen_options( $settings_html ) {
+		if ( ! FrmAppHelper::on_form_listing_page() ) {
+			return $settings_html;
+		}
+
+		$show_desc = get_user_option( 'frm_forms_show_desc' );
+		return $settings_html . '<p>
+			<label for="frm-forms-show-desc">' . esc_html__( 'Show form description', 'formidable' ) . '</label>
+			<input type="checkbox" name="frm_forms_show_desc" id="frm-forms-show-desc" value="1" ' . checked( $show_desc, '1', false ) . ' />
+		</p>';
+	}
+
 	/**
 	 * @deprecated 4.0
 	 *

classes/controllers/FrmHooksController.php

@@ -157,7 +157,9 @@ public static function load_admin_hooks() {
 		add_filter( 'frm_fields_in_form_builder', 'FrmFormsController::update_form_builder_fields' );
 
 		add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 );
+		add_filter( 'screen_settings', 'FrmFormsController::add_screen_options' );
 		add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' );
+		add_action( 'admin_footer', 'FrmFormsController::print_forms_list_templates' );
 
 		// Elementor.
 		add_action( 'elementor/editor/footer', 'FrmElementorController::admin_init' );

classes/helpers/FrmFormsListHelper.php

@@ -286,9 +286,15 @@ public function single_row( $item, $style = '' ) {
 				$class .= ' column-primary';
 			}
 
-			$class        = 'class="' . esc_attr( $class ) . '"';
-			$data_colname = ' data-colname="' . esc_attr( $column_display_name ) . '"';
-			$attributes   = $class . $style . $data_colname;
+			$class = 'class="' . esc_attr( $class ) . '"';
+
+			if ( 'settings' === $column_name ) {
+				$data_colname = ' data-colname="' . esc_attr( trim( strip_tags( $column_display_name ) ) ) . '"';
+			} else {
+				$data_colname = ' data-colname="' . esc_attr( $column_display_name ) . '"';
+			}
+
+			$attributes = $class . $style . $data_colname;
 
 			switch ( $column_name ) {
 				case 'cb':
@@ -299,7 +305,12 @@ public function single_row( $item, $style = '' ) {
 					$val = $item->{$column_name};
 					break;
 				case 'name':
-					$val  = $this->get_form_name( $item, $actions, $edit_link, $mode );
+					$val = $this->get_form_name( $item, $actions, $edit_link, $mode );
+
+					if ( get_user_option( 'frm_forms_show_desc' ) && ! empty( $item->description ) ) {
+						$val .= '<p class="frm_form_desc">' . nl2br( FrmAppHelper::kses( $item->description ) ) . '</p>';
+					}
+
 					$val .= $action_links;
 					break;
 				case 'created_at':
@@ -411,6 +422,17 @@ protected function column_views( $form ) {
 		// phpcs:enable Generic.WhiteSpace.ScopeIndent
 	}
 
+	/**
+	 * Get the HTML for the Settings column in the form list.
+	 *
+	 * @since x.x
+	 *
+	 * @return string
+	 */
+	protected function column_settings() {
+		return '&nbsp;';
+	}
+
 	/**
 	 * @param array  $actions
 	 * @param object $item

classes/views/frm-forms/forms-list-settings.php

@@ -0,0 +1,102 @@
+<?php
+/**
+ * Template for the forms list settings
+ *
+ * @since x.x
+ *
+ * @package Formidable
+ *
+ * @var int       $per_page
+ * @var array     $columns
+ * @var array     $hidden
+ * @var array     $skip_cols
+ * @var bool      $show_screen_options
+ * @var WP_Screen $screen
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'You are not allowed to call this page directly.' );
+}
+?>
+<div id="frm-forms-list-settings" class="frm_hidden frm-p-2xs">
+	<div class="frm-collapsible-box">
+		<a href="#" class="frm-collapsible-box__btn">
+			<?php
+			esc_html_e( 'Columns', 'formidable' );
+			FrmAppHelper::icon_by_class( 'frmfont frm_arrowup6_icon' );
+			?>
+		</a>
+
+		<?php
+		$attrs = array(
+			'class' => 'frm-collapsible-box__content',
+		);
+
+		if ( ! $show_screen_options ) {
+			$attrs['id'] = 'adv-settings';
+			wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false );
+		}
+		?>
+		<div <?php FrmAppHelper::array_to_html_params( $attrs, true ); ?>>
+			<div class="frm-forms-list-column-checkboxes">
+				<?php
+				foreach ( $columns as $key => $label ) {
+					if ( in_array( $key, $skip_cols, true ) ) {
+						continue;
+					}
+
+					$is_hidden = in_array( $key, $hidden, true );
+					?>
+					<label>
+						<input
+							type="checkbox"
+							class="hide-column-tog"
+							value="<?php echo esc_attr( $key ); ?>"
+							data-wp-column-input-id="<?php echo esc_attr( $key ); ?>-hide"
+							<?php checked( ! $is_hidden ); ?>
+						/>
+						<?php echo esc_html( $label ); ?>
+					</label>
+					<?php
+				}//end foreach
+				?>
+			</div>
+		</div>
+	</div>
+
+	<hr />
+
+	<div class="frm-flex frm-items-center frm-justify-between frm-mb-sm frm-pt-2xs">
+		<label for="frm-forms-list-show-desc"><?php esc_html_e( 'Form description', 'formidable' ); ?></label>
+		<?php
+		FrmHtmlHelper::toggle(
+			'frm-forms-list-show-desc',
+			'frm_forms_show_desc',
+			array(
+				'echo'       => true,
+				'checked'    => intval( get_user_option( 'frm_forms_show_desc' ) ) === 1,
+				'input_html' => array(
+					'data-wp-screen-option-id' => 'frm-forms-show-desc',
+				),
+			)
+		);
+		?>
+	</div>
+
+	<div class="frm-flex frm-items-center frm-justify-between frm-mb-sm">
+		<label for="frm-forms-list-per-page"><?php esc_html_e( 'Items per page', 'formidable' ); ?></label>
+		<input
+			type="number"
+			id="frm-forms-list-per-page"
+			value="<?php echo intval( $per_page ); ?>"
+			min="1"
+			data-wp-screen-option-id="formidable_page_formidable_per_page"
+		/>
+	</div>
+
+	<hr />
+
+	<div style="text-align: right;" class="frm-pt-2xs frm-pb-xs">
+		<button type="button" class="frm-button-primary button-primary" id="frm-save-forms-list-settings-btn"><?php esc_html_e( 'Apply', 'formidable' ); ?></button>
+	</div>
+</div>