Rock: Field Settings Refresh <Lite>

.eslintignore

@@ -10,9 +10,11 @@ js/addons-page.js
 js/formidable_styles.js
 js/formidable_admin.js
 js/bootstrap-multiselect.js
+js/formidable-settings-components.js
 
 # Config files
 *.config.js
+webpack*.js
 
 **/node_modules/**
 **/vendor/**

.eslintrc.json

@@ -34,7 +34,7 @@
 		"window": true,
 		"document": true
 	},
-	"plugins": ["react", "jsx-a11y", "sonarjs", "cypress", "no-jquery", "compat"],
+	"plugins": ["react", "jsx-a11y", "sonarjs", "cypress", "no-jquery", "compat", "jsdoc"],
 	"settings": {
 		"import/resolver": {
 			"webpack": {
@@ -94,7 +94,7 @@
 		"@wordpress/no-global-active-element": "off",
 		"no-alert": "off",
 		"no-undef": "off",
-		"jsdoc/no-undefined-types": "off",
+		"jsdoc/check-tag-names": "error",
 		"no-shadow": "off",
 		"sonarjs/no-duplicate-string": "off",
 		"sonarjs/prefer-single-boolean-return": "off",

.github/workflows/qadeploy.yml

@@ -13,11 +13,18 @@ jobs:
     - name: 🚚 Get latest code
       uses: actions/checkout@v3.5.0
 
+    - name: 🔄 Sanitize branch name
+      id: sanitize
+      run: |
+        BRANCH="${{ github.event.pull_request.head.ref }}"
+        SANITIZED_BRANCH="${BRANCH//\//-}"
+        echo "sanitized_branch=$SANITIZED_BRANCH" >> $GITHUB_OUTPUT
+
     - name: 📂 Sync files
       uses: SamKirkland/FTP-Deploy-Action@4.3.1
       with:
         server: ${{ secrets.FRM_FTP_HOST }}
-        server-dir: ${{ github.event.repository.name }}-${{ github.event.pull_request.head.ref }}/
+        server-dir: ${{ github.event.repository.name }}-${{ steps.sanitize.outputs.sanitized_branch }}/
         username: ${{ secrets.FRM_FTP_USERNAME }}
         password: ${{ secrets.FRM_FTP_PASSWORD }}
         exclude: |

.stylelintrc.json

@@ -6,6 +6,7 @@
 		"selector-id-pattern": null,
 		"font-family-name-quotes": null,
 		"function-url-quotes": null,
+		"no-duplicate-selectors": null,
 		"value-keyword-case": [
 			"lower",
 			{

classes/controllers/FrmAppController.php

@@ -784,6 +784,29 @@ public static function admin_js() {
 			wp_register_script( 'formidable_addons', $plugin_url . '/js/admin/addons.js', array( 'formidable_admin', 'wp-dom-ready' ), $version, true );
 			wp_enqueue_script( 'formidable_addons' );
 		}
+
+		self::enqueue_builder_assets( $plugin_url, $version );
+	}
+
+	/**
+	 * Enqueue the Form Builder assets.
+	 *
+	 * @since x.x
+	 *
+	 * @param string $plugin_url The plugin URL.
+	 * @param string $version    The plugin version.
+	 * @return void
+	 */
+	private static function enqueue_builder_assets( $plugin_url, $version ) {
+		wp_register_style( 'formidable-settings-components', $plugin_url . '/css/admin/frm-settings-components.css', array( 'formidable-admin', 'formidable-grids' ), $version );
+		wp_register_script( 'formidable-settings-components', $plugin_url . '/js/formidable-settings-components.js', array( 'formidable_admin' ), $version, true );
+
+		if ( ! FrmAppHelper::is_form_builder_page() ) {
+			return;
+		}
+
+		wp_enqueue_style( 'formidable-settings-components' );
+		wp_enqueue_script( 'formidable-settings-components' );
 	}
 
 	/**

classes/controllers/FrmFieldsController.php

@@ -391,28 +391,30 @@ private static function default_value_types( $field, $atts ) {
 			'default_value'    => array(
 				'class' => '',
 				'icon'  => 'frm_icon_font frm_text2_icon',
-				'title' => __( 'Default Value (Text)', 'formidable' ),
+				'title' => __( 'Default Value', 'formidable' ),
 				'data'  => array(
 					'frmshow' => '#default-value-for-',
 				),
 			),
 			'calc'             => array(
-				'class' => 'frm_show_upgrade frm_noallow',
-				'title' => __( 'Default Value (Calculation)', 'formidable' ),
-				'icon'  => 'frm_icon_font frm_calculator_icon',
-				'data'  => array(
+				'class'   => 'frm_show_upgrade frm_noallow',
+				'title'   => __( 'Calculate Value', 'formidable' ),
+				'icon'    => 'frm_icon_font frm_calculator_icon',
+				'data'    => array(
 					'medium'  => 'calculations',
 					'upgrade' => __( 'Calculator forms', 'formidable' ),
 				),
+				'tooltip' => __( 'Automatically calculate the value of this field based on values from other fields.', 'formidable' ),
 			),
 			'get_values_field' => array(
-				'class' => 'frm_show_upgrade frm_noallow',
-				'title' => __( 'Default Value (Lookup)', 'formidable' ),
-				'icon'  => 'frm_icon_font frm_search_icon',
-				'data'  => array(
+				'class'   => 'frm_show_upgrade frm_noallow',
+				'title'   => __( 'Lookup', 'formidable' ),
+				'icon'    => 'frm_icon_font frm_search_icon',
+				'data'    => array(
 					'medium'  => 'lookup',
 					'upgrade' => __( 'Lookup fields', 'formidable' ),
 				),
+				'tooltip' => __( 'Dynamically retrieve the value of this field from a lookup field.', 'formidable' ),
 			),
 		);
 
@@ -422,9 +424,11 @@ private static function default_value_types( $field, $atts ) {
 		$settings = array_keys( $types );
 		$active   = 'default_value';
 
-		foreach ( $settings as $type ) {
-			if ( ! empty( $field[ $type ] ) ) {
-				$active = $type;
+		if ( FrmAppHelper::pro_is_connected() ) {
+			foreach ( $settings as $type ) {
+				if ( ! empty( $field[ $type ] ) ) {
+					$active = $type;
+				}
 			}
 		}
 

classes/controllers/FrmFormsController.php

@@ -68,7 +68,7 @@ public static function logic_tip() {
 		$data_message .= ' <img src="' . esc_url( $images_url ) . '/survey-logic.png" srcset="' . esc_url( $images_url ) . 'survey-logic@2x.png 2x" alt="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '"/>';
 		echo '<a href="javascript:void(0)" class="frm_noallow frm_show_upgrade frm_add_logic_link frm-collapsed frm-flex-justify" data-upgrade="' . esc_attr__( 'Conditional Logic options', 'formidable' ) . '" data-message="' . esc_attr( $data_message ) . '" data-medium="builder" data-content="logic">';
 		esc_html_e( 'Conditional Logic', 'formidable' );
-		FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown6_icon', array( 'aria-hidden' => 'true' ) );
+		FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon', array( 'aria-hidden' => 'true' ) );
 		echo '</a>';
 	}
 

classes/controllers/FrmStylesController.php

@@ -1265,13 +1265,11 @@ public static function do_accordion_sections( $screen, $context, $data_object )
 						<li class="control-section accordion-section <?php echo esc_attr( $open_class ); ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
 							<h3 class="accordion-section-title hndle">
 								<?php
-								FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id );
+								FrmAppHelper::icon_by_class( 'frmfont ' . $icon_id . ' frm_svg24' );
 								echo esc_html( $box['title'] );
 								?>
 								<button type="button" aria-expanded="<?php echo esc_attr( 'open' === $open_class ? 'true' : 'false' ); ?>" aria-controls="<?php echo esc_attr( $accordion_content_id ); ?>" aria-label="<?php echo esc_attr( $box['title'] ); ?>">
-									<?php
-									FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon' );
-									?>
+									<?php FrmAppHelper::icon_by_class( 'frmfont frm_arrowdown8_icon' ); ?>
 								</button>
 							</h3>
 							<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>" id="<?php echo esc_attr( $accordion_content_id ); ?>">

classes/helpers/FrmAppHelper.php

@@ -1540,6 +1540,7 @@ public static function show_search_box( $atts ) {
 			'text'        => __( 'Search', 'formidable' ),
 			'input_id'    => '',
 			'value'       => false,
+			'class'       => '',
 		);
 		$atts     = array_merge( $defaults, $atts );
 
@@ -1574,13 +1575,11 @@ public static function show_search_box( $atts ) {
 			$input_atts['autocomplete'] = 'off';
 		}
 		?>
-		<p class="frm-search">
+		<p class="frm-search <?php echo esc_attr( $atts['class'] ); ?>">
 			<label class="screen-reader-text" for="<?php echo esc_attr( $input_id ); ?>">
 				<?php echo esc_html( $atts['text'] ); ?>:
 			</label>
-
-			<?php self::icon_by_class( 'frm_icon_font frm_search_icon' ); ?>
-
+			<?php self::icon_by_class( 'frm_icon_font frm_search_icon frm_svg20' ); ?>
 			<input <?php self::array_to_html_params( $input_atts, true ); ?> />
 			<?php
 			if ( empty( $atts['tosearch'] ) ) {
@@ -3910,12 +3909,6 @@ private static function fill_default_images_dropdown_args( $args ) {
 		$new_args['options']     = (array) $new_args['options'];
 		$new_args['input_attrs'] = (array) $new_args['input_attrs'];
 
-		// Set the number of columns.
-		$new_args['col_class'] = ceil( 12 / count( $new_args['options'] ) );
-		if ( $new_args['col_class'] > 6 ) {
-			$new_args['col_class'] = ceil( $new_args['col_class'] / 2 );
-		}
-
 		/**
 		 * Allows modifying the arguments of images_dropdown() method.
 		 *
@@ -4227,13 +4220,16 @@ public static function show_new_feature( $feature ) {
 	}
 
 	/**
+	 * Enhances upgrade data parameters with installation link and plan requirement information.
+	 *
 	 * @since 5.0.17
 	 *
-	 * @param string $plugin
-	 * @param array  $params
-	 * @return array
+	 * @param string $plugin   The plugin slug to get installation data for.
+	 * @param array  $params   Initial parameters for the upgrade data.
+	 * @param bool   $detailed Whether to include detailed information.
+	 * @return array Modified parameters with installation data.
 	 */
