@eeacms/volto-cca-policy 0.3.72 → 0.3.74

package/src/search/cca/views.js

@@ -1,4 +1,4 @@
-export default {
+const viewsCCA = {
   resultViews: [
     {
       id: 'ClusterHorizontalCardItem',
@@ -13,3 +13,5 @@ export default {
     },
   ],
 };
+
+export default viewsCCA;

package/src/search/health_observatory/views-health.js

@@ -1,4 +1,4 @@
-export default {
+const viewsHealth = {
   resultViews: [
     {
       id: 'healthHorizontalCardItem',
@@ -13,3 +13,5 @@ export default {
     },
   ],
 };
+
+export default viewsHealth;

package/src/search/vocabulary.js

@@ -1,4 +1,16 @@
 import { eea_languages } from '@eeacms/volto-cca-policy/constants';
+import { defineMessages } from 'react-intl';
+
+defineMessages({
+  publicationReference: {
+    id: 'Publication reference',
+    defaultMessage: 'Publications and reports',
+  },
+  video: {
+    id: 'Video',
+    defaultMessage: 'Videos and podcasts',
+  },
+});
 
 export const vocab = {
   cluster_name: {

package/src/store/middleware.js

@@ -1,40 +1,41 @@
-export const langRedirection = ({ dispatch, getState }) => (next) => (
-  action,
-) => {
-  if (typeof action === 'function') {
-    return next(action);
-  }
+export const langRedirection =
+  ({ dispatch, getState }) =>
+  (next) =>
+  (action) => {
+    if (typeof action === 'function') {
+      return next(action);
+    }
 
-  switch (action.type) {
-    case '@@router/LOCATION_CHANGE':
-      const { pathname } = action.payload.location;
-      const state = getState();
-      const locale = state.intl.locale || 'en';
-      const search = ['/data-and-downloads', '/advanced-search'];
-      const isSearchPage = search.some((el) => pathname.includes(el));
-      const queryString = action.payload.location.search;
-      const urlParams = new URLSearchParams(queryString);
-      const hasLanguageQueryParam = urlParams.has('set_language');
+    switch (action.type) {
+      case '@@router/LOCATION_CHANGE':
+        const { pathname } = action.payload.location;
+        const state = getState();
+        const locale = state.intl.locale || 'en';
+        const search = ['/data-and-downloads', '/advanced-search'];
+        const isSearchPage = search.some((el) => pathname.includes(el));
+        const queryString = action.payload.location.search;
+        const urlParams = new URLSearchParams(queryString);
+        const hasLanguageQueryParam = urlParams.has('set_language');
 
-      // sometimes there's Links where the target has moved
-      const nonApiPathname = pathname.replaceAll('++api++', '');
-      if (nonApiPathname !== pathname) {
-        action.payload.location.pathname = nonApiPathname;
-        window.history.replaceState(window.history.state, '', nonApiPathname);
-      }
+        // sometimes there's Links where the target has moved
+        const nonApiPathname = pathname.replaceAll('++api++', '');
+        if (nonApiPathname !== pathname) {
+          action.payload.location.pathname = nonApiPathname;
+          window.history.replaceState(window.history.state, '', nonApiPathname);
+        }
 
-      if (
-        locale !== 'en' &&
-        !isSearchPage &&
-        !hasLanguageQueryParam &&
-        pathname.indexOf('/en/') > -1
-      ) {
-        const newPathname = pathname.replaceAll('/en/', `/${locale}/`);
-        action.payload.location.pathname = newPathname;
-        window.history.replaceState(window.history.state, '', newPathname);
-      }
-      return next(action);
-    default:
-      return next(action);
-  }
-};
+        if (
+          locale !== 'en' &&
+          !isSearchPage &&
+          !hasLanguageQueryParam &&
+          pathname.indexOf('/en/') > -1
+        ) {
+          const newPathname = pathname.replaceAll('/en/', `/${locale}/`);
+          action.payload.location.pathname = newPathname;
+          window.history.replaceState(window.history.state, '', newPathname);
+        }
+        return next(action);
+      default:
+        return next(action);
+    }
+  };

package/theme/globals/blocks.less

@@ -89,3 +89,7 @@
     }
   }
 }
+
+.ui.items > .item > img + .content {
+  padding-left: 1rem;
+}

package/theme/globals/mission.less

@@ -15,20 +15,13 @@
 }
 
 body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
-  h2 {
-  color: #3d5265;
-  font-size: 23px;
-}
-
-body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
+  .block.gridBlock
   .image {
   height: 260px;
 }
 
 body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
+  .block.gridBlock
   img {
   height: 260px;
   object-fit: contain;

package/theme/globals/observatory.less

@@ -35,7 +35,7 @@
 .no-padding-tab .column-blocks-wrapper {
   margin-bottom: 1rem;
 
-  .block.teaserGrid {
+  .block.gridBlock {
     margin-bottom: 0rem;
   }
 }
@@ -72,7 +72,7 @@
 }
 
 .block.call-to-action,
-.block.teaserGrid {
+.block.gridBlock {
   margin-bottom: 0rem;
 }
 

package/theme/globals/views.less

@@ -33,6 +33,10 @@ div.geochars-field {
   }
 }
 
+.geolocation-field .ol-map {
+  cursor: pointer;
+}
+
 .btn-right {
   margin: calc(2rem - 0.1em) 0em 1rem;
   float: right;
@@ -335,3 +339,24 @@ hr {
   border-radius: 4px;
   border: 1px solid #e5e5e5;
 }
+
+.broken-links-table {
+  td {
+    max-width: 200px;
+  }
+
+  a {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .cursor-pointer {
+    cursor: pointer;
+  }
+
+  .select-none {
+    user-select: none;
+  }
+}

package/src/components/theme/Views/brokenlinks.less

@@ -1,21 +0,0 @@
-.broken-links-table {
-  td {
-    max-width: 200px;
-  }
-
-  a {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    // max-width: 200px;
-  }
-
-  .cursor-pointer {
-    cursor: pointer;
-  }
-
-  .select-none {
-    user-select: none;
-  }
-}

package/src/components/theme/Widgets/geolocation.css

@@ -1,3 +0,0 @@
-.geolocation-field .ol-map {
-  cursor: pointer;
-}

package/src/customizations/volto/components/manage/UniversalLink/UniversalLink.test.jsx

@@ -1,229 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { Provider } from 'react-intl-redux';
-import configureStore from 'redux-mock-store';
-import { render } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import UniversalLink from './UniversalLink';
-import config from '@plone/volto/registry';
-
-const mockStore = configureStore();
-const store = mockStore({
-  userSession: {
-    token: null,
-  },
-  intl: {
-    locale: 'en',
-    messages: {},
-  },
-});
-
-global.console.error = jest.fn();
-
-describe('UniversalLink', () => {
-  it('renders a UniversalLink component with internal link', () => {
-    const component = renderer.create(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink href={'/en/welcome-to-volto'}>
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
-  });
-
-  it('renders a UniversalLink component with external link', () => {
-    const component = renderer.create(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink href="https://github.com/plone/volto">
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
-  });
-
-  it('renders a UniversalLink component if no external(href) link passed', () => {
-    const component = renderer.create(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            item={{
-              '@id': 'http://localhost:3000/en/welcome-to-volto',
-            }}
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
-  });
-
-  it('check UniversalLink set rel attribute for ext links', () => {
-    const { getByTitle } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            href="https://github.com/plone/volto"
-            title="Volto GitHub repository"
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(getByTitle('Volto GitHub repository').getAttribute('rel')).toBe(
-      'noopener',
-    );
-  });
-
-  it('check UniversalLink set target attribute for ext links', () => {
-    const { getByTitle } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            href="https://github.com/plone/volto"
-            title="Volto GitHub repository"
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(getByTitle('Volto GitHub repository').getAttribute('target')).toBe(
-      '_blank',
-    );
-  });
-
-  it('check UniversalLink can unset target for ext links with prop', () => {
-    const { getByTitle } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            href="https://github.com/plone/volto"
-            title="Volto GitHub repository"
-            openLinkInNewTab={false}
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(
-      getByTitle('Volto GitHub repository').getAttribute('target'),
-    ).toBeNull();
-  });
-
-  it('check UniversalLink renders ext link for blacklisted urls', () => {
-    config.settings.externalRoutes = [
-      {
-        match: {
-          path: '/external-app',
-          exact: true,
-          strict: false,
-        },
-        url(payload) {
-          return payload.location.pathname;
-        },
-      },
-    ];
-
-    const { getByTitle } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            href="http://localhost:3000/external-app"
-            title="Blacklisted route"
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(getByTitle('Blacklisted route').getAttribute('target')).toBe(
-      '_blank',
-    );
-  });
-
-  it('UniversalLink renders external link where link is blacklisted', () => {
-    const notInEN = /^(?!.*(#|\/en|\/static|\/controlpanel|\/cypress|\/login|\/logout|\/contact-form)).*$/;
-    config.settings.externalRoutes = [
-      {
-        match: {
-          path: notInEN,
-          exact: false,
-          strict: false,
-        },
-        url(payload) {
-          return payload.location.pathname;
-        },
-      },
-    ];
-
-    const { getByTitle } = render(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            href="http://localhost:3000/blacklisted-app"
-            title="External blacklisted app"
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-
-    expect(getByTitle('External blacklisted app').getAttribute('target')).toBe(
-      '_blank',
-    );
-    expect(getByTitle('External blacklisted app').getAttribute('rel')).toBe(
-      'noopener',
-    );
-  });
-
-  it('check UniversalLink does not break with error in item', () => {
-    const component = renderer.create(
-      <Provider store={store}>
-        <MemoryRouter>
-          <UniversalLink
-            item={{
-              error: 'Error while fetching content',
-              message: 'Something went wrong',
-            }}
-          >
-            <h1>Title</h1>
-          </UniversalLink>
-        </MemoryRouter>
-      </Provider>,
-    );
-    const json = component.toJSON();
-    expect(json).toMatchSnapshot();
-    expect(global.console.error).toHaveBeenCalled();
-  });
-});
-
-it('renders a UniversalLink component when url ends with @@display-file', () => {
-  const component = renderer.create(
-    <Provider store={store}>
-      <MemoryRouter>
-        <UniversalLink href="http://localhost:3000/en/welcome-to-volto/@@display-file">
-          <h1>Title</h1>
-        </UniversalLink>
-      </MemoryRouter>
-    </Provider>,
-  );
-  const json = component.toJSON();
-  expect(json).toMatchSnapshot();
-});