@eeacms/volto-clms-theme 1.0.71 → 1.0.72

package/CHANGELOG.md

@@ -4,8 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.0.72](https://github.com/eea/volto-clms-theme/compare/1.0.71...1.0.72)
+
+- fix tests [`8d68b8d`](https://github.com/eea/volto-clms-theme/commit/8d68b8d9f013f469d6f1138f5301055175344ab6)
+- add edit button for editors at documents listing [`7e81f0b`](https://github.com/eea/volto-clms-theme/commit/7e81f0b920db84c47f3354a9a6d5736213746dea)
+- add default link if has no files to download [`f45842d`](https://github.com/eea/volto-clms-theme/commit/f45842d9a19cab1333cb31843fb5fe5b1e2b15db)
+
 #### [1.0.71](https://github.com/eea/volto-clms-theme/compare/1.0.70...1.0.71)
 
+> 21 February 2022
+
+- Taxonomy widget [`#209`](https://github.com/eea/volto-clms-theme/pull/209)
 - Taxonomy widget [`#208`](https://github.com/eea/volto-clms-theme/pull/208)
 - merge conflicts [`c714434`](https://github.com/eea/volto-clms-theme/commit/c714434f91ce01b9dc82014b32d2c9c34fbe1308)
 - add download link to technical library objects at listing [`455a6dc`](https://github.com/eea/volto-clms-theme/commit/455a6dc6c4cf38f5018582d11b90f156232f1d99)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.71",
+  "version": "1.0.72",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards.jsx

@@ -4,6 +4,7 @@ import { ConditionalLink } from '@plone/volto/components';
 import { flattenToAppURL } from '@plone/volto/helpers';
 
 import { isInternalURL } from '@plone/volto/helpers/Url/Url';
+import { useSelector } from 'react-redux';
 
 import CclCard from '@eeacms/volto-clms-theme/components/CclCard/CclCard';
 
@@ -11,7 +12,7 @@ const CclListingCards = (props) => {
   const { items, linkHref, linkTitle, isEditMode, variation = 'doc' } = props;
   let link = null;
   let href = linkHref?.[0]?.['@id'] || '';
-
+  const user = useSelector((state) => state.users.user);
   if (isInternalURL(href)) {
     link = (
       <ConditionalLink to={flattenToAppURL(href)} condition={!isEditMode}>
@@ -21,7 +22,6 @@ const CclListingCards = (props) => {
   } else if (href) {
     link = <a href={href}>{linkTitle || href}</a>;
   }
-
   let containerClass = '';
   if (['news', 'event'].includes(variation)) {
     containerClass = 'ccl-container';
@@ -33,7 +33,12 @@ const CclListingCards = (props) => {
       <div className={containerClass}>
         {items && items.length > 0
           ? items.map((item, index) => (
-              <CclCard key={index} type={variation} card={item} />
+              <CclCard
+                key={index}
+                type={variation}
+                card={item}
+                showEditor={user?.roles?.includes('Manager')}
+              />
             ))
           : 'There are no items to display'}
       </div>

package/src/components/Blocks/CustomTemplates/VoltoListingBlock/CclListingCards.test.jsx

@@ -10,19 +10,26 @@ import configureStore from 'redux-mock-store';
 Enzyme.configure({ adapter: new Adapter() });
 
 const mockStore = configureStore();
+const store = mockStore({
+  content: {
+    create: {},
+    data: {},
+  },
+  intl: {
+    locale: 'en',
+    messages: {},
+  },
+  users: {
+    user: {
+      roles: ['Manager'],
+    },
+  },
+});
+const internalLink = [{ '@id': '/news' }];
+const externalLink = [{ '@id': 'https://wwww.google.com' }];
 
 describe('CclListingCards', () => {
   it('News listing card internal link', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -33,7 +40,6 @@ describe('CclListingCards', () => {
         },
       },
     ];
-    const linkHref = [{ '@id': '/news' }];
     const linkTitle = 'More news';
     const isEditMode = true;
     const variation = 'CclCardsnews';
@@ -42,7 +48,7 @@ describe('CclListingCards', () => {
         <MemoryRouter>
           <CclListingCards
             items={items}
-            linkHref={linkHref}
+            linkHref={internalLink}
             linkTitle={linkTitle}
             isEditMode={isEditMode}
             variation={variation}
@@ -53,16 +59,6 @@ describe('CclListingCards', () => {
     expect(component).toBeDefined();
   });
   it('Line-color listing card external link', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -73,7 +69,6 @@ describe('CclListingCards', () => {
         },
       },
     ];
-    const linkHref = [{ '@id': 'https://wwww.google.com' }];
     const linkTitle = 'More line-color';
     const isEditMode = true;
     const variation = 'CclCardsline-color';
@@ -82,7 +77,7 @@ describe('CclListingCards', () => {
         <MemoryRouter>
           <CclListingCards
             items={items}
-            linkHref={linkHref}
+            linkHref={externalLink}
             linkTitle={linkTitle}
             isEditMode={isEditMode}
             variation={variation}
@@ -93,16 +88,6 @@ describe('CclListingCards', () => {
     expect(component).toBeDefined();
   });
   it('line listing card external link', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -113,7 +98,6 @@ describe('CclListingCards', () => {
         },
       },
     ];
-    const linkHref = [{ '@id': 'https://wwww.google.com' }];
     const linkTitle = 'More line';
     const isEditMode = true;
     const variation = 'CclCardsline';
@@ -122,7 +106,7 @@ describe('CclListingCards', () => {
         <MemoryRouter>
           <CclListingCards
             items={items}
-            linkHref={linkHref}
+            linkHref={externalLink}
             linkTitle={linkTitle}
             isEditMode={isEditMode}
             variation={variation}
@@ -133,16 +117,6 @@ describe('CclListingCards', () => {
     expect(component).toBeDefined();
   });
   it('without linkHref', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -169,16 +143,6 @@ describe('CclListingCards', () => {
     expect(component).toBeDefined();
   });
   it('internal link without linkTitle', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -189,7 +153,6 @@ describe('CclListingCards', () => {
         },
       },
     ];
-    const linkHref = [{ '@id': '/news' }];
     const isEditMode = true;
     const variation = 'CclCardsnews';
     const component = mount(
@@ -197,7 +160,7 @@ describe('CclListingCards', () => {
         <MemoryRouter>
           <CclListingCards
             items={items}
-            linkHref={linkHref}
+            linkHref={internalLink}
             isEditMode={isEditMode}
             variation={variation}
           ></CclListingCards>
@@ -207,16 +170,6 @@ describe('CclListingCards', () => {
     expect(component).toBeDefined();
   });
   it('External link without linkTitle', () => {
-    const store = mockStore({
-      content: {
-        create: {},
-        data: {},
-      },
-      intl: {
-        locale: 'en',
-        messages: {},
-      },
-    });
     const items = [
       {
         title: 'Card Title',
@@ -227,7 +180,6 @@ describe('CclListingCards', () => {
         },
       },
     ];
-    const linkHref = [{ '@id': 'https://www.google.com' }];
     const isEditMode = true;
     const variation = 'CclCardsnews';
     const component = mount(
@@ -235,7 +187,7 @@ describe('CclListingCards', () => {
         <MemoryRouter>
           <CclListingCards
             items={items}
-            linkHref={linkHref}
+            linkHref={externalLink}
             isEditMode={isEditMode}
             variation={variation}
           ></CclListingCards>

package/src/components/CclCard/CclCard.jsx

@@ -9,6 +9,8 @@ import React from 'react';
 import { When } from '@plone/volto/components/theme/View/EventDatesInfo';
 import { Label } from 'semantic-ui-react';
 import { portal_types_labels } from '../Blocks/CustomTemplates/VoltoSearchBlock';
+import penSVG from '@plone/volto/icons/pen.svg';
+import { Icon } from '@plone/volto/components';
 
 function bytesToSize(bytes) {
   var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
@@ -17,7 +19,7 @@ function bytesToSize(bytes) {
   return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
 }
 function CclCard(props) {
-  const { type, children, card } = props;
+  const { type, children, card, showEditor = false } = props;
   let url = '/';
   let content_type = '';
   if (card) {
@@ -49,7 +51,17 @@ function CclCard(props) {
                 {card?.file?.download ? (
                   <a href={card.file.download}>{card?.title}</a>
                 ) : (
-                  card?.title
+                  <Link to={url}>{card?.title}</Link>
+                )}
+                {card?.file?.download && showEditor && (
+                  <Link to={`${url}/edit`}>
+                    <Icon
+                      name={penSVG}
+                      size="15px"
+                      className="circled"
+                      title={'Edit'}
+                    />
+                  </Link>
                 )}
               </div>
               <div className="card-doc-text">