From 57316126bcd5899e1d99f249bb92eb904e1e6481 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 26 Sep 2023 10:21:54 -0300 Subject: [PATCH 01/87] Sets maximum size for search bar in desktop. --- .../blocks/faceted-search/theme-search/scss/_layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/scss/_layout.scss b/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/scss/_layout.scss index fcff907eb..8ab017360 100644 --- a/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/scss/_layout.scss +++ b/src/views/gutenberg-blocks/blocks/faceted-search/theme-search/scss/_layout.scss @@ -151,8 +151,8 @@ } } .search-control .search-control-item .search-area { - min-width: 13.75%; - min-width: 13.75vw; + min-width: calc(min(13.75%, 280px)); + min-width: calc(min(13.75vw, 280px)); } } From 47b53631f1a673a0b413af2a91eca8951ea5c2e6 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 2 Oct 2023 10:49:18 -0300 Subject: [PATCH 02/87] Add filter to set the thumbnail placeholder. #319. --- src/classes/theme-helper/template-tags.php | 10 +++++++++- src/views/admin/js/utilities.js | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/classes/theme-helper/template-tags.php b/src/classes/theme-helper/template-tags.php index e6c00ebeb..24bb34936 100644 --- a/src/classes/theme-helper/template-tags.php +++ b/src/classes/theme-helper/template-tags.php @@ -1019,7 +1019,15 @@ function tainacan_get_the_mime_type_icon($mime_type, $image_size = 'medium') { $icon_file = 'placeholder_square'; } - return $images_path . $icon_file . $image_size . '.png'; + /** + * Filter the image source for the empty thumbnail placeholder. + * + * @param string src The image source for the empty thumbnail placeholder. + * Default is 'placeholder_square'. + * @param string mime_type The document type of the item. + * @param string image_size The size of the image to be loaded. + */ + return apply_filters('tainacan-get-the-mime-type-icon', $images_path . $icon_file . $image_size . '.png', $mime_type, $image_size); } /** diff --git a/src/views/admin/js/utilities.js b/src/views/admin/js/utilities.js index 61c9b6345..fc7b8437d 100644 --- a/src/views/admin/js/utilities.js +++ b/src/views/admin/js/utilities.js @@ -72,7 +72,15 @@ export const ThumbnailHelperFunctions = () => { imageSrc = 'placeholder_square'; } - return this.getEmptyThumbnailPlaceholderBySize(imageSrc, tainacanSize); + /** + * Filter the image source for the empty thumbnail placeholder. + * + * @param string imageSrc The image source for the empty thumbnail placeholder. + * Default is 'placeholder_square'. + * @param string documentType The document type of the item. + * @param string size The size of the image to be loaded. + */ + return wp.hooks.applyFilters('tainacan_get_the_mime_type_icon', this.getEmptyThumbnailPlaceholderBySize(imageSrc, tainacanSize), documentType, tainacanSize); }, getEmptyThumbnailPlaceholderBySize(imageSrc, tainacanSize) { switch(tainacanSize) { From 16434d07199a4da4b1a7db9fbbe0129614860225 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Tue, 3 Oct 2023 09:07:31 -0300 Subject: [PATCH 03/87] fix: remove the sanitize text file name on 404 `template_redirect` --- src/classes/class-tainacan-private-files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/class-tainacan-private-files.php b/src/classes/class-tainacan-private-files.php index 2402e64b6..c97ced581 100644 --- a/src/classes/class-tainacan-private-files.php +++ b/src/classes/class-tainacan-private-files.php @@ -191,7 +191,7 @@ class Private_Files { $upload_dir = wp_get_upload_dir(); $base_upload_url = preg_replace('/^https?:\/\//', '', $upload_dir['baseurl']); - $requested_uri = sanitize_text_field($_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']); + $requested_uri = ($_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']); if ( strpos($requested_uri, $base_upload_url) === false ) { // Not uploads @@ -228,7 +228,7 @@ class Private_Files { if ( !$existing_file && \file_exists( $prefixed_both ) ) { $existing_file = $prefixed_both; } - + echo "-----------> $file
$prefixed_file
$prefixed_collection $prefixed_both: $existing_file"; if ($existing_file) { $item = \Tainacan\Repositories\Items::get_instance()->fetch( (int) $item_id, (int) $collection_id ); From c33270e22e8fecd02818a20746806f1701aad570 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Tue, 3 Oct 2023 09:09:08 -0300 Subject: [PATCH 04/87] fix: add the TAINACAN_INDEX_PDF_CONTENT in public search --- src/classes/class-tainacan-media.php | 12 +++++------- src/classes/class-tainacan-search-engine.php | 8 +++++++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/classes/class-tainacan-media.php b/src/classes/class-tainacan-media.php index 75890920b..d0623f1f3 100644 --- a/src/classes/class-tainacan-media.php +++ b/src/classes/class-tainacan-media.php @@ -7,10 +7,11 @@ namespace Tainacan; class Media { private static $instance = null; - private static $file_handle = null; private static $file_name = null; private $attachment_html_url_base = 'tainacan_attachment_html'; + public static $content_index_meta = 'document_content_index'; + public static function get_instance() { if(!isset(self::$instance)) { self::$instance = new self(); @@ -246,10 +247,8 @@ class Media { return; } - $content_index_meta = 'document_content_index'; - if ($file == null) { - $meta_id = update_post_meta( $item_id, $content_index_meta, null ); + update_post_meta( $item_id, SELF::$content_index_meta, null ); return true; } @@ -274,9 +273,8 @@ class Media { $wp_charset = get_bloginfo('charset'); $content_charset = mb_detect_encoding($content); $content = mb_convert_encoding($content, $wp_charset, $content_charset); - - $meta_id = update_post_meta( $item_id, $content_index_meta, $content ); - } catch(Exception $e) { + update_post_meta( $item_id, SELF::$content_index_meta, $content ); + } catch(\Exception $e) { error_log('Caught exception: ' . $e->getMessage() . "\n"); return false; } diff --git a/src/classes/class-tainacan-search-engine.php b/src/classes/class-tainacan-search-engine.php index 05e8ea7e2..2fcdf86ee 100644 --- a/src/classes/class-tainacan-search-engine.php +++ b/src/classes/class-tainacan-search-engine.php @@ -176,10 +176,16 @@ class Search_Engine { $seperator = ' OR '; } if ( empty($search_meta_query) ) return ''; + + $content_index_meta = ''; + if ( defined('TAINACAN_INDEX_PDF_CONTENT') && true === TAINACAN_INDEX_PDF_CONTENT ) { + $content_index_meta_meta_key = \TAINACAN\Media::$content_index_meta; + $content_index_meta = "OR (m.meta_key='{$content_index_meta_meta_key}')"; + } $join = \is_user_logged_in() ? '' - : " INNER JOIN $wpdb->posts pmeta ON m.meta_key = pmeta.ID AND pmeta.post_status = 'publish'"; + : " INNER JOIN $wpdb->posts pmeta ON (m.meta_key = pmeta.ID AND pmeta.post_status = 'publish') $content_index_meta"; return "EXISTS ( SELECT m.post_id FROM $wpdb->postmeta m $join From cd44dc5bcae814c4f61e3e9112edeae512f8f0e6 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Tue, 3 Oct 2023 10:04:36 -0300 Subject: [PATCH 05/87] fix: get `comment_status` for item --- src/classes/entities/class-tainacan-item.php | 16 ++++++++++------ .../repositories/class-tainacan-items.php | 12 ++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index ede1a2681..0ce9e8ae5 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -307,7 +307,9 @@ class Item extends Entity { * @return string "open"|"closed" */ public function get_comment_status() { - return apply_filters('tainacan-item-comments_open', $this->get_mapped_property('comment_status'), $this->get_id()); + $comment_status = $this->get_mapped_property('comment_status'); + $comment_status_filtered = apply_filters('comments_open', $comment_status == 'open', $this->get_id()) == true ? 'open' : 'closed'; + return $comment_status_filtered; } /** @@ -1183,13 +1185,15 @@ class Item extends Entity { if ( $metadata_section->is_conditional_section() ) { $rules = $metadata_section->get_conditional_section_rules(); - $item_id = $this->get_id(); + if( !empty($rules) ) { + $item_id = $this->get_id(); - foreach ( $rules as $meta_id => $meta_values_conditional ) { + foreach ( $rules as $meta_id => $meta_values_conditional ) { - $meta_values = get_post_meta( $item_id, $meta_id ); - if (!array_intersect($meta_values, $meta_values_conditional)) - return $return; + $meta_values = get_post_meta( $item_id, $meta_id ); + if (!array_intersect($meta_values, $meta_values_conditional)) + return $return; + } } } diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php index 0f18e3aef..9b7d4fa5e 100644 --- a/src/classes/repositories/class-tainacan-items.php +++ b/src/classes/repositories/class-tainacan-items.php @@ -26,7 +26,7 @@ class Items extends Repository { protected function __construct() { parent::__construct(); - add_filter( 'tainacan-item-comments_open', [$this, 'hook_comments_open'], 10, 2); + add_filter( 'comments_open', [$this, 'hook_comments_open'], 10, 2); add_action( 'tainacan-api-item-updated', array( &$this, 'hook_api_updated_item' ), 10, 2 ); add_filter( 'map_meta_cap', array( $this, 'map_meta_cap' ), 10, 4 ); } @@ -582,19 +582,19 @@ class Items extends Repository { /** * Return if comment are open for this item (post_id) and the collection too * - * @param string $open_comment + * @param bool $comments_open * @param integer $post_id Item id - * @return string + * @return bool */ - public function hook_comments_open($open_comment, $post_id) { + public function hook_comments_open($comments_open, $post_id) { $item = self::get_entity_by_post($post_id); if($item != false && $item instanceof Entities\Item) { $collection = $item->get_collection(); - if( $collection != null && $collection->get_allow_comments() !== 'open' ) return 'closed'; + if( $collection != null && $collection->get_allow_comments() !== 'open' ) return false; } - return $open_comment; + return $comments_open; } /** From 5882c6dd752493a5ac4d18a4dfa24bfcc5991808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Nunes=20Medeiros?= Date: Thu, 5 Oct 2023 10:53:58 -0300 Subject: [PATCH 06/87] fix: remove echo re --- src/classes/class-tainacan-private-files.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/class-tainacan-private-files.php b/src/classes/class-tainacan-private-files.php index c97ced581..d7aab700c 100644 --- a/src/classes/class-tainacan-private-files.php +++ b/src/classes/class-tainacan-private-files.php @@ -228,7 +228,7 @@ class Private_Files { if ( !$existing_file && \file_exists( $prefixed_both ) ) { $existing_file = $prefixed_both; } - echo "-----------> $file
$prefixed_file
$prefixed_collection $prefixed_both: $existing_file"; + if ($existing_file) { $item = \Tainacan\Repositories\Items::get_instance()->fetch( (int) $item_id, (int) $collection_id ); From 8c958127d4d75f192ad1df9d6fc13361885d7440 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 9 Oct 2023 15:13:00 -0300 Subject: [PATCH 07/87] Checks if user can edit taxonomy before displaying add new term button. --- ...-tainacan-rest-item-metadata-controller.php | 2 +- .../components/edition/item-edition-form.vue | 5 +++++ .../components/edition/term-edition-form.vue | 12 +++++++++--- .../metadata-types/taxonomy/Taxonomy.vue | 6 +++++- .../admin/js/store/modules/taxonomy/actions.js | 18 ++++++++++++++++-- .../class-tainacan-gutenberg-block.php | 2 +- 6 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php b/src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php index d50e20fe6..0329721a7 100644 --- a/src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php +++ b/src/classes/api/endpoints/class-tainacan-rest-item-metadata-controller.php @@ -132,7 +132,7 @@ class REST_Item_Metadata_Controller extends REST_Controller { public function prepare_item_for_response( $item, $request ) { $item_arr = $item->_toArray(true, true); - if($request['context'] === 'edit'){ + if ($request['context'] === 'edit') { $item_arr['current_user_can_edit'] = $item->can_edit(); $item_arr['current_user_can_delete'] = $item->can_delete(); } diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index 2c027cc0f..21eb9981d 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -1172,6 +1172,11 @@ export default { this.isLoading = false; + if ( wp && wp.hooks && wp.hooks.hasFilter(`tainacan_item_edition_form_submit--redirect`) ) { + window.location = wp.hooks.applyFilters(`tainacan_item_edition_form_submit--redirect`, this.item, this.form.collectionId, tainacan_plugin.admin_url); + return; + } + if (!this.$adminOptions.itemEditionMode && !this.$adminOptions.mobileAppMode) { if (!this.isOnSequenceEdit) { diff --git a/src/views/admin/components/edition/term-edition-form.vue b/src/views/admin/components/edition/term-edition-form.vue index 7bb11f7a4..689d5acb4 100644 --- a/src/views/admin/components/edition/term-edition-form.vue +++ b/src/views/admin/components/edition/term-edition-form.vue @@ -233,7 +233,9 @@ originalForm: Object, taxonomyId: '', isHierarchical: Boolean, - isTermInsertionFlow: false + isTermInsertionFlow: false, + metadatumId: [String, Number], + itemId: [String, Number] }, data() { return { @@ -308,7 +310,9 @@ this.isLoading = true; this.sendChildTerm({ taxonomyId: this.taxonomyId, - term: data + term: data, + metadatumId: this.metadatumId, + itemId: this.itemId }) .then((term) => { this.$emit('onEditionFinished', {term: term, hasChangedParent: this.hasChangedParent, initialParent: this.initialParentId }); @@ -342,7 +346,9 @@ this.isLoading = true; this.updateTerm({ taxonomyId: this.taxonomyId, - term: data + term: data, + metadatumId: this.metadatumId, + itemId: this.itemId }) .then((term) => { this.formErrors = {}; diff --git a/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue b/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue index 42558db5d..fa4a0b4ac 100644 --- a/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue +++ b/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue @@ -59,6 +59,8 @@ custom-class="tainacan-modal" :close-button-aria-label="$i18n.get('close')"> { +export const sendChildTerm = ({ commit }, { taxonomyId, term, itemId, metadatumId }) => { + + if ( itemId != undefined ) + term['item_id'] = itemId; + + if ( metadatumId != undefined ) + term['metadatum_id'] = metadatumId; + return new Promise(( resolve, reject ) => { axios.tainacan.post(`/taxonomy/${taxonomyId}/terms/`, term) .then( res => { @@ -172,7 +179,14 @@ export const sendChildTerm = ({ commit }, { taxonomyId, term }) => { }); }; -export const updateTerm = ({}, { taxonomyId, term }) => { +export const updateTerm = ({}, { taxonomyId, term, itemId, metadatumId }) => { + + if ( itemId != undefined ) + term['item_id'] = itemId; + + if ( metadatumId != undefined ) + term['metadatum_id'] = metadatumId; + return new Promise(( resolve, reject ) => { axios.tainacan.patch(`/taxonomy/${taxonomyId}/terms/${term.id}`, term) .then( res => { diff --git a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php index f84a1ee5b..4fac8f1af 100644 --- a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php +++ b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php @@ -284,7 +284,7 @@ function tainacan_blocks_get_category_icon_script() { wp_enqueue_script( 'tainacan-blocks-register-category-icon', $TAINACAN_BASE_URL . '/assets/js/tainacan_blocks_category_icon.js', - array('wp-blocks'), + array('wp-blocks', 'wp-element'), $TAINACAN_VERSION ); } From 2fb84e6d78e223a1220b86ec87bbe42779be9b3a Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 10 Oct 2023 11:20:36 -0300 Subject: [PATCH 08/87] Removes abandoned filter on item edition form to redriect after submit. --- src/views/admin/components/edition/item-edition-form.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index 21eb9981d..2c027cc0f 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -1172,11 +1172,6 @@ export default { this.isLoading = false; - if ( wp && wp.hooks && wp.hooks.hasFilter(`tainacan_item_edition_form_submit--redirect`) ) { - window.location = wp.hooks.applyFilters(`tainacan_item_edition_form_submit--redirect`, this.item, this.form.collectionId, tainacan_plugin.admin_url); - return; - } - if (!this.$adminOptions.itemEditionMode && !this.$adminOptions.mobileAppMode) { if (!this.isOnSequenceEdit) { From c08ae9a74221401c667e2e5d4a193f0837a5b89b Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 10 Oct 2023 16:52:41 -0300 Subject: [PATCH 09/87] Adds options to hide certain elements of the item edition form and change labels. #811. --- .../entities/class-tainacan-collection.php | 208 ++++++++- .../class-tainacan-collections.php | 123 +++++ .../edition/collection-edition-form.vue | 424 ++++++++++++++---- .../edition/item-attachments-edition-form.vue | 5 +- .../edition/item-document-edition-form.vue | 11 +- .../components/edition/item-edition-form.vue | 37 +- .../edition/item-thumbnail-edition-form.vue | 3 +- .../js/store/modules/collection/actions.js | 3 +- src/views/admin/pages/singles/item-page.vue | 20 +- src/views/tainacan-i18n.php | 6 +- 10 files changed, 704 insertions(+), 136 deletions(-) diff --git a/src/classes/entities/class-tainacan-collection.php b/src/classes/entities/class-tainacan-collection.php index 3ab6d06fd..b4922de52 100644 --- a/src/classes/entities/class-tainacan-collection.php +++ b/src/classes/entities/class-tainacan-collection.php @@ -40,7 +40,17 @@ class Collection extends Entity { $hide_items_thumbnail_on_lists, $submission_anonymous_user, $submission_default_status, - $submission_use_recaptcha; + $submission_use_recaptcha, + $item_enabled_document_types, + $item_document_label, + $item_thumbnail_label, + $item_attachment_label_singular, + $item_attachment_label_plural, + $item_enable_attachments, + $item_enable_metadata_focus_mode, + $item_enable_metadata_required_filter, + $item_enable_metadata_searchbar, + $item_enable_metadata_collapses; /** * {@inheritDoc} @@ -607,14 +617,103 @@ class Collection extends Entity { /** * Get the default metadata section properties. * - * @param [string] $value - * * @return void */ function get_default_metadata_section_properties( ) { return $this->get_mapped_property( 'default_metadata_section_properties' ); } + /** + * Get the enabled document types for this collection. + * + * @return array The enabled document types. + */ + function get_item_enabled_document_types() { + return $this->get_mapped_property('item_enabled_document_types'); + } + + /** + * Get the label for the section in this collection. + * + * @return string The label for the section. + */ + function get_item_document_label() { + return $this->get_mapped_property('item_document_label'); + } + + /** + * Get the label for the thumbnail section in this collection. + * + * @return string The label for the thumbnail section. + */ + function get_item_thumbnail_label() { + return $this->get_mapped_property('item_thumbnail_label'); + } + + /** + * Get the singular label for the attachment section in this collection. + * + * @return string The singular label for the attachment section. + */ + function get_item_attachment_label_singular() { + return $this->get_mapped_property('item_attachment_label_singular'); + } + + /** + * Get the plural label for the attachment section in this collection. + * + * @return string The plural label for the attachment section. + */ + function get_item_attachment_label_plural() { + return $this->get_mapped_property('item_attachment_label_plural'); + } + + /** + * Check if attachments are enabled for this collection. + * + * @return string 'yes' if attachments are enabled, 'no' otherwise. + */ + function get_item_enable_attachments() { + return $this->get_mapped_property('item_enable_attachments'); + } + + /** + * Check if metadata focus mode is enabled for this collection. + * + * @return string 'yes' if metadata focus mode is enabled, 'no' otherwise. + */ + function get_item_enable_metadata_focus_mode() { + return $this->get_mapped_property('item_enable_metadata_focus_mode'); + } + + /** + * Check if metadata required filter is enabled for this collection. + * + * @return string 'yes' if metadata required filter is enabled, 'no' otherwise. + */ + function get_item_enable_metadata_required_filter() { + return $this->get_mapped_property('item_enable_metadata_required_filter'); + } + + /** + * Check if metadata search bar is enabled for this collection. + * + * @return string 'yes' if metadata search bar is enabled, 'no' otherwise. + */ + function get_item_enable_metadata_searchbar() { + return $this->get_mapped_property('item_enable_metadata_searchbar'); + } + + /** + * Check if metadata collapses are enabled for this collection. + * + * @return bool True if metadata collapses are enabled, 'no' otherwise. + */ + function get_item_enable_metadata_collapses() { + return $this->get_mapped_property('item_enable_metadata_collapses'); + } + + // Setters /** * Set the collection name * @@ -750,7 +849,7 @@ class Collection extends Entity { * @return void */ function set_metadata_section_order( $value ) { - if( !empty($value) ) { + if( !empty( $value ) ) { $metadata_order = array( ); foreach($value as $section) { $metadata_order = array_merge($metadata_order, $section['metadata_order']); @@ -888,6 +987,107 @@ class Collection extends Entity { return $this->set_mapped_property( 'default_metadata_section_properties', $value); } + + /** + * Set the enabled document types for this collection. + * + * @param array $value The enabled document types. + * @return void + */ + function set_item_enabled_document_types( $value ) { + $this->set_mapped_property('item_enabled_document_types', $value); + } + + /** + * Set the label for the document section in this collection. + * + * @param string $value The label for the document section. + * @return void + */ + function set_item_document_label( $value ) { + $this->set_mapped_property('item_document_label', $value); + } + + /** + * Set the label for the thumbnail section in this collection. + * + * @param string $value The label for the thumbnail section. + * @return void + */ + function set_item_thumbnail_label( $value ) { + $this->set_mapped_property('item_thumbnail_label', $value); + } + + /** + * Set the singular label for the attachment section in this collection. + * + * @param string $value The singular label for the attachment section. + * @return void + */ + function set_item_attachment_label_singular( $value ) { + $this->set_mapped_property('item_attachment_label_singular', $value); + } + + /** + * Set the plural label for the attachment section in this collection. + * + * @param string $value The plural label for the attachment section. + * @return void + */ + function set_item_attachment_label_plural( $value ) { + $this->set_mapped_property('item_attachment_label_plural', $value); + } + + /** + * Enable or disable attachments for this collection. + * + * @param string $value 'yes' to enable attachments, 'no' to disable. + * @return void + */ + function set_item_enable_attachments( $value ) { + $this->set_mapped_property('item_enable_attachments', $value); + } + + /** + * Enable or disable metadata focus mode for this collection. + * + * @param string $value 'yes' to enable metadata focus mode, 'no' to disable. + * @return void + */ + function set_item_enable_metadata_focus_mode( $value ) { + $this->set_mapped_property('item_enable_metadata_focus_mode', $value); + } + + /** + * Enable or disable metadata required filter for this collection. + * + * @param string $value 'yes' to enable metadata required filter, 'no' to disable. + * @return void + */ + function set_item_enable_metadata_required_filter( $value ) { + $this->set_mapped_property('item_enable_metadata_required_filter', $value); + } + + /** + * Enable or disable metadata search bar for this collection. + * + * @param string $value 'yes' to enable metadata search bar, 'no' to disable. + * @return void + */ + function set_item_enable_metadata_searchbar( $value ) { + $this->set_mapped_property('item_enable_metadata_searchbar', $value); + } + + /** + * Enable or disable metadata collapses for this collection. + * + * @param string $value 'yes' to enable metadata collapses, 'no' to disable. + * @return void + */ + function set_item_enable_metadata_collapses( $value ) { + $this->set_mapped_property('item_enable_metadata_collapses', $value); + } + /** * Validate Collection * diff --git a/src/classes/repositories/class-tainacan-collections.php b/src/classes/repositories/class-tainacan-collections.php index 509e55b6f..7e454d114 100644 --- a/src/classes/repositories/class-tainacan-collections.php +++ b/src/classes/repositories/class-tainacan-collections.php @@ -330,6 +330,129 @@ class Collections extends Repository { ] ] ], + 'item_enabled_document_types' => [ + 'map' => 'meta', + 'title' => __( 'Enabled document types', 'tainacan' ), + 'type' => 'object', + 'description' => __( 'The document types that are available in the item edition form.', 'tainacan' ), + 'items' => [ + 'type' => 'object', + 'properties' => [ + 'enabled' => [ + 'description' => __( 'Whether the document type is enabled or not.', 'tainacan' ), + 'type' => 'string', + 'enum' => [ 'yes', 'no' ], + ], + 'label' => [ + 'description' => __( 'The label that will represent the document type.', 'tainacan' ), + 'type' => 'string', + ], + 'icon' => [ + 'description' => __( 'The slug of the icon that will represent the document type.', 'tainacan' ), + 'type' => 'string', + ], + ] + ], + 'default' => [ + 'attachment' => [ + 'enabled' => 'yes', + 'label' => __( 'File', 'tainacan' ), + 'icon' => 'attachments' + ], + 'url' => [ + 'enabled' => 'yes', + 'label' => __('URL', 'tainacan' ), + 'icon' => 'url' + ], + 'text' => [ + 'enabled' => 'yes', + 'label' => __('Text', 'tainacan' ), + 'icon' => 'text' + ] + ] + ], + 'item_document_label' => [ + 'map' => 'meta', + 'title' => __( 'Main document label', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'The label for the main document section in the item edition form', 'tainacan' ), + 'default' => __( 'Document', 'tainacan' ), + //'validation' => v::stringType(), + ], + 'item_thumbnail_label' => [ + 'map' => 'meta', + 'title' => __( 'Thumbnail label', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'The label for the thumbnail section in the item edition form', 'tainacan' ), + 'default' => __( 'Thumbnail', 'tainacan' ), + //'validation' => v::stringType(), + ], + 'item_attachment_label_singular' => [ + 'map' => 'meta', + 'title' => __( 'Attachments singular label', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'The singular label for the attachments section in the item edition form', 'tainacan' ), + 'default' => __( 'Attachment', 'tainacan' ), + //'validation' => v::stringType(), + ], + 'item_attachment_label_plural' => [ + 'map' => 'meta', + 'title' => __( 'Attachments plural label', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'The plural label for the attachments section in the item edition form', 'tainacan' ), + 'default' => __( 'Attachments', 'tainacan' ), + //'validation' => v::stringType(), + ], + 'item_enable_attachments' => [ + 'map' => 'meta', + 'title' => __( 'Item attachments', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'If enabled, each item can have a set of files attached to it, complementary to the item document.', 'tainacan' ), + 'default' => 'yes', + 'on_error' => __( 'Value should be yes or no', 'tainacan' ), + 'enum' => [ 'yes', 'no' ], + 'validation' => v::stringType()->in( [ 'yes', 'no' ] ), // yes or no + ], + 'item_enable_metadata_focus_mode' => [ + 'map' => 'meta', + 'title' => __( 'Metadata focus mode', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'If enabled, a button can start a special navigation mode, that focus one metadatum per time in the item edition form.', 'tainacan' ), + 'default' => 'yes', + 'on_error' => __( 'Value should be yes or no', 'tainacan' ), + 'enum' => [ 'yes', 'no' ], + 'validation' => v::stringType()->in( [ 'yes', 'no' ] ), // yes or no + ], + 'item_enable_metadata_required_filter' => [ + 'map' => 'meta', + 'title' => __( 'Metadata required filter', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'If enabled, a switch can be toggled to display only required metadata in the item edition form.', 'tainacan' ), + 'default' => 'yes', + 'on_error' => __( 'Value should be yes or no', 'tainacan' ), + 'enum' => [ 'yes', 'no' ], + 'validation' => v::stringType()->in( [ 'yes', 'no' ] ), // yes or no + ], + 'item_enable_metadata_searchbar' => [ + 'map' => 'meta', + 'title' => __( 'Metadata search bar', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'If enabled, a search bar can be used for filtering the list of metadata in the item edition form.', 'tainacan' ), + 'default' => 'yes', + 'on_error' => __( 'Value should be yes or no', 'tainacan' ), + 'enum' => [ 'yes', 'no' ], + 'validation' => v::stringType()->in( [ 'yes', 'no' ] ), // yes or no + ], + 'item_enable_metadata_collapses' => [ + 'map' => 'meta', + 'title' => __( 'Metadata collapses', 'tainacan' ), + 'type' => 'string', + 'description' => __( 'If enabled, each metadata in the item form will be wrapped in a collapsable component.', 'tainacan' ), + 'default' => 'yes', + 'on_error' => __( 'Value should be yes or no', 'tainacan' ), + 'enum' => [ 'yes', 'no' ], + 'validation' => v::stringType()->in( [ 'yes', 'no' ] ), // yes or no + ], ] ); } diff --git a/src/views/admin/components/edition/collection-edition-form.vue b/src/views/admin/components/edition/collection-edition-form.vue index b9871b6e9..81a5fc818 100644 --- a/src/views/admin/components/edition/collection-edition-form.vue +++ b/src/views/admin/components/edition/collection-edition-form.vue @@ -221,116 +221,225 @@ :message="$i18n.getHelperMessage('collections', 'hide_items_thumbnail_on_lists')"/> - - -   - - - + +
+ + + + {{ $i18n.get('label_item_edition_form_options') }} +
- - -   - - - - +
+ v-show="showItemEditionFormOptions" + class="options-columns"> - + +
+ + + + + + + + + +
+ + + +   + + + + + +
+ + + + + + + + + +
+ + + :label="$i18n.getHelperTitle('collections', 'allow_comments')"> +   + + + + +
+ + + +
+ + + + {{ $i18n.get('label_item_submission_options') }} +
+ +
+ +
+ + +   + v-model="form.allows_submission" /> - - - - - -
- - - - - {{ statusOption.name }} - -
- -

- {{ $i18n.get('info_item_submission_draft_status') }} -

- - - - - -   - - -

+ :title="$i18n.getHelperTitle('collections', 'allows_submission')" + :message="$i18n.getHelperMessage('collections', 'allows_submission')"/> + +

+ + + +   + + + + + + + +
+ + + + + {{ statusOption.name }} + +
+ +

+ {{ $i18n.get('info_item_submission_draft_status') }} +

+ + + + + +   + + +

+ + + +

+
@@ -723,7 +832,33 @@ export default { submission_default_status: 'draft', submission_anonymous_user: 'no', hide_items_thumbnail_on_lists: '', - submission_use_recaptcha: 'no' + submission_use_recaptcha: 'no', + item_enabled_document_types: { + attachment: { + enabled: 'yes', + label: this.$i18n.get( 'File', 'tainacan'), + icon: 'attachments' + }, + url: { + enabled: 'yes', + label: this.$i18n.get( 'URL', 'tainacan'), + icon: 'url' + }, + text: { + enabled: 'yes', + label: this.$i18n.get( 'Text', 'tainacan'), + icon: 'text' + } + }, + item_document_label: this.$i18n.get( 'Document', 'tainacan' ), + item_thumbnail_label: this.$i18n.get( 'Thumbnail', 'tainacan' ), + item_attachment_label_singular: this.$i18n.get( 'Attachment', 'tainacan' ), + item_attachment_label_plural: this.$i18n.get( 'Attachments', 'tainacan' ), + item_enable_attachments: 'yes', + item_enable_metadata_focus_mode: 'yes', + item_enable_metadata_required_filter: 'yes', + item_enable_metadata_searchbar: 'yes', + item_enable_metadata_collapses: 'yes' }, thumbnail: {}, cover: {}, @@ -754,7 +889,9 @@ export default { metadataSearchCancel: undefined, isLoadingMetadata: true, sortingMetadata: [], - localDefaultOrderBy: 'date' + localDefaultOrderBy: 'date', + showItemEditionFormOptions: false, + showItemSubmissionOptions: false } }, computed: { @@ -844,6 +981,16 @@ export default { this.form.submission_default_status = this.collection.submission_default_status; this.form.submission_use_recaptcha = this.collection.submission_use_recaptcha; this.form.hide_items_thumbnail_on_lists = this.collection.hide_items_thumbnail_on_lists; + this.form.item_enabled_document_types = this.collection.item_enabled_document_types; + this.form.item_document_label = this.collection.item_document_label; + this.form.item_thumbnail_label = this.collection.item_thumbnail_label; + this.form.item_attachment_label_singular = this.collection.item_attachment_label_singular; + this.form.item_attachment_label_plural = this.collection.item_attachment_label_plural; + this.form.item_enable_attachments = this.collection.item_enable_attachments; + this.form.item_enable_metadata_focus_mode = this.collection.item_enable_metadata_focus_mode; + this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; + this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; + this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; // Generates CoverPage from current cover_page_id info if (this.form.cover_page_id != undefined && this.form.cover_page_id != '') { @@ -954,7 +1101,17 @@ export default { submission_default_status: this.form.submission_default_status, submission_use_recaptcha: this.form.submission_use_recaptcha, allow_comments: this.form.allow_comments, - hide_items_thumbnail_on_lists: this.form.hide_items_thumbnail_on_lists + hide_items_thumbnail_on_lists: this.form.hide_items_thumbnail_on_lists, + item_enabled_document_types: this.form.item_enabled_document_types, + item_document_label: this.form.item_document_label, + item_thumbnail_label: this.form.item_thumbnail_label, + item_attachment_label_singular: this.form.item_attachment_label_singular, + item_attachment_label_plural: this.form.item_attachment_label_plural, + item_enable_attachments: this.form.item_enable_attachments, + item_enable_metadata_focus_mode: this.form.item_enable_metadata_focus_mode, + item_enable_metadata_required_filter: this.form.item_enable_metadata_required_filter, + item_enable_metadata_searchbar: this.form.item_enable_metadata_searchbar, + item_enable_metadata_collapses: this.form.item_enable_metadata_collapses }; this.fillExtraFormData(data); @@ -983,6 +1140,16 @@ export default { this.form.submission_default_status = this.collection.submission_default_status; this.form.submission_use_recaptcha = this.collection.submission_use_recaptcha; this.form.hide_items_thumbnail_on_lists = this.collection.hide_items_thumbnail_on_lists; + this.form.item_enabled_document_types = this.collection.item_enabled_document_types; + this.form.item_document_label = this.collection.item_document_label; + this.form.item_thumbnail_label = this.collection.item_thumbnail_label; + this.form.item_attachment_label_singular = this.collection.item_attachment_label_singular; + this.form.item_attachment_label_plural = this.collection.item_attachment_label_plural; + this.form.item_enable_attachments = this.collection.item_enable_attachments; + this.form.item_enable_metadata_focus_mode = this.collection.item_enable_metadata_focus_mode; + this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; + this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; + this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; this.isLoading = false; this.formErrorMessage = ''; @@ -1043,6 +1210,16 @@ export default { this.form.submission_default_status = this.collection.submission_default_status; this.form.submission_use_recaptcha = this.collection.submission_use_recaptcha; this.form.hide_items_thumbnail_on_lists = this.collection.hide_items_thumbnail_on_lists; + this.form.item_enabled_document_types = this.collection.item_enabled_document_types; + this.form.item_document_label = this.collection.item_document_label; + this.form.item_thumbnail_label = this.collection.item_thumbnail_label; + this.form.item_attachment_label_singular = this.collection.item_attachment_label_singular; + this.form.item_attachment_label_plural = this.collection.item_attachment_label_plural; + this.form.item_enable_attachments = this.collection.item_enable_attachments; + this.form.item_enable_metadata_focus_mode = this.collection.item_enable_metadata_focus_mode; + this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; + this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; + this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; // Pre-fill status with publish to incentivate it this.form.status = 'publish'; @@ -1327,6 +1504,55 @@ export default { color: var(--tainacan-white) !important; } } + + .collection-form-section { + margin: 1.5em 0 0.5em -0.5em; + position: relative; + cursor: pointer; + + .icon { + background: var(--tainacan-background-color); + z-index: 1; + position: relative; + } + strong { + background: var(--tainacan-background-color); + color: var(--tainacan-gray4); + font-size: 0.875em; + z-index: 1; + position: relative; + padding-right: 12px; + } + hr { + position: absolute; + top: -0.75em; + width: calc(100% - 42px); + height: 1px; + background-color: var(--tainacan-gray2); + margin-left: 42px; + } + } + + .options-columns { + margin-left: 0.25rem; + padding-left: 1.25em; + padding-right: 0.25em; + padding-bottom: 1.25em;border-left: 1px solid var(--tainacan-gray2); + + &>div:not(.field) { + -moz-column-count: 2; + -moz-column-gap: 0; + -moz-column-rule: 1px solid var(--tainacan-gray1); + -webkit-column-count: 2; + -webkit-column-gap: 0; + -webkit-column-rule: 1px solid var(--tainacan-gray1); + column-count: 2; + column-gap: 4em; + column-rule: 1px solid var(--tainacan-gray1); + margin-bottom: 1.125rem; + } + } + .header-field { padding-top: 1px; @@ -1472,7 +1698,7 @@ export default { } .item-submission-options { padding-left: 1em; - padding-top: 1.25em; + padding-top: 1.0em; margin-top: -1.5em; border-left: 1px solid var(--tainacan-gray2); } diff --git a/src/views/admin/components/edition/item-attachments-edition-form.vue b/src/views/admin/components/edition/item-attachments-edition-form.vue index ee5773fc5..487d93aeb 100644 --- a/src/views/admin/components/edition/item-attachments-edition-form.vue +++ b/src/views/admin/components/edition/item-attachments-edition-form.vue @@ -8,7 +8,7 @@ - {{ $i18n.get('label_attachments') }}  + {{ collection && collection.item_attachment_label_plural ? collection.item_attachment_label_plural : $i18n.get('label_attachments') }}  - {{ $i18n.get('label_add_or_update_attachments') }} + {{ $i18n.getWithVariables('label_add_or_update_%s', [ collection && collection.item_attachment_label_plural ? collection.item_attachment_label_plural : $i18n.get('label_attachments') ]) }}
- {{ form.document != undefined && form.document != null && form.document != '' ? $i18n.get('label_document') : $i18n.get('label_document_empty') }} + {{ collection && collection.item_document_label ? collection.item_document_label : ( (form.document != undefined && form.document != null && form.document != '') ? $i18n.get('label_document') : $i18n.get('label_document_empty') ) }} -
  • +

  • {{ $i18n.get('label_file') }}

    • -
  • +

  • {{ $i18n.get('label_text') }}

    • -
  • +
    • @@ -140,12 +134,6 @@ :filters-as-modal="filtersAsModal" :is-mobile-screen="isMobileScreen" /> -
    @@ -194,12 +182,6 @@ :filters-as-modal="filtersAsModal" :is-mobile-screen="isMobileScreen" /> -
    @@ -244,12 +226,6 @@ :filters-as-modal="filtersAsModal" :is-mobile-screen="isMobileScreen" /> -
    @@ -271,8 +247,11 @@

    @@ -281,6 +260,7 @@

    {{ $i18n.get('info_there_is_no_filter' ) }}

    +

    {{ $i18n.get('info_collection_filter_on_repository_level') }}

    { // Then we add collection level filters collections.forEach(collection => { promises.push( - axios.tainacan.get('/collection/' + collection.id + '/filters/?include_control_metadata_types=true&nopaging=1&include_disabled=false&metaquery[0][key]=collection_id&metaquery[0][value]=default&metaquery[0][compare]=!=') + axios.tainacan.get('/collection/' + collection.id + '/filters/?include_control_metadata_types=true&nopaging=1&include_disabled=false&metaquery[0][key]=collection_id&metaquery[0][value]=default&metaquery[0][compare]=!=&metaquery[1][key]=display_in_repository_level_lists&metaquery[1][value]=no&metaquery[1][compare]=!=') .then((resp) => { return { filters: resp.data, collectionId: collection.id } }) .catch((error) => { reject(error); @@ -201,8 +201,10 @@ export const fetchRepositoryCollectionFilters = ({ dispatch, commit } ) => { .then((results) => { let futureRepositoryCollectionFilters = {}; - for (let resp of results) - futureRepositoryCollectionFilters[resp.collectionId != 'default' ? resp.collectionId : 'repository-filters'] = resp.filters; + for (let resp of results) { + if (resp.filters.length > 0) + futureRepositoryCollectionFilters[resp.collectionId != 'default' ? resp.collectionId : 'repository-filters'] = resp.filters; + } commit('setRepositoryCollectionFilters', futureRepositoryCollectionFilters); @@ -251,7 +253,7 @@ export const fetchTaxonomyFilters = ({ dispatch, commit }, { taxonomyId, collect const collectionsToSearch = collectionsIds.length ? collectionsIds : taxonomy.collections_ids collectionsToSearch.forEach(collectionId => { promises.push( - axios.tainacan.get('/collection/' + collectionId + '/filters/?include_control_metadata_types=true&nopaging=1&include_disabled=false&metaquery[0][key]=collection_id&metaquery[0][value]=default&metaquery[0][compare]=!=') + axios.tainacan.get('/collection/' + collectionId + '/filters/?include_control_metadata_types=true&nopaging=1&include_disabled=false&metaquery[0][key]=collection_id&metaquery[0][value]=default&metaquery[0][compare]=!=&metaquery[1][key]=display_in_repository_level_lists&metaquery[1][value]=no&metaquery[1][compare]=!=') .then((resp) => { return { filters: resp.data, collectionId: collectionId } }) .catch((error) => { reject(error); @@ -268,7 +270,8 @@ export const fetchTaxonomyFilters = ({ dispatch, commit }, { taxonomyId, collect let taxonomyFilters = resp.filters.filter((filter) => { return filter.metadatum.metadata_type_object.options.taxonomy_id != taxonomyId }); - futureTaxonomyFilters[resp.collectionId != 'default' ? resp.collectionId : 'repository-filters'] = taxonomyFilters; + if (taxonomyFilters.length > 0) + futureTaxonomyFilters[resp.collectionId != 'default' ? resp.collectionId : 'repository-filters'] = taxonomyFilters; } commit('setTaxonomyFilters', futureTaxonomyFilters); diff --git a/src/views/tainacan-i18n.php b/src/views/tainacan-i18n.php index 3a0dab5fd..f66b5d0ff 100644 --- a/src/views/tainacan-i18n.php +++ b/src/views/tainacan-i18n.php @@ -906,6 +906,7 @@ return apply_filters( 'tainacan-i18n', [ 'info_there_is_no_metadatum' => __( 'There is no metadata here yet.', 'tainacan' ), 'info_there_is_no_metadata_section' => __( 'There is no metadata section here yet.', 'tainacan' ), 'info_there_is_no_filter' => __( 'There is no filter here yet.', 'tainacan' ), + 'info_collection_filter_on_repository_level' => __( 'If there are filters set in the collections, you can also set them to be displayed at repository level.', 'tainacan' ), 'info_changes' => __( 'Changes', 'tainacan' ), 'info_possible_external_sources' => __( 'Possible external sources: CSV, Instagram, YouTube, etc.', 'tainacan' ), 'info_help_term_name' => __( 'The term name', 'tainacan' ), From 7ac67a4542d19084d44e158ca92836198312e9b9 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Sun, 12 Nov 2023 11:14:28 -0300 Subject: [PATCH 41/87] refactoring: improvements efficiency of the `register_taxonomies_for_all_collections` --- .../repositories/class-tainacan-items.php | 7 ++-- .../class-tainacan-taxonomies.php | 38 +++++++++++++++---- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/classes/repositories/class-tainacan-items.php b/src/classes/repositories/class-tainacan-items.php index 6ada41c66..d84c10ac7 100644 --- a/src/classes/repositories/class-tainacan-items.php +++ b/src/classes/repositories/class-tainacan-items.php @@ -189,11 +189,12 @@ class Items extends Repository { * @see \Tainacan\Repositories\Repository::register_post_type() */ public function register_post_type() { - + $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance(); $Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance(); - $collections = $Tainacan_Collections->fetch( [], 'OBJECT' ); + // TODO: This can be a problem in large repositories. + $collections = $Tainacan_Collections->fetch( ['nopaging' => true], 'OBJECT' ); $taxonomies = $Tainacan_Taxonomies->fetch( [ 'status' => [ 'auto-draft', @@ -220,7 +221,7 @@ class Items extends Repository { } // register taxonomies to collections considering metadata inheritance - $Tainacan_Taxonomies->register_taxonomies_for_all_collections(); + $Tainacan_Taxonomies->register_taxonomies_for_all_collections($collections); } diff --git a/src/classes/repositories/class-tainacan-taxonomies.php b/src/classes/repositories/class-tainacan-taxonomies.php index 8dbe443cc..63efa1173 100644 --- a/src/classes/repositories/class-tainacan-taxonomies.php +++ b/src/classes/repositories/class-tainacan-taxonomies.php @@ -336,21 +336,43 @@ class Taxonomies extends Repository { } - public function register_taxonomies_for_all_collections() { + public function register_taxonomies_for_all_collections($all_collections = null) { + global $wpdb; $Tainacan_Collections = \Tainacan\Repositories\Collections::get_instance(); // TODO: This can be a problem in large repositories. - $collections = $Tainacan_Collections->fetch( ['nopaging' => true], 'OBJECT' ); - + $collections = $all_collections != null ? $all_collections : $Tainacan_Collections->fetch( ['nopaging' => true], 'OBJECT' ); if ( ! is_array( $collections ) ) { return; } - // register taxonomies to other collections considering metadata inheritance - foreach ( $collections as $collection ) { - $taxonomies = $this->fetch_by_collection($collection, ['nopaging' => true]); - foreach ( $taxonomies as $taxonomy ) { - register_taxonomy_for_object_type( $taxonomy->get_db_identifier(), $collection->get_db_identifier() ); + $query = $wpdb->prepare(" + SELECT + meta.post_id as meta_id, meta.meta_value as tax_id, col.meta_value as collection_id + FROM + $wpdb->postmeta meta INNER JOIN ( + SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key='collection_id' + ) as col ON meta.post_id = col.post_id + WHERE + meta.meta_key='_option_taxonomy_id' + AND meta.post_id IN (SELECT post_id FROM $wpdb->postmeta WHERE meta_key='metadata_type' and meta_value='Tainacan\\\Metadata_Types\\\Taxonomy'); + ", []); + + $taxonomies_res = $wpdb->get_results( $query ); + + foreach ($taxonomies_res as $tax_res) { + // Aqui você pode acessar os valores de cada coluna + $tax_id = $tax_res->tax_id; + $collection_id = $tax_res->collection_id; + + $tax_db_identifier_by_id = $this->get_db_identifier_by_id($tax_id); + if ($collection_id != 'default' ) { + $collection_slug = Entities\Collection::$db_identifier_prefix . $collection_id . Entities\Collection::$db_identifier_sufix; + register_taxonomy_for_object_type($tax_db_identifier_by_id ,$collection_slug); + } else { + foreach ( $collections as $collection ) { + register_taxonomy_for_object_type($tax_db_identifier_by_id, $collection->get_db_identifier()); + } } } } From 1b462d8173e0d4eb55399d5ffb7eabbc54f985b9 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Sun, 12 Nov 2023 14:51:06 -0300 Subject: [PATCH 42/87] fix: order of update taxonomy metadatum --- src/classes/repositories/class-tainacan-metadata.php | 2 +- src/classes/repositories/class-tainacan-taxonomies.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/classes/repositories/class-tainacan-metadata.php b/src/classes/repositories/class-tainacan-metadata.php index a4c65c719..1b29f2d85 100644 --- a/src/classes/repositories/class-tainacan-metadata.php +++ b/src/classes/repositories/class-tainacan-metadata.php @@ -737,8 +737,8 @@ class Metadata extends Repository { public function insert( $metadatum ) { $this->pre_update_taxonomy_metadatum( $metadatum ); $new_metadatum = parent::insert( $metadatum ); - $this->update_taxonomy_metadatum( $new_metadatum ); $this->update_metadata_type_index( $new_metadatum ); + $this->update_taxonomy_metadatum( $new_metadatum ); return $new_metadatum; } diff --git a/src/classes/repositories/class-tainacan-taxonomies.php b/src/classes/repositories/class-tainacan-taxonomies.php index 63efa1173..d5c5442fd 100644 --- a/src/classes/repositories/class-tainacan-taxonomies.php +++ b/src/classes/repositories/class-tainacan-taxonomies.php @@ -346,7 +346,7 @@ class Taxonomies extends Repository { return; } - $query = $wpdb->prepare(" + $taxonomies_res = $wpdb->get_results(" SELECT meta.post_id as meta_id, meta.meta_value as tax_id, col.meta_value as collection_id FROM @@ -356,9 +356,7 @@ class Taxonomies extends Repository { WHERE meta.meta_key='_option_taxonomy_id' AND meta.post_id IN (SELECT post_id FROM $wpdb->postmeta WHERE meta_key='metadata_type' and meta_value='Tainacan\\\Metadata_Types\\\Taxonomy'); - ", []); - - $taxonomies_res = $wpdb->get_results( $query ); + "); foreach ($taxonomies_res as $tax_res) { // Aqui você pode acessar os valores de cada coluna From 6d5f533c01ac0e921cf1d748eef4cf1cc5ec1961 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Sun, 12 Nov 2023 14:51:40 -0300 Subject: [PATCH 43/87] version: update phpunit-polyfills version --- composer.json | 2 +- composer.lock | 1325 ++++++++++++++++++++++++------------------------- 2 files changed, 643 insertions(+), 684 deletions(-) diff --git a/composer.json b/composer.json index 790a1c48e..64ecae3e2 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ }, "require-dev": { "squizlabs/php_codesniffer": "^2.2 || ^3.0.2", - "yoast/phpunit-polyfills": "^1.0.1" + "yoast/phpunit-polyfills": "^1.1.0" }, "prefer-stable" : true, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index 5dac8f50d..fd3475f15 100644 --- a/composer.lock +++ b/composer.lock @@ -4,30 +4,31 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9a50d78655731555071e552968158d04", + "content-hash": "b4a2e92ef156f721adcd7d96bad410a8", "packages": [ { "name": "kornrunner/blurhash", - "version": "v1.1.0", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/kornrunner/php-blurhash.git", - "reference": "5a09325353229c108c8d2ff129ec08b447753f9b" + "reference": "bc8a4596cb0a49874f0158696a382ab3933fefe4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kornrunner/php-blurhash/zipball/5a09325353229c108c8d2ff129ec08b447753f9b", - "reference": "5a09325353229c108c8d2ff129ec08b447753f9b", + "url": "https://api.github.com/repos/kornrunner/php-blurhash/zipball/bc8a4596cb0a49874f0158696a382ab3933fefe4", + "reference": "bc8a4596cb0a49874f0158696a382ab3933fefe4", "shasum": "" }, "require": { - "php": "^7.2" + "php": "^7.3|^8.0" }, "require-dev": { - "ocramius/package-versions": "<1.5", + "ext-gd": "*", + "ocramius/package-versions": "^1.4|^2.0", "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8.2", - "vimeo/psalm": "^3.4" + "phpunit/phpunit": "^9", + "vimeo/psalm": "^4.3" }, "type": "library", "autoload": { @@ -51,7 +52,7 @@ "issues": "https://github.com/kornrunner/php-blurhash/issues", "source": "https://github.com/kornrunner/php-blurhash.git" }, - "time": "2020-04-15T22:06:04+00:00" + "time": "2022-07-13T19:38:39+00:00" }, { "name": "phpcompatibility/php-compatibility", @@ -184,19 +185,20 @@ }, { "name": "smalot/pdfparser", - "version": "v2.0.1", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/smalot/pdfparser.git", - "reference": "768d1d6859bdf9ef0da44724ac84079f920b7599" + "reference": "eef0263bbaec86d30801d3551ac83f4e1015d4c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smalot/pdfparser/zipball/768d1d6859bdf9ef0da44724ac84079f920b7599", - "reference": "768d1d6859bdf9ef0da44724ac84079f920b7599", + "url": "https://api.github.com/repos/smalot/pdfparser/zipball/eef0263bbaec86d30801d3551ac83f4e1015d4c3", + "reference": "eef0263bbaec86d30801d3551ac83f4e1015d4c3", "shasum": "" }, "require": { + "ext-iconv": "*", "ext-zlib": "*", "php": ">=7.1", "symfony/polyfill-mbstring": "^1.18" @@ -228,22 +230,22 @@ ], "support": { "issues": "https://github.com/smalot/pdfparser/issues", - "source": "https://github.com/smalot/pdfparser/tree/v2.0.1" + "source": "https://github.com/smalot/pdfparser/tree/v2.7.0" }, - "time": "2021-11-22T11:57:24+00:00" + "time": "2023-08-10T06:11:26+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.6.1", + "version": "3.7.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e" + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/f268ca40d54617c6e06757f83f699775c9b3ff2e", - "reference": "f268ca40d54617c6e06757f83f699775c9b3ff2e", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", + "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", "shasum": "" }, "require": { @@ -279,14 +281,15 @@ "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "standards", + "static analysis" ], "support": { "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2021-10-11T04:00:11+00:00" + "time": "2023-02-22T23:07:41+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -319,12 +322,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -372,29 +375,30 @@ "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -421,7 +425,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" }, "funding": [ { @@ -437,41 +441,42 @@ "type": "tidelift" } ], - "time": "2020-11-10T18:47:58+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.10.2", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -487,7 +492,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" }, "funding": [ { @@ -495,7 +500,63 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.17.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + }, + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -559,16 +620,16 @@ }, { "name": "phar-io/version", - "version": "3.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "bae7c545bef187884426f042434e561ab1ddb182" + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182", - "reference": "bae7c545bef187884426f042434e561ab1ddb182", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { @@ -604,273 +665,50 @@ "description": "Library for handling version information and constraints", "support": { "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.1.0" + "source": "https://github.com/phar-io/version/tree/3.2.1" }, - "time": "2021-02-23T14:00:09+00:00" - }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.5.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae", - "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1" - }, - "time": "2021-10-02T14:08:47+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "1.14.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.14.0" - }, - "time": "2021-09-10T09:02:12+00:00" + "time": "2022-02-21T01:04:05+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "7.0.15", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "819f92bba8b001d4363065928088de22f25a3a48" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", - "reference": "819f92bba8b001d4363065928088de22f25a3a48", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.3 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" + "nikic/php-parser": "^4.15", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^8.2.2" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.7.2" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "7.0-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -898,7 +736,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" }, "funding": [ { @@ -906,32 +745,32 @@ "type": "github" } ], - "time": "2021-07-26T12:20:09+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -958,7 +797,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" }, "funding": [ { @@ -966,26 +805,97 @@ "type": "github" } ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2021-12-02T12:48:52+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1009,34 +919,40 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" }, - "time": "2015-06-21T13:50:34+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" }, { "name": "phpunit/php-timer", - "version": "2.1.3", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1062,7 +978,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" }, "funding": [ { @@ -1070,116 +986,54 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "3.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2021-07-26T12:15:06+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "8.5.21", + "version": "9.6.13", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984" + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", - "reference": "50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", + "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", + "doctrine/instantiator": "^1.3.1 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", + "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" - }, - "require-dev": { - "ext-pdo": "*" + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "bin": [ "phpunit" @@ -1187,10 +1041,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "8.5-dev" + "dev-master": "9.6-dev" } }, "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], "classmap": [ "src/" ] @@ -1215,44 +1072,161 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.21" + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" }, "funding": [ { - "url": "https://phpunit.de/donate.html", + "url": "https://phpunit.de/sponsors.html", "type": "custom" }, { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2021-09-25T07:37:20+00:00" + "time": "2023-09-19T05:39:22+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "name": "sebastian/cli-parser", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" } }, "autoload": { @@ -1274,7 +1248,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" }, "funding": [ { @@ -1282,34 +1256,34 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1348,7 +1322,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -1356,33 +1330,90 @@ "type": "github" } ], - "time": "2020-11-30T08:04:30+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { - "name": "sebastian/diff", - "version": "3.0.3", + "name": "sebastian/complexity", + "version": "2.0.2", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", "shasum": "" }, "require": { - "php": ">=7.1" + "nikic/php-parser": "^4.7", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:52:27+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" } }, "autoload": { @@ -1414,7 +1445,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" }, "funding": [ { @@ -1422,27 +1453,27 @@ "type": "github" } ], - "time": "2020-11-30T07:59:04+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "5.1.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -1450,7 +1481,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -1477,7 +1508,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" }, "funding": [ { @@ -1485,34 +1516,34 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2023-02-03T06:03:51+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", - "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1547,14 +1578,14 @@ } ], "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ "export", "exporter" ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -1562,30 +1593,30 @@ "type": "github" } ], - "time": "2021-11-11T13:51:24+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", - "version": "3.0.1", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { - "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^8.0" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -1593,7 +1624,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1618,7 +1649,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" }, "funding": [ { @@ -1626,34 +1657,91 @@ "type": "github" } ], - "time": "2020-11-30T07:43:24+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { - "name": "sebastian/object-enumerator", - "version": "3.0.4", + "name": "sebastian/lines-of-code", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "nikic/php-parser": "^4.6", + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:42:11+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" } }, "autoload": { @@ -1675,7 +1763,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" }, "funding": [ { @@ -1683,32 +1771,32 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1730,7 +1818,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" }, "funding": [ { @@ -1738,32 +1826,32 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1790,10 +1878,10 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" }, "funding": [ { @@ -1801,29 +1889,32 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2023-02-03T06:07:39+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1845,7 +1936,7 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" }, "funding": [ { @@ -1853,32 +1944,32 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2020-09-28T06:45:17+00:00" }, { "name": "sebastian/type", - "version": "1.1.4", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", "shasum": "" }, "require": { - "php": ">=7.2" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.2" + "phpunit/phpunit": "^9.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -1901,7 +1992,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" }, "funding": [ { @@ -1909,29 +2000,29 @@ "type": "github" } ], - "time": "2020-11-30T07:25:11+00:00" + "time": "2023-02-03T06:13:03+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1954,88 +2045,15 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" - }, - "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "symfony/polyfill-ctype", - "version": "v1.23.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-ctype": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.23-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for ctype functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" - ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", + "url": "https://github.com/sebastianbergmann", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2020-09-28T06:39:44+00:00" }, { "name": "theseer/tokenizer", @@ -2087,76 +2105,18 @@ ], "time": "2021-07-28T10:34:58+00:00" }, - { - "name": "webmozart/assert", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25", - "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "symfony/polyfill-ctype": "^1.8" - }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.10-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.10.0" - }, - "time": "2021-03-09T10:59:23+00:00" - }, { "name": "yoast/phpunit-polyfills", - "version": "1.0.3", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "5ea3536428944955f969bc764bbe09738e151ada" + "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/5ea3536428944955f969bc764bbe09738e151ada", - "reference": "5ea3536428944955f969bc764bbe09738e151ada", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/224e4a1329c03d8bad520e3fc4ec980034a4b212", + "reference": "224e4a1329c03d8bad520e3fc4ec980034a4b212", "shasum": "" }, "require": { @@ -2164,13 +2124,12 @@ "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, "require-dev": { - "yoast/yoastcs": "^2.2.0" + "yoast/yoastcs": "^2.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.x-dev", - "dev-develop": "1.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -2204,7 +2163,7 @@ "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2021-11-23T01:37:03+00:00" + "time": "2023-08-19T14:25:08+00:00" } ], "aliases": [], @@ -2214,5 +2173,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From dc6f0fd9358510afe0c7c9be4e309b518c900512 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 13 Nov 2023 16:05:15 -0300 Subject: [PATCH 44/87] Improves loading state identification on repository level filters. #824. --- .../components/search/filters-items-list.vue | 39 +++--- .../admin/js/store/modules/filter/actions.js | 113 +++++++++--------- src/views/class-tainacan-admin.php | 2 +- 3 files changed, 82 insertions(+), 72 deletions(-) diff --git a/src/views/admin/components/search/filters-items-list.vue b/src/views/admin/components/search/filters-items-list.vue index 70ac214d9..c34f4c669 100644 --- a/src/views/admin/components/search/filters-items-list.vue +++ b/src/views/admin/components/search/filters-items-list.vue @@ -2,7 +2,6 @@
    @@ -944,7 +950,8 @@ export default { item_enable_metadata_focus_mode: 'yes', item_enable_metadata_required_filter: 'yes', item_enable_metadata_searchbar: 'yes', - item_enable_metadata_collapses: 'yes' + item_enable_metadata_collapses: 'yes', + item_enable_metadata_enumeration: 'yes', }, thumbnail: {}, cover: {}, @@ -1078,6 +1085,7 @@ export default { this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; + this.form.item_enable_metadata_enumeration = this.collection.item_enable_metadata_enumeration; // Generates CoverPage from current cover_page_id info if (this.form.cover_page_id != undefined && this.form.cover_page_id != '') { @@ -1198,7 +1206,8 @@ export default { item_enable_metadata_focus_mode: this.form.item_enable_metadata_focus_mode, item_enable_metadata_required_filter: this.form.item_enable_metadata_required_filter, item_enable_metadata_searchbar: this.form.item_enable_metadata_searchbar, - item_enable_metadata_collapses: this.form.item_enable_metadata_collapses + item_enable_metadata_collapses: this.form.item_enable_metadata_collapses, + item_enable_metadata_enumeration: this.form.item_enable_metadata_enumeration, }; this.fillExtraFormData(data); @@ -1237,6 +1246,7 @@ export default { this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; + this.form.item_enable_metadata_enumeration = this.collection.item_enable_metadata_enumeration; this.isLoading = false; this.formErrorMessage = ''; @@ -1307,6 +1317,7 @@ export default { this.form.item_enable_metadata_required_filter = this.collection.item_enable_metadata_required_filter; this.form.item_enable_metadata_searchbar = this.collection.item_enable_metadata_searchbar; this.form.item_enable_metadata_collapses = this.collection.item_enable_metadata_collapses; + this.form.item_enable_metadata_enumeration = this.collection.item_enable_metadata_enumeration; // Pre-fill status with publish to incentivate it this.form.status = 'publish'; @@ -1780,6 +1791,8 @@ export default { .options-checkboxes { display: flex; margin: 5px 0; + flex-wrap: wrap; + gap: 0.5rem; justify-content: space-between; /deep/ .b-checkbox.checkbox { width: auto diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index 274bc3092..08705dfb1 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -398,6 +398,11 @@ + + {{ Number(sectionIndex) + 1 }}. + {{ metadataSection.name }}  + :is-metadata-navigation="isMetadataNavigation" + :enumerate-metadatum="enumerateMetadatum" /> @@ -169,7 +175,8 @@ metadataNameFilterString: '', isMobileScreen: false, isFocused: false, - isMetadataNavigation: false + isMetadataNavigation: false, + enumerateMetadatum: [String, Boolean] }, data(){ return { diff --git a/src/views/admin/js/store/modules/collection/actions.js b/src/views/admin/js/store/modules/collection/actions.js index 27f010bff..1f09feb36 100644 --- a/src/views/admin/js/store/modules/collection/actions.js +++ b/src/views/admin/js/store/modules/collection/actions.js @@ -239,7 +239,7 @@ export const fetchCollection = ({ commit, }, id) => { export const fetchCollectionBasics = ({ commit }, {collectionId, isContextEdit }) => { return new Promise((resolve, reject) => { - let endpoint = '/collections/' + collectionId + '?fetch_only=name,url,status,allow_comments,hide_items_thumbnail_on_lists,item_enabled_document_types,item_document_label,item_thumbnail_label,item_enable_thumbnail,item_attachment_label,item_enable_attachments,item_enable_metadata_focus_mode,item_enable_metadata_required_filter,item_enable_metadata_searchbar,item_enable_metadata_collapses'; + let endpoint = '/collections/' + collectionId + '?fetch_only=name,url,status,allow_comments,hide_items_thumbnail_on_lists,item_enabled_document_types,item_document_label,item_thumbnail_label,item_enable_thumbnail,item_attachment_label,item_enable_attachments,item_enable_metadata_focus_mode,item_enable_metadata_required_filter,item_enable_metadata_searchbar,item_enable_metadata_collapses,item_enable_metadata_enumeration'; if (isContextEdit) endpoint += '&context=edit'; From c01b9e336c4864f761dd4fb0fae3bafad1b0cc47 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 16 Nov 2023 19:07:50 -0300 Subject: [PATCH 53/87] Adds enumeration to item submission block. Wraps enumerations in classes. #827. --- .../admin/components/edition/item-edition-form.vue | 3 ++- .../components/metadata-types/compound/Compound.vue | 5 +++-- .../metadata-types/tainacan-form-item.vue | 3 ++- .../components/metadata-types/taxonomy/Taxonomy.vue | 2 +- .../admin/js/store/modules/collection/actions.js | 2 +- .../item-submission/item-submission-form.vue | 13 ++++++++++++- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index 08705dfb1..e50d3ddd4 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -400,7 +400,8 @@ + style="opacity: 0.65;" + class="metadata-section-enumeration"> {{ Number(sectionIndex) + 1 }}. {{ metadataSection.name }}  diff --git a/src/views/admin/components/metadata-types/compound/Compound.vue b/src/views/admin/components/metadata-types/compound/Compound.vue index d217bb6ac..022b20545 100644 --- a/src/views/admin/components/metadata-types/compound/Compound.vue +++ b/src/views/admin/components/metadata-types/compound/Compound.vue @@ -32,7 +32,8 @@