diff --git a/apps/cs/src/pages/menu/api/user-organization-service.ts b/apps/cs/src/entities/user-organization/api/user-organization-service.ts similarity index 100% rename from apps/cs/src/pages/menu/api/user-organization-service.ts rename to apps/cs/src/entities/user-organization/api/user-organization-service.ts diff --git a/apps/cs/src/entities/user-organization/index.ts b/apps/cs/src/entities/user-organization/index.ts new file mode 100644 index 000000000..47463958b --- /dev/null +++ b/apps/cs/src/entities/user-organization/index.ts @@ -0,0 +1,5 @@ +export { UserOrganizationApi } from "./api/user-organization-service"; +export type { + User, + UserOrganization, +} from "./model/user-organization-interface"; diff --git a/apps/cs/src/pages/menu/model/user-organization-interface.ts b/apps/cs/src/entities/user-organization/model/user-organization-interface.ts similarity index 100% rename from apps/cs/src/pages/menu/model/user-organization-interface.ts rename to apps/cs/src/entities/user-organization/model/user-organization-interface.ts diff --git a/apps/cs/src/pages/menu/lib/utils.ts b/apps/cs/src/pages/menu/lib/utils.ts index 274a0a057..09dd2a8a9 100644 --- a/apps/cs/src/pages/menu/lib/utils.ts +++ b/apps/cs/src/pages/menu/lib/utils.ts @@ -1,9 +1,6 @@ import type { DropOptions, NodeModel } from "@minoru/react-dnd-treeview"; +import type { UserOrganization, User } from "@/entities/user-organization"; import type { TreeMenu, TreeNode } from "../model/menu-interface"; -import type { - UserOrganization, - User, -} from "../model/user-organization-interface"; export const generateMenuTreeData = ( data: TreeMenu[], diff --git a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx index 41749b26b..505532296 100644 --- a/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx +++ b/apps/cs/src/pages/menu/ui/organization-search-dialog.tsx @@ -19,12 +19,12 @@ import { Input, } from "@common/components/ui"; import { cn } from "@common/components/lib"; +import { + UserOrganizationApi, + type User, + type UserOrganization, +} from "@/entities/user-organization"; import { ENDPOINT } from "@/shared/config"; -import { UserOrganizationApi } from "../api/user-organization-service"; -import type { - UserOrganization, - User, -} from "../model/user-organization-interface"; import { filterUserOrganizationTreeDataByKeyword, generateUserOrganizationTreeData, diff --git a/apps/cs/src/pages/menu/ui/type-menu-form.tsx b/apps/cs/src/pages/menu/ui/type-menu-form.tsx index bd992bd70..085506ce6 100644 --- a/apps/cs/src/pages/menu/ui/type-menu-form.tsx +++ b/apps/cs/src/pages/menu/ui/type-menu-form.tsx @@ -13,10 +13,10 @@ import { TableHead, TableRow, } from "@common/components"; -import { FormItem, FormControl, FormField } from "@/shared/ui/form"; import type { BoardPopup } from "@/entities/board"; import type { Contents } from "@/entities/content"; -import type { User } from "../model/user-organization-interface"; +import type { User } from "@/entities/user-organization"; +import { FormItem, FormControl, FormField } from "@/shared/ui/form"; import type { MenuFormData, MenuType } from "../model/menu-interface"; import { OrganizationSearchDialog } from "./organization-search-dialog"; import { ContentSearchDialog } from "./content-search-dialog";