-
Notifications
You must be signed in to change notification settings - Fork 58
feat: add support for displaying tags as labels #4381
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.
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
Open
jason10lee
wants to merge
7
commits into
trunk
Choose a base branch
from
feat/tag-labels
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+230
−0
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1144256
feat: add support for displaying tags as labels
jason10lee ef2cd3f
fix: apply suggestions from Copilot code review
jason10lee 0fe60fb
fix: cleanup; Copilot suggestions
jason10lee 36e8403
fix: tweaks; Copilot suggestions
jason10lee 2b427be
chore: clean up comments
jason10lee 2521459
fix: incorporate feedback on names, outdated variables
jason10lee ae531b4
feat: rename settings; display flag_meta_key only if checkbox is checked
thomasguillot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,205 @@ | ||
| <?php | ||
| /** | ||
| * Newspack Tag Labels | ||
| * | ||
| * @package Newspack | ||
| */ | ||
|
|
||
| namespace Newspack; | ||
|
|
||
| defined( 'ABSPATH' ) || exit; | ||
|
|
||
| /** | ||
| * Newspack Tag Labels | ||
| */ | ||
| class Tag_Labels { | ||
|
|
||
| /** | ||
| * Key names. | ||
| */ | ||
| const TAG_LABEL_META_KEY = '_np_label_enabled'; | ||
| const TAG_LABEL_FLAG_META_KEY = '_np_label_flag'; | ||
|
|
||
|
|
||
| // Helper functions for themes to get arrays of labels and flags. | ||
| /** | ||
| * Given a term, check if labels are enabled for it. | ||
| * | ||
| * @param WP_Term $term Term to check. | ||
| * | ||
| * @return bool | ||
| */ | ||
| public static function is_tag_label( $term ) { | ||
| if ( ! $term || ! $term->term_id ) { | ||
| return false; | ||
| } | ||
| return ! empty( get_term_meta( $term->term_id, self::TAG_LABEL_META_KEY, true ) ); | ||
| } | ||
|
|
||
| /** | ||
| * Given a term, return the flag (text) of its label and | ||
| * the link to the term archive. | ||
| * | ||
| * Will return null if label isn't enabled for the term. | ||
| * | ||
| * @param WP_Term $term Term to check. | ||
| * | ||
| * @return array|null As ['flag' => FLAG_NAME, 'link' => TERM_LINK]. | ||
| */ | ||
| public static function get_tag_label_for_term( $term ) { | ||
| if ( ! $term || ! $term->term_id || ! self::is_tag_label( $term ) ) { | ||
| return null; | ||
| } | ||
|
|
||
| // A little fancy in case someone wants to give a tag a | ||
| // falsy label flag. Empty string still gets default value. | ||
| $term_label_flag = get_term_meta( $term->term_id, self::TAG_LABEL_FLAG_META_KEY, true ); | ||
| if ( ! isset( $term_label_flag ) || '' === $term_label_flag ) { | ||
| $term_label_flag = $term->name; | ||
| } | ||
|
|
||
| $term_label_link = get_term_link( $term->term_id ); | ||
|
|
||
| return [ | ||
| 'flag' => $term_label_flag, | ||
| 'link' => $term_label_link, | ||
| ]; | ||
| } | ||
|
|
||
| /** | ||
| * Given a post ID, grab array of tag labels (if any) for it. | ||
| * | ||
| * @param int $post_id Post ID. | ||
| * | ||
| * @return array Elements as ['flag' => FLAG_NAME, 'link' => TERM_LINK]. | ||
| */ | ||
| public static function get_labels_for_post( $post_id ) { | ||
| $post_terms = get_the_terms( $post_id, 'post_tag' ); | ||
|
|
||
| if ( ! $post_terms ) { | ||
| return []; | ||
| } | ||
|
|
||
| return array_filter( | ||
| array_map( | ||
| function( $term ) { | ||
| return self::get_tag_label_for_term( $term ); | ||
| }, | ||
| $post_terms | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Initialize hooks. | ||
| */ | ||
| public static function init() { | ||
| add_action( 'post_tag_term_edit_form_top', array( __CLASS__, 'enqueue_scripts' ) ); | ||
|
|
||
| add_action( 'post_tag_edit_form_fields', [ __CLASS__, 'edit_term' ] ); | ||
| add_action( 'edited_post_tag', [ __CLASS__, 'save_term' ] ); | ||
| } | ||
|
|
||
| /** | ||
| * Enqueues js script | ||
| * | ||
| * @return void | ||
| */ | ||
| public static function enqueue_scripts() { | ||
| wp_enqueue_script( | ||
| 'newspack_tag_labels', | ||
| Newspack::plugin_url() . '/dist/other-scripts/tag-labels.js', | ||
| [ 'jquery' ], | ||
| NEWSPACK_PLUGIN_VERSION, | ||
| true | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Add term edit fields. | ||
| * | ||
| * Toggle to determine if the term is a label. | ||
| * Also, override for flag (text used on label). | ||
| * | ||
| * @param WP_Term $term The current WP_Term object. | ||
| */ | ||
| public static function edit_term( $term ) { | ||
| $checkbox_id = self::TAG_LABEL_META_KEY; | ||
| $is_label = self::is_tag_label( $term ); | ||
|
|
||
| $label = self::get_tag_label_for_term( $term ); | ||
| $label_flag = $label ? $label['flag'] : $term->name; | ||
|
|
||
| $input_label_flag = ( $term->name === $label_flag ) ? '' : $label_flag; | ||
| ?> | ||
| <tr class="form-field newspack-label-enable term-<?php echo esc_attr( self::TAG_LABEL_META_KEY ); ?>-wrap"> | ||
| <th scope="row"><label for="<?php echo esc_attr( $checkbox_id ); ?>"><?php esc_html_e( 'Display as label', 'newspack-plugin' ); ?></label></th> | ||
| <td> | ||
| <input | ||
| aria-describedby="<?php echo esc_attr( self::TAG_LABEL_META_KEY ); ?>-description" | ||
| type="checkbox" | ||
| name="<?php echo esc_attr( $checkbox_id ); ?>" | ||
| value="true" | ||
| <?php | ||
| checked( $is_label, true ); | ||
| ?> | ||
| > | ||
| <p class="description" id="<?php echo esc_attr( self::TAG_LABEL_META_KEY ); ?>-description"> | ||
| <?php echo esc_html__( 'Show this tag as a highlighted label wherever posts are displayed.', 'newspack-plugin' ); ?> | ||
| </p> | ||
| </td> | ||
| </tr> | ||
| <tr class="form-field newspack-label-setting term-<?php echo esc_attr( self::TAG_LABEL_FLAG_META_KEY ); ?>-wrap"<?php echo $is_label ? '' : ' style="display: none;"'; ?>> | ||
| <th scope="row"><label for="<?php echo esc_attr( self::TAG_LABEL_FLAG_META_KEY ); ?>"><?php esc_html_e( 'Label text', 'newspack-plugin' ); ?></label></th> | ||
| <td> | ||
| <input | ||
| aria-describedby="<?php echo esc_attr( self::TAG_LABEL_FLAG_META_KEY ); ?>-description" | ||
| type="text" | ||
| name="<?php echo esc_attr( self::TAG_LABEL_FLAG_META_KEY ); ?>" | ||
| placeholder="<?php echo esc_attr( $term->name ); ?>" | ||
| value="<?php echo esc_attr( $input_label_flag ); ?>" | ||
| <?php | ||
| if ( ! $is_label ) { | ||
| echo ' disabled'; } | ||
jason10lee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ?> | ||
| > | ||
| <p class="description" id="<?php echo esc_attr( self::TAG_LABEL_FLAG_META_KEY ); ?>-description"> | ||
| <?php echo esc_html__( 'Custom text to display instead of the tag name.', 'newspack-plugin' ); ?> | ||
| </p> | ||
| </td> | ||
| </tr> | ||
| <?php | ||
| } | ||
|
|
||
| /** | ||
| * Store our custom term meta when term is saved | ||
| * | ||
| * @param int $term_id Term ID. | ||
| */ | ||
| public static function save_term( $term_id ) { | ||
|
|
||
| // See wp-admin/edit-tag-form.php for where this is set. | ||
| check_admin_referer( 'update-tag_' . $term_id ); | ||
|
|
||
| if ( ! current_user_can( 'edit_term', $term_id ) ) { | ||
| return; | ||
| } | ||
|
|
||
| // Save label data if label is enabled; otherwise kill it. | ||
| if ( ! empty( $_POST[ self::TAG_LABEL_META_KEY ] ) ) { | ||
| update_term_meta( $term_id, self::TAG_LABEL_META_KEY, true ); | ||
|
|
||
| // Save falsy values other than empty string in case someone wants a flag of '0' or something. | ||
| if ( isset( $_POST[ self::TAG_LABEL_FLAG_META_KEY ] ) && $_POST[ self::TAG_LABEL_FLAG_META_KEY ] !== '' ) { | ||
| update_term_meta( $term_id, self::TAG_LABEL_FLAG_META_KEY, sanitize_text_field( wp_unslash( $_POST[ self::TAG_LABEL_FLAG_META_KEY ] ) ) ); | ||
jason10lee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } else { | ||
| delete_term_meta( $term_id, self::TAG_LABEL_FLAG_META_KEY ); | ||
| } | ||
| } else { | ||
| delete_term_meta( $term_id, self::TAG_LABEL_META_KEY ); | ||
| delete_term_meta( $term_id, self::TAG_LABEL_FLAG_META_KEY ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Tag_Labels::init(); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* globals jQuery */ | ||
|
|
||
| ( function ( $ ) { | ||
| function toggleLabelSetting() { | ||
| const checkbox = $( '.newspack-label-enable input[type="checkbox"]' ); | ||
| const labelSettingRow = $( '.newspack-label-setting' ); | ||
|
|
||
| if ( checkbox.is( ':checked' ) ) { | ||
| labelSettingRow.show(); | ||
| labelSettingRow.find( 'input' ).prop( 'disabled', false ); | ||
| } else { | ||
| labelSettingRow.hide(); | ||
| labelSettingRow.find( 'input' ).prop( 'disabled', true ); | ||
| } | ||
| } | ||
|
|
||
| // Set initial state on page load. | ||
| toggleLabelSetting(); | ||
|
|
||
| // Update on checkbox change. | ||
| $( '.newspack-label-enable input[type="checkbox"]' ).on( 'change', toggleLabelSetting ); | ||
| } )( jQuery ); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would
has_tag_label(or even justhas_label) be a better name here? I was confusedUh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, named this expecting a tag would be of a type 'label', but
hasmay be better. I'm leaning toward_tag_labelover just_labelbecause 'label' is a bit of a generic term on its own.Seeing as you asked whether 'labels' is even appropriate, let's see what folks say about it.