Refactor admin JavaScript build system and structure

.browserslistrc

@@ -0,0 +1 @@
+extends @wordpress/browserslist-config

.eslintignore

@@ -1,11 +1,18 @@
 # Exclude auto generated files.
 **/*.min.js
 **/*.js.map
-**/formidable_blocks.js
-**/formidable_overlay.js
-**/formidable_dashboard.js
-**/formidable-templates.js
-**/formidable_styles.js
+js/formidable_blocks.js
+js/formidable_overlay.js
+js/form-templates.js
+js/formidable_dashboard.js
+js/onboarding-wizard.js
+js/addons-page.js
+js/formidable_styles.js
+js/formidable_admin.js
+js/bootstrap-multiselect.js
+
+# Config files
+*.config.js
 
 **/node_modules/**
 **/vendor/**

.eslintrc.json

@@ -38,7 +38,7 @@
 	"settings": {
 		"import/resolver": {
 			"webpack": {
-				"config": "webpack.config.js"
+				"config": "./webpack.config.js"
 			}
 		},
 		"react": {
@@ -48,7 +48,24 @@
 	"rules": {
 		"cypress/unsafe-to-chain-command": "off",
 		"cypress/no-assigning-return-values": "off",
-		"camelcase": ["error", { "properties": "never" }],
+		"camelcase": [
+			"error",
+			{
+				"properties": "never",
+				"allow": [
+					"frm_admin_js",
+					"frm_stripe_vars",
+					"frm_trans_vars",
+					"formidable_form_selector",
+					"frm_js",
+					"frm_password_checks",
+					"formidable_block_calculator",
+					"formidable_view_selector",
+					"frmdates_admin_js",
+					"frm_abdn"
+				]
+			}
+		],
 		"lines-around-comment": "off",
 		"react/display-name": "off",
 		"react/jsx-curly-spacing": [
@@ -128,6 +145,9 @@
 		"no-jquery/no-trim": "error",
 		"no-jquery/no-type": "error",
 		"no-jquery/no-unique": "error",
-		"no-jquery/no-when": "error"
+		"no-jquery/no-when": "error",
+		"react/jsx-no-target-blank": "off",
+		"comma-dangle": "off",
+		"arrow-parens": ["error", "as-needed"]
 	}
 }

.github/workflows/cypress.yml

@@ -27,7 +27,7 @@ jobs:
           node-version: 20
 
       - name: Install dependencies
-        run: npm ci --include=dev
+        run: npm ci --legacy-peer-deps --include=dev
 
       - name: Set up WP environment
         run: npm run env start

.github/workflows/jscs.yml

@@ -5,20 +5,18 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [ opened, labeled, synchronize ]
 
 name: Inspections
 jobs:
   runPHPCSInspection:
+    if: contains(github.event.pull_request.labels.*.name, 'run analysis')
     name: Run ESLint
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@master
       - name: Analyze js code style
         run: |
-          npm install eslint
-          wget https://develop.svn.wordpress.org/trunk/.jshintrc
-          ./node_modules/.bin/eslint ./js/formidable*
-          ./node_modules/.bin/eslint ./tests/cypress/e2e/*
+          npm ci --legacy-peer-deps --include=dev
+          ./node_modules/.bin/eslint .

classes/controllers/FrmEntriesController.php

@@ -393,20 +393,18 @@ private static function field_supports_sorting( $field ) {
 	 * @return array
 	 */
 	public static function hidden_columns( $result ) {
+		global $frm_vars;
+
 		if ( ! is_array( $result ) ) {
 			// Force an unexpected value to be an array.
 			// Since $result is a filtered option and gets saved to the database, it's possible it could be a string.
 			// Since this code expects an array it would break with a "Uncaught Error: [] operator not supported for strings" error.
 			$result = array();
 		}
 
-		$form_id = FrmForm::get_current_form_id();
-
-		$hidden = self::user_hidden_columns_for_form( $form_id, $result );
-
-		global $frm_vars;
-		$i = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
-
+		$form_id     = FrmForm::get_current_form_id();
+		$hidden      = self::user_hidden_columns_for_form( $form_id, $result );
+		$i           = isset( $frm_vars['cols'] ) ? count( $frm_vars['cols'] ) : 0;
 		$max_columns = 11;
 
 		if ( ! empty( $hidden ) ) {
@@ -447,6 +445,10 @@ private static function user_hidden_columns_for_form( $form_id, $result ) {
 	 * Remove some columns by default when there are too many
 	 *
 	 * @since 2.05.07
+	 *
+	 * @param array $atts
+	 * @param array $result
+	 * @return void
 	 */
 	private static function remove_excess_cols( $atts, &$result ) {
 		global $frm_vars;

js/admin/addons.js

@@ -5,19 +5,18 @@
  */
 
 wp.domReady( () => {
-
 	/**
 	 * Internal dependencies
 	 */
 	const { toggleAddonState } = window.frmAdminBuild;
 
-	document.addEventListener( 'click', ( event ) => {
+	document.addEventListener( 'click', event => {
 		if ( event.target.matches( '.frm-uninstall-addon' ) ) {
 			event.preventDefault();
 			toggleAddonState( event.target, 'frm_uninstall_addon' );
 		} else if ( event.target.matches( '.frm-deactivate-addon' ) ) {
 			event.preventDefault();
 			toggleAddonState( event.target, 'frm_deactivate_addon' );
 		}
-	});
-});
+	} );
+} );