-	public static function get_upgrade_data_params( $plugin, $params ) {
+	public static function get_upgrade_data_params( $plugin, $params, $detailed = false ) {
 		$link = FrmAddonsController::install_link( $plugin );
 		if ( ! $link ) {
 			return $params;
@@ -4246,7 +4242,11 @@ public static function get_upgrade_data_params( $plugin, $params ) {
 				$params['medium'] = $plugin;
 			}
 		} else {
-			$params['requires'] = FrmFormsHelper::get_plan_required( $link );
+			$params['requires'] = $params['requires'] ?? FrmFormsHelper::get_plan_required( $link );
+		}
+
+		if ( $detailed ) {
+			$params['plugin-status'] = $link['status'] ?? '';
 		}
 
 		return $params;

classes/helpers/FrmFieldsHelper.php

@@ -601,7 +601,8 @@ public static function show_single_option( $field ) {
 		$base_name = 'default_value_' . $field['id'];
 		$html_id   = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
 
-		$default_type = self::get_default_value_type( $field );
+		$default_type  = self::get_default_value_type( $field );
+		$options_count = count( $field['options'] );
 
 		foreach ( $field['options'] as $opt_key => $opt ) {
 			$field_val = self::get_value_from_array( $opt, $opt_key, $field );
@@ -693,6 +694,7 @@ public static function inline_modal( $args ) {
 			'args'         => array(),
 			'title'        => '',
 			'inside_class' => 'inside',
+			'dismiss-icon' => true,
 		);
 		$args     = array_merge( $defaults, $args );
 
@@ -2425,4 +2427,82 @@ public static function get_all_draft_field_ids( $form_id ) {
 		$draft_field_rows = self::get_draft_field_results( $form_id );
 		return wp_list_pluck( $draft_field_rows, 'id' );
 	}
+
+	/**
+	 * Render AI generate options button.
+	 *
+	 * @since x.x
+	 *
+	 * @param array $args Field arguments.
+	 * @param bool  $should_hide_bulk_edit Whether to hide bulk edit.
+	 */
+	public static function render_ai_generate_options_button( $args, $should_hide_bulk_edit = false ) {
+		$attributes = array( 'class' => self::get_ai_generate_options_button_class() );
+
+		if ( ! empty( $should_hide_bulk_edit ) ) {
+			$attributes['class'] .= ' frm-force-hidden';
+		}
+
+		$data = FrmAppHelper::get_upgrade_data_params(
+			'ai',
+			array(
+				'requires' => 'Business',
+				'upgrade'  => __( 'Generate options with AI', 'formidable' ),
+				'medium'   => 'builder',
+				'content'  => 'generate-options-with-ai',
+			),
+			true
+		);
+
+		if ( in_array( FrmAddonsController::license_type(), array( 'elite', 'business' ), true ) && 'active' === $data['plugin-status'] ) {
+			// Backwards compatibility "@since x.x".
+			if ( ! method_exists( 'FrmAIAppController', 'get_ai_generated_options_summary' ) ) {
+				$data = array(
+					'modal-title'   => __( 'Generate options with AI', 'formidable' ),
+					'modal-content' => __( 'Update the Formidable AI add-on to the last version to use this feature.', 'formidable' ),
+				);
+			} else {
+				$attributes['class']   .= ' frm-ai-generate-options-modal-trigger';
+				$attributes['data-fid'] = $args['likert_id'] ?? $args['field']['id'];
+			}
+		}
+
+		if ( empty( $attributes['data-fid'] ) ) {
+			unset( $data['plugin-status'] );
+			foreach ( $data as $key => $value ) {
+				$attributes[ 'data-' . $key ] = $value;
+			}
+		}
+
+		include FrmAppHelper::plugin_path() . '/classes/views/frm-fields/back-end/generate-options-with-ai.php';
+	}
+
+	/**
+	 * Get AI generate options button class.
+	 *
+	 * @since x.x
+	 *
+	 * @return string Button class.
+	 */
+	private static function get_ai_generate_options_button_class() {
+		return implode(
+			' ',
+			array(
+				'frm_form_field',
+				'frm6',
+				'frm6_followed',
+				'frm-h-stack',
+				'button',
+				'frm-button-secondary',
+				'frm-button-gradient',
+				'frm-rounded-6',
+				'frm-max-w-fit',
+				'frm-font-normal',
+				'frm-py-2xs',
+				'frm-px-xs',
+				'frm-mt-xs',
+				'frm-mb-12',
+			)
+		);
+	}
 }