From 6e3f42fbd9f0f5fa653c28ec39b00302c3ec9c99 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 12 May 2021 10:45:18 -0300 Subject: [PATCH 01/64] feat: change SQL to return itens of facets #344 --- .../repositories/class-tainacan-metadata.php | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php index d511a6cc1..3bcec2ae9 100644 --- a/src/classes/repositories/class-tainacan-metadata.php +++ b/src/classes/repositories/class-tainacan-metadata.php @@ -1165,9 +1165,9 @@ class Metadata extends Repository { $base_query = $wpdb->prepare("FROM $wpdb->term_relationships tr INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id INNER JOIN $wpdb->terms t ON tt.term_id = t.term_id + INNER JOIN ($items_query) as posts ON tr.object_id = posts.ID WHERE tt.parent = %d AND - tr.object_id IN ($items_query) AND tt.taxonomy = %s $search_q ORDER BY t.name ASC @@ -1235,9 +1235,6 @@ class Metadata extends Repository { } - - - // add selected to the result if ( !empty($args['include']) ) { if ( is_array($args['include']) && !empty($args['include']) ) { @@ -1261,7 +1258,6 @@ class Metadata extends Repository { } } - $number = ctype_digit($args['number']) && $args['number'] >=1 ? $args['number'] : $total; if( $number < 1){ $pages = 1; @@ -1309,18 +1305,19 @@ class Metadata extends Repository { } - - } else { - $items_query_clause = ''; if ($items_query) { - $items_query_clause = "AND post_id IN($items_query)"; + $items_query_clause = "($items_query) as qItems"; + $base_query = $wpdb->prepare( "(SELECT DISTINCT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = %s $search_q ORDER BY meta_value) as qBase", $metadatum_id ); + $total_query = "SELECT COUNT(DISTINCT qBase.meta_value) FROM $base_query INNER JOIN $items_query_clause ON qBase.post_id = qItems.ID"; + $query = "SELECT DISTINCT qBase.meta_value FROM $base_query INNER JOIN $items_query_clause ON qBase.post_id = qItems.ID $pagination"; + //$query = "SELECT DISTINCT meta_value $base_query $pagination"; + } else { + $base_query = $wpdb->prepare( "FROM $wpdb->postmeta WHERE meta_key = %s $search_q ORDER BY meta_value", $metadatum_id ); + $total_query = "SELECT COUNT(DISTINCT meta_value) $base_query"; + $query = "SELECT DISTINCT meta_value $base_query $pagination"; } - $base_query = $wpdb->prepare( "FROM $wpdb->postmeta WHERE meta_key = %s $search_q $items_query_clause ORDER BY meta_value", $metadatum_id ); - - $total_query = "SELECT COUNT(DISTINCT meta_value) $base_query"; - $query = "SELECT DISTINCT meta_value $base_query $pagination"; $results = $wpdb->get_col($query); $total = $wpdb->get_var($total_query); From 9bcf653d4dacd513660d48b7f16223f840e80320 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Mon, 26 Jul 2021 11:46:38 -0300 Subject: [PATCH 02/64] feat: display related item metadata on value as html #572 --- .../class-tainacan-relationship.php | 84 ++++++++++++------- 1 file changed, 53 insertions(+), 31 deletions(-) diff --git a/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php b/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php index 09f4aff51..635e70969 100644 --- a/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php +++ b/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php @@ -163,7 +163,7 @@ class Relationship extends Metadata_Type { * @param Item_Metadata_Entity $item_metadata * @return string The HTML representation of the value, containing one or multiple items names, linked to the item page */ - public function get_value_as_html(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) { + public function get_value_as_html(\Tainacan\Entities\Item_Metadata_Entity $item_metadata) { $value = $item_metadata->get_value(); $return = ''; @@ -205,8 +205,7 @@ class Relationship extends Metadata_Type { // item not found } } - - return $return; + return "
{$return}
"; } private function get_item_html($item) { @@ -214,41 +213,64 @@ class Relationship extends Metadata_Type { $id = $item->get_id(); $search_meta_id = $this->get_option('search'); - - if ( $id && $search_meta_id ) { - $link = get_permalink( (int) $id ); - - $search_meta_id = $this->get_option('search'); - - $metadatum = \Tainacan\Repositories\Metadata::get_instance()->fetch((int) $search_meta_id); - - $label = ''; - - if ($metadatum instanceof \Tainacan\Entities\Metadatum) { - $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum); - $label = $item_meta->get_value_as_string(); - } - - if ( empty($label) ) { - $label = $item->get_title(); - } - - if (is_string($link)) { - if ( is_user_logged_in() || - \is_post_status_viewable( $item->get_status() ) && - \is_post_status_viewable($item->get_collection()->get_status()) ) { - $return = ""; - $return.= $label; - $return .= ""; - } else { - $return.= $label; + $display_metas = $this->get_option('display_related_item_metadata '); + + if(!empty($display_metas)) { + $args = !empty($display_metas) ? ['post__in' => $display_metas] : []; + $item_metadata = $item->get_metadata($args); + $metadata_value = []; + foreach ( $item_metadata as $meta_id => $meta ) { + if ( $meta instanceof \Tainacan\Entities\Item_Metadata_Entity && $meta->get_value_as_html() != '' ) { + $as_link = $search_meta_id == $meta_id ? $this->get_item_link($item, $search_meta_id) : false; + $html = $this->get_meta_html($meta); + $metadata_value[] = $html; } + $return = implode("\n", $metadata_value); + } + $return = "
{$return}
"; + } else { + if ( $id && $search_meta_id ) { + $search_meta_id = $this->get_option('search'); + $as_link = $this->get_item_link($item, $search_meta_id); + $return = "
$as_link
\n $return"; } } return $return; } + private function get_item_link($item, $search_meta_id) { + $id = $item->get_id(); + $link = get_permalink( (int) $id ); + $metadatum = \Tainacan\Repositories\Metadata::get_instance()->fetch((int) $search_meta_id); + $value = ''; + if ($metadatum instanceof \Tainacan\Entities\Metadatum) { + $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($item, $metadatum); + $value = $item_meta->get_value_as_string(); + } + if ( empty($value) ) { + $value = $item->get_title(); + } + if (is_string($link)) { + if ( is_user_logged_in() || + \is_post_status_viewable( $item->get_status() ) && + \is_post_status_viewable($item->get_collection()->get_status()) ) { + $return = " $value "; + } else { + $return = "
$value:
"; + } + } + } + + private function get_meta_html(\Tainacan\Entities\Item_Metadata_Entity $meta, $value_link = false) { + $html = ''; + if ($meta instanceof \Tainacan\Entities\Item_Metadata_Entity && !empty($meta->get_value_as_html())) { + $html = '

