From 40a86daf2fe49b90a4b5c063539cde42be4c0c32 Mon Sep 17 00:00:00 2001 From: Joshua T Flowers Date: Wed, 3 Mar 2021 16:57:00 -0500 Subject: [PATCH] Remove active item from navigation store (https://github.com/woocommerce/woocommerce-admin/pull/6486) * Remove active item from navigation store * Add changelog entry --- .../client/navigation/components/container/index.js | 3 +-- .../packages/data/src/navigation/action-types.js | 1 - .../packages/data/src/navigation/actions.js | 7 ------- .../packages/data/src/navigation/reducer.js | 9 +-------- .../packages/data/src/navigation/selectors.js | 4 ---- .../packages/data/src/navigation/test/reducer.js | 10 ---------- plugins/woocommerce-admin/readme.txt | 1 + 7 files changed, 3 insertions(+), 32 deletions(-) diff --git a/plugins/woocommerce-admin/client/navigation/components/container/index.js b/plugins/woocommerce-admin/client/navigation/components/container/index.js index 47d4c12f48e..20609f39bb9 100644 --- a/plugins/woocommerce-admin/client/navigation/components/container/index.js +++ b/plugins/woocommerce-admin/client/navigation/components/container/index.js @@ -125,10 +125,9 @@ const Container = ( { menuItems } ) => { export default compose( withSelect( ( select ) => { - const { getActiveItem, getMenuItems } = select( NAVIGATION_STORE_NAME ); + const { getMenuItems } = select( NAVIGATION_STORE_NAME ); return { - activeItem: getActiveItem(), menuItems: getMenuItems(), }; } ) diff --git a/plugins/woocommerce-admin/packages/data/src/navigation/action-types.js b/plugins/woocommerce-admin/packages/data/src/navigation/action-types.js index 15b6ce64f84..e4c297e0d0c 100644 --- a/plugins/woocommerce-admin/packages/data/src/navigation/action-types.js +++ b/plugins/woocommerce-admin/packages/data/src/navigation/action-types.js @@ -1,7 +1,6 @@ const TYPES = { ADD_MENU_ITEMS: 'ADD_MENU_ITEMS', SET_MENU_ITEMS: 'SET_MENU_ITEMS', - SET_ACTIVE_ITEM: 'SET_ACTIVE_ITEM', ADD_FAVORITE_FAILURE: 'ADD_FAVORITE_FAILURE', ADD_FAVORITE_REQUEST: 'ADD_FAVORITE_REQUEST', ADD_FAVORITE_SUCCESS: 'ADD_FAVORITE_SUCCESS', diff --git a/plugins/woocommerce-admin/packages/data/src/navigation/actions.js b/plugins/woocommerce-admin/packages/data/src/navigation/actions.js index 87b0ef11eda..c07e22f2c68 100644 --- a/plugins/woocommerce-admin/packages/data/src/navigation/actions.js +++ b/plugins/woocommerce-admin/packages/data/src/navigation/actions.js @@ -9,13 +9,6 @@ import apiFetch from '@wordpress/api-fetch'; import TYPES from './action-types'; import { WC_ADMIN_NAMESPACE } from '../constants'; -export function setActiveItem( activeItem ) { - return { - type: TYPES.SET_ACTIVE_ITEM, - activeItem, - }; -} - export function setMenuItems( menuItems ) { return { type: TYPES.SET_MENU_ITEMS, diff --git a/plugins/woocommerce-admin/packages/data/src/navigation/reducer.js b/plugins/woocommerce-admin/packages/data/src/navigation/reducer.js index 1b344c624bf..0e37bdfbe78 100644 --- a/plugins/woocommerce-admin/packages/data/src/navigation/reducer.js +++ b/plugins/woocommerce-admin/packages/data/src/navigation/reducer.js @@ -5,21 +5,14 @@ import TYPES from './action-types'; const reducer = ( state = { - activeItem: null, error: null, menuItems: [], favorites: [], requesting: {}, }, - { type, activeItem, error, favorite, favorites, menuItems } + { type, error, favorite, favorites, menuItems } ) => { switch ( type ) { - case TYPES.SET_ACTIVE_ITEM: - state = { - ...state, - activeItem, - }; - break; case TYPES.SET_MENU_ITEMS: state = { ...state, diff --git a/plugins/woocommerce-admin/packages/data/src/navigation/selectors.js b/plugins/woocommerce-admin/packages/data/src/navigation/selectors.js index d1b54416c87..8ffc75e5cbb 100644 --- a/plugins/woocommerce-admin/packages/data/src/navigation/selectors.js +++ b/plugins/woocommerce-admin/packages/data/src/navigation/selectors.js @@ -9,10 +9,6 @@ export const getMenuItems = ( state ) => { return applyFilters( MENU_ITEMS_HOOK, state.menuItems ); }; -export const getActiveItem = ( state ) => { - return state.activeItem || null; -}; - export const getFavorites = ( state ) => { return state.favorites || []; }; diff --git a/plugins/woocommerce-admin/packages/data/src/navigation/test/reducer.js b/plugins/woocommerce-admin/packages/data/src/navigation/test/reducer.js index a877ab01bdf..2d77ee39636 100644 --- a/plugins/woocommerce-admin/packages/data/src/navigation/test/reducer.js +++ b/plugins/woocommerce-admin/packages/data/src/navigation/test/reducer.js @@ -5,7 +5,6 @@ import reducer from '../reducer'; import TYPES from '../action-types'; const defaultState = { - activeItem: null, error: null, menuItems: [], favorites: [], @@ -75,15 +74,6 @@ describe( 'navigation reducer', () => { expect( state.menuItems[ 1 ].id ).toBe( 'menu-item-2' ); } ); - it( 'should set the active menu item', () => { - const state = reducer( defaultState, { - type: TYPES.SET_ACTIVE_ITEM, - activeItem: 'test-active-item', - } ); - - expect( state.activeItem ).toBe( 'test-active-item' ); - } ); - it( 'should set the favorites', () => { const favorites = [ 'favorite1', 'favorite2' ]; const state = reducer( defaultState, { diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt index d32ec238bcc..8e77266265d 100644 --- a/plugins/woocommerce-admin/readme.txt +++ b/plugins/woocommerce-admin/readme.txt @@ -76,6 +76,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt == Unreleased == - Dev: Add initial tests for navigation Menu class #6492 +- Dev: Remove active item from navigation store #6486 - Fix: Add check for navigating being enabled. #6462 - Dev: Add nav favorite button tests #6446 - Dev: Add a changelog lint check to PRs. #6414