From 0e550d496c4bbf9dbe5d1349adec50b07edaae8d Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Tue, 11 Oct 2022 13:09:37 +0300 Subject: [PATCH] Simplify creation of composite Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- ...lication-menu-item-composite.injectable.ts | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/features/application-menu/main/application-menu-item-composite.injectable.ts b/src/features/application-menu/main/application-menu-item-composite.injectable.ts index b7954cf820..e39538face 100644 --- a/src/features/application-menu/main/application-menu-item-composite.injectable.ts +++ b/src/features/application-menu/main/application-menu-item-composite.injectable.ts @@ -8,10 +8,9 @@ import type { Composite } from "./menu-items/get-composite/get-composite"; import getComposite from "./menu-items/get-composite/get-composite"; import { computed } from "mobx"; import { pipeline } from "@ogre-tools/fp"; -import { get } from "lodash/fp"; import type { ApplicationMenuItemTypes } from "./menu-items/application-menu-item-injection-token"; -export interface MenuItemRoot { id: "root"; kind: "root"; orderNumber: 0 } +export interface MenuItemRoot { id: "root"; parentId: undefined; kind: "root"; orderNumber: 0 } const applicationMenuItemCompositeInjectable = getInjectable({ id: "application-menu-item-composite", @@ -23,14 +22,18 @@ const applicationMenuItemCompositeInjectable = getInjectable({ const items = menuItems.get(); return pipeline( - [{ id: "root" as const, kind: "root" as const, orderNumber: 0 as const }, ...items], + [ + { + id: "root" as const, + parentId: undefined, + kind: "root" as const, + orderNumber: 0 as const, + }, - x => getComposite({ - source: x, - rootId: "root", - getId: get("id"), - getParentId: get("parentId"), - }), + ...items, + ], + + (x) => getComposite({ source: x }), ); }); },