Skip to content

Commit 5552ea5

Browse files
refactor: preview import feed
1 parent 8a082bf commit 5552ea5

File tree

5 files changed

+21
-13
lines changed

5 files changed

+21
-13
lines changed

includes/admin/feedzy-rss-feeds-admin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1987,7 +1987,7 @@ public function feedzy_enqueue_setup_wizard_scripts() {
19871987
),
19881988
'dryRun' => array(
19891989
'loading' => '<p class="hide-when-loaded">' . __( 'Processing the source and loading the items that will be imported when it runs', 'feedzy-rss-feeds' ) . '...</p>'
1990-
. '<p><b>' . __( 'Please note that if some of these items have already have been imported in previous runs with the same filters, they may be shown here but will not be imported again.', 'feedzy-rss-feeds' ) . '</b></p>'
1990+
. '<p><b>' . __( 'Note: Preview does not display filtered results. Filters will be applied when posts are imported.', 'feedzy-rss-feeds' ) . '</b></p>'
19911991
. '<p class="loading-img hide-when-loaded"><img src="' . includes_url( 'images/wpspin-2x.gif' ) . '"></p><div></div>',
19921992
'title' => __( 'Importable Items', 'feedzy-rss-feeds' ),
19931993
),

includes/admin/feedzy-rss-feeds-import.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,8 @@ private function run_now() {
13871387
private function dry_run() {
13881388
check_ajax_referer( FEEDZY_BASEFILE, 'security' );
13891389

1390-
$fields = urldecode( isset( $_POST['fields'] ) ? sanitize_url( $_POST['fields'] ) : '' );
1390+
$fields = urldecode( isset( $_POST['fields'] ) ? sanitize_url( $_POST['fields'] ) : '' );
1391+
$environment = isset( $_POST['environment'] ) ? sanitize_text_field( $_POST['environment'] ) : 'default';
13911392
parse_str( $fields, $data );
13921393

13931394
$feedzy_meta_data = $data['feedzy_meta_data'];
@@ -1467,8 +1468,8 @@ function ( $errors, $feed, $url ) {
14671468
$feedzy_meta_data['import_feed_limit'],
14681469
'', // should be empty.
14691470
$feedzy_meta_data['inc_key'],
1470-
feedzy_is_pro() ? 'keywords_exc' : '',
1471-
feedzy_is_pro() ? $feedzy_meta_data['exc_key'] : '',
1471+
feedzy_is_pro() || 'wizard' === $environment ? 'keywords_exc' : '',
1472+
feedzy_is_pro() || 'wizard' === $environment ? $feedzy_meta_data['exc_key'] : '',
14721473
feedzy_is_pro() ? 'keywords_ban' : '',
14731474
feedzy_is_pro() ? $feedzy_meta_data['exc_key'] : '',
14741475
implode( ',', $tags )

includes/layouts/setup-wizard.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@
139139
</div>
140140
</div>
141141
<div class="form-block">
142+
<?php if ( 'page_builder' !== $integrate_with ) : ?>
143+
<button class="btn btn-ghost<?php echo empty( $feed_source ) ? ' disabled' : ''; ?>" id="preflight">
144+
<?php esc_html_e( 'Preview Import', 'feedzy-rss-feeds' ); ?>
145+
</button>
146+
<?php endif; ?>
142147
<button class="btn btn-primary<?php echo empty( $feed_source ) ? ' disabled' : ''; ?>" data-step_number="2">
143148
<?php
144149
if ( 'page_builder' === $integrate_with ) {
@@ -223,16 +228,13 @@ class="feedzy-open-media btn btn-outline-primary"
223228
<?php esc_html_e( 'Exclude posts with title not containing', 'feedzy-rss-feeds' ); ?>
224229
</label>
225230
<div class="fz-form-group">
226-
<input type="text" id="feedzy_exclude_title" name="feedzy_meta_data[exclude_post_title]" class="form-control" value="" />
231+
<input type="text" id="feedzy_exclude_title" name="feedzy_meta_data[exc_key]" class="form-control" value="" />
227232
<div class="help-text pt-8">
228233
<?php esc_html_e( 'Posts will not be imported if their title includes these keywords.', 'feedzy-rss-feeds' ); ?>
229234
</div>
230235
</div>
231236
</div>
232237
<div class="form-block">
233-
<button class="btn btn-ghost" id="preflight">
234-
<?php esc_html_e( 'Preview Import', 'feedzy-rss-feeds' ); ?>
235-
</button>
236238
<button class="btn btn-primary fz-wizard-feed-import">
237239
<?php esc_html_e( 'Create a draft import', 'feedzy-rss-feeds' ); ?> <span class="dashicons dashicons-arrow-right-alt"></span>
238240
</button>

includes/views/css/style-wizard.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,11 @@
471471
.feedzy-accordion-item__title h2 {
472472
margin-bottom: 0;
473473
}
474-
474+
.btn-ghost.disabled {
475+
cursor: none;
476+
pointer-events: none;
477+
color: #757575;
478+
}
475479
#TB_ajaxContent ul {
476480
list-style: decimal;
477481
margin-left: 20px;

js/feedzy-setup-wizard.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jQuery(function ($) {
3535
const feedUrl = $(this).attr('href');
3636
$(this).parents('.fz-row').find('input:text').val(feedUrl);
3737

38-
$('[data-step_number="2"]').removeClass('disabled');
38+
$('[data-step_number="2"], #preflight').removeClass('disabled');
3939
return false;
4040
});
4141

@@ -212,7 +212,7 @@ jQuery(function ($) {
212212
'select[name="feedzy_meta_data[import_post_status]"]'
213213
).val(),
214214
fallback_image: $('input[name="feedzy_meta_data[default_thumbnail_id]"]').val(),
215-
excluded_post_title: $('input[name="feedzy_meta_data[exclude_post_title]"]').val(),
215+
excluded_post_title: $('input[name="feedzy_meta_data[exc_key]"]').val(),
216216
action: 'feedzy',
217217
_action: 'wizard_import_feed',
218218
},
@@ -331,9 +331,9 @@ jQuery(function ($) {
331331
// Remove disabled class from save button.
332332
$(document).on('input', '#wizard_feed_source', function () {
333333
if ('' === $(this).val()) {
334-
$('[data-step_number="2"]').addClass('disabled');
334+
$('[data-step_number="2"], #preflight').addClass('disabled');
335335
} else {
336-
$('[data-step_number="2"]').removeClass('disabled');
336+
$('[data-step_number="2"], #preflight').removeClass('disabled');
337337
}
338338
});
339339

@@ -466,6 +466,7 @@ jQuery(function ($) {
466466
fields: $.param($fields),
467467
action: 'feedzy',
468468
_action: 'dry_run',
469+
environment: 'wizard',
469470
},
470471
function(data) {
471472
$('#TB_ajaxContent').addClass('loaded');

0 commit comments

Comments
 (0)