Version 2.21

.circleci/config.yml

@@ -138,4 +138,3 @@ workflows:
             - run_php_72_unit_tests
             - run_php_80_unit_tests
 #            - run_acceptance_tests
-

assets/css/scss/admin-global.scss

@@ -171,3 +171,64 @@
 		margin: -1px;
 	}
 }
+
+
+.gv-fields.csv-disabled {
+	cursor: not-allowed;
+
+	.csv-disabled-notice {
+		display: block;
+	}
+	.gv-field-label,
+	.gv-field-controls button {
+		color: #d7dade !important;
+	}
+
+	.ui-tooltip-content .gv-items-picker-container.gv-widget-picker-container & {
+		display: none;
+	}
+}
+
+
+/** The "Embed Shortcode" section in the Publish metabox */
+.gv-shortcode {
+	.dashicons-editor-code {
+		color: #888;
+		left: -1px;
+		font-size: 20px;
+		line-height: 1;
+
+		html[dir=rtl] & {
+			left: auto;
+			right: -1px;
+		}
+	}
+
+	html[dir=rtl] & .code.widefat {
+		text-align: right;
+	}
+
+	position: relative;
+
+	input.code {
+		cursor: pointer;
+	}
+
+	span.copied {
+		display: none;
+		position: absolute;
+		top: 30px;
+		right: 15px;
+		background-color: #000;
+		color: #FFF;
+		padding: 2px 5px;
+		border-radius: 5px;
+	}
+
+	.wp-list-table & {
+		span.copied {
+			top: 3px;
+			right: 3px;
+		}
+	}
+}

assets/css/scss/admin-views.scss

@@ -1912,23 +1912,6 @@ $dialog-button-padding: 5px;
 	}
 }
 
-/** The "Embed Shortcode" section in the Publish metabox */
-.gv-shortcode {
-	.dashicons-editor-code {
-		color: #888;
-		left: -1px;
-		font-size: 20px;
-		line-height: 1;
-		html[dir=rtl] & {
-			left: auto;
-			right: -1px;
-		}
-	}
-	html[dir=rtl] & .code.widefat {
-		text-align: right;
-	}
-}
-
 /** The "Direct Access" section in the Publish metabox */
 #gv-direct-access:before {
 	font: normal 20px/1 Dashicons;

assets/js/admin-shortcode.js

@@ -0,0 +1,29 @@
+/**
+ * Responsible for copying the short codes from the list and edit page.
+ * @since 2.21
+ */
+( function ( $ ) {
+	$( document ).on( 'ready', function () {
+		var shortcode_clipboard = new ClipboardJS( '.gv-shortcode input.code', {
+			text: function ( trigger ) {
+				return $( trigger ).val();
+			}
+		} );
+
+		shortcode_clipboard.on('success', function (e) {
+			var $el = $( e.trigger ).closest( '.gv-shortcode' ).find( '.copied' );
+			$el.show();
+			setTimeout( function () {
+				$el.fadeOut();
+			}, 1000 );
+		});
+
+		// ClipBoardJS only listens to the `click` event, so we fake that here for `Enter`.
+		$( '.gv-shortcode input.code' ).on( 'keydown', function ( e ) {
+			if ( 'Enter' === e.key ) {
+				e.preventDefault();
+				$( this ).trigger( 'click' );
+			}
+		} );
+	} );
+} )( jQuery );

assets/js/admin-views.js

@@ -144,9 +144,6 @@
 				// bind Add Field fields to the addField method
 				.on( 'click', '.ui-tooltip-content .gv-fields', vcfg.startAddField )
 
-				// When user clicks into the shortcode example field, select the example.
-				.on( 'click', ".gv-shortcode input", vcfg.selectText )
-
 				// Show the direct access options and hide the toggle button when opened.
 				.on( 'click', "#gv-direct-access .edit-direct-access", vcfg.editDirectAccess )
 
@@ -2792,6 +2789,23 @@
 			}
 		} );
 
+		const $embedShortcodeEl = $( '#gv-embed-shortcode' );
+		$( '#gravityview_se_is_secure' ).on( 'change', function () {
+			let embedShortcode = $embedShortcodeEl.val();
+			if ( !embedShortcode ) {
+				return;
+			}
+
+			if ( $( this ).is( ':checked' ) ) {
+				embedShortcode = embedShortcode.replace( /]$/, ` secret="${ $embedShortcodeEl.data( 'secret' ) }"]` );
+
+			} else {
+				embedShortcode = embedShortcode.replace( / secret="[^"]+"/, '' );
+			}
+
+			$embedShortcodeEl.val( embedShortcode );
+		} );
+
 		// Expose globally methods to initialize/destroy tooltips and to display dialog window
 		window.gvAdminActions = {
 			initTooltips: viewConfiguration.init_tooltips,
@@ -2802,4 +2816,21 @@
 		$( document.body ).trigger( 'gravityview/loaded' );
 	} );
 
+	/**
+	 * Handles CSV widget classes.
+	 * @since 2.21
+	 */
+	$( function () {
+		const $csv_enable = $( '#gravityview_se_csv_enable' );
+		const update_csv_widget_classes = function () {
+			$( '[data-fieldid="export_link"]' )
+				.toggleClass( 'csv-disabled', !$csv_enable.is( ':checked' ) )
+				.attr( 'aria-disabled', $csv_enable.is( ':checked' ) ? 'false' : 'true' )
+			;
+		};
+
+		$csv_enable.on( 'change', update_csv_widget_classes );
+		update_csv_widget_classes();
+	} );
+
 }(jQuery));

future/includes/class-gv-entry-gravityforms.php

@@ -20,6 +20,13 @@ class GF_Entry extends Entry implements \ArrayAccess {
 	 */
 	public static $backend = 'gravityforms';
 
+	/**
+	 * The entry slug.
+	 *
+	 * @var string
+	 */
+	public $slug;
+
 	/**
 	 * Initialization.
 	 */

future/includes/class-gv-entry.php

@@ -154,8 +154,9 @@ public function get_permalink( \GV\View $view = null, \GV\Request $request = nul
 		 * Modify the URL to the View "directory" context.
 		 *
 		 * @since 1.19.4
-		 * @param string $link URL to the View's "directory" context (Multiple Entries screen)
-		 * @param int $post_id ID of the post to link to. If the View is embedded, it is the post or page ID
+		 *
+		 * @param string $permalink URL to the View's "directory" context (Multiple Entries screen).
+		 * @param int $post_id ID of the post to link to. If the View is embedded, it is the post or page ID.
 		 */
 		$permalink = apply_filters( 'gravityview_directory_link', $permalink, $request->is_view( false ) ? $view_id : ( $post ? $post->ID : null ) );
 

future/includes/class-gv-field-internal.php

@@ -17,6 +17,13 @@ class Internal_Field extends Field {
 	 */
 	public $field;
 
+	/**
+	 * The field type.
+	 *
+	 * @var string
+	 */
+	public $type;
+
 	/**
 	 * Create self from a configuration array.
 	 *

future/includes/class-gv-field.php

@@ -297,7 +297,11 @@ public function get_label( View $view = null, Source $source = null, Entry $entr
 
 		/** A custom label is available. */
 		if ( ! empty( $this->custom_label ) ) {
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
+			return \GravityView_API::replace_variables(
+				$this->custom_label,
+				$source ? $source->form ?? null : null,
+				$entry ? $entry->as_entry() : null
+			);
 		}
 
 		return '';