From 87dad7df1d3e32afccf7357df1b1d39af5a98154 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Fri, 13 Jul 2018 16:34:28 +0200 Subject: [PATCH] Improve code organization under context-menu directory Feature #13805 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/views-components/context-menu/context-menu.tsx | 2 +- src/views-components/context-menu/index.ts | 4 ++-- .../context-menu/{ => item-sets}/empty-item-set.ts | 4 ++-- .../context-menu/{ => item-sets}/project-item-set.ts | 8 ++++---- .../context-menu/{ => item-sets}/root-project-item-set.ts | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/views-components/context-menu/{ => item-sets}/empty-item-set.ts (53%) rename src/views-components/context-menu/{ => item-sets}/project-item-set.ts (65%) rename src/views-components/context-menu/{ => item-sets}/root-project-item-set.ts (63%) diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx index 93cb644a..b7654f82 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -9,7 +9,7 @@ import ContextMenu, { ContextMenuProps, ContextMenuItem } from "../../components import { createAnchorAt } from "../../components/popover/helpers"; import { ContextMenuResource } from "../../store/context-menu/context-menu-reducer"; import { ContextMenuItemSet } from "./context-menu-item-set"; -import { emptyItemSet } from "./empty-item-set"; +import { emptyItemSet } from "./item-sets/empty-item-set"; type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { diff --git a/src/views-components/context-menu/index.ts b/src/views-components/context-menu/index.ts index 92933300..c4eef706 100644 --- a/src/views-components/context-menu/index.ts +++ b/src/views-components/context-menu/index.ts @@ -3,8 +3,8 @@ // SPDX-License-Identifier: AGPL-3.0 import { ContextMenuHOC, addMenuItemsSet } from "./context-menu"; -import { projectItemSet } from "./project-item-set"; -import { rootProjectItemSet } from "./root-project-item-set"; +import { projectItemSet } from "./item-sets/project-item-set"; +import { rootProjectItemSet } from "./item-sets/root-project-item-set"; export default ContextMenuHOC; diff --git a/src/views-components/context-menu/empty-item-set.ts b/src/views-components/context-menu/item-sets/empty-item-set.ts similarity index 53% rename from src/views-components/context-menu/empty-item-set.ts rename to src/views-components/context-menu/item-sets/empty-item-set.ts index 209b75cd..9ebf0656 100644 --- a/src/views-components/context-menu/empty-item-set.ts +++ b/src/views-components/context-menu/item-sets/empty-item-set.ts @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ContextMenuItemGroup } from "../../components/context-menu/context-menu"; -import { ContextMenuItemSet } from "./context-menu-item-set"; +import { ContextMenuItemGroup } from "../../../components/context-menu/context-menu"; +import { ContextMenuItemSet } from "../context-menu-item-set"; export const emptyItemSet: ContextMenuItemSet = { getItems: () => items, diff --git a/src/views-components/context-menu/project-item-set.ts b/src/views-components/context-menu/item-sets/project-item-set.ts similarity index 65% rename from src/views-components/context-menu/project-item-set.ts rename to src/views-components/context-menu/item-sets/project-item-set.ts index e205339f..9cda3279 100644 --- a/src/views-components/context-menu/project-item-set.ts +++ b/src/views-components/context-menu/item-sets/project-item-set.ts @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ContextMenuItemGroup } from "../../components/context-menu/context-menu"; -import { ContextMenuItemSet } from "./context-menu-item-set"; -import actions from "../../store/project/project-action"; -import { IconTypes } from "../../components/icon/icon"; +import { ContextMenuItemGroup } from "../../../components/context-menu/context-menu"; +import { ContextMenuItemSet } from "../context-menu-item-set"; +import actions from "../../../store/project/project-action"; +import { IconTypes } from "../../../components/icon/icon"; export const projectItemSet: ContextMenuItemSet = { getItems: () => items, diff --git a/src/views-components/context-menu/root-project-item-set.ts b/src/views-components/context-menu/item-sets/root-project-item-set.ts similarity index 63% rename from src/views-components/context-menu/root-project-item-set.ts rename to src/views-components/context-menu/item-sets/root-project-item-set.ts index 51068818..906424ac 100644 --- a/src/views-components/context-menu/root-project-item-set.ts +++ b/src/views-components/context-menu/item-sets/root-project-item-set.ts @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ContextMenuItemGroup } from "../../components/context-menu/context-menu"; -import { ContextMenuItemSet } from "./context-menu-item-set"; -import actions from "../../store/project/project-action"; -import { IconTypes } from "../../components/icon/icon"; +import { ContextMenuItemGroup } from "../../../components/context-menu/context-menu"; +import { ContextMenuItemSet } from "../context-menu-item-set"; +import actions from "../../../store/project/project-action"; +import { IconTypes } from "../../../components/icon/icon"; export const rootProjectItemSet: ContextMenuItemSet = { getItems: () => items, -- 2.30.2