Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/397 #1036

Merged
merged 23 commits into from
Aug 20, 2024
Merged

Feature/397 #1036

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f60c6c5
Update pulled content management
roshniahuja Mar 17, 2023
abbb8cf
Modal for unlink and relink
roshniahuja Mar 20, 2023
88761be
Changed Sidebar title and Added linked and unlinked dashicons for dis…
roshniahuja Mar 21, 2023
292a9ea
Resolved PluginDocumentSettingPanel title issue
roshniahuja Mar 21, 2023
401f31c
Resolved conflict
roshniahuja Mar 21, 2023
213550f
CS: Fix prettier issues.
roshniahuja Mar 22, 2023
c29495e
Merge branch 'develop' into feature/397
ravinderk Jun 5, 2023
090f650
Merge branch 'develop' into feature/397
ravinderk Jun 8, 2023
ef32752
update designs as per request
faisal-alvi Jul 4, 2024
fab7f9c
different status icons
faisal-alvi Jul 5, 2024
d33f096
Merge branch 'develop' into feature/397
faisal-alvi Jul 5, 2024
2e5bcff
fix minor phpcs warning
faisal-alvi Jul 5, 2024
fcfaa14
eslint warning
faisal-alvi Jul 5, 2024
a4b6c88
a few ignorable lines for eslint
faisal-alvi Jul 5, 2024
c53d6da
make popup clickable
Sidsector9 Jul 14, 2024
8e1e2cd
Merge branch 'develop' into feature/397
Sidsector9 Jul 14, 2024
29e8f4c
Update assets/js/gutenberg-plugin.js
faisal-alvi Jul 22, 2024
0542975
Update assets/js/gutenberg-plugin.js
faisal-alvi Jul 22, 2024
2e8f1a0
fix eslint errors
faisal-alvi Jul 22, 2024
7dcf925
fix button alignment
faisal-alvi Jul 22, 2024
0035c48
Merge branch 'develop' into feature/397
faisal-alvi Jul 22, 2024
01e58e7
add translators comment
faisal-alvi Jul 22, 2024
49f7f9c
Update includes/syndicated-post-ui.php
faisal-alvi Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions assets/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,67 @@
width: 20px;
}

.distributor-panel span {
display: inline-block;
margin-bottom: 15px;
}

#distributed-unlink {
margin: 0;
}

#distributed-unlink .dashicons-editor-unlink {
color: #b50909;
margin-right: 7px;
text-decoration: none;
}

.distributed-modal-popup .components-modal__icon-container svg {
width: 25px;
}

.distributed-modal-popup h1 {
margin-left: 8px;
margin-top: -3px;
}

.distributed-modal-popup span {display: inline-block;}

.distributed-modal-popup .actions {
margin-top: 20px;
}

body .distributed-modal-popup button,
body .distributed-modal-popup .button {
opacity: 1;
pointer-events: initial;
cursor: pointer;
}

.distributed-modal-popup .actions a.button {
display: inline-block;
margin-right: 20px;
}

.distributed-modal-popup .actions a span {
display: inline-block;
margin-top: 5px;
margin-right: 5px;
color: #b50909;
}

.distributed-modal-popup .actions a span.dashicons-admin-links {
color: #046e04;
}

.distributed-modal-popup .actions #close {
margin-top: 5px;
}

.distributed-modal-popup {
max-width: 380px;
}

.distributor-toggle {
margin-bottom: 8px;
}
Expand Down
11 changes: 11 additions & 0 deletions assets/css/gutenberg-syndicated-post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ body.dt-linked-post {
cursor: default;
}

.distributed-modal-popup {
& * {
pointer-events: auto;
opacity: 1;
}

a, button {
cursor: pointer;
}
}

