-
+
{intl.formatMessage(messages.searchResults)}
diff --git a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx
index 0e89643ac..975927c43 100644
--- a/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx
+++ b/src/components/ItaliaTheme/View/ServizioView/ServizioMetatag.jsx
@@ -44,7 +44,7 @@ const ServizioMetatag = ({ content }) => {
if (richTextHasContent(content.a_chi_si_rivolge)) {
schemaOrg.audience = {
'@type': 'Audience',
- name: fieldDataToPlainText(content.a_chi_si_rivolge),
+ audienceType: fieldDataToPlainText(content.a_chi_si_rivolge),
};
}
@@ -52,8 +52,6 @@ const ServizioMetatag = ({ content }) => {
schemaOrg.availableChannel.serviceUrl = toPublicURL(
content.canale_digitale_link,
);
- } else {
- schemaOrg.availableChannel.serviceUrl = '';
}
if (content.ufficio_responsabile[0]) {
diff --git a/src/config/Blocks/ListingOptions/utils.js b/src/config/Blocks/ListingOptions/utils.js
index 2e13dfbd9..322ae0b90 100644
--- a/src/config/Blocks/ListingOptions/utils.js
+++ b/src/config/Blocks/ListingOptions/utils.js
@@ -165,7 +165,6 @@ export const addLighthouseField = (schema, intl, position = 0) => {
['service-category-link', 'service-category-link'],
['topic-element', 'topic-element'],
['service-link', 'service-link'],
- ['administration-element', 'administration-element'],
['management-category-link', 'management-category-link'],
['news-category-link', 'news-category-link'],
['custom-category-link', 'custom-category-link'],
diff --git a/src/config/RichTextEditor/Plugins/AnchorPlugin/components/LinkButton/AddLinkForm.jsx b/src/config/RichTextEditor/Plugins/AnchorPlugin/components/LinkButton/AddLinkForm.jsx
index 34f3eace2..cbecedc87 100644
--- a/src/config/RichTextEditor/Plugins/AnchorPlugin/components/LinkButton/AddLinkForm.jsx
+++ b/src/config/RichTextEditor/Plugins/AnchorPlugin/components/LinkButton/AddLinkForm.jsx
@@ -87,6 +87,7 @@ class AddLinkForm extends Component {
['accessibility-link', 'accessibility-link'],
['privacy-policy-link', 'privacy-policy-link'],
['legal-notes', 'legal-notes'],
+ ['pager-link', 'pager-link'],
];
}
diff --git a/src/config/italiaConfig.js b/src/config/italiaConfig.js
index ec7021ca4..e9d80772e 100644
--- a/src/config/italiaConfig.js
+++ b/src/config/italiaConfig.js
@@ -6,7 +6,7 @@ import contentSVG from '@plone/volto/icons/content.svg';
import bookSVG from '@plone/volto/icons/book.svg';
import shareSVG from '@plone/volto/icons/share.svg';
import searchIcon from 'bootstrap-italia/src/svg/it-search.svg';
-
+import { defineMessages } from 'react-intl';
import { Search } from '@plone/volto/components';
import {
@@ -69,6 +69,13 @@ const ReleaseLog = loadable(
() => import('design-comuni-plone-theme/components/ReleaseLog/ReleaseLog'),
);
+const messages = defineMessages({
+ search_brdc: {
+ id: 'search_brdc',
+ defaultMessage: 'Ricerca',
+ },
+});
+
export default function applyConfig(voltoConfig) {
let config = applyRichTextConfig(voltoConfig);
@@ -496,6 +503,7 @@ export default function applyConfig(voltoConfig) {
{
path: '/**/search',
component: Search,
+ breadcrumbs_title: messages.search_brdc,
},
{
path: ['/login', '/**/login'],
diff --git a/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx b/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
index c9c980914..cad27aa3f 100644
--- a/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
+++ b/src/customizations/volto/components/manage/Blocks/Listing/ListingBody.jsx
@@ -93,13 +93,6 @@ const ListingBody = React.memo(
// Also need to purge title from searchblock schema, it's the name of the listing template used
const listingBodyProps =
variation?.['@type'] !== 'search' ? data : { ...variation, title: '' };
-
- // Need to know if data-element is "service-link"
- // to add data-element="pager-link" to pagination links
- const isServiceLink =
- data?.id_lighthouse === 'service-link' ||
- variation?.id_lighthouse === 'service-link';
-
return (
{loadingQuery && (
@@ -130,7 +123,6 @@ const ListingBody = React.memo(
activePage={currentPage}
totalPages={totalPages}
onPageChange={onPaginationChange}
- isServiceLink={isServiceLink}
/>
)}
diff --git a/src/reducers/breadcrumbs.js b/src/reducers/breadcrumbs.js
new file mode 100644
index 000000000..ffc4f58c9
--- /dev/null
+++ b/src/reducers/breadcrumbs.js
@@ -0,0 +1,89 @@
+/**
+ * Breadcrumbs reducer.
+ * @module reducers/breadcrumbs/breadcrumbs
+ */
+
+import { map } from 'lodash';
+import {
+ flattenToAppURL,
+ getBaseUrl,
+ hasApiExpander,
+} from '@plone/volto/helpers';
+
+import {
+ GET_BREADCRUMBS,
+ GET_CONTENT,
+} from '@plone/volto/constants/ActionTypes';
+
+const initialState = {
+ error: null,
+ items: [],
+ root: null,
+ loaded: false,
+ loading: false,
+};
+
+/**
+ * Breadcrumbs reducer.
+ * @function breadcrumbs
+ * @param {Object} state Current state.
+ * @param {Object} action Action to be handled.
+ * @returns {Object} New state.
+ */
+export function breadcrumbs(state = initialState, action = {}) {
+ let hasExpander;
+ switch (action.type) {
+ case `${GET_BREADCRUMBS}_PENDING`:
+ return {
+ ...state,
+ error: null,
+ loaded: false,
+ loading: true,
+ };
+ case `${GET_CONTENT}_SUCCESS`:
+ hasExpander = hasApiExpander(
+ 'breadcrumbs',
+ getBaseUrl(flattenToAppURL(action.result['@id'])),
+ );
+ if (hasExpander && !action.subrequest) {
+ return {
+ ...state,
+ error: null,
+ items: map(
+ action.result['@components'].breadcrumbs.items,
+ (item) => ({
+ title: item.title,
+ url: flattenToAppURL(item['@id']),
+ }),
+ ),
+ root: flattenToAppURL(action.result['@components'].breadcrumbs.root),
+ loaded: true,
+ loading: false,
+ };
+ }
+ return state;
+ case `${GET_BREADCRUMBS}_SUCCESS`:
+ return {
+ ...state,
+ error: null,
+ items: map(action.result.items, (item) => ({
+ title: item.title,
+ url: flattenToAppURL(item['@id']),
+ })),
+ root: flattenToAppURL(action.result.root),
+ loaded: true,
+ loading: false,
+ };
+
+ case `${GET_BREADCRUMBS}_FAIL`:
+ return {
+ ...state,
+ error: action.error,
+ items: [],
+ loaded: false,
+ loading: false,
+ };
+ default:
+ return state;
+ }
+}
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 0f5675576..9ec3c1e5c 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -12,6 +12,7 @@ import { dettagliProcedimento } from './dettagliProcedimento';
import { modulisticaItems } from './modulisticaItems';
import { originalQueryReducer } from './originalQueryReducer';
import { searchBandiFiltersReducer } from './searchBandiFiltersReducer';
+import { breadcrumbs } from './breadcrumbs';
/**
* Root reducer.
@@ -30,6 +31,7 @@ const reducers = {
modulisticaItems,
originalQuery: originalQueryReducer,
searchBandiFilters: searchBandiFiltersReducer,
+ breadcrumbs: breadcrumbs,
};
export default reducers;
diff --git a/src/theme/ItaliaTheme/Widgets/_dataGridWidget.scss b/src/theme/ItaliaTheme/Widgets/_dataGridWidget.scss
index 59388159b..0591509f2 100644
--- a/src/theme/ItaliaTheme/Widgets/_dataGridWidget.scss
+++ b/src/theme/ItaliaTheme/Widgets/_dataGridWidget.scss
@@ -32,21 +32,10 @@
}
.row {
- position: relative;
- flex-direction: row;
- flex-wrap: wrap;
-
.column.field-column {
width: unset !important ;
flex-basis: 45%;
-
- &:not(:nth-last-child(2)) {
- flex-grow: 0;
- }
-
- &:nth-child(2n) {
- flex-grow: 0;
- }
+ flex-grow: 0;
.ui.input {
width: 100% !important;
diff --git a/yarn.lock b/yarn.lock
index aa641bc19..ccd8b3f3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6474,7 +6474,7 @@ __metadata:
typeface-roboto-mono: 0.0.75
typeface-titillium-web: 0.0.72
volto-blocks-widget: 3.1.0
- volto-data-grid-widget: 2.2.3
+ volto-data-grid-widget: 2.3.1
volto-dropdownmenu: 4.1.0
volto-editablefooter: 5.0.1
volto-feedback: 0.1.5
@@ -14101,12 +14101,12 @@ __metadata:
languageName: node
linkType: hard
-"volto-data-grid-widget@npm:2.2.3":
- version: 2.2.3
- resolution: "volto-data-grid-widget@npm:2.2.3"
+"volto-data-grid-widget@npm:2.3.1":
+ version: 2.3.1
+ resolution: "volto-data-grid-widget@npm:2.3.1"
peerDependencies:
"@plone/volto": ">=16.0.0-alpha.38"
- checksum: 17f680b8b4f4d598b32c536df098befe8dc0eef275dc93cb887b391dbe09b34724989380c2e2f6d008660ef5d8ed66d5b377b6f0a92fcc543d7a896950ea6f12
+ checksum: a464c7cbc7a4eef49bb0753c713fdd54842c425cb58dfb06c2debe85714ca5ca00e563bcefc00b21d4d3d05d225f16cf642b4a95197022953faf4f0071cdb0ea
languageName: node
linkType: hard