' . $value_link === false ? $meta->get_value_as_html() : $value_link . "

"; + } + + return $html; + } + /** * Get related Collection object * @return \Tainacan\Entities\Collection|false The Collection object or false From 629b462686b65fd9bd8fdb1d5fedbf6f64552128 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Mon, 26 Jul 2021 11:51:17 -0300 Subject: [PATCH 03/64] fix: return value function `get_item_link` #572 --- .../relationship/class-tainacan-relationship.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php b/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php index 635e70969..1062b19bc 100644 --- a/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php +++ b/src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php @@ -257,9 +257,10 @@ class Relationship extends Metadata_Type { \is_post_status_viewable($item->get_collection()->get_status()) ) { $return = " $value "; } else { - $return = "
$value:
"; + $return = $value; } } + return $return; } private function get_meta_html(\Tainacan\Entities\Item_Metadata_Entity $meta, $value_link = false) { From 67fc22fd3e40d73146d434968edc1a666a106065 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Wed, 28 Jul 2021 17:29:31 -0300 Subject: [PATCH 04/64] Begins implementation of form option to select displayed metadata on relationship value_as_html #572 --- .../relationship/FormRelationship.vue | 69 ++++++++++++++----- .../class-tainacan-relationship.php | 19 +++-- 2 files changed, 65 insertions(+), 23 deletions(-) diff --git a/src/views/admin/components/metadata-types/relationship/FormRelationship.vue b/src/views/admin/components/metadata-types/relationship/FormRelationship.vue index 3dd8cd2c0..fd197bff6 100644 --- a/src/views/admin/components/metadata-types/relationship/FormRelationship.vue +++ b/src/views/admin/components/metadata-types/relationship/FormRelationship.vue @@ -32,6 +32,8 @@