@eeacms/volto-clms-theme 1.0.63 → 1.0.67

package/src/components/Blocks/customBlocks.js

@@ -1,3 +1,8 @@
+import {
+  AccordionFacet,
+  RightModalFacets,
+  WithType,
+} from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock';
 import {
   CclCarouselView,
   CclProductTabsView,
@@ -39,26 +44,20 @@ import CclHomeSearchBlockView from '@eeacms/volto-clms-theme/components/Blocks/C
 import CclHomeUsersBlockEdit from '@eeacms/volto-clms-theme/components/Blocks/CclHomeUsersBlock/CclHomeUsersBlockEdit';
 import CclHomeUsersBlockView from '@eeacms/volto-clms-theme/components/Blocks/CclHomeUsersBlock/CclHomeUsersBlockView';
 import CclMapMenu from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoArcgisBlock/CclMapMenu';
-import CclProductLeftMenuEdit from '@eeacms/volto-clms-theme/components/Blocks/CclProductLeftMenu/CclProductLeftMenuEdit';
-import CclProductLeftMenuView from '@eeacms/volto-clms-theme/components/Blocks/CclProductLeftMenu/CclProductLeftMenuView';
 import CclRelatedListingEdit from '@eeacms/volto-clms-theme/components/Blocks/CclRelatedListingBlock/CclRelatedListingEdit';
 import CclRelatedListingView from '@eeacms/volto-clms-theme/components/Blocks/CclRelatedListingBlock/CclRelatedListingView';
 import CclUseCaseListEdit from '@eeacms/volto-clms-theme/components/Blocks/CclUseCaseList/CclUseCaseListEdit';
 import CclUseCaseListView from '@eeacms/volto-clms-theme/components/Blocks/CclUseCaseList/CclUseCaseListView';
 import CclWhiteBgView from '@eeacms/volto-clms-theme/components/Blocks/CclHomeBgImageBlock/CclWhiteBgView';
-import RightModalFacets from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock/RightModalFacets';
-import customIdFieldSchema from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoFormBlock/customIdFieldSchema';
-import AccordionCheckboxFacet from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock/AccordionCheckboxFacet';
-import AccordionLabelFacet from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoSearchBlock/AccordionLabelFacet';
 import RelatedListingSchema from '@eeacms/volto-clms-theme/components/Blocks/CclRelatedListingBlock/schema';
 import { TABS_BLOCK } from '@eeacms/volto-tabs-block/constants';
 import TextLinkCarouselEdit from '@eeacms/volto-clms-theme/components/Blocks/CclTextLinkCarouselBlock/CclTextLinkCarouselEdit';
 import TextLinkCarouselView from '@eeacms/volto-clms-theme/components/Blocks/CclTextLinkCarouselBlock/CclTextLinkCarouselView';
 import cardSVG from '@plone/volto/icons/indent.svg';
 import containerSVG from '@plone/volto/icons/apps.svg';
+import customIdFieldSchema from '@eeacms/volto-clms-theme/components/Blocks/CustomTemplates/VoltoFormBlock/customIdFieldSchema';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import homeBand from '@plone/volto/icons/image-wide.svg';
-import leftMenuSVG from '@plone/volto/icons/nav.svg';
 import linkSVG from '@plone/volto/icons/link.svg';
 import navSVG from '@plone/volto/icons/nav.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
@@ -74,6 +73,53 @@ export const customGroupBlocksOrder = [
   },
 ];
 