/* Allow clicks on confirmation dialog buttons */
.components-confirm-dialog button {
opacity: 1;
Expand Down
149 changes: 140 additions & 9 deletions assets/js/gutenberg-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { pluginIcon } from './components/plugin-icon';

import { Icon } from '@wordpress/components';
import { Icon, Modal, Button, Flex } from '@wordpress/components';
import { select, useSelect } from '@wordpress/data';
import { PluginDocumentSettingPanel } from '@wordpress/edit-post';
import { __, _n, _x, sprintf } from '@wordpress/i18n';
import { registerPlugin } from '@wordpress/plugins';
import { useState } from '@wordpress/element';

const { document, dt, dtGutenberg, MouseEvent } = window;

Expand Down Expand Up @@ -131,14 +132,133 @@
* Render the distributed from component
*/
const RenderDistributedFrom = () => {
const [ isOpen, setOpen ] = useState( false );
const openModal = () => setOpen( true );
const closeModal = () => setOpen( false );

if ( ! parseInt( dtGutenberg.unlinked ) ) {
return (
<div>
<span id="distributed-from">
{ sprintf(
/* translators: 1: Syndication date and time. */
__(
'Pulled & linked on %1$s from %2$s',
'distributor'
),
dtGutenberg.syndicationTime,
dtGutenberg.originalLocationName
) }
</span>
<span id="distributed-data">
{ __( 'Updating the ', 'distributor' ) }
<a href={ dtGutenberg.postUrl }>
{ __( 'Original Content', 'distributor' ) },
</a>
faisal-alvi marked this conversation as resolved.
Show resolved Hide resolved
{ __(
'will update this post automatically.',
'distributor'
) }
,
faisal-alvi marked this conversation as resolved.
Show resolved Hide resolved
</span>
<span id="distributed-unlink" onClick={ openModal }> {/* eslint-disable-line */}
<a href='javascript:void(0);'> {/* eslint-disable-line */}
<span className="dashicons dashicons-editor-unlink"></span>
{ __( 'Unlink from Original', 'distributor' ) }
</a>
</span>
{ isOpen && (
<Modal
title="Unlink from Original"
icon={ pluginIcon }
size={ 50 }
onRequestClose={ closeModal }
className="distributed-modal-popup"
overlayClassName="distributed-modal-overlay"
>
<p dangerouslySetInnerHTML={ {

Check failure on line 179 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L179 

[prettier/prettier] Replace `·` with `⏎↹↹↹↹↹↹↹`
__html: sprintf(

Check failure on line 180 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L180 

[prettier/prettier] Insert `↹`
__( 'Unlinking from the %1$sOriginal Content%2$s will stop updating this post automatically.', 'distributor' ),

Check failure on line 181 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L181 

[prettier/prettier] Replace `__(·'Unlinking·from·the·%1$sOriginal·Content%2$s·will·stop·updating·this·post·automatically.',·'distributor'·` with `↹__(⏎↹↹↹↹↹↹↹↹↹↹'Unlinking·from·the·%1$sOriginal·Content%2$s·will·stop·updating·this·post·automatically.',⏎↹↹↹↹↹↹↹↹↹↹'distributor'⏎↹↹↹↹↹↹↹↹↹`

Check failure on line 181 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L181 

[@wordpress/i18n-translator-comments] Translation function with placeholders is missing preceding translator comment
'<a href="' + dtGutenberg.postUrl + '">',

Check failure on line 182 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L182 

[prettier/prettier] Insert `↹`
'</a>'

Check failure on line 183 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L183 

[prettier/prettier] Insert `↹`
)

Check failure on line 184 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L184 

[prettier/prettier] Replace `)` with `↹),`
} } />

Check failure on line 185 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L185 

[prettier/prettier] Replace `}·}·` with `↹}·}⏎↹↹↹↹↹↹`
<Flex justify='flex-end'>

Check failure on line 186 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L186 

[prettier/prettier] Replace `'flex-end'` with `"flex-end"`
<Button
icon={ <Icon icon="editor-unlink" /> }
variant='secondary'

Check failure on line 189 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L189 

[prettier/prettier] Replace `'secondary'` with `"secondary"`
href={ dtGutenberg.unlinkNonceUrl }
>
{ __( 'Unlink', 'distributor' ) }
</Button>
<Button
variant='link'
onClick={ closeModal }
>

Check failure on line 197 in assets/js/gutenberg-plugin.js

View workflow job for this annotation

GitHub Actions / ESLint Report Analysis

assets/js/gutenberg-plugin.js#L194-L197 

[prettier/prettier] Replace `⏎↹↹↹↹↹↹↹↹variant='link'⏎↹↹↹↹↹↹↹↹onClick={·closeModal·}⏎↹↹↹↹↹↹↹` with `·variant="link"·onClick={·closeModal·}`
{ __( 'Cancel', 'distributor' ) }
</Button>
</Flex>
</Modal>
) }
</div>
);
}
return (
<span id="distributed-from">
{ sprintf(
/* translators: 1: Syndication date and time. */
__( 'Distributed on: %1$s', 'distributor' ),
dtGutenberg.syndicationTime
<div>
<span id="distributed-from">
{ sprintf(
/* translators: 1: Syndication date and time. */
__( 'Pulled on %1$s from %2$s', 'distributor' ),
dtGutenberg.syndicationTime,
dtGutenberg.originalLocationName
) }
</span>
<span id="distributed-data">
{ __( 'This post has been unlinked from the ', 'distributor' ) }
<a href={ dtGutenberg.postUrl }>
{ __( 'Original Content', 'distributor' ) }
</a>
{ '.' }
</span>
<span id="distributed-restorelink" onClick={ openModal }> {/* eslint-disable-line */}
<span className="dashicons dashicons-admin-links"></span>
<a href='javascript:void(0);'> {/* eslint-disable-line */}
{ __( 'Restore link to Original', 'distributor' ) }
</a>
</span>
{ isOpen && (
<Modal
title="Restore link to Original"
icon={ pluginIcon }
size={ 50 }
onRequestClose={ closeModal }
className="distributed-modal-popup"
overlayClassName="distributed-modal-overlay"
>
<span id="distributed-data">
{ __( 'Restoring the link to the ', 'distributor' ) }
<a href={ dtGutenberg.postUrl }>
{ __( 'Original Content', 'distributor' ) }
</a>
{ __(
' will start updating this post automatically from the Original, overwriting current content.',
'distributor'
) }
</span>
<div className="actions">
<a href={ dtGutenberg.linkNonceUrl } className="button">
<span className="dashicons dashicons-admin-links"></span>
{ __( 'Restore link', 'distributor' ) }
</a>
<span id="close" onClick={ closeModal } aria-label="Cancel"> {/* eslint-disable-line */}
<a href='javascript:void(0);'> {/* eslint-disable-line */}
{ __( 'Cancel', 'distributor' ) }
</a>
</span>
</div>
</Modal>
) }
</span>
</div>
);
};

Expand All @@ -149,6 +269,17 @@
<Icon className="components-panel__icon" icon={ pluginIcon } size={ 20 } />
);

/**
* Create the Distributor title
*/
const isUnlinkedContent = parseInt( dtGutenberg.unlinked ) !== 0;

const DistributorTitle = () => {
return isUnlinkedContent
? __( 'Unlinked Content', 'distributor' )
: __( 'Pulled Content', 'distributor' );
};

/**
* Add the Distributor panel to Gutenberg
*/
Expand Down Expand Up @@ -201,7 +332,7 @@
distributorTopMenu?.classList.add( 'hide' );
return (
<PluginDocumentSettingPanel
title={ __( 'Distributor', 'distributor' ) }
title={ <DistributorTitle /> }
icon={ DistributorIcon }
className="distributor-panel"
>
Expand All @@ -214,7 +345,7 @@
distributorTopMenu?.classList.remove( 'hide' );
return (
<PluginDocumentSettingPanel
title={ __( 'Distributor', 'distributor' ) }
title={ <DistributorTitle /> }
icon={ DistributorIcon }
className="distributor-panel"
>
Expand Down
31 changes: 18 additions & 13 deletions includes/syndicated-post-ui.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,23 @@ function output_distributor_column( $column_name, $post_id ) {
$original_blog_id = get_post_meta( $post_id, 'dt_original_blog_id', true );
$original_source_id = get_post_meta( $post_id, 'dt_original_source_id', true );
$original_deleted = (bool) get_post_meta( $post_id, 'dt_original_post_deleted', true );
$connection_map = get_post_meta( $post_id, 'dt_connection_map', true );

if ( ( empty( $original_blog_id ) && empty( $original_source_id ) ) || $original_deleted ) {
echo '—';
if ( ( ( empty( $original_blog_id ) && empty( $original_source_id ) ) || $original_deleted ) && ! $connection_map ) {
echo '';
} else {
$unlinked = (bool) get_post_meta( $post_id, 'dt_unlinked', true );
$post_type_object = get_post_type_object( get_post_type( $post_id ) );
$post_url = get_post_meta( $post_id, 'dt_original_post_url', true );

if ( $unlinked ) {
echo '<a href="' . esc_url( $post_url ) . '"><img class="dt-unlinked" src="' . esc_url( plugins_url( 'assets/img/icon.svg', __DIR__ ) ) . '" alt="' . esc_attr__( 'Unlinked', 'distributor' ) . '" title="' . esc_attr__( 'Unlinked', 'distributor' ) . '"></a>';
if ( $connection_map ) {
// When a post is pushed from current site or pulled by other sites.
echo '<span title="' . esc_attr__( 'Pushed', 'distributor' ) . '" class="dashicons dashicons-admin-page"></span>';
} else {
echo '<a href="' . esc_url( $post_url ) . '"><img src="' . esc_url( plugins_url( 'assets/img/icon.svg', __DIR__ ) ) . '" alt="' . esc_attr__( 'Linked', 'distributor' ) . '" title="' . esc_attr__( 'Linked', 'distributor' ) . '"></a>';
$unlinked = (bool) get_post_meta( $post_id, 'dt_unlinked', true );
$post_url = get_post_meta( $post_id, 'dt_original_post_url', true );

if ( $unlinked ) {
echo '<a href="' . esc_url( $post_url ) . '"><span title="' . esc_attr__( 'Unlinked', 'distributor' ) . '" class="dashicons dashicons-editor-unlink"></span></span></a>';
faisal-alvi marked this conversation as resolved.
Show resolved Hide resolved
} else {
echo '<a target="_blank" href="' . esc_url( $post_url ) . '"><span title="' . esc_attr__( 'Linked', 'distributor' ) . '" class="dashicons dashicons-admin-links"></span></a>';
}
}
}
}
Expand Down Expand Up @@ -373,12 +378,12 @@ function link() {

if ( ! empty( $update ) ) {
wp_update_post(
[
array(
'ID' => $post_id,
'post_title' => $update['post_title'],
'post_content' => $update['post_content'],
'post_excerpt' => $update['post_excerpt'],
]
)
);

if ( null !== $update['meta'] ) {
Expand Down Expand Up @@ -640,7 +645,7 @@ function enqueue_gutenberg_edit_scripts() {
'gutenberg-syndicated-post.min'
);

$localize_data = [
$localize_data = array(
'originalBlogId' => (int) $original_blog_id,
'originalPostId' => (int) $original_post_id,
'originalSourceId' => (int) $original_source_id,
Expand All @@ -658,7 +663,7 @@ function enqueue_gutenberg_edit_scripts() {
'supportedPostStati' => \Distributor\Utils\distributable_post_statuses(),
// Filter documented in includes/push-ui.php.
'noPermissions' => ! is_user_logged_in() || ! current_user_can( apply_filters( 'dt_syndicatable_capabilities', 'edit_posts' ) ),
];
);

$gutenberg_syndicated_post_script
->load_in_footer()
Expand Down
Loading