diff --git a/app/Http/Controllers/MenuSyncController.php b/app/Http/Controllers/MenuSyncController.php index a99e5cad..7713356a 100644 --- a/app/Http/Controllers/MenuSyncController.php +++ b/app/Http/Controllers/MenuSyncController.php @@ -12,7 +12,14 @@ class MenuSyncController extends Controller { - protected int $tenantId = 1; // MNG 메뉴는 tenant_id=1 + /** + * 현재 선택된 테넌트 ID + */ + protected function getTenantId(): int + { + $tenantId = session('selected_tenant_id'); + return ($tenantId && $tenantId !== 'all') ? (int) $tenantId : 1; + } /** * 환경 설정 조회 @@ -20,7 +27,7 @@ class MenuSyncController extends Controller private function getEnvironments(): array { $setting = TenantSetting::withoutGlobalScopes() - ->where('tenant_id', $this->tenantId) + ->where('tenant_id', $this->getTenantId()) ->where('setting_group', 'menu_sync') ->where('setting_key', 'environments') ->first(); @@ -85,7 +92,7 @@ public function saveSettings(Request $request): JsonResponse TenantSetting::withoutGlobalScopes()->updateOrCreate( [ - 'tenant_id' => $this->tenantId, + 'tenant_id' => $this->getTenantId(), 'setting_group' => 'menu_sync', 'setting_key' => 'environments', ], @@ -178,7 +185,7 @@ public function push(Request $request): JsonResponse // 선택된 메뉴 조회 $menus = Menu::withoutGlobalScopes() - ->where('tenant_id', $this->tenantId) + ->where('tenant_id', $this->getTenantId()) ->whereIn('id', $validated['menu_ids']) ->get(); @@ -316,7 +323,7 @@ public function testConnection(Request $request): JsonResponse private function getMenuTree(?int $parentId = null): array { $menus = Menu::withoutGlobalScopes() - ->where('tenant_id', $this->tenantId) + ->where('tenant_id', $this->getTenantId()) ->where('parent_id', $parentId) ->orderBy('sort_order') ->get(); @@ -340,7 +347,7 @@ private function getMenuTree(?int $parentId = null): array private function getChildrenData(int $parentId): array { $children = Menu::withoutGlobalScopes() - ->where('tenant_id', $this->tenantId) + ->where('tenant_id', $this->getTenantId()) ->where('parent_id', $parentId) ->orderBy('sort_order') ->get(); @@ -411,17 +418,20 @@ private function flattenMenuNames(array $menus, string $prefix = ''): array } /** - * 이름으로 메뉴 필터링 + * 이름으로 메뉴 필터링 (부모 이름 포함) */ - private function filterMenusByName(array $menus, array $names): array + private function filterMenusByName(array $menus, array $names, ?string $parentName = null): array { $result = []; foreach ($menus as $menu) { if (in_array($menu['name'], $names)) { + // 부모 이름 추가 + $menu['parent_name'] = $parentName; $result[] = $menu; } if (! empty($menu['children'])) { - $result = array_merge($result, $this->filterMenusByName($menu['children'], $names)); + // 현재 메뉴를 부모로 전달 + $result = array_merge($result, $this->filterMenusByName($menu['children'], $names, $menu['name'])); } } return $result; @@ -435,7 +445,7 @@ private function importMenu(array $data, ?int $parentId = null): void // 부모 메뉴 찾기 if (! $parentId && ! empty($data['parent_name'])) { $parent = Menu::withoutGlobalScopes() - ->where('tenant_id', $this->tenantId) + ->where('tenant_id', $this->getTenantId()) ->where('name', $data['parent_name']) ->first(); $parentId = $parent?->id; @@ -444,7 +454,7 @@ private function importMenu(array $data, ?int $parentId = null): void // 기존 메뉴 찾기 또는 생성 $menu = Menu::withoutGlobalScopes()->updateOrCreate( [ - 'tenant_id' => $this->tenantId, + 'tenant_id' => $this->getTenantId(), 'name' => $data['name'], ], [ @@ -464,4 +474,4 @@ private function importMenu(array $data, ?int $parentId = null): void } } } -} \ No newline at end of file +} diff --git a/resources/views/menus/_sync_menu_item.blade.php b/resources/views/menus/_sync_menu_item.blade.php index 66ac41e5..e62b6ebd 100644 --- a/resources/views/menus/_sync_menu_item.blade.php +++ b/resources/views/menus/_sync_menu_item.blade.php @@ -3,34 +3,48 @@ $isRemoteOnly = $side === 'remote' && in_array($menu['name'], $diff['remote_only'] ?? []); $isBoth = in_array($menu['name'], $diff['both'] ?? []); + // 동기화 필요 여부 (로컬에서는 local_only만, 원격에서는 remote_only만 체크 가능) + $needsSync = $isLocalOnly || $isRemoteOnly; + $bgClass = ''; $badgeClass = ''; $badgeText = ''; if ($isLocalOnly) { - $bgClass = 'bg-green-50 border-green-200'; + $bgClass = 'bg-green-50'; $badgeClass = 'bg-green-100 text-green-700'; $badgeText = 'NEW'; } elseif ($isRemoteOnly) { - $bgClass = 'bg-purple-50 border-purple-200'; + $bgClass = 'bg-purple-50'; $badgeClass = 'bg-purple-100 text-purple-700'; $badgeText = 'NEW'; } else { - $bgClass = 'bg-white hover:bg-gray-50'; + $bgClass = 'hover:bg-gray-50'; } - - $paddingLeft = ($depth * 1.5) + 0.5; @endphp -
+@php + $menuKey = $side . '_' . ($menu['id'] ?? Str::slug($menu['name'])); +@endphp +
+
- + @if($side === 'local') - + @else + data-menu-key="{{ $menuKey }}" + data-has-children="{{ !empty($menu['children']) ? 'true' : 'false' }}" + onchange="toggleChildren(this)" + class="w-4 h-4 rounded focus:ring-purple-500 {{ $needsSync ? 'text-purple-600 border-gray-300' : 'bg-gray-200 border-gray-300 cursor-not-allowed' }}" + {{ !$needsSync ? 'disabled' : '' }}> @endif @@ -71,8 +85,13 @@ class="w-4 h-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500"> @endif - - {{ $menu['name'] }} + + + {{ $menu['name'] }} + @if($depth > 0) + Lv.{{ $depth + 1 }} + @endif + @if($badgeText) @@ -88,6 +107,7 @@ class="w-4 h-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500"> @if(!empty($menu['children'])) +
@foreach($menu['children'] as $child) @include('menus._sync_menu_item', [ 'menu' => $child, @@ -96,4 +116,6 @@ class="w-4 h-4 text-purple-600 border-gray-300 rounded focus:ring-purple-500"> 'depth' => $depth + 1 ]) @endforeach -@endif \ No newline at end of file +
+@endif +
diff --git a/resources/views/menus/sync.blade.php b/resources/views/menus/sync.blade.php index fa6ad3b2..08fb5454 100644 --- a/resources/views/menus/sync.blade.php +++ b/resources/views/menus/sync.blade.php @@ -109,6 +109,8 @@ class="px-6 py-3 text-sm font-medium border-b-2 transition-colors
+ @@ -118,10 +120,13 @@ class="px-6 py-3 text-sm font-medium border-b-2 transition-colors ({{ count($localMenus) }}개 그룹)
@if(!empty($environments[$selectedEnv]['url']) && !$remoteError) - +
+ 0개 선택 + +
@endif
@@ -140,6 +145,8 @@ class="px-3 py-1.5 bg-green-600 hover:bg-green-700 text-white text-xs font-mediu
+ @@ -149,10 +156,13 @@ class="px-3 py-1.5 bg-green-600 hover:bg-green-700 text-white text-xs font-mediu ({{ count($remoteMenus) }}개 그룹)
@if(!empty($environments[$selectedEnv]['url']) && !$remoteError) - +
+ 0개 선택 + +
@endif
@@ -446,5 +456,48 @@ function closeSettingsModal() { document.addEventListener('keydown', function(e) { if (e.key === 'Escape') closeSettingsModal(); }); + + // 전체 선택 (활성화된 체크박스만) + function toggleSelectAll(side, checked) { + const checkboxes = document.querySelectorAll(`input[name="${side}_menu"]:not(:disabled)`); + checkboxes.forEach(cb => cb.checked = checked); + updateSelectedCount(side); + } + + // 선택된 개수 업데이트 + function updateSelectedCount(side) { + const checkboxes = document.querySelectorAll(`input[name="${side}_menu"]:checked`); + const countEl = document.getElementById(`${side}SelectedCount`); + if (countEl) { + countEl.textContent = `${checkboxes.length}개 선택`; + } + } + + // 체크박스 변경 이벤트 리스너 + document.addEventListener('change', function(e) { + if (e.target.name === 'local_menu') { + updateSelectedCount('local'); + } else if (e.target.name === 'remote_menu') { + updateSelectedCount('remote'); + } + }); + + // 상위 메뉴 체크 시 하위 메뉴도 선택/해제 + function toggleChildren(checkbox) { + const menuGroup = checkbox.closest('.menu-group'); + if (!menuGroup) return; + + const childrenContainer = menuGroup.querySelector(':scope > .children-container'); + if (!childrenContainer) return; + + const childCheckboxes = childrenContainer.querySelectorAll('input[type="checkbox"]:not(:disabled)'); + childCheckboxes.forEach(cb => { + cb.checked = checkbox.checked; + }); + + // 선택 개수 업데이트 + const side = checkbox.name.replace('_menu', ''); + updateSelectedCount(side); + } -@endpush \ No newline at end of file +@endpush