+function listingVariation(id, isDefault, title, template, isWO = false) {
+  return {
+    id: id,
+    isDefault: isDefault,
+    title: title,
+    template: VariationHOC(
+      isWO ? CclListingWorkOpportunities : CclListingCards,
+      template,
+    ),
+    fullobjects: true,
+  };
+}
+
+const availableVariations = [
+  listingVariation('CclCardsdoc', true, 'Line list', 'doc'),
+  listingVariation('CclCardsline', false, 'Line list with Image', 'line'),
+  listingVariation(
+    'CclCardsline-color',
+    false,
+    'Colored Line list with Image',
+    'line-color',
+  ),
+  listingVariation('CclCardsblock', false, '2 Column Cards list', 'block'),
+  listingVariation(
+    'CclCardsthreeColumns',
+    false,
+    '3 Column Cards list',
+    'threeColumns',
+  ),
+  listingVariation('CclCardsnews', false, 'News Line list', 'news'),
+  listingVariation('CclCardsevent', false, 'Events Line list', 'event'),
+  listingVariation(
+    'CclWOOpenTenders',
+    false,
+    'Open Work Opportunities',
+    'OpenTenders',
+    true,
+  ),
+  listingVariation(
+    'CclWOCloseTenders',
+    false,
+    'Closed Work Opportunities',
+    'CloseTenders',
+    true,
+  ),
+];
+
 const customBlocks = (config) => ({
   ...config.blocks.blocksConfig,
   video: {
@@ -140,71 +186,7 @@ const customBlocks = (config) => ({
   listing: {
     ...config.blocks.blocksConfig.listing,
     showLinkMore: true,
-    variations: [
-      {
-        id: 'CclCardsdoc',
-        isDefault: true,
-        title: 'Line list',
-        template: VariationHOC(CclListingCards, 'doc'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsline',
-        isDefault: false,
-        title: 'Line list with Image',
-        template: VariationHOC(CclListingCards, 'line'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsline-color',
-        isDefault: false,
-        title: 'Colored Line list with Image',
-        template: VariationHOC(CclListingCards, 'line-color'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsblock',
-        isDefault: false,
-        title: '2 Column Cards list',
-        template: VariationHOC(CclListingCards, 'block'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsthreeColumns',
-        isDefault: false,
-        title: '3 Column Cards list',
-        template: VariationHOC(CclListingCards, 'threeColumns'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsnews',
-        isDefault: false,
-        title: 'News Line list',
-        template: VariationHOC(CclListingCards, 'news'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsevent',
-        isDefault: false,
-        title: 'Events Line list',
-        template: VariationHOC(CclListingCards, 'event'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclWOOpenTenders',
-        isDefault: false,
-        title: 'Open Work Opportunities',
-        template: VariationHOC(CclListingWorkOpportunities, 'OpenTenders'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclWOCloseTenders',
-        isDefault: false,
-        title: 'Closed Work Opportunities',
-        template: VariationHOC(CclListingWorkOpportunities, 'CloseTenders'),
-        fullobjects: true,
-      },
-    ],
+    variations: availableVariations,
   },
   accordion: {
     ...config.blocks.blocksConfig.accordion,
@@ -246,22 +228,6 @@ const customBlocks = (config) => ({
       view: [], // Future proof (not implemented yet) view user role(s)
     },
   },
-  productLeftMenu: {
-    id: 'productLeftMenu', // The name (id) of the block
-    title: 'Product Left Menu', // The display name of the block
-    icon: leftMenuSVG, // The icon used in the block chooser
-    group: 'ccl_blocks', // The group (blocks can be grouped, displayed in the chooser)
-    view: CclProductLeftMenuView, // The view mode component
-    edit: CclProductLeftMenuEdit, // The edit mode component
-    restricted: false, // If the block is restricted, it won't show in the chooser
-    mostUsed: false, // A meta group `most used`, appearing at the top of the chooser
-    blockHasOwnFocusManagement: false, // Set this to true if the block manages its own focus
-    sidebarTab: 1, // The sidebar tab you want to be selected when selecting the block
-    security: {
-      addPermission: [], // Future proof (not implemented yet) add user permission role(s)
-      view: [], // Future proof (not implemented yet) view user role(s)
-    },
-  },
   useCaseList: {
     id: 'useCaseList', // The name (id) of the block
     title: 'UseCase List', // The display name of the block
@@ -295,71 +261,7 @@ const customBlocks = (config) => ({
       addPermission: [], // Future proof (not implemented yet) add user permission role(s)
       view: [], // Future proof (not implemented yet) view user role(s)
     },
-    variations: [
-      {
-        id: 'CclCardsdoc',
-        isDefault: true,
-        title: 'Line list',
-        template: VariationHOC(CclListingCards, 'doc'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsline',
-        isDefault: false,
-        title: 'Line list with Image',
-        template: VariationHOC(CclListingCards, 'line'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsline-color',
-        isDefault: false,
-        title: 'Colored Line list with Image',
-        template: VariationHOC(CclListingCards, 'line-color'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsblock',
-        isDefault: false,
-        title: '2 Column Cards list',
-        template: VariationHOC(CclListingCards, 'block'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsthreeColumns',
-        isDefault: false,
-        title: '3 Column Cards list',
-        template: VariationHOC(CclListingCards, 'threeColumns'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsnews',
-        isDefault: false,
-        title: 'News Line list',
-        template: VariationHOC(CclListingCards, 'news'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclCardsevent',
-        isDefault: false,
-        title: 'Events Line list',
-        template: VariationHOC(CclListingCards, 'event'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclWOOpenTenders',
-        isDefault: false,
-        title: 'Open Work Opportunities',
-        template: VariationHOC(CclListingWorkOpportunities, 'OpenTenders'),
-        fullobjects: true,
-      },
-      {
-        id: 'CclWOCloseTenders',
-        isDefault: false,
-        title: 'Closed Work Opportunities',
-        template: VariationHOC(CclListingWorkOpportunities, 'CloseTenders'),
-        fullobjects: true,
-      },
-    ],
+    variations: availableVariations,
   },
   cardContainer: {
     id: 'cardContainer', // The name (id) of the block
@@ -412,13 +314,13 @@ const customBlocks = (config) => ({
           {
             id: 'accordionCheckboxFacet',
             title: 'Accordion Checkbox',
-            view: AccordionCheckboxFacet,
+            view: WithType(AccordionFacet, 'checkbox'),
             isDefault: true,
           },
           {
             id: 'accordionLabelFacet',
             title: 'Accordion Label',
-            view: AccordionLabelFacet,
+            view: WithType(AccordionFacet, 'label'),
             isDefault: false,
           },
           ...config.blocks.blocksConfig.search.extensions.facetWidgets.types,

package/src/components/CLMSDatasetDetailView/BoundingBoxComponent.test.jsx

@@ -0,0 +1,27 @@
+import BoundingBoxComponent from './BoundingBoxComponent';
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+
+import Enzyme from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+import { mount } from 'enzyme';
+Enzyme.configure({ adapter: new Adapter() });
+
+//jest test for BoundingBoxComponent
+describe('BoundingBoxComponent', () => {
+  //test for BoundingBoxComponent rendering
+  it('Check if BoundingBoxComponent is rendered', () => {
+    const boundingBox = {
+      west: -180,
+      east: 180,
+      north: 90,
+      south: -90,
+    };
+    const wrapper = mount(
+      <MemoryRouter>
+        <BoundingBoxComponent bbox={boundingBox} />
+      </MemoryRouter>,
+    );
+    expect(wrapper).toBeDefined();
+  });
+});

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.jsx

@@ -6,7 +6,6 @@
 import {
   DataSetInfoContent,
   DownloadDataSetContent,
-  MetadataContent,
 } from '@eeacms/volto-clms-theme/components/CLMSDatasetDetailView';
 import { Modal, Segment } from 'semantic-ui-react';
 import { useDispatch, useSelector } from 'react-redux';
@@ -19,19 +18,10 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { getUser } from '@plone/volto/actions';
-import { injectIntl } from 'react-intl';
 import jwtDecode from 'jwt-decode';
 import { postImportGeonetwork } from '../../actions';
 import { useLocation } from 'react-router-dom';
 
-// import {
-//   mockDatabaseInfo,
-//   mockMetadata,
-//   mockDownloadDataset,
-// } from './mockDatasetInfo';
-// import CclCitation from '../CclCitation/CclCitation';
-// import { CclInfoContainer, CclInfoDescription } from '../CclInfoDescription';
-
 /**
  * Full view component class.
  * @function CLMSDatasetDetailView
@@ -45,8 +35,6 @@ const CLMSDatasetDetailView = ({ content, token }) => {
   const geonetwork_importation = useSelector(
     (state) => state.geonetwork_importation,
   );
-  // const userSession = useSelector((state) => state.userSession);
-  // const user_token = userSession.token ? jwtDecode(userSession.token).sub : '';
   const user = useSelector((state) => state.users?.user);
   React.useEffect(() => {
     dispatch(getUser(token));
@@ -192,13 +180,19 @@ const CLMSDatasetDetailView = ({ content, token }) => {
         )}
       <CclTabs routing={true}>
         <div tabTitle="General Info">{DataSetInfoContent(content)}</div>
-        <div tabTitle="Metadata">{MetadataContent(content)}</div>
-
-        {content?.downloadable_dataset ? (
-          <div tabTitle="Download">{DownloadDataSetContent(content)}</div>
-        ) : (
-          <div tabTitle=""></div>
-        )}
+        {content?.downloadable_dataset &&
+          content?.downloadable_files?.items?.length > 0 && (
+            <div tabTitle="Download">{DownloadDataSetContent(content)}</div>
+          )}
+        {content?.downloadable_dataset &&
+          content?.downloadable_files?.items?.length === 0 && (
+            <div
+              tabTitle="Download"
+              redirect={`${location.pathname}/download-by-area`}
+            >
+              {''}
+            </div>
+          )}
 
         <div underPanel={true}>
           <nav className="left-menu-detail">
@@ -282,10 +276,9 @@ CLMSDatasetDetailView.propTypes = {
 };
 
 export default compose(
-  injectIntl,
   connect((state) => ({
     token: state.userSession.token
-      ? jwtDecode(state.userSession.token).sub
+      ? jwtDecode(state.userSession.token)?.sub
       : '',
   })),
 )(CLMSDatasetDetailView);

package/src/components/CLMSDatasetDetailView/CLMSDatasetDetailView.test.jsx

@@ -0,0 +1,194 @@
+import React from 'react';
+import renderer from 'react-test-renderer';
+import CLMSDatasetDetailView from './CLMSDatasetDetailView';
+import { MemoryRouter } from 'react-router-dom';
+
+import { Provider } from 'react-redux';
+import configureStore from 'redux-mock-store';
+
+const mockStore = configureStore();
+
+describe('CLMSDatasetDetailView', () => {
+  it('Check metadata view', () => {
+    const content = {
+      title: 'Test title!',
+      url: './example',
+      description: 'Description test',
+      download: true,
+      dataResourceTitle: 'example title',
+      dataResourceAbstract: {
+        data: 'exampledata',
+      },
+      dataSources: {
+        title: 'example title',
+        description: 'example description',
+        tooltip: 'example tooltip',
+        data: 'Source data',
+      },
+      dataResourceLocator: 'Resource locator',
+      image: {
+        src:
+          'https://eu-copernicus.github.io/copernicus-component-library/assets/images/image_placeholder.jpg',
+        alt: 'Placeholder',
+      },
+      downloadable_dataset: true,
+      downloadable_files: [
+        {
+          title: 'example title',
+          description: 'example description',
+          tooltip: 'example tooltip',
+          url: './example',
+        },
+        {
+          title: 'example title',
+          description: 'example description',
+          tooltip: 'example tooltip',
+          url: './example',
+        },
+      ],
+    };
+    const store = mockStore({
+      content: {
+        ...content,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequest: {
+          '123': { items: [] },
+        },
+      },
+      users: {
+        user: { roles: ['Manager'] },
+      },
+      userSession: {
+        token:
+          'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTY0NDM4MzA0NCwiZnVsbG5hbWUiOm51bGx9.cB_q3Q0Jhu8h2m_SDmmknodpDxDLfb4o-qY6Y2plE04',
+      },
+    });
+
+    const DatasetDetailView = renderer
+      .create(
+        <Provider store={store}>
+          <MemoryRouter>
+            <CLMSDatasetDetailView content={content}>
+              <p>Metadata view test</p>
+            </CLMSDatasetDetailView>
+          </MemoryRouter>
+        </Provider>,
+      )
+      .toJSON();
+    expect(DatasetDetailView).toBeDefined();
+  });
+  it('Check metadata view without downloadable files', () => {
+    const content = {
+      title: 'Test title!',
+      url: './example',
+      description: 'Description test',
+      download: true,
+      dataResourceTitle: 'example title',
+      dataResourceAbstract: {
+        data: 'exampledata',
+      },
+      dataSources: {
+        title: 'example title',
+        description: 'example description',
+        tooltip: 'example tooltip',
+        data: 'Source data',
+      },
+      dataResourceLocator: 'Resource locator',
+      image: {
+        src:
+          'https://eu-copernicus.github.io/copernicus-component-library/assets/images/image_placeholder.jpg',
+        alt: 'Placeholder',
+      },
+      downloadable_dataset: true,
+      downloadable_files: [],
+    };
+    const store = mockStore({
+      content: {
+        ...content,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequest: {
+          '123': { items: [] },
+        },
+      },
+      users: {
+        user: { roles: ['Manager'] },
+      },
+      userSession: {
+        token:
+          'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTY0NDM4MzA0NCwiZnVsbG5hbWUiOm51bGx9.cB_q3Q0Jhu8h2m_SDmmknodpDxDLfb4o-qY6Y2plE04',
+      },
+    });
+
+    const DatasetDetailView = renderer
+      .create(
+        <Provider store={store}>
+          <MemoryRouter>
+            <CLMSDatasetDetailView content={content}>
+              <p>Metadata view test</p>
+            </CLMSDatasetDetailView>
+          </MemoryRouter>
+        </Provider>,
+      )
+      .toJSON();
+    expect(DatasetDetailView).toBeDefined();
+  });
+  it('Check metadata view with geonetwork_identifiers items lenght > 0 user roles exists and user roles includes manager', () => {
+    const content = {
+      geonetwork_identifiers: [
+        {
+          title: 'example title',
+          description: 'example description',
+          tooltip: 'example tooltip',
+          url: './example',
+        },
+        {
+          title: 'example title',
+          description: 'example description',
+          tooltip: 'example tooltip',
+          url: './example',
+        },
+      ],
+    };
+    const store = mockStore({
+      content: {
+        ...content,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+      },
+      search: {
+        subrequest: {
+          '123': { items: [] },
+        },
+      },
+      user: { roles: ['Manager'] },
+      userSession: {
+        token:
+          'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTY0NDM4MzA0NCwiZnVsbG5hbWUiOm51bGx9.cB_q3Q0Jhu8h2m_SDmmknodpDxDLfb4o-qY6Y2plE04',
+      },
+    });
+    const DatasetDetailView = renderer
+      .create(
+        <Provider store={store}>
+          <MemoryRouter>
+            <CLMSDatasetDetailView content={content}>
+              <p>Metadata view test</p>
+            </CLMSDatasetDetailView>
+          </MemoryRouter>
+        </Provider>,
+      )
+      .toJSON();
+    expect(DatasetDetailView).toBeDefined();
+  });
+});

package/src/components/CLMSDatasetDetailView/ContactComponent.test.jsx

@@ -0,0 +1,34 @@
+import ContactComponent from './ContactComponent';
+import React from 'react';
+import renderer from 'react-test-renderer';
+import { MemoryRouter } from 'react-router-dom';
+
+import Enzyme from 'enzyme';
+import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
+Enzyme.configure({ adapter: new Adapter() });
+//jest test for ContactComponent
+describe('ContactComponent', () => {
+  //test for ContactComponent rendering
+  it('Check if ContactComponent is rendered', () => {
+    const contact = {
+      organisationName: 'Test',
+      deliveryPoint: 'Test',
+      city: 'Test',
+      administrativeArea: 'Test',
+      postalCode: 'Test',
+      country: 'Test',
+      electronicMailAddress: 'Test',
+      url: 'Test',
+      urlTitle: 'Test',
+      roleCode: 'Test',
+    };
+    const contactComponent = renderer
+      .create(
+        <MemoryRouter>
+          <ContactComponent contact={contact} />
+        </MemoryRouter>,
+      )
+      .toJSON();
+    expect(contactComponent).toBeDefined();
+  });
+});