Issue solved

plone · Dec 27, 2024 · 9900d41 · 9900d41
1 parent 9735a0a
commit 9900d41
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 94 deletions.
diff --git a/...to/src/actions/favourites/favourites 2.js → .../volto/src/actions/favorites/favorites.js b/...to/src/actions/favourites/favourites 2.js → .../volto/src/actions/favorites/favorites.js
@@ -1,25 +1,25 @@
 import { cloneBlocks } from '@plone/volto/helpers/Blocks/cloneBlocks';
 import config from '@plone/volto/registry';
 
-export const ADD_TO_FAVOURITES = 'ADD_TO_FAVOURITES';
-export const REMOVE_FROM_FAVOURITES = 'REMOVE_FROM_FAVOURITES';
-export const LOAD_FAVOURITES = 'LOAD_FAVOURITES';
+export const ADD_TO_FAVORITES = 'ADD_TO_FAVORITES';
+export const REMOVE_FROM_FAVORITES = 'REMOVE_FROM_FAVORITES';
+export const LOAD_FAVORITES = 'LOAD_FAVORITES';
 
-export function loadFavourites() {
+export function loadFavorites() {
   return {
-    type: LOAD_FAVOURITES,
+    type: LOAD_FAVORITES,
   };
 }
 
-export function addToFavourites(blockData) {
+export function addToFavorites(blockData) {
   const { id, type, data } = blockData;
   const blockConfig = config.blocks.blocksConfig[type];
   const clonedData = blockConfig?.cloneData
     ? blockConfig.cloneData(data)
     : cloneBlocks(data);
 
   return {
-    type: ADD_TO_FAVOURITES,
+    type: ADD_TO_FAVORITES,
     block: {
       id,
       type,
@@ -28,9 +28,9 @@ export function addToFavourites(blockData) {
   };
 }
 
-export function removeFromFavourites(blockId) {
+export function removeFromFavorites(blockId) {
   return {
-    type: REMOVE_FROM_FAVOURITES,
+    type: REMOVE_FROM_FAVORITES,
     blockId,
   };
 }
diff --git a/packages/volto/src/actions/favourites/favourites.js b/packages/volto/src/actions/favourites/favourites.js
diff --git a/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx b/packages/volto/src/components/manage/Blocks/Block/EditBlockWrapper.jsx
@@ -31,9 +31,9 @@ const messages = defineMessages({
     id: 'save',
     defaultMessage: 'save',
   },
-  addToFavourites: {
-    id: 'addToFavourites',
-    defaultMessage: 'Add to Favourites',
+  addToFavorites: {
+    id: 'addToFavorites',
+    defaultMessage: 'Add to Favorites',
   },
 });
 

diff --git a/packages/volto/src/components/manage/Blocks/Block/SaveBlockDialog.jsx b/packages/volto/src/components/manage/Blocks/Block/SaveBlockDialog.jsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Button, Modal, Input, Header } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { addToFavourites } from '@plone/volto/actions/favourites/favourites';
+import { addToFavorites } from '@plone/volto/actions/favorites/favorites';
 import config from '@plone/volto/registry';
 
 const messages = defineMessages({
@@ -44,7 +44,7 @@ const SaveBlockDialog = ({ block, type, data, isOpen, onClose }) => {
     if (blockConfig?.cloneData) {
       blockData.data = blockConfig.cloneData(blockData.data)[1];
     }
-    dispatch(addToFavourites(blockData));
+    dispatch(addToFavorites(blockData));
     setName('');
     onClose();
   };

diff --git a/...mponents/manage/Sidebar/FavouriteItem.jsx → ...omponents/manage/Sidebar/FavoriteItem.jsx b/...mponents/manage/Sidebar/FavouriteItem.jsx → ...omponents/manage/Sidebar/FavoriteItem.jsx
diff --git a/packages/volto/src/components/manage/Sidebar/Sidebar.jsx b/packages/volto/src/components/manage/Sidebar/Sidebar.jsx
@@ -14,18 +14,18 @@ import { setSidebarTab } from '@plone/volto/actions/sidebar/sidebar';
 import expandSVG from '@plone/volto/icons/left-key.svg';
 import collapseSVG from '@plone/volto/icons/right-key.svg';
 import save from '@plone/volto/icons/save.svg';
-import { removeFromFavourites } from '@plone/volto/actions/favourites/favourites';
-import FavouriteItem from './FavouriteItem';
-import { loadFavourites } from '../../../actions/favourites/favourites';
+import { removeFromFavorites } from '@plone/volto/actions/favorites/favorites';
+import FavoriteItem from './FavoriteItem';
+import { loadFavorites } from '../../../actions/favorites/favorites';
 
 const messages = defineMessages({
   save: {
     id: 'Save',
     defaultMessage: 'Save',
   },
-  Favourite: {
-    id: 'Favourite',
-    defaultMessage: 'Favourite',
+  Favorite: {
+    id: 'Favorite',
+    defaultMessage: 'Favorite',
   },
   document: {
     id: 'Document',
@@ -62,7 +62,7 @@ const Sidebar = (props) => {
     documentTab,
     blockTab,
     settingsTab,
-    FavouriteTab = true,
+    FavoriteTab = true,
     orderTab = true,
   } = props;
 
@@ -71,7 +71,7 @@ const Sidebar = (props) => {
   );
   const [size] = useState(0);
   const [showFull, setshowFull] = useState(true);
-  const favouriteItems = useSelector((state) => state?.favourites?.items ?? []);
+  const FavoriteItems = useSelector((state) => state?.favorites?.items ?? []);
   const tab = useSelector((state) => state?.sidebar?.tab ?? 0);
   const toolbarExpanded = useSelector(
     (state) => state?.toolbar?.expanded ?? false,
@@ -85,11 +85,11 @@ const Sidebar = (props) => {
   };
 
   useEffect(() => {
-    dispatch(loadFavourites());
+    dispatch(loadFavorites());
   }, [dispatch]);
 
-  const handleRemoveFavourite = (blockId) => {
-    dispatch(removeFromFavourites(blockId));
+  const handleRemoveFavorite = (blockId) => {
+    dispatch(removeFromFavorites(blockId));
   };
 
   const resetFullSizeSidebar = useCallback(() => {
@@ -247,23 +247,23 @@ const Sidebar = (props) => {
                 </Tab.Pane>
               ),
             },
-            !!FavouriteTab && {
-              menuItem: intl.formatMessage(messages.Favourite),
+            !!FavoriteTab && {
+              menuItem: intl.formatMessage(messages.Favorite),
               pane: (
                 <Tab.Pane
-                  key="Favourite"
+                  key="Favorite"
                   className="tab-wrapper"
-                  id="sidebar-Favourite"
+                  id="sidebar-Favorite"
                 >
                   <div className="saved-items-container">
-                    {Array.isArray(favouriteItems) &&
-                    favouriteItems.length > 0 ? (
+                    {Array.isArray(FavoriteItems) &&
+                    FavoriteItems.length > 0 ? (
                       <div className="divide-y">
-                        {favouriteItems.map((item) => (
-                          <FavouriteItem
+                        {FavoriteItems.map((item) => (
+                          <FavoriteItem
                             key={item.id}
                             item={item}
-                            onRemove={handleRemoveFavourite}
+                            onRemove={handleRemoveFavorite}
                           />
                         ))}
                       </div>
@@ -275,7 +275,7 @@ const Sidebar = (props) => {
                           size="48px"
                         />
                         <p className="mt-2 text-gray-500">
-                          No favourite blocks saved
+                          No Favorites blocks saved
                         </p>
                       </div>
                     )}
@@ -295,14 +295,14 @@ Sidebar.propTypes = {
   documentTab: PropTypes.bool,
   blockTab: PropTypes.bool,
   settingsTab: PropTypes.bool,
-  FavouriteTab: PropTypes.bool,
+  FavoriteTab: PropTypes.bool,
 };
 
 Sidebar.defaultProps = {
   documentTab: true,
   blockTab: true,
   settingsTab: false,
-  FavouriteTab: true,
+  FavoriteTab: true,
 };
 
 export default compose(withCookies)(Sidebar);
diff --git a/packages/volto/src/components/manage/Sidebar/__snapshots__/Sidebar.test.jsx.snap b/packages/volto/src/components/manage/Sidebar/__snapshots__/Sidebar.test.jsx.snap
@@ -63,7 +63,7 @@ Array [
           className="item"
           onClick={[Function]}
         >
-          Favourite
+          Favorite
         </a>
       </div>
       <div
@@ -147,7 +147,7 @@ Array [
       </div>
       <div
         className="ui bottom attached segment tab tab-wrapper"
-        id="sidebar-Favourite"
+        id="sidebar-Favorite"
       >
         <div
           className="saved-items-container"
@@ -176,7 +176,7 @@ Array [
             <p
               className="mt-2 text-gray-500"
             >
-              No favourite blocks saved
+              No Favorites blocks saved
             </p>
           </div>
         </div>

diff --git a/packages/volto/src/icons/save1 2.crdownload b/packages/volto/src/icons/save1 2.crdownload
diff --git a/.../reducers/favourites/favouritesReducer.js → ...rc/reducers/favorites/favoritesReducer.js b/.../reducers/favourites/favouritesReducer.js → ...rc/reducers/favorites/favoritesReducer.js
@@ -1,10 +1,10 @@
 import {
-  ADD_TO_FAVOURITES,
-  REMOVE_FROM_FAVOURITES,
-  LOAD_FAVOURITES,
-} from '../../actions/favourites/favourites';
+  ADD_TO_FAVORITES,
+  REMOVE_FROM_FAVORITES,
+  LOAD_FAVORITES,
+} from '../../actions/favorites/favorites';
 
-const STORAGE_KEY = 'volto_favourite_blocks';
+const STORAGE_KEY = 'volto_favorite_blocks';
 
 const extractPreviewData = (blockData) => {
   if (!blockData) return null;
@@ -65,17 +65,17 @@ const initialState = {
   items: loadFromStorage(),
 };
 
-export default function favouritesReducer(state = initialState, action) {
+export default function favoritesReducer(state = initialState, action) {
   let newState;
   switch (action.type) {
-    case LOAD_FAVOURITES:
+    case LOAD_FAVORITES:
       newState = {
         ...state,
         items: loadFromStorage(),
       };
       break;
 
-    case ADD_TO_FAVOURITES: {
+    case ADD_TO_FAVORITES: {
       const blockExists = state.items.some(function (item) {
         return item.id === action.block.id;
       });
@@ -98,7 +98,7 @@ export default function favouritesReducer(state = initialState, action) {
       break;
     }
 
-    case REMOVE_FROM_FAVOURITES: {
+    case REMOVE_FROM_FAVORITES: {
       const newItems = state.items.filter((item) => item.id !== action.blockId);
       newState = {
         ...state,

diff --git a/packages/volto/src/reducers/index.js b/packages/volto/src/reducers/index.js
@@ -53,7 +53,7 @@ import upgrade from './upgrade/upgrade';
 import userschema from './userschema/userschema';
 import site from './site/site';
 import navroot from './navroot/navroot';
-import favourites from './favourites/favouritesReducer';
+import favorites from './favorites/favoritesReducer';
 
 /**
  * Root reducer.
@@ -112,7 +112,7 @@ const reducers = {
   userschema,
   site,
   navroot,
-  favourites,
+  favorites,
 };
 
 export default reducers;