new version

build/admin.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-blob', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => 'a339aab71a12d7ab5b5d');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-blob', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-element', 'wp-hooks', 'wp-html-entities', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-url'), 'version' => 'b57de25f0f19d555cfc7');

build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => '6fac6b0f7f4e39ac0f74');
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-primitives', 'wp-url'), 'version' => 'b13329298ae63819af9e');

formello.php

@@ -3,7 +3,7 @@
  * Plugin Name: Formello
  * Plugin URI:  https://formello.net/
  * Description: Lightweight Gutenberg contact form builder, blazingly fast with no external dependencies and ReCaptcha support.
- * Version:     2.2.2
+ * Version:     2.3.0
  * Author:      Formello
  * Author URI:  https://formello.net
  * License:     GPL2

includes/Rest/Controllers/Submissions.php

@@ -94,7 +94,6 @@ public function get_submissions( $request ) {
 
 		$submission_data = '';
 		foreach ( $columns as $column ) {
-			//$submission_data .= ", data->>'$." . $column . "' AS $column";
 			$submission_data .= ", JSON_UNQUOTE( JSON_EXTRACT( data, '$." . $column . "' ) ) AS $column";
 		}
 

readme.txt

@@ -2,9 +2,9 @@
 Contributors:      Formello, tropicalista
 Donate link: 	   https://formello.net
 Tags:              contact form, form builder, form block, gutenberg form, forms, gutenberg block, contact form plugin, forms, form builder, custom form, contact button, contact me, custom contact form, form manager, form, forms builder, forms creator, captcha, recaptcha, email form, web form, feedback form, email submit form, message form, contact form block, wordpress form plugin
-Requires at least: 6.2.2
+Requires at least: 6.4.2
 Tested up to:      6.3
-Stable tag:        2.2.2
+Stable tag:        2.3.0
 Requires PHP:      5.6
 License:           GPL-2.0-or-later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
@@ -128,6 +128,11 @@ Yes, you can insert Formello forms using a shortcode.
 
 == Changelog ==
 
+= 2.3.0 =
+* New datatable to manage submissions
+* Code reduction and improvements
+* Better handling of form submission
+
 = 2.2.2 =
 * Fix wrong CSS
 

src/admin/pages/settings/components/integrations.js

@@ -7,7 +7,11 @@ import {
 	Button,
 } from '@wordpress/components';
 
-import { RawHTML, Fragment, createInterpolateElement } from '@wordpress/element';
+import {
+	RawHTML,
+	Fragment,
+	createInterpolateElement,
+} from '@wordpress/element';
 
 import { __, sprintf } from '@wordpress/i18n';
 
@@ -18,9 +22,14 @@ const IntegrationsTab = () => {
 			a: (
 				<Button
 					text={ __( 'addons page', 'search-console' ) }
-					onClick={ () =>
-						navigator.goTo( '/formello-addons/general' )
-					}
+					onClick={ () => {
+						window.dispatchEvent(
+							new CustomEvent( 'changePage', {
+								detail: '?page=formello-addons',
+							} )
+						);
+						navigator.goTo( '/formello-addons/general' );
+					} }
 					variant="link"
 				/>
 			),
@@ -35,19 +44,12 @@ const IntegrationsTab = () => {
 				<CardBody>
 					<p>
 						{ noticeString(
-							__( 'Go to <a /> to download your preferred integrations.', 'tropical-juice' )
-						) }
-					</p>
-					<RawHTML>
-						{ sprintf(
-							/* translators: Link to addons. */
 							__(
-								'<p>Go to %s to download your preferred integrations. We are working on other integrations.</p>',
+								'Go to <a /> to enable your preferred integrations.',
 								'formello'
-							),
-							`<a href="https://formello.net/addons/" target="_blank">addons page</a>`
+							)
 						) }
-					</RawHTML>
+					</p>
 				</CardBody>
 			</Card>
 		</Fragment>

src/admin/pages/submissions/submissions.js

@@ -27,10 +27,7 @@ import {
  */
 import { DataViews } from '../../components/dataviews';
 import Header from '../../components/masthead.js';
-import {
-	OPERATOR_IN,
-	ENUMERATION_TYPE,
-} from '../../components/dataviews/constants';
+import { OPERATOR_IN } from '../../components/dataviews/constants';
 
 const EMPTY_ARRAY = [];
 const defaultConfigPerViewType = {
@@ -186,8 +183,6 @@ export const Submissions = () => {
 				getValue: ( item ) => item[ key ],
 				filters: [ { id: 'search', type: 'search' } ],
 				render: ( { item } ) => {
-					console.log( typeof item.fields[ key ], item.fields[ key ] )
-
 					if ( 'submitted_at' === key ) {
 						const formattedDate = dateI18n(
 							getSettings().formats.datetimeAbbreviated,
@@ -250,7 +245,7 @@ export const Submissions = () => {
 			trashSubmissionAction,
 			{
 				id: 'mark-as-starred',
-				label: __( 'Mark as favorite' ),
+				label: __( 'Toggle favorite' ),
 				isPrimary: false,
 				isBulk: true,
 				isEligible: () => true,
@@ -264,7 +259,7 @@ export const Submissions = () => {
 			},
 			{
 				id: 'mark-as-new',
-				label: __( 'Mark as new' ),
+				label: __( 'Toggle new' ),
 				isPrimary: false,
 				isBulk: true,
 				icon: heading,

src/admin/pages/tools/index.js

@@ -38,13 +38,9 @@ export default function Tools() {
 	// Filter to add a tab
 	applyFilters( 'formello.ToolsTabs', '', toolsTabs );
 
-	const { goTo, params } = useNavigator();
+	const { params } = useNavigator();
 	const initialTab = params.tab || 'general';
 
-	const updateUrl = ( tabName ) => {
-		goTo( '/' + tabName );
-	};
-
 	return (
 		<Fragment>
 			<Header title={ __( 'Tools', 'formello' ) } />

src/blocks/form/actions/email.js

@@ -7,13 +7,7 @@ import { __ } from '@wordpress/i18n';
 import ClassicEdit from '../../../components/editor.js';
 import MergeTags from '../../../components/merge-tags';
 
-export default function Email(
-	content,
-	props,
-	action,
-	handleUpdate,
-	settingsUrl
-) {
+export default function Email( content, props, action, handleUpdate ) {
 	const { clientId } = props;
 
 	const id = `editor-${ clientId }`;
@@ -91,7 +85,7 @@ export default function Email(
 				} }
 			/>
 
-			<BaseControl label={ __( 'Message', 'formello' ) }>
+			<BaseControl label={ __( 'Message', 'formello' ) } id={ id }>
 				<ClassicEdit
 					id={ id }
 					value={ action.message }

src/blocks/input/edit.js

@@ -24,18 +24,6 @@ import Toolbar from '../../components/field-options/toolbar';
 
 import { SUPPORTED_ATTRIBUTES } from '../../components/field-options/constants';
 
-const getNameFromLabel = ( content ) => {
-	return (
-		content
-			// Convert anything that's not a letter or number to a hyphen.
-			.replace( /[^\p{L}\p{N}]+/gu, '_' )
-			// Convert to lowercase
-			.toLowerCase()
-			// Remove any remaining leading or trailing hyphens.
-			.replace( /(^-+)|(-+$)/g, '' )
-	);
-};
-
 export default function Edit( props ) {
 	const { attributes, setAttributes, clientId } = props;
 	const {
@@ -59,13 +47,19 @@ export default function Edit( props ) {
 	const idx = clientId.substr( 2, 6 ).replace( '-', '' ).replace( /-/g, '' );
 
 	useEffect( () => {
+		const idx = clientId
+			.substr( 2, 6 )
+			.replace( '-', '' )
+			.replace( /-/g, '' );
 		if ( ! id ) {
 			setAttributes( {
 				id: 'field_' + idx,
 			} );
 		}
 		if ( ! name ) {
-			setAttributes( { name: getNameFromLabel( label ) } );
+			setAttributes( {
+				name: 'field_' + idx,
+			} );
 		}
 	}, [] );
 

src/blocks/input/variations.js

@@ -116,13 +116,6 @@ const variations = [
 		attributes: { type: 'tel' },
 		scope: [ 'inserter', 'transform' ],
 	},
-	{
-		name: 'textarea',
-		title: __( 'Textarea' ),
-		icon: Textarea,
-		attributes: { type: 'textarea' },
-		scope: [ 'inserter' ],
-	},
 	{
 		name: 'url',
 		title: __( 'Url' ),

src/components/field-options/constants.js

@@ -158,6 +158,7 @@ export const SUPPORTED_ATTRIBUTES = {
 		'id',
 		'required',
 		'value',
+		'type', // hack to use one component
 		'readonly',
 		'disabled',
 		'placeholder',