@eeacms/volto-clms-theme 1.0.114 → 1.0.115

package/CHANGELOG.md

@@ -4,8 +4,22 @@ 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.115](https://github.com/eea/volto-clms-theme/compare/1.0.114...1.0.115)
+
+- dispatch logout [`6f05001`](https://github.com/eea/volto-clms-theme/commit/6f0500198ac72145adbc0d4779b60760a4771527)
+- delete profile tab inside profile [`4dedca5`](https://github.com/eea/volto-clms-theme/commit/4dedca5f32ef01e0f11b6a3cacc8272964000d0f)
+- date formatting [`93514f7`](https://github.com/eea/volto-clms-theme/commit/93514f789c0a0d7282a2d620d13bf4996ffc28df)
+- get user from state for UniversalLink [`d3f2d64`](https://github.com/eea/volto-clms-theme/commit/d3f2d64a92b4537b8a80319e9a34e6515c863e84)
+- routingHOC condition [`8331195`](https://github.com/eea/volto-clms-theme/commit/8331195c27e2d9c10fa4b0cd7f4ef72473bf1331)
+- upgrade volto-form-block version [`8bb77fa`](https://github.com/eea/volto-clms-theme/commit/8bb77fa83b1a2e270824f0de261627928308a147)
+- use new time handler [`44edb37`](https://github.com/eea/volto-clms-theme/commit/44edb378d4a3c0a4e3c352ef141e37a6dab5883d)
+- new date handler that respects user's timezone [`b2d8143`](https://github.com/eea/volto-clms-theme/commit/b2d814331bd2a4f7bb6d7a3312e41d3a0fa52ddf)
+
 #### [1.0.114](https://github.com/eea/volto-clms-theme/compare/1.0.113...1.0.114)
 
+> 4 August 2022
+
+- Develop [`#288`](https://github.com/eea/volto-clms-theme/pull/288)
 - show the message coming from backend [`da826b3`](https://github.com/eea/volto-clms-theme/commit/da826b3c9adab0091f643c326cbd716dd523e2a8)
 - remove the years from the title DoubleRangeFacet [`e32c20e`](https://github.com/eea/volto-clms-theme/commit/e32c20e6cd3a1f096da242ce9f0c5518794a26fd)
 - HomeUsersBlock improvements [`a05b1fb`](https://github.com/eea/volto-clms-theme/commit/a05b1fb16ef3d736ffc486f2a82b0c5014f102b6)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.114",
+  "version": "1.0.115",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -55,7 +55,7 @@
     "react-svg": "14.0.4",
     "slick-carousel": "1.8.1",
     "volto-dropdownmenu": "2.2.7",
-    "volto-form-block": "2.2.2",
+    "volto-form-block": "2.4.1",
     "react-input-range": "^1.3.0",
     "lightgallery": "^2.4.0",
     "validator": "13.7.0"

package/src/actions/index.js

@@ -92,3 +92,5 @@ export {
   POST_IMPORT_WMS_FIELDS,
   postImportWMSFields,
 } from './import_wms_fields/import_wms_fields';
+
+export { DELETE_PROFILE, delProfile } from './profile/delete_profile';

package/src/actions/profile/delete_profile.js

@@ -0,0 +1,20 @@
+/**
+ * Delete profle.
+ * @module actions/newsletter
+ */
+export const DELETE_PROFILE = 'DELETE_PROFILE';
+
+/**
+ * Delete profle.
+ * @function delProfile
+ * @returns {Object} Get extra items action.
+ */
+export function delProfile() {
+  return {
+    type: DELETE_PROFILE,
+    request: {
+      op: 'del',
+      path: `/@delete-user-profile`,
+    },
+  };
+}

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

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { defineMessages, useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { Link } from 'react-router-dom';
+import { workOpportunitiesCclDateTimeFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
 
 const messages = defineMessages({
   ProcurementNo: {
@@ -21,6 +22,8 @@ const messages = defineMessages({
 
 const CclWorkOpportunity = (props) => {
   const { item, intl, user } = props;
+  const lang = useSelector((state) => state.intl.locale);
+
   return (
     <div className="card-work">
       {user.roles && user.roles.includes('Manager') && (
@@ -52,7 +55,7 @@ const CclWorkOpportunity = (props) => {
         <span className="card-work-title">
           {intl.formatMessage(messages.SubmissionDeadline)}
         </span>
-        {new Date(item.submission_deadline).toLocaleString()}
+        {workOpportunitiesCclDateTimeFormat(item.submission_deadline, lang)}
       </div>
     </div>
   );

package/src/components/Blocks/CustomTemplates/VoltoTabsBlock/RoutingHOC.jsx

@@ -16,7 +16,12 @@ const RoutingHOC = (TabView) =>
       ) {
         return rTabsList[0];
       }
-      return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
+      if (
+        window.location.hash.match(/.*&?#?tab=(.*)/) &&
+        window.location.hash.match(/.*&?#?tab=(.*)/).length > 1
+      ) {
+        return rTabsList[window.location.hash.match(/.*&?#?tab=(.*)/)[1] - 1];
+      }
     }
     React.useEffect(() => {
       const isReload =

package/src/components/CLMSProfileView/CLMSDeleteProfileView.jsx

@@ -0,0 +1,53 @@
+/**
+ * CLMSProfileView container.
+ * @module components/CLMSProfileView/CLMSProfileView
+ */
+
+import React from 'react';
+
+import { injectIntl } from 'react-intl';
+import { Container } from 'semantic-ui-react';
+import CclButton from '@eeacms/volto-clms-theme/components/CclButton/CclButton';
+import { delProfile } from '../../actions';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { logout } from '@plone/volto/actions';
+
+export const CLMSDeleteProfileView = (props) => {
+  const dispatch = useDispatch();
+  let history = useHistory();
+
+  const isDeleted = useSelector((state) => state.profile_delete.loaded)
+    ? true
+    : false;
+
+  function handleClick() {
+    dispatch(delProfile());
+  }
+
+  if (isDeleted === true) {
+    history.push('/');
+    dispatch(logout());
+  }
+
+  return (
+    <Container>
+      <div>
+        <h1 className="page-title">Delete your profile</h1>
+        <p>Click in the button bellow to your profile.</p>
+
+        <CclButton
+          to="profile#Delete-profile"
+          mode={'filled'}
+          onClick={() => {
+            handleClick();
+          }}
+        >
+          Delete
+        </CclButton>
+      </div>
+    </Container>
+  );
+};
+
+export default injectIntl(CLMSDeleteProfileView);

package/src/components/CLMSProfileView/CLMSProfileView.jsx

@@ -11,6 +11,7 @@ import {
   CLMSApiTokensView,
   CLMSNewsletterSubscriberView,
   CLMSUserProfileView,
+  CLMSDeleteProfileView,
 } from '@eeacms/volto-clms-theme/components/CLMSProfileView';
 import React, { Component } from 'react';
 
@@ -75,6 +76,9 @@ class CLMSProfileView extends Component {
                 <SubscriptionView type={subscription?.type} />
               </div>
             ))}
+            <div tabTitle="Delete profile">
+              <CLMSDeleteProfileView />
+            </div>
           </CclTabs>
         ) : (
           <Unauthorized />

package/src/components/CLMSProfileView/index.js

@@ -2,3 +2,4 @@ export CLMSProfileView from './CLMSProfileView';
 export CLMSUserProfileView from './CLMSUserProfileView';
 export CLMSApiTokensView from './CLMSApiTokensView';
 export CLMSNewsletterSubscriberView from './CLMSNewsletterSubscriberView';
+export CLMSDeleteProfileView from './CLMSDeleteProfileView';

package/src/components/CLMSWorkOpportunityView/WorkOpportunityView.jsx

@@ -1,5 +1,7 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
+import { workOpportunitiesCclDateTimeFormat } from '@eeacms/volto-clms-theme/components/CclUtils';
+import { useSelector } from 'react-redux';
 
 const messages = defineMessages({
   ProcurementNo: {
@@ -24,6 +26,7 @@ const CLMSWorkOpportunityView = (props) => {
       ? content.items.map((item) => (item['@type'] === 'File' ? item : null))
       : [];
   const index = files.indexOf(null);
+  const lang = useSelector((state) => state.intl.locale);
   if (index > -1) {
     files.splice(index, 1);
   }
@@ -46,7 +49,10 @@ const CLMSWorkOpportunityView = (props) => {
             <span className="card-work-title">
               {intl.formatMessage(messages.SubmissionDeadline)}
             </span>
-            {new Date(content.submission_deadline).toLocaleString()}
+            {workOpportunitiesCclDateTimeFormat(
+              content.submission_deadline,
+              lang,
+            )}
           </div>
         </div>
       </>

package/src/components/CclUtils/dateFormats.js

@@ -1,3 +1,11 @@
+import { parseDateTime } from '@plone/volto/helpers';
+import moment from 'moment';
+
+const getInternalValue = (value, lang) => {
+  moment.locale(lang);
+  return parseDateTime(lang, value, undefined, moment);
+};
+
 export const cclDateTimeFormat = (date) => {
   const dateObj = new Date(date);
   const day = ('0' + dateObj.getDate()).slice(-2);
@@ -8,6 +16,11 @@ export const cclDateTimeFormat = (date) => {
   return `${day}.${month}.${year} ${hours}.${minutes}`;
 };
 
+export const workOpportunitiesCclDateTimeFormat = (date, lang) => {
+  const internal = getInternalValue(date, lang);
+  return internal.format('DD.MM.YYYY hh.mm A');
+};
+
 export const cclDateFormat = (date) => {
   const dateObj = new Date(date);
   const day = dateObj.getDate();
@@ -15,3 +28,8 @@ export const cclDateFormat = (date) => {
   const year = dateObj.getFullYear();
   return `${day}.${month}.${year}`;
 };
+
+export const workOpportunitiesCclDateFormat = (date, lang) => {
+  const internal = getInternalValue(date, lang);
+  return internal.format('DD.MM.YYYY');
+};

package/src/components/CclUtils/index.js

@@ -2,4 +2,9 @@ import StringToHTML from './StringToHTML';
 
 export { StringToHTML };
 
-export { cclDateFormat, cclDateTimeFormat } from './dateFormats';
+export {
+  workOpportunitiesCclDateFormat,
+  workOpportunitiesCclDateTimeFormat,
+  cclDateFormat,
+  cclDateTimeFormat,
+} from './dateFormats';

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

@@ -27,6 +27,7 @@ const UniversalLink = ({
   ...props
 }) => {
   const token = useSelector((state) => state.userSession?.token);
+  const user = useSelector((state) => state.users.user);
 
   let url = href;
   if (!href && item) {
@@ -51,7 +52,7 @@ const UniversalLink = ({
 
       //case: item of type 'File'
       if (
-        !this.props.roles?.includes('Manager') &&
+        !user?.roles?.includes('Manager') &&
         config.settings.downloadableObjects.includes(item['@type'])
       ) {
         url = `${url}/@@download/file`;

package/src/reducers/index.js

@@ -17,6 +17,7 @@ import tokens from './tokens/tokens';
 import { userschemaReducer } from './userschema/userschema';
 import { importWMSLayersReducer } from './import_wms_layers/import_wms_layers_reducer';
 import { importWMSFieldsReducer } from './import_wms_fields/import_wms_fields_reducer';
+import { deleteProfileReducer } from './profile/delete_profile_reducer';
 
 /**
  * Root reducer.
@@ -43,6 +44,7 @@ const reducers = {
   subscription: subscribeToReducer,
   importWMSLayers: importWMSLayersReducer,
   importWMSFields: importWMSFieldsReducer,
+  profile_delete: deleteProfileReducer,
 };
 
 export default reducers;

package/src/reducers/profile/delete_profile_reducer.js

@@ -0,0 +1,41 @@
+/**
+ * Profile reducer.
+ * @module profile/profile_reducer
+ */
+
+import { DELETE_PROFILE } from '../../actions';
+
+const getInitialState = {
+  error: null,
+  loaded: false,
+  loading: false,
+  items: [],
+};
+
+export const deleteProfileReducer = (state = getInitialState, action = {}) => {
+  switch (action.type) {
+    case `${DELETE_PROFILE}_PENDING`:
+      return {
+        ...state,
+        error: null,
+        loaded: false,
+        loading: true,
+      };
+    case `${DELETE_PROFILE}_FAIL`:
+      return {
+        ...state,
+        error: true,
+        loaded: false,
+        loading: false,
+      };
+    case `${DELETE_PROFILE}_SUCCESS`:
+      return {
+        ...state,
+        error: null,
+        loaded: true,
+        loading: false,
+      };
+    default:
+      return state;
+  }
+};