From 793daf6760722acdfcdbef4c2a1f846633fc437d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Dec 2020 17:43:06 +0000 Subject: [PATCH 01/34] Bump ini from 1.3.5 to 1.3.7 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] --- package-lock.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 495847f64..ec848ebad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4746,12 +4746,6 @@ "dev": true, "optional": true }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, @@ -5780,9 +5774,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz", + "integrity": "sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ==", "dev": true }, "inquirer": { From 43f6347e88ee7793bbcbf31c56a8ebb7cc27f9d8 Mon Sep 17 00:00:00 2001 From: Aron Ambrosiani Date: Mon, 21 Dec 2020 21:28:03 +0100 Subject: [PATCH 02/34] adding support for displaying metadata slug in css --- src/classes/entities/class-tainacan-item.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index d860626e6..3f79810c1 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -530,7 +530,8 @@ class Item extends Entity { 'exclude_description' => false, 'exclude_core' => false, 'hide_empty' => true, - 'before' => '
', + 'display_slug_as_class' => false, + 'before' => '
', 'after' => '
', 'before_title' => '

', 'after_title' => '

', @@ -570,6 +571,12 @@ class Item extends Entity { $item_meta = new \Tainacan\Entities\Item_Metadata_Entity($this, $metadatum_object); if ($item_meta->has_value() || !$args['hide_empty']) { $before = str_replace('$type', $mto->get_slug(), $args['before']); + if ($args['display_slug_as_class']) { + $before = str_replace('$id', 'metadata-slug-'.$item_meta->get_metadatum()->get_slug() , $before); + } + else { + $before = str_replace(' $id', '', $before); + } $return .= $before; $return .= $args['before_title'] . $metadatum_object->get_name() . $args['after_title']; $return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value']; @@ -635,6 +642,12 @@ class Item extends Entity { if ($item_meta->has_value() || !$args['hide_empty']) { $before = str_replace('$type', $fto->get_slug(), $args['before']); + if ($args['display_slug_as_class']) { + $before = str_replace('$id', 'metadata-slug-'.$item_meta->get_metadatum()->get_slug() , $before); + } + else { + $before = str_replace(' $id', '', $before); + } $return .= $before; $return .= $args['before_title'] . $item_meta->get_metadatum()->get_name() . $args['after_title']; $return .= $args['before_value'] . $item_meta->get_value_as_html() . $args['after_value']; From 1abb7901301ca0d6c41d1dbe78dfdd1b1db47cfd Mon Sep 17 00:00:00 2001 From: Aron Ambrosiani Date: Tue, 22 Dec 2020 15:52:53 +0100 Subject: [PATCH 03/34] Update class-tainacan-item.php + description of the new parameter --- src/classes/entities/class-tainacan-item.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/classes/entities/class-tainacan-item.php b/src/classes/entities/class-tainacan-item.php index 3f79810c1..ef1e446dc 100644 --- a/src/classes/entities/class-tainacan-item.php +++ b/src/classes/entities/class-tainacan-item.php @@ -498,6 +498,8 @@ class Item extends Entity { * * @type bool $hide_empty Wether to hide or not metadata the item has no value to * Default: true + * @type bool $display_slug_as_class Show metadata slug as a class in the div before the metadata block + * Default: false * @type string $before String to be added before each metadata block * Default '
' where $type is the metadata type slug * @type string $after String to be added after each metadata block From 2a592e0b573a572964a4a190c25ef6fe5d67cf1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 22:35:14 +0000 Subject: [PATCH 04/34] Bump axios from 0.19.2 to 0.21.1 Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1) Signed-off-by: dependabot[bot] --- package-lock.json | 32 +++++++------------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index 495847f64..1e200b58f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1895,29 +1895,11 @@ "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", "requires": { - "follow-redirects": "1.5.10" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } - } + "follow-redirects": "^1.10.0" } }, "babel-code-frame": { @@ -4467,8 +4449,7 @@ "follow-redirects": { "version": "1.12.1", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz", - "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==", - "dev": true + "integrity": "sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==" }, "for-in": { "version": "1.0.2", @@ -6841,7 +6822,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true }, "multicast-dns": { "version": "6.2.3", diff --git a/package.json b/package.json index 0ee87963b..1e6fec6c9 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js --display-error-details --progress --hide-modules" }, "dependencies": { - "axios": "^0.19.2", + "axios": "^0.21.1", "buefy": "^0.9.4", "bulma": "^0.9.1", "css-vars-ponyfill": "^2.3.1", From 309d1f0edcbf877db2b39f89aa07875adf10b826 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 14 Jan 2021 15:48:46 -0300 Subject: [PATCH 05/34] Creates base style for tainacan media pages, which centers and adds white background by default to them. --- src/assets/css/tainacan-media-page.css | 36 ++++++++++++++++++++++++++ src/classes/class-tainacan-media.php | 10 ++++--- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/assets/css/tainacan-media-page.css diff --git a/src/assets/css/tainacan-media-page.css b/src/assets/css/tainacan-media-page.css new file mode 100644 index 000000000..32c009785 --- /dev/null +++ b/src/assets/css/tainacan-media-page.css @@ -0,0 +1,36 @@ +body:not([class]){ + margin: auto; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; +} +body:not([class]) > img { + width: auto; +} +body:not([class]) > iframe { + width: 100%; + height: 100%; + min-height: 80vh; + border: none; +} +body:not([class]) > audio, +body:not([class]) > video { + width: 100%; + height: auto; + min-height: 54px; + max-height: 100%; +} +body:not([class]) > audio { + width: 100%; +} +body:not([class]) > a, +body:not([class]) > p { + z-index: 99; + padding: 1rem 4.33337vw; + background: white; + border-radius: 3px; + word-wrap: break-word; +} \ No newline at end of file diff --git a/src/classes/class-tainacan-media.php b/src/classes/class-tainacan-media.php index c331afeb9..934f4aa84 100644 --- a/src/classes/class-tainacan-media.php +++ b/src/classes/class-tainacan-media.php @@ -21,6 +21,10 @@ class Media { protected function __construct() { add_action( 'init', [$this, 'add_attachment_page_rewrite_rule'] ); + + global $TAINACAN_BASE_URL; + wp_enqueue_style( 'tainacan-media-page', $TAINACAN_BASE_URL . '/assets/css/tainacan-media-page.css', [], TAINACAN_VERSION ); + add_filter( 'query_vars', [$this, 'attachment_page_add_var'] ); add_action( 'template_redirect', [$this, 'attachment_page'] ); } @@ -320,11 +324,11 @@ class Media { public function attachment_page() { $att_id = get_query_var('tainacan_attachment_page'); - + if ( ! $att_id ) { return; // continue normal execution } - + $attachment = get_post($att_id); if ( $attachment instanceof \WP_Post && $attachment->post_type == 'attachment' ) { @@ -359,7 +363,7 @@ class Media { $output .= $img; } else { - + wp_print_styles('tainacan-media-page'); global $wp_embed; $url = wp_get_attachment_url($att_id); From c4298e47b47fb0d14732cd5792118a3814206d2c Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 15 Jan 2021 10:22:46 -0300 Subject: [PATCH 06/34] feat: add action tainacan-register-vuejs--public-component. --- src/views/class-tainacan-component-hooks.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index 9c649469e..844aa6f46 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -32,6 +32,7 @@ class Component_Hooks { // the priority should see less than on function // `load_admin_page()` of class `Admin` in file /src/views/class-tainacan-admin.php add_action( 'admin_enqueue_scripts', array( &$this, 'register_component' ), 80 ); + add_action( 'wp_enqueue_scripts', array( &$this, 'register_public_component' ), 80 ); } public function register_component() { @@ -41,6 +42,15 @@ class Component_Hooks { } } + public function register_public_component() { + do_action('tainacan-register-vuejs--public-component', $this); + foreach($this->registered_component as $handle => $component) { + if(isset($component['args']['public']) == true && $component['args']['public'] != false) { + wp_enqueue_script($handle, $component['script_path']); + } + } + } + /** * Register a new vuejs component * From 322e2269da8c1febe01382122ee2a02314f99844 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 15 Jan 2021 10:26:01 -0300 Subject: [PATCH 07/34] fix: name action --- src/views/class-tainacan-component-hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index 844aa6f46..f9078b49c 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -43,7 +43,7 @@ class Component_Hooks { } public function register_public_component() { - do_action('tainacan-register-vuejs--public-component', $this); + do_action('tainacan-register-vuejs-public-component', $this); foreach($this->registered_component as $handle => $component) { if(isset($component['args']['public']) == true && $component['args']['public'] != false) { wp_enqueue_script($handle, $component['script_path']); From 1ba4ea31fd3c1a3c3551b1cc17e368e12c3add8b Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 15 Jan 2021 10:43:02 -0300 Subject: [PATCH 08/34] fix: use arg public to load register component #473 --- src/views/class-tainacan-component-hooks.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index f9078b49c..e6a9bd567 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -31,22 +31,18 @@ class Component_Hooks { private function init() { // the priority should see less than on function // `load_admin_page()` of class `Admin` in file /src/views/class-tainacan-admin.php - add_action( 'admin_enqueue_scripts', array( &$this, 'register_component' ), 80 ); - add_action( 'wp_enqueue_scripts', array( &$this, 'register_public_component' ), 80 ); + add_action( 'wp_enqueue_scripts', array( &$this, 'register_component' ), 80 ); } public function register_component() { do_action('tainacan-register-vuejs-component', $this); foreach($this->registered_component as $handle => $component) { - wp_enqueue_script($handle, $component['script_path']); - } - } - - public function register_public_component() { - do_action('tainacan-register-vuejs-public-component', $this); - foreach($this->registered_component as $handle => $component) { - if(isset($component['args']['public']) == true && $component['args']['public'] != false) { + if ( is_admin() ) { wp_enqueue_script($handle, $component['script_path']); + } else { + if(isset($component['args']['public']) == true && $component['args']['public'] != false) { + wp_enqueue_script($handle, $component['script_path']); + } } } } From 509cb6170a3d078541bcd5031f173fb4210fdb50 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 15 Jan 2021 12:06:31 -0300 Subject: [PATCH 09/34] Alters priority of some scripts enqueueing #473 --- .../theme-helper/class-tainacan-theme-helper.php | 10 ++++------ src/views/class-tainacan-admin.php | 2 +- src/views/class-tainacan-component-hooks.php | 1 + .../class-tainacan-gutenberg-block.php | 11 +++++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/classes/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php index 509978537..c018a5e99 100644 --- a/src/classes/theme-helper/class-tainacan-theme-helper.php +++ b/src/classes/theme-helper/class-tainacan-theme-helper.php @@ -35,7 +35,7 @@ class Theme_Helper { // Redirect to post type archive if no cover page is set add_action('wp', array($this, 'collection_single_redirect')); - add_action('wp_print_scripts', array($this, 'enqueue_scripts')); + add_action('wp_print_scripts', array($this, 'enqueue_scripts'), 90); // make archive for terms work with items add_action('pre_get_posts', array($this, 'tax_archive_pre_get_posts')); @@ -62,11 +62,7 @@ class Theme_Helper { $this->register_view_mode('table', [ 'label' => __('Table', 'tainacan'), - 'dynamic_metadata' => true, - 'icon' => '', - 'type' => 'component', - 'implements_skeleton' => true, - 'requires_thumbnail' => false + 'dynamic_metadata' => true ]); $this->register_view_mode('cards', [ 'label' => __('Cards', 'tainacan'), @@ -120,6 +116,8 @@ class Theme_Helper { wp_register_script('tainacan-search', $TAINACAN_BASE_URL . '/assets/js/theme_search.js' , ['underscore'] , TAINACAN_VERSION); wp_localize_script('tainacan-search', 'tainacan_plugin', \Tainacan\Admin::get_instance()->get_admin_js_localization_params()); } + + error_log('enqueue_scripts'); } public function is_post_an_item(\WP_Post $post) { diff --git a/src/views/class-tainacan-admin.php b/src/views/class-tainacan-admin.php index 67f388259..e8467eb7c 100644 --- a/src/views/class-tainacan-admin.php +++ b/src/views/class-tainacan-admin.php @@ -254,7 +254,7 @@ class Admin { 'wp_elasticpress' => \Tainacan\Elastic_Press::get_instance()->is_active(), 'item_submission_captcha_site_key' => get_option("tnc_option_recaptch_site_key") ]; - + $maps = [ 'collections' => $Tainacan_Collections->get_map(), 'metadata' => $Tainacan_Metadata->get_map(), diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index e6a9bd567..3e099bcf2 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -32,6 +32,7 @@ class Component_Hooks { // the priority should see less than on function // `load_admin_page()` of class `Admin` in file /src/views/class-tainacan-admin.php add_action( 'wp_enqueue_scripts', array( &$this, 'register_component' ), 80 ); + add_action( 'admin_enqueue_scripts', array( &$this, 'register_component' ), 80 ); } public function register_component() { diff --git a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php index e23c49263..81c6ea74b 100644 --- a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php +++ b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php @@ -28,7 +28,8 @@ function tainacan_blocks_add_gutenberg_blocks_actions() { add_action('init', 'tainacan_blocks_register_tainacan_facets_list'); add_action('init', 'tainacan_blocks_register_tainacan_item_submission_form'); - add_action('init', 'tainacan_blocks_add_plugin_settings'); + add_action('init', 'tainacan_blocks_add_plugin_settings', 90); + add_action('wp_enqueue_scripts', 'tainacan_blocks_add_plugin_admin_settings', 90); add_filter('block_categories', 'tainacan_blocks_register_categories', 10, 2); add_action('init', 'tainacan_blocks_register_category_icon'); @@ -403,14 +404,13 @@ function tainacan_blocks_get_plugin_js_settings(){ 'base_url' => $TAINACAN_BASE_URL, 'admin_url' => admin_url(), 'site_url' => site_url(), - 'theme_items_list_url' => esc_url_raw( get_site_url() ) . '/' . \Tainacan\Theme_Helper::get_instance()->get_items_list_slug(), + 'theme_items_list_url' => esc_url_raw( get_site_url() ) . '/' . \Tainacan\Theme_Helper::get_instance()->get_items_list_slug() ]; - + return $settings; } function tainacan_blocks_add_plugin_settings() { - $settings = tainacan_blocks_get_plugin_js_settings(); wp_localize_script( 'terms-list', 'tainacan_blocks', $settings ); @@ -423,6 +423,9 @@ function tainacan_blocks_add_plugin_settings() { wp_localize_script( 'collections-list', 'tainacan_blocks', $settings ); wp_localize_script( 'carousel-collections-list', 'tainacan_blocks', $settings ); wp_localize_script( 'facets-list', 'tainacan_blocks', $settings ); +} + +function tainacan_blocks_add_plugin_admin_settings() { // The faceded search block uses a different settings object, the same used on the theme items list wp_localize_script( 'tainacan-search', 'tainacan_plugin', \Tainacan\Admin::get_instance()->get_admin_js_localization_params() ); From dfac0bb1d328088dc490f58358cd0b9b80a7c874 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 15 Jan 2021 15:12:36 -0300 Subject: [PATCH 10/34] fix: order and actions hooks #473 --- src/views/class-tainacan-component-hooks.php | 3 +-- src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index 3e099bcf2..6cc0a37ef 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -31,8 +31,7 @@ class Component_Hooks { private function init() { // the priority should see less than on function // `load_admin_page()` of class `Admin` in file /src/views/class-tainacan-admin.php - add_action( 'wp_enqueue_scripts', array( &$this, 'register_component' ), 80 ); - add_action( 'admin_enqueue_scripts', array( &$this, 'register_component' ), 80 ); + add_action( 'init', array( &$this, 'register_component' ), 80 ); } public function register_component() { diff --git a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php index 81c6ea74b..e3fd7fb78 100644 --- a/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php +++ b/src/views/gutenberg-blocks/class-tainacan-gutenberg-block.php @@ -29,7 +29,7 @@ function tainacan_blocks_add_gutenberg_blocks_actions() { add_action('init', 'tainacan_blocks_register_tainacan_item_submission_form'); add_action('init', 'tainacan_blocks_add_plugin_settings', 90); - add_action('wp_enqueue_scripts', 'tainacan_blocks_add_plugin_admin_settings', 90); + add_action('init', 'tainacan_blocks_add_plugin_admin_settings', 90); add_filter('block_categories', 'tainacan_blocks_register_categories', 10, 2); add_action('init', 'tainacan_blocks_register_category_icon'); From 3beef4c9a32827266a389ebdb25629adf4683793 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 15 Jan 2021 15:15:49 -0300 Subject: [PATCH 11/34] fix: remove error_log #473 --- src/classes/theme-helper/class-tainacan-theme-helper.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/classes/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php index c018a5e99..060ac6fbe 100644 --- a/src/classes/theme-helper/class-tainacan-theme-helper.php +++ b/src/classes/theme-helper/class-tainacan-theme-helper.php @@ -116,8 +116,6 @@ class Theme_Helper { wp_register_script('tainacan-search', $TAINACAN_BASE_URL . '/assets/js/theme_search.js' , ['underscore'] , TAINACAN_VERSION); wp_localize_script('tainacan-search', 'tainacan_plugin', \Tainacan\Admin::get_instance()->get_admin_js_localization_params()); } - - error_log('enqueue_scripts'); } public function is_post_an_item(\WP_Post $post) { From 21e832a3ceea5f699afd1ef19975db9ad4b6da5c Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 18 Jan 2021 11:10:46 -0300 Subject: [PATCH 12/34] Adds 'deps' argument to register_vuejs_component #473. --- src/views/class-tainacan-component-hooks.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/class-tainacan-component-hooks.php b/src/views/class-tainacan-component-hooks.php index 6cc0a37ef..14af21f9b 100644 --- a/src/views/class-tainacan-component-hooks.php +++ b/src/views/class-tainacan-component-hooks.php @@ -37,11 +37,13 @@ class Component_Hooks { public function register_component() { do_action('tainacan-register-vuejs-component', $this); foreach($this->registered_component as $handle => $component) { + $deps = isset($component['args']['deps']) ? $component['args']['deps'] : []; + if ( is_admin() ) { - wp_enqueue_script($handle, $component['script_path']); + wp_enqueue_script($handle, $component['script_path'], $deps); } else { - if(isset($component['args']['public']) == true && $component['args']['public'] != false) { - wp_enqueue_script($handle, $component['script_path']); + if (isset($component['args']['public']) == true && $component['args']['public'] != false) { + wp_enqueue_script($handle, $component['script_path'], $deps); } } } From c32365f76fc8a2649ffbca6152c60bccfa9fbbbb Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 09:52:40 -0300 Subject: [PATCH 13/34] fix: add capability `read` on tainacan roles #384 --- src/classes/class-tainacan-roles.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/classes/class-tainacan-roles.php b/src/classes/class-tainacan-roles.php index f3882427a..a4e2d5ecf 100644 --- a/src/classes/class-tainacan-roles.php +++ b/src/classes/class-tainacan-roles.php @@ -392,7 +392,8 @@ class Roles { 'slug' => 'tainacan-administrator', 'display_name' => 'Tainacan Administrator', 'caps' => [ - 'manage_tainacan' => true + 'manage_tainacan' => true, + 'read' => true ] ], 'tainacan-editor' => [ @@ -414,7 +415,8 @@ class Roles { 'tnc_rep_read_private_metadata' => true, 'tnc_rep_read_private_filters' => true, 'tnc_rep_read_logs' => true, - 'manage_tainacan_collection_all' => true + 'manage_tainacan_collection_all' => true, + 'read' => true ] ], 'tainacan-author' => [ @@ -426,7 +428,8 @@ class Roles { 'tnc_rep_read_private_collections' => true, 'tnc_rep_read_private_taxonomies' => true, 'tnc_rep_read_private_metadata' => true, - 'tnc_rep_read_private_filters' => true, + 'tnc_rep_read_private_filters' => true,, + 'read' => true ] ], ]; From 96a0034acd9f1d41a8cf76e255660b15161e9ee1 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 09:57:35 -0300 Subject: [PATCH 14/34] fix: error elements in arrays #384 --- src/classes/class-tainacan-roles.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/class-tainacan-roles.php b/src/classes/class-tainacan-roles.php index a4e2d5ecf..574cd41d9 100644 --- a/src/classes/class-tainacan-roles.php +++ b/src/classes/class-tainacan-roles.php @@ -428,7 +428,7 @@ class Roles { 'tnc_rep_read_private_collections' => true, 'tnc_rep_read_private_taxonomies' => true, 'tnc_rep_read_private_metadata' => true, - 'tnc_rep_read_private_filters' => true,, + 'tnc_rep_read_private_filters' => true, 'read' => true ] ], From 6fd7a289b780aa9af379b2d04706d35e53106834 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 10:09:32 -0300 Subject: [PATCH 15/34] fix: resolve warning cannot modify header information on enqueue style. --- src/classes/class-tainacan-media.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/classes/class-tainacan-media.php b/src/classes/class-tainacan-media.php index 934f4aa84..8810fd651 100644 --- a/src/classes/class-tainacan-media.php +++ b/src/classes/class-tainacan-media.php @@ -21,9 +21,8 @@ class Media { protected function __construct() { add_action( 'init', [$this, 'add_attachment_page_rewrite_rule'] ); - - global $TAINACAN_BASE_URL; - wp_enqueue_style( 'tainacan-media-page', $TAINACAN_BASE_URL . '/assets/css/tainacan-media-page.css', [], TAINACAN_VERSION ); + add_action( 'admin_enqueue_scripts', array( &$this, 'add_css' ) ); + add_action( 'wp_enqueue_scripts', array( &$this, 'add_css' ) ); add_filter( 'query_vars', [$this, 'attachment_page_add_var'] ); add_action( 'template_redirect', [$this, 'attachment_page'] ); @@ -37,6 +36,11 @@ class Media { ); } + public function add_css() { + global $TAINACAN_BASE_URL; + wp_enqueue_style( 'tainacan-media-page', $TAINACAN_BASE_URL . '/assets/css/tainacan-media-page.css', [], TAINACAN_VERSION ); + } + public function attachment_page_add_var($vars) { $vars[] = 'tainacan_attachment_page'; return $vars; From e5bceaa14704d901fbf27a6b8509a08553fb7cbf Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 11:07:59 -0300 Subject: [PATCH 16/34] feat: add capabilites defaults for tainacan roles #384 --- .../endpoints/class-tainacan-rest-roles-controller.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/classes/api/endpoints/class-tainacan-rest-roles-controller.php b/src/classes/api/endpoints/class-tainacan-rest-roles-controller.php index 5bd3ca306..0014e9647 100644 --- a/src/classes/api/endpoints/class-tainacan-rest-roles-controller.php +++ b/src/classes/api/endpoints/class-tainacan-rest-roles-controller.php @@ -151,6 +151,7 @@ class REST_Roles_Controller extends REST_Controller { if ( isset($request['capabilities']) && is_array($request['capabilities']) ) { $this->handle_capabilities_for_role($role_slug, $request['capabilities']); + $this->handle_capabilites_default_for_role($role_slug); } if ($new_role instanceof \WP_Role) { @@ -262,6 +263,7 @@ class REST_Roles_Controller extends REST_Controller { if ( is_array($request['capabilities']) ) { $this->handle_capabilities_for_role($role_slug, $request['capabilities']); + $this->handle_capabilites_default_for_role($role_slug); } elseif ( isset($request['add_cap']) ) { // validate that we only deal with tainacan capabilities @@ -317,6 +319,13 @@ class REST_Roles_Controller extends REST_Controller { } + private function handle_capabilites_default_for_role($role_slug) { + if ( !isset( \wp_roles()->roles[$role_slug] ) ) { + return false; + } + \wp_roles()->add_cap($role_slug, 'read', true); + } + /** * @param \WP_REST_Request $request * From a9786fcd0c8cd5cba44b51a290482b99e48201c3 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 15:30:13 -0300 Subject: [PATCH 17/34] fix: dependencies for read private metadata and filters `meta_caps` #384. --- src/classes/class-tainacan-roles.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/classes/class-tainacan-roles.php b/src/classes/class-tainacan-roles.php index 574cd41d9..af6c6cef4 100644 --- a/src/classes/class-tainacan-roles.php +++ b/src/classes/class-tainacan-roles.php @@ -247,6 +247,9 @@ class Roles { 'display_name' => __('View private metadata', 'tainacan'), 'description' => __('Access private metadata in this collection', 'tainacan'), 'scope' => 'collection', + 'dependencies' => [ + 'read_private_tainacan-metadata' + ], 'supercaps' => [ 'manage_tainacan', 'manage_tainacan_collection_all', @@ -258,6 +261,9 @@ class Roles { 'display_name' => __('View private filters', 'tainacan'), 'description' => __('Access private filters in this collection', 'tainacan'), 'scope' => 'collection', + 'dependencies' => [ + 'read_private_tainacan-filters' + ], 'supercaps' => [ 'manage_tainacan', 'manage_tainacan_collection_all', @@ -530,6 +536,8 @@ class Roles { } $collection_capabilities = tainacan_collections()->get_capabilities(); + $meta_caps = (new \Tainacan\Entities\Metadatum())->get_capabilities(); + $filters_caps = (new \Tainacan\Entities\Filter())->get_capabilities(); foreach ( $caps as $cap ) { @@ -537,6 +545,13 @@ class Roles { continue; } + if( $user->has_cap('manage_tainacan') && in_array($requested_cap, [ + $meta_caps->read_private_posts, + $filters_caps->read_private_posts] ) + ) { + $allcaps = array_merge($allcaps, [ $requested_cap => true ]); + } + if ( \strpos($cap, 'tnc_') === 0 ) { if ( $user->has_cap('manage_tainacan') ) { From 90ce5f447e803b0651679e03ad163bd1ee06ab08 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Wed, 20 Jan 2021 16:02:18 -0300 Subject: [PATCH 18/34] fix: prevent infinite loop, maximum function nesting level reached #384 --- src/classes/class-tainacan-roles.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/classes/class-tainacan-roles.php b/src/classes/class-tainacan-roles.php index af6c6cef4..db1269991 100644 --- a/src/classes/class-tainacan-roles.php +++ b/src/classes/class-tainacan-roles.php @@ -545,9 +545,10 @@ class Roles { continue; } - if( $user->has_cap('manage_tainacan') && in_array($requested_cap, [ + if( in_array($requested_cap, [ $meta_caps->read_private_posts, $filters_caps->read_private_posts] ) + && $user->has_cap('manage_tainacan') ) { $allcaps = array_merge($allcaps, [ $requested_cap => true ]); } From a8ee1fbedf11d0b258270e306c204781b067a7b9 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 21 Jan 2021 08:46:38 -0300 Subject: [PATCH 19/34] Disables ESC for closing filters panel when not inside a modal --- src/views/theme-search/pages/theme-items-page.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 59d619487..39243d915 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -411,7 +411,7 @@ :trap-focus="filtersAsModal" full-screen :custom-class="'tainacan-form filters-menu' + (filtersAsModal ? ' filters-menu-modal' : '')" - :can-cancel="hideHideFiltersButton ? ['x', 'outside'] : ['x', 'escape', 'outside']"> + :can-cancel="hideHideFiltersButton || !filtersAsModal ? ['x', 'outside'] : ['x', 'escape', 'outside']"> Date: Thu, 21 Jan 2021 16:17:15 -0300 Subject: [PATCH 20/34] Adds better view modes selection. --- .../edition/collection-edition-form.vue | 31 +++++++++++++------ .../scss/_dropdown-and-autocomplete.scss | 3 ++ .../theme-search/pages/theme-items-page.vue | 6 ++++ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/views/admin/components/edition/collection-edition-form.vue b/src/views/admin/components/edition/collection-edition-form.vue index ff021d98f..d5d09459b 100644 --- a/src/views/admin/components/edition/collection-edition-form.vue +++ b/src/views/admin/components/edition/collection-edition-form.vue @@ -221,7 +221,7 @@ :message="$i18n.getHelperMessage('collections', 'enabled_view_modes')"/>
- - {{ registeredViewModes[viewMode].label }} +

+ + +  {{ registeredViewModes[viewMode].label }} + +

+

{{ registeredViewModes[viewMode].description }}

 @@ -1249,6 +1254,14 @@ export default { margin-top: -1.5em; border-left: 1px solid var(--tainacan-gray2); } + .enabled-view-modes-dropdown { + p { + white-space: normal; + } + /deep/ svg { + margin: 0 0 -8px -3px; + } + } diff --git a/src/views/admin/scss/_dropdown-and-autocomplete.scss b/src/views/admin/scss/_dropdown-and-autocomplete.scss index c263f4220..50f837081 100644 --- a/src/views/admin/scss/_dropdown-and-autocomplete.scss +++ b/src/views/admin/scss/_dropdown-and-autocomplete.scss @@ -6,6 +6,9 @@ .icon { color: var(--tainacan-secondary); align-items: center; + svg { + fill: var(--tainacan-secondary); + } } .gray-icon { padding-right: 0 !important; diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 39243d915..31c9258d7 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -1447,10 +1447,16 @@ font-size: 1.3125em !important; color: var(--tainacan-info-color) !important; max-width: 1.25em; + svg { + color: var(--tainacan-info-color) !important; + } } .has-text-secondary.gray-icon .icon i::before, .has-text-secondary.gray-icon i::before { color: var(--tainacan-secondary) !important; + svg { + fill: var(--tainacan-secondary) !important; + } } .dropdown-menu { From 5c7bd07f48b4cf331ad7894713193bdb9c7e0c47 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Thu, 21 Jan 2021 16:30:17 -0300 Subject: [PATCH 21/34] Brings back table view mode and improves view modes description. #473. --- .../theme-helper/class-tainacan-theme-helper.php | 15 ++++++++++----- .../edition/collection-edition-form.vue | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/classes/theme-helper/class-tainacan-theme-helper.php b/src/classes/theme-helper/class-tainacan-theme-helper.php index 060ac6fbe..dd8f14fc5 100644 --- a/src/classes/theme-helper/class-tainacan-theme-helper.php +++ b/src/classes/theme-helper/class-tainacan-theme-helper.php @@ -62,12 +62,17 @@ class Theme_Helper { $this->register_view_mode('table', [ 'label' => __('Table', 'tainacan'), - 'dynamic_metadata' => true + 'description' => 'The classic table display.', + 'dynamic_metadata' => true, + 'icon' => '', + 'type' => 'component', + 'implements_skeleton' => true, + 'requires_thumbnail' => false ]); $this->register_view_mode('cards', [ 'label' => __('Cards', 'tainacan'), 'dynamic_metadata' => false, - 'description' => 'A cards view, displaying title, description, author name and creation date.', + 'description' => 'A cards view, displaying cropped thumbnails, title and description.', 'icon' => '', 'type' => 'component', 'implements_skeleton' => true, @@ -76,7 +81,7 @@ class Theme_Helper { $this->register_view_mode('records', [ 'label' => __('Records', 'tainacan'), 'dynamic_metadata' => true, - 'description' => 'A records view, similiar to cards, but flexible for metadata', + 'description' => 'A records view, similiar to cards, but flexible for metadata.', 'icon' => '', 'type' => 'component', 'implements_skeleton' => true, @@ -93,7 +98,7 @@ class Theme_Helper { $this->register_view_mode('slideshow', [ 'label' => __('Slideshow', 'tainacan'), 'dynamic_metadata' => false, - 'description' => 'A fullscreen slideshow view.', + 'description' => 'A fullscreen slideshow view, that shows the item document instead of just thumbnails.', 'icon' => '', 'type' => 'component', 'show_pagination' => false, @@ -102,7 +107,7 @@ class Theme_Helper { $this->register_view_mode('list', [ 'label' => __('List', 'tainacan'), 'dynamic_metadata' => true, - 'description' => 'A list view, similiar to the records, but full width', + 'description' => 'A list view, similiar to the records, but full width.', 'icon' => '', 'type' => 'component', 'implements_skeleton' => true, diff --git a/src/views/admin/components/edition/collection-edition-form.vue b/src/views/admin/components/edition/collection-edition-form.vue index d5d09459b..01ab01aea 100644 --- a/src/views/admin/components/edition/collection-edition-form.vue +++ b/src/views/admin/components/edition/collection-edition-form.vue @@ -1255,6 +1255,9 @@ export default { border-left: 1px solid var(--tainacan-gray2); } .enabled-view-modes-dropdown { + /deep/ .dropdown-item { + display: flex !important; + } p { white-space: normal; } From e9c18c92a93515e77ddf4b82b8338a37d766833d Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 22 Jan 2021 09:08:55 -0300 Subject: [PATCH 22/34] Fixes wrong link for exposers on items list repositore levels. #474. --- src/views/admin/components/modals/exposers-modal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/admin/components/modals/exposers-modal.vue b/src/views/admin/components/modals/exposers-modal.vue index 2925e8143..390895cd1 100644 --- a/src/views/admin/components/modals/exposers-modal.vue +++ b/src/views/admin/components/modals/exposers-modal.vue @@ -276,7 +276,7 @@ export default { return this.selectedItems && this.selectedItems.length ? 1 : Math.ceil(Number(this.totalItems)/Number(this.maxItemsPerPage)); }, exposerBaseURL() { - let baseURL = this.collectionId != undefined ? '/collection/' + this.collectionId + '/items/' : '/items/'; + let baseURL = this.collectionId ? '/collection/' + this.collectionId + '/items/' : '/items/'; let currentParams = JSON.parse(JSON.stringify(this.$route.query)); // Removes Fetch Only From 912ae47e5ca6daf8074fea11c2f17617e98d251e Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 22 Jan 2021 09:46:09 -0300 Subject: [PATCH 23/34] Fixes undefined warning for enabled view modes on repository level lists. --- src/views/theme-search/js/view-modes-mixin.js | 2 +- src/views/theme-search/pages/theme-items-page.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/theme-search/js/view-modes-mixin.js b/src/views/theme-search/js/view-modes-mixin.js index 3aa127243..d746fa02c 100644 --- a/src/views/theme-search/js/view-modes-mixin.js +++ b/src/views/theme-search/js/view-modes-mixin.js @@ -32,7 +32,7 @@ export const viewModesMixin = { } }, mounted() { - this.isSlideshowViewModeEnabled = this.enabledViewModes.findIndex((viewMode) => viewMode == 'slideshow') >= 0; + this.isSlideshowViewModeEnabled = (this.enabledViewModes && Array.isArray(this.enabledViewModes)) ? (this.enabledViewModes.findIndex((viewMode) => viewMode == 'slideshow') >= 0) : false; }, methods: { getItemLink(itemUrl, index) { diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 31c9258d7..7c40a20fe 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -775,7 +775,7 @@ const userPrefViewMode = this.$userPrefs.get(prefsViewMode); let existingViewModeIndex = Object.keys(this.registeredViewModes).findIndex(viewMode => viewMode == userPrefViewMode); - let enabledViewModeIndex = this.enabledViewModes.findIndex((viewMode) => viewMode == userPrefViewMode); + let enabledViewModeIndex = (this.enabledViewModes && Array.isArray(this.enabledViewModes)) ? this.enabledViewModes.findIndex((viewMode) => viewMode == userPrefViewMode) : -1; if (existingViewModeIndex >= 0 && enabledViewModeIndex >= 0) this.$eventBusSearch.setInitialViewMode(userPrefViewMode); else From 1741687d97f91e46ee8a389a9c5e80d227fa0fde Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 22 Jan 2021 09:46:22 -0300 Subject: [PATCH 24/34] fix: add dependencies on role `manage_tainacan_collection_*` #384 --- src/classes/class-tainacan-roles.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/classes/class-tainacan-roles.php b/src/classes/class-tainacan-roles.php index db1269991..dbe5d01e5 100644 --- a/src/classes/class-tainacan-roles.php +++ b/src/classes/class-tainacan-roles.php @@ -24,6 +24,9 @@ class Roles { */ private function __construct() { + $this->meta_caps = (new \Tainacan\Entities\Metadatum())->get_capabilities(); + $this->filters_caps = (new \Tainacan\Entities\Filter())->get_capabilities(); + $this->capabilities = [ 'manage_tainacan' => [ 'display_name' => __('Manage Tainacan', 'tainacan'), @@ -172,6 +175,10 @@ class Roles { 'display_name' => __('Manage Collection', 'tainacan'), 'description' => __('Manage all collection settings, items, metadata, filters, etc.', 'tainacan'), 'scope' => 'collection', + 'dependencies' => [ + $this->meta_caps->read_private_posts, + $this->filters_caps->read_private_posts + ], 'supercaps' => [ 'manage_tainacan', 'manage_tainacan_collection_all' @@ -248,7 +255,7 @@ class Roles { 'description' => __('Access private metadata in this collection', 'tainacan'), 'scope' => 'collection', 'dependencies' => [ - 'read_private_tainacan-metadata' + $this->meta_caps->read_private_posts, // e.g.: 'read_private_tainacan-metadata' ], 'supercaps' => [ 'manage_tainacan', @@ -262,7 +269,7 @@ class Roles { 'description' => __('Access private filters in this collection', 'tainacan'), 'scope' => 'collection', 'dependencies' => [ - 'read_private_tainacan-filters' + $this->filters_caps->read_private_posts, // e.g.: 'read_private_tainacan-filters' ], 'supercaps' => [ 'manage_tainacan', @@ -536,8 +543,6 @@ class Roles { } $collection_capabilities = tainacan_collections()->get_capabilities(); - $meta_caps = (new \Tainacan\Entities\Metadatum())->get_capabilities(); - $filters_caps = (new \Tainacan\Entities\Filter())->get_capabilities(); foreach ( $caps as $cap ) { @@ -546,9 +551,12 @@ class Roles { } if( in_array($requested_cap, [ - $meta_caps->read_private_posts, - $filters_caps->read_private_posts] ) - && $user->has_cap('manage_tainacan') + $this->meta_caps->read_private_posts, + $this->filters_caps->read_private_posts] + ) && ( + $user->has_cap('manage_tainacan') || + $user->has_cap('manage_tainacan_collection_all') + ) ) { $allcaps = array_merge($allcaps, [ $requested_cap => true ]); } From 9f47726581c97ef77d4c49828c712f062d86e589 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 22 Jan 2021 15:02:44 -0300 Subject: [PATCH 25/34] update version version --- src/tainacan.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tainacan.php b/src/tainacan.php index 627aa6b0f..06d6ed50c 100644 --- a/src/tainacan.php +++ b/src/tainacan.php @@ -4,13 +4,13 @@ Plugin Name: Tainacan Plugin URI: https://tainacan.org/ Description: Open source, powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform. Author: Tainacan.org -Version: 0.17.2 +Version: 0.17.3 Text Domain: tainacan License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html */ -const TAINACAN_VERSION = '0.17.2'; +const TAINACAN_VERSION = '0.17.3'; defined( 'ABSPATH' ) or die( 'No script kiddies please!' ); $TAINACAN_BASE_URL = plugins_url('', __FILE__); From fcf1afea9c99a3bcdc956f63045f5d126f5163b1 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 22 Jan 2021 15:03:49 -0300 Subject: [PATCH 26/34] add exception to unable create submission ID --- .../class-tainacan-rest-items-controller.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php index 59e41722b..1fa9032ff 100644 --- a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php +++ b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php @@ -988,10 +988,14 @@ class REST_Items_Controller extends REST_Controller { $item = $this->items_repository->insert( $item ); $fake_id = \hexdec(\uniqid()); $id = $item->get_id(); - set_transient('tnc_transient_submission_' . $fake_id, $id, 300); - $response_item = $this->prepare_item_for_response($item, $request); - $response_item['id'] = $fake_id; - return new \WP_REST_Response($response_item, 201 ); + if (set_transient('tnc_transient_submission_' . $fake_id, $id, 300) == true) { + $response_item = $this->prepare_item_for_response($item, $request); + $response_item['id'] = $fake_id; + return new \WP_REST_Response($response_item, 201 ); + } else return new \WP_REST_Response([ + 'error_message' => __('unable create submission ID.', 'tainacan'), + ], 400); + } else { return new \WP_REST_Response([ 'error_message' => __('One or more values are invalid.', 'tainacan'), From 19dd6b4b29060c3ea7b2e9ed5ac774cca80e9fb7 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 22 Jan 2021 17:51:13 -0300 Subject: [PATCH 27/34] Proper SVG view mode icon alignments. --- .../admin/components/edition/collection-edition-form.vue | 4 +++- src/views/admin/scss/_dropdown-and-autocomplete.scss | 7 ++++++- src/views/theme-search/pages/theme-items-page.vue | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/admin/components/edition/collection-edition-form.vue b/src/views/admin/components/edition/collection-edition-form.vue index 01ab01aea..4034e3401 100644 --- a/src/views/admin/components/edition/collection-edition-form.vue +++ b/src/views/admin/components/edition/collection-edition-form.vue @@ -1262,7 +1262,9 @@ export default { white-space: normal; } /deep/ svg { - margin: 0 0 -8px -3px; + margin-left: -2px; + overflow: hidden; + vertical-align: middle; } } diff --git a/src/views/admin/scss/_dropdown-and-autocomplete.scss b/src/views/admin/scss/_dropdown-and-autocomplete.scss index 50f837081..060ed4555 100644 --- a/src/views/admin/scss/_dropdown-and-autocomplete.scss +++ b/src/views/admin/scss/_dropdown-and-autocomplete.scss @@ -8,6 +8,8 @@ align-items: center; svg { fill: var(--tainacan-secondary); + overflow: hidden; + vertical-align: middle; } } .gray-icon { @@ -57,7 +59,10 @@ &:hover { background-color: var(--tainacan-input-border-color); } .is-small { color: var(--tainacan-info-color); } &.is-active { background-color: var(--tainacan-primary); } - + svg { + overflow: hidden; + vertical-align: middle; + } .media { display: flex; align-items: center; diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 7c40a20fe..995d6088f 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -1449,6 +1449,8 @@ max-width: 1.25em; svg { color: var(--tainacan-info-color) !important; + overflow: hidden; + vertical-align: middle; } } .has-text-secondary.gray-icon .icon i::before, @@ -1456,6 +1458,8 @@ color: var(--tainacan-secondary) !important; svg { fill: var(--tainacan-secondary) !important; + overflow: hidden; + vertical-align: middle; } } From d06e5bd74c9b5e617d1d514bda237ed805e33959 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 22 Jan 2021 18:02:03 -0300 Subject: [PATCH 28/34] Update to loading display for template view modes. --- src/views/theme-search/pages/theme-items-page.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 995d6088f..58ea1145e 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -467,18 +467,18 @@ class="loading-container"> - + :active.sync="showLoading"/> - +
- +
From 90efaf4a57a566143c175e86f30f7aac86d49bc3 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 26 Jan 2021 10:14:16 -0300 Subject: [PATCH 29/34] Avoids null strings passed to fetch_only query params #478 --- src/views/admin/pages/lists/items-page.vue | 27 ++++++++++--------- .../theme-search/pages/theme-items-page.vue | 23 +++++++++------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/views/admin/pages/lists/items-page.vue b/src/views/admin/pages/lists/items-page.vue index 9803729a0..1bed33883 100644 --- a/src/views/admin/pages/lists/items-page.vue +++ b/src/views/admin/pages/lists/items-page.vue @@ -948,12 +948,14 @@ let descriptionMetadatum = this.localDisplayedMetadata.find(metadatum => metadatum.metadata_type_object != undefined ? metadatum.metadata_type_object.related_mapped_prop == 'description' : false); // Updates Search - this.$eventBusSearch.addFetchOnly( - ((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null) + ',' + - ((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null) + ',' + - ((authorNameMetadatum != undefined && authorNameMetadatum.display) ? 'author_name': null) + ',' + - (this.isRepositoryLevel ? 'title' : null) + ',' + - (this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null), false, fetchOnlyMetadatumIds.toString()); + let fetchOnlyArray = [ + ((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null), + ((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null), + ((authorNameMetadatum != undefined && authorNameMetadatum.display) ? 'author_name': null), + (this.isRepositoryLevel ? 'title' : null), + (this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null) + ]; + this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString() , false, fetchOnlyMetadatumIds.toString()); // Closes dropdown this.$refs.displayedMetadataDropdown.toggle(); @@ -1098,13 +1100,14 @@ display: authorNameMetadatumDisplay }); - this.$eventBusSearch.addFetchOnly( - (thumbnailMetadatumDisplay ? 'thumbnail' : null) +','+ - (creationDateMetadatumDisplay ? 'creation_date' : null) +','+ - (authorNameMetadatumDisplay ? 'author_name' : null) +','+ - (this.isRepositoryLevel ? 'title' : null) +','+ + let fetchOnlyArray = [ + (thumbnailMetadatumDisplay ? 'thumbnail' : null), + (creationDateMetadatumDisplay ? 'creation_date' : null), + (authorNameMetadatumDisplay ? 'author_name' : null), + (this.isRepositoryLevel ? 'title' : null), (this.isRepositoryLevel ? 'description' : null) - , false, fetchOnlyMetadatumIds.toString()); + ]; + this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString() , false, fetchOnlyMetadatumIds.toString()); // Sorting metadata if (this.isRepositoryLevel) { diff --git a/src/views/theme-search/pages/theme-items-page.vue b/src/views/theme-search/pages/theme-items-page.vue index 58ea1145e..d7e351d6b 100644 --- a/src/views/theme-search/pages/theme-items-page.vue +++ b/src/views/theme-search/pages/theme-items-page.vue @@ -933,11 +933,13 @@ let descriptionMetadatum = this.localDisplayedMetadata.find(metadatum => metadatum.metadata_type_object != undefined ? metadatum.metadata_type_object.related_mapped_prop == 'description' : false); // Updates Search - this.$eventBusSearch.addFetchOnly( - ((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null) + ',' + - ((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null) + ',' + - (this.isRepositoryLevel ? 'title' : null) + ',' + - (this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null), false, fetchOnlyMetadatumIds.toString()); + let fetchOnlyArray = [ + ((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null), + ((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null), + (this.isRepositoryLevel ? 'title' : null), + (this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null) + ]; + this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString(), false, fetchOnlyMetadatumIds.toString()); // Closes dropdown this.$refs.displayedMetadataDropdown.toggle(); @@ -1064,12 +1066,13 @@ let creationDateMetadatumDisplay = prefsFetchOnlyObject ? (prefsFetchOnlyObject[1] != 'null') : true; - this.$eventBusSearch.addFetchOnly( - (thumbnailMetadatumDisplay ? 'thumbnail' : null) +','+ - (creationDateMetadatumDisplay ? 'creation_date' : null) +','+ - (this.isRepositoryLevel ? 'title' : null) +','+ + let fetchOnlyArray = [ + (thumbnailMetadatumDisplay ? 'thumbnail' : null), + (creationDateMetadatumDisplay ? 'creation_date' : null), + (this.isRepositoryLevel ? 'title' : null), (this.isRepositoryLevel ? 'description' : null) - , false, fetchOnlyMetadatumIds.toString()); + ]; + this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString(), false, fetchOnlyMetadatumIds.toString()); // Sorting metadata if (this.isRepositoryLevel) { From 83344f6ddecd1fc83f49f82591addd3f2630b9cb Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 29 Jan 2021 09:53:01 -0300 Subject: [PATCH 30/34] fix: generete fake id submission --- .../api/endpoints/class-tainacan-rest-items-controller.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php index 1fa9032ff..7cdba668c 100644 --- a/src/classes/api/endpoints/class-tainacan-rest-items-controller.php +++ b/src/classes/api/endpoints/class-tainacan-rest-items-controller.php @@ -145,7 +145,7 @@ class REST_Items_Controller extends REST_Controller { ) ); register_rest_route( - $this->namespace, '/collection/(?P[\d]+)/' . $this->rest_base . '/submission/(?P[\d]+)/finish', + $this->namespace, '/collection/(?P[\d]+)/' . $this->rest_base . '/submission/(?P[a-z0-9]+)/finish', array( array( 'methods' => \WP_REST_Server::CREATABLE, @@ -986,7 +986,7 @@ class REST_Items_Controller extends REST_Controller { if ($item->validate()) { $item = $this->items_repository->insert( $item ); - $fake_id = \hexdec(\uniqid()); + $fake_id = md5(uniqid(mt_rand(), true)); $id = $item->get_id(); if (set_transient('tnc_transient_submission_' . $fake_id, $id, 300) == true) { $response_item = $this->prepare_item_for_response($item, $request); From 43e3a4901443e5aeb4f611de5e17d71c17978756 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 1 Feb 2021 15:44:21 -0300 Subject: [PATCH 31/34] Loading state when fetching users filter. --- src/views/admin/pages/lists/activities-page.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/admin/pages/lists/activities-page.vue b/src/views/admin/pages/lists/activities-page.vue index 66061acfc..53b3134ff 100644 --- a/src/views/admin/pages/lists/activities-page.vue +++ b/src/views/admin/pages/lists/activities-page.vue @@ -109,7 +109,11 @@
- + From fc532eeb6e66f24854ab3cbf40c46bec0a8a408b Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Mon, 1 Feb 2021 16:08:26 -0300 Subject: [PATCH 32/34] Fixes language verb vs noun disambiguation when translating 'publish' --- src/views/admin/components/edition/item-edition-form.vue | 6 +++--- src/views/tainacan-admin-i18n.php | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index d007b87a2..760d54471 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -628,7 +628,7 @@ v-if="collection && collection.current_user_can_publish_items" @click="onSubmit(visibility)" type="button" - class="button is-success">{{ $i18n.get('label_publish') }} + class="button is-success">{{ $i18n.get('label_verb_publish') }}
{{ $i18n.get('label_publish') }} + class="button is-success">{{ $i18n.get('label_verb_publish') }}