TASK: Remove unused target property from drawer menu items

Classes/Infrastructure/Neos/MenuProvider.php

@@ -55,7 +55,6 @@ public function getMenu(ActionRequest $actionRequest): array
             $result[$moduleName]['label'] = $module['label'];
             $result[$moduleName]['icon'] = $module['icon'];
             $result[$moduleName]['uri'] = $module['uri'];
-            $result[$moduleName]['target'] = 'Window';
 
             $result[$moduleName]['children'] = match ($module['module']) {
                 'content' => $this->buildChildrenForSites($controllerContext),
@@ -89,7 +88,6 @@ private function buildChildrenForSites(ControllerContext $controllerContext): ar
             $result[$index]['icon'] = 'globe';
             $result[$index]['label'] = $name;
             $result[$index]['uri'] = $uri;
-            $result[$index]['target'] = 'Window';
             $result[$index]['isActive'] = $active;
             $result[$index]['skipI18n'] = true;
         }
@@ -114,7 +112,6 @@ private function buildChildrenForBackendModule(array $module): array
             $result[$submoduleName]['uri'] = $submodule['uri'];
             $result[$submoduleName]['position'] = $submodule['position'];
             $result[$submoduleName]['isActive'] = true;
-            $result[$submoduleName]['target'] = 'Window';
             $result[$submoduleName]['skipI18n'] = false;
         }
 

packages/neos-ui/src/Containers/Drawer/Drawer.tsx

@@ -19,15 +19,14 @@ import {SynchronousRegistry} from '@neos-project/neos-ui-extensibility';
 
 import MenuItemGroup from './MenuItemGroup/index';
 import style from './style.module.css';
-import {TARGET_WINDOW, TARGET_CONTENT_CANVAS, THRESHOLD_MOUSE_LEAVE} from './constants';
+import {THRESHOLD_MOUSE_LEAVE} from './constants';
 
 const withReduxState = connect((state: GlobalState) => ({
     isHidden: state?.ui?.drawer?.isHidden,
     collapsedMenuGroups: state?.ui?.drawer?.collapsedMenuGroups
 }), {
     hideDrawer: actions.UI.Drawer.hide,
-    toggleMenuGroup: actions.UI.Drawer.toggleMenuGroup,
-    setContentCanvasSrc: actions.UI.ContentCanvas.setSrc
+    toggleMenuGroup: actions.UI.Drawer.toggleMenuGroup
 });
 
 const withNeosGlobals = neos(globalRegistry => ({
@@ -40,7 +39,6 @@ const StatelessDrawer: React.FC<{
 
     hideDrawer: () => void;
     toggleMenuGroup: (menuGroup: string) => void;
-    setContentCanvasSrc: (src: string) => void;
 
     containerRegistry: SynchronousRegistry<any>;
 
@@ -54,7 +52,6 @@ const StatelessDrawer: React.FC<{
             icon?: string;
             label: string;
             uri?: string;
-            target?: string;
             isActive: boolean;
             skipI18n: boolean;
         }[];
@@ -75,25 +72,6 @@ const StatelessDrawer: React.FC<{
             }, THRESHOLD_MOUSE_LEAVE);
         }
     }, [props.hideDrawer]);
-    const handleMenuItemClick = React.useCallback((target?: string, uri?: string) => {
-        const {setContentCanvasSrc, hideDrawer} = props;
-
-        switch (target) {
-            case TARGET_CONTENT_CANVAS:
-                if (uri) {
-                    setContentCanvasSrc(uri);
-                }
-                hideDrawer();
-                break;
-
-            case TARGET_WINDOW:
-            default:
-                // we do not need to do anything here, as MenuItems of type TARGET_WINDOW automatically
-                // wrap their contents in an <a>-tag (such that the user can crtl-click it to open in a
-                // new window).
-                break;
-        }
-    }, [props.setContentCanvasSrc, props.hideDrawer]);
     const {isHidden, menuData, collapsedMenuGroups, toggleMenuGroup, containerRegistry} = props;
     const classNames = mergeClassNames({
         [style.drawer]: true,
@@ -110,11 +88,9 @@ const StatelessDrawer: React.FC<{
             aria-hidden={isHidden ? 'true' : 'false'}
             >
             <div className={style.drawer__menuItemGroupsWrapper}>
-                {!isHidden && Object.entries(menuData).map(([menuGroup, menuGroupConfiguration]) => (
+                {Object.entries(menuData).map(([menuGroup, menuGroupConfiguration]) => (
                     <MenuItemGroup
                         key={menuGroup}
-                        onClick={handleMenuItemClick}
-                        onChildClick={handleMenuItemClick}
                         collapsed={Boolean(collapsedMenuGroups.includes(menuGroup))}
                         handleMenuGroupToggle={() => toggleMenuGroup(menuGroup)}
                         {...menuGroupConfiguration}

packages/neos-ui/src/Containers/Drawer/MenuItem/MenuItem.tsx

@@ -14,41 +14,27 @@ import {Icon, Button} from '@neos-project/react-ui-components';
 import I18n from '@neos-project/neos-ui-i18n';
 
 import style from '../style.module.css';
-import {TARGET_WINDOW} from '../constants';
 
 export const MenuItem: React.FC<{
     icon?: string;
     label: string;
     uri?: string;
-    target?: string;
     isActive: boolean;
     skipI18n?: boolean;
-
-    onClick: (target?: string, uri?: string) => void;
 }> = (props) => {
-    const handleClick = React.useCallback(() => {
-        const {uri, target, onClick} = props;
-
-        onClick(target, uri);
-    }, [props.onClick, props.uri, props.target]);
-
-    const {skipI18n, label, icon, uri, target} = props;
-
-    const button = (
-        <Button
-            className={style.drawer__menuItemBtn}
-            onClick={handleClick}
-            style="transparent"
-            hoverStyle="clean"
-            disabled={!uri}
-            >
-            {icon && <Icon icon={icon} padded="right"/>}
-            {skipI18n ? label : <I18n id={label} fallback={label}/>}
-        </Button>
+    const {skipI18n, label, icon, uri} = props;
+
+    return (
+        <a href={uri}>
+            <Button
+                className={style.drawer__menuItemBtn}
+                style="transparent"
+                hoverStyle="clean"
+                disabled={!uri}
+                >
+                {icon && <Icon icon={icon} padded="right"/>}
+                {skipI18n ? label : <I18n id={label} fallback={label}/>}
+            </Button>
+        </a>
     );
-
-    if (target === TARGET_WINDOW) {
-        return <a href={uri}>{button}</a>;
-    }
-    return button;
 }

packages/neos-ui/src/Containers/Drawer/MenuItemGroup/MenuItemGroup.tsx

@@ -14,7 +14,6 @@ import {Icon, ToggablePanel, Button} from '@neos-project/react-ui-components';
 import I18n from '@neos-project/neos-ui-i18n';
 
 import MenuItem from '../MenuItem/index';
-import {TARGET_WINDOW} from '../constants';
 import style from '../style.module.css';
 
 export const MenuItemGroup: React.FC<{
@@ -28,44 +27,30 @@ export const MenuItemGroup: React.FC<{
         icon?: string;
         label: string;
         uri?: string;
-        target?: string;
         isActive: boolean;
         skipI18n?: boolean;
     }[];
-
-    onClick: (target?: string, uri?: string) => void;
-    onChildClick: () => void;
 }> = (props) => {
-    const handleClick = React.useCallback(() => {
-        const {uri, target, onClick} = props;
-
-        onClick(target, uri);
-    }, [props.onClick, props.target, props.uri]);
-    const {label, icon, children, onChildClick, target, uri, collapsed, handleMenuGroupToggle} = props;
-
-    const headerButton = (
-        <Button
-            className={style.drawer__menuItemGroupBtn}
-            onClick={handleClick}
-            style="transparent"
-            hoverStyle="clean"
-            >
-            {icon && <Icon icon={icon} padded="right"/>}
-
-            <I18n id={label} fallback={label}/>
-        </Button>
-    );
-
-    const header = (target === TARGET_WINDOW ? <a href={uri}>{headerButton}</a> : headerButton);
+    const {label, icon, children, uri, collapsed, handleMenuGroupToggle} = props;
 
     return (
         <ToggablePanel onPanelToggle={handleMenuGroupToggle} isOpen={!collapsed} style="condensed" className={style.drawer__menuItem}>
             <ToggablePanel.Header className={style.drawer__menuItem__header}>
-                {header}
+                <a href={uri}>
+                    <Button
+                        className={style.drawer__menuItemGroupBtn}
+                        style="transparent"
+                        hoverStyle="clean"
+                        >
+                        {icon && <Icon icon={icon} padded="right"/>}
+
+                        <I18n id={label} fallback={label}/>
+                    </Button>
+                </a>
             </ToggablePanel.Header>
             <ToggablePanel.Contents>
                 {children.map((item, index) => (
-                    <MenuItem key={index} onClick={onChildClick} {...item}/>
+                    <MenuItem key={index} {...item}/>
                 ))}
             </ToggablePanel.Contents>
         </ToggablePanel>

packages/neos-ui/src/Containers/Drawer/constants.ts

@@ -7,6 +7,4 @@
  * information, please view the LICENSE file which was distributed with this
  * source code.
  */
-export const TARGET_WINDOW = 'Window';
-export const TARGET_CONTENT_CANVAS = 'ContentCanvas';
 export const THRESHOLD_MOUSE_LEAVE = 500;