0)
- queryObject.perpage = this.maxItemsNumber;
- else if (queryObject.perpage != undefined && queryObject.perpage > 0)
- this.localMaxItemsNumber = queryObject.perpage;
- else {
- queryObject.perpage = 12;
- this.localMaxItemsNumber = 12;
- }
-
- // Set up sorting order
- if (this.localOrder != undefined)
- queryObject.order = this.localOrder;
- else if (queryObject.order != undefined)
- this.localOrder = queryObject.order;
- else {
- queryObject.order = 'asc';
- this.localOrder = 'asc';
- }
-
- // Set up sorting order
- if (this.searchString != undefined)
- queryObject.search = this.searchString;
- else if (queryObject.search != undefined)
- this.searchString = queryObject.search;
- else {
- delete queryObject.search;
- this.searchString = undefined;
- }
-
- // Set up paging
- if (this.paged != undefined)
- queryObject.paged = this.paged;
- else if (queryObject.paged != undefined)
- this.paged = queryObject.paged;
- else
- this.paged = 1;
-
- // emove unecessary queries
- delete queryObject.readmode;
- delete queryObject.iframemode;
- delete queryObject.admin_view_mode;
- delete queryObject.fetch_only_meta;
-
- endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject) + '&fetch_only=title,url,thumbnail';
-
- this.tainacanAxios.get(endpoint, { cancelToken: this.itemsRequestSource.token })
- .then(response => {
-
- for (let item of response.data.items)
- this.items.push(item);
+ for (let item of this.selectedItems)
+ this.items.push(item);
this.isLoading = false;
- this.totalItems = response.headers['x-wp-total'];
+ this.totalItems = this.items.length;
- }).catch((error) => {
- this.isLoading = false;
- if (error.response && error.response.status && error.response.status == 401)
- this.errorMessage = 'Not allowed to see these items.'
- });
+ } else if (this.loadStrategy == 'selection') {
+ let endpoint = '/collection/' + this.collectionId + '/items?' + qs.stringify({ postin: this.selectedItems, perpage: this.selectedItems.length }) + '&fetch_only=title,url,thumbnail';
+
+ this.tainacanAxios.get(endpoint, { cancelToken: this.itemsRequestSource.token })
+ .then(response => {
+
+ for (let item of response.data.items)
+ this.items.push(item);
+
+ this.isLoading = false;
+ this.totalItems = response.headers['x-wp-total'];
+
+ }).catch((error) => {
+ this.isLoading = false;
+ if (error.response && error.response.status && error.response.status == 401)
+ this.errorMessage = 'Not allowed to see these items.'
+ });
+ } else {
+
+ let endpoint = '/collection' + this.searchURL.split('#')[1].split('/collections')[1];
+ let query = endpoint.split('?')[1];
+ let queryObject = qs.parse(query);
+
+ // Set up max items to be shown
+ if (this.maxItemsNumber != undefined && Number(this.maxItemsNumber) > 0)
+ queryObject.perpage = this.maxItemsNumber;
+ else if (queryObject.perpage != undefined && queryObject.perpage > 0)
+ this.localMaxItemsNumber = queryObject.perpage;
+ else {
+ queryObject.perpage = 12;
+ this.localMaxItemsNumber = 12;
+ }
+
+ // Set up sorting order
+ if (this.localOrder != undefined)
+ queryObject.order = this.localOrder;
+ else if (queryObject.order != undefined)
+ this.localOrder = queryObject.order;
+ else {
+ queryObject.order = 'asc';
+ this.localOrder = 'asc';
+ }
+
+ // Set up sorting order
+ if (this.searchString != undefined)
+ queryObject.search = this.searchString;
+ else if (queryObject.search != undefined)
+ this.searchString = queryObject.search;
+ else {
+ delete queryObject.search;
+ this.searchString = undefined;
+ }
+
+ // Set up paging
+ if (this.paged != undefined)
+ queryObject.paged = this.paged;
+ else if (queryObject.paged != undefined)
+ this.paged = queryObject.paged;
+ else
+ this.paged = 1;
+
+ // emove unecessary queries
+ delete queryObject.readmode;
+ delete queryObject.iframemode;
+ delete queryObject.admin_view_mode;
+ delete queryObject.fetch_only_meta;
+
+ endpoint = endpoint.split('?')[0] + '?' + qs.stringify(queryObject) + '&fetch_only=title,url,thumbnail';
+
+ this.tainacanAxios.get(endpoint, { cancelToken: this.itemsRequestSource.token })
+ .then(response => {
+
+ for (let item of response.data.items)
+ this.items.push(item);
+
+ this.isLoading = false;
+ this.totalItems = response.headers['x-wp-total'];
+
+ }).catch((error) => {
+ this.isLoading = false;
+ if (error.response && error.response.status && error.response.status == 401)
+ this.errorMessage = 'Not allowed to see these items.'
+ });
+ }
},
fetchCollectionForHeader() {
if (this.showCollectionHeader) {
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/block.json b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/block.json
index 174bc98fa..9327147bd 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/block.json
+++ b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/block.json
@@ -1,6 +1,7 @@
{
"name": "tainacan/facets-list",
"title": "Tainacan Facets List",
+ "apiVersion": 2,
"category": "tainacan-blocks",
"keywords": [ "facets", "search", "terms" ],
"description": "List facets from a Tainacan Collection or Repository",
@@ -131,6 +132,10 @@
"isLoadingChildTerms": {
"type": "Number",
"default": null
+ },
+ "itemsCountStyle": {
+ "type": "String",
+ "default": "default"
}
},
"supports": {
@@ -138,6 +143,12 @@
"html": false,
"typography": {
"fontSize": true
+ },
+ "color": {
+ "text": true,
+ "background": false,
+ "gradients": false,
+ "link": true
}
},
"editorScript": "facets-list",
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/deprecated.js b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/deprecated.js
index a193dcafd..b353f2b11 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/deprecated.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/deprecated.js
@@ -1,4 +1,186 @@
export default [
+ /* Deprecated on Tainacan 0.18.6 due to itemsCountStyle */
+ {
+ "attributes": {
+ "content": {
+ "type": "Array",
+ "source": "children",
+ "selector": "div"
+ },
+ "collectionId": {
+ "type": "String",
+ "default": ""
+ },
+ "collectionSlug": {
+ "type": "String",
+ "default": ""
+ },
+ "facets": {
+ "type": "Array",
+ "default": []
+ },
+ "facetsObject": {
+ "type": "Array",
+ "default": []
+ },
+ "showImage": {
+ "type": "Boolean",
+ "default": true
+ },
+ "nameInsideImage": {
+ "type": "Boolean",
+ "default": false
+ },
+ "showItemsCount": {
+ "type": "Boolean",
+ "default": true
+ },
+ "showLoadMore": {
+ "type": "Boolean",
+ "default": false
+ },
+ "showSearchBar": {
+ "type": "Boolean",
+ "value": false
+ },
+ "layout": {
+ "type": "String",
+ "default": "grid"
+ },
+ "cloudRate": {
+ "type": "Number",
+ "default": 1
+ },
+ "isModalOpen": {
+ "type": "Boolean",
+ "default": false
+ },
+ "gridMargin": {
+ "type": "Number",
+ "default": 24
+ },
+ "metadatumId": {
+ "type": "String",
+ "default": ""
+ },
+ "metadatumType": {
+ "type": "String",
+ "default": ""
+ },
+ "facetsRequestSource": {
+ "type": "String",
+ "default": ""
+ },
+ "maxFacetsNumber": {
+ "type": "Number",
+ "value": 12
+ },
+ "isLoading": {
+ "type": "Boolean",
+ "value": false
+ },
+ "isLoadingCollection": {
+ "type": "Boolean",
+ "value": false
+ },
+ "collection": {
+ "type": "Object",
+ "value": {}
+ },
+ "searchString": {
+ "type": "String",
+ "default": ""
+ },
+ "blockId": {
+ "type": "String",
+ "default": ""
+ },
+ "parentTerm": {
+ "type": "Number",
+ "default": null
+ },
+ "isParentTermModalOpen": {
+ "type": "Boolean",
+ "default": false
+ },
+ "maxColumnsCount": {
+ "type": "Number",
+ "default": 5
+ },
+ "appendChildTerms": {
+ "type": "Boolean",
+ "default": false
+ },
+ "childFacetsObject": {
+ "type": "Object",
+ "default": {}
+ },
+ "linkTermFacetsToTermPage": {
+ "type": "Boolean",
+ "default": true
+ },
+ "isLoadingChildTerms": {
+ "type": "Number",
+ "default": null
+ }
+ },
+ "supports": {
+ "align": ["full", "wide"],
+ "html": false,
+ "typography": {
+ "fontSize": true
+ }
+ },
+ save({ attributes, className }){
+ const {
+ content,
+ blockId,
+ collectionId,
+ collectionSlug,
+ parentTerm,
+ showImage,
+ nameInsideImage,
+ showItemsCount,
+ showLoadMore,
+ layout,
+ cloudRate,
+ gridMargin,
+ metadatumId,
+ metadatumType,
+ maxFacetsNumber,
+ maxColumnsCount,
+ showSearchBar,
+ linkTermFacetsToTermPage,
+ appendChildTerms
+ } = attributes;
+ return
+ { content }
+
+ }
+ },
/* Deprecated on Tainacan 0.18.4 due to new block.json strategy */
{
attributes: {
diff --git a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
index 57781b270..c815cd2b0 100644
--- a/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
+++ b/src/views/gutenberg-blocks/tainacan-blocks/facets-list/edit.js
@@ -1,8 +1,8 @@
const { __ } = wp.i18n;
-const { BaseControl, RangeControl, Spinner, Button, ToggleControl, Tooltip, Placeholder, PanelBody } = wp.components;
+const { BaseControl, RangeControl, Spinner, SelectControl, Button, ToggleControl, Placeholder, PanelBody } = wp.components;
-const { InspectorControls, BlockControls } = (tainacan_blocks.wp_version < '5.2' ? wp.editor : wp.blockEditor );
+const { InspectorControls, BlockControls, useBlockProps } = (tainacan_blocks.wp_version < '5.2' ? wp.editor : wp.blockEditor );
import MetadataModal from './metadata-modal.js';
import ParentTermModal from './parent-term-modal.js';
@@ -17,7 +17,7 @@ export default function({ attributes, setAttributes, className, isSelected, clie
facetsObject,
content,
collectionId,
- collectionSlug,
+ collectionSlug,
showImage,
nameInsideImage,
showItemsCount,
@@ -39,9 +39,13 @@ export default function({ attributes, setAttributes, className, isSelected, clie
appendChildTerms,
childFacetsObject,
linkTermFacetsToTermPage,
- isLoadingChildTerms
+ isLoadingChildTerms,
+ itemsCountStyle
} = attributes;
+ // Gets blocks props from hook
+ const blockProps = tainacan_blocks.wp_version < '5.6' ? { className: className } : useBlockProps();
+
// Obtains block's client id to render it on save function
setAttributes({ blockId: clientId });
@@ -70,6 +74,11 @@ export default function({ attributes, setAttributes, className, isSelected, clie
gridMargin = 24;
setAttributes({ gridMargin: gridMargin });
}
+ if (itemsCountStyle === undefined) {
+ itemsCountStyle = 'default';
+ setAttributes({ itemsCountStyle: itemsCountStyle });
+ }
+
// Uptades previous logic of metadatum type
if (metadatumType == __('Taxonomy', 'tainacan')) {
metadatumType = 'Tainacan\\Metadata_Types\\Taxonomy';
@@ -91,7 +100,7 @@ export default function({ attributes, setAttributes, className, isSelected, clie
href={ !appendChildTerms ? ((linkTermFacetsToTermPage && isMetadatumTypeTaxonomy(metadatumType)) ? facet.term_url : facet.url) : (facet.total_children > 0 ? null : (linkTermFacetsToTermPage ? facet.term_url : facet.url)) }
onClick={ () => { (appendChildTerms && facet.total_children > 0) ? displayChildTerms(facetId) : null } }
target="_blank"
- style={{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'rem' : ''}}>
+ style={{ fontSize: layout == 'cloud' && facet.total_items ? + (1 + (cloudRate/4) * Math.log(facet.total_items)) + 'em' : ''}}>
{ isMetadatumTypeTaxonomy(metadatumType) ?
: null
}
-
{ facet.label ? facet.label : '' }
- { facet.total_items ?
({ facet.total_items }) : null }
+
+ { facet.label ? facet.label : '' }
+ {
+ facet.total_items ?
+
+ { itemsCountStyle === 'below' ?
+ ( facet.total_items != 1 ? (facet.total_items + ' ' + __('items', 'tainacan' )) : (facet.total_items + ' ' + __('item', 'tainacan' )) )
+ :
+ ( ' (' + facet.total_items + ')' )
+ }
+
+ : null }
+
{ appendChildTerms && facet.total_children > 0 ?
( childFacetsObject[facetId] && childFacetsObject[facetId].visible ?