Revert "fix: [tenant-console] 테넌트 콘솔 분리작업"

This reverts commit 8da1702e
This commit is contained in:
2026-03-13 21:24:18 +09:00
parent c3bc7912dd
commit 432888980b
70 changed files with 423 additions and 1173 deletions

View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers;
use App\Helpers\TenantHelper;
use App\Models\Category;
use App\Models\GlobalCategory;
use App\Models\Tenants\Tenant;
@@ -19,7 +18,7 @@ class CategoryController extends Controller
*/
private function getCustomGroupLabels(): array
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
return [];
}
@@ -38,7 +37,7 @@ private function getCustomGroupLabels(): array
*/
public function storeGroup(Request $request): RedirectResponse
{
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
if (! $tenantId) {
return redirect()->back()->with('error', '테넌트를 먼저 선택해주세요.');
}
@@ -84,7 +83,7 @@ public function storeGroup(Request $request): RedirectResponse
);
return redirect()
->to(TenantHelper::route('categories.index', ['group' => $groupCode]))
->route('categories.index', ['group' => $groupCode])
->with('success', "'{$groupLabel}' 그룹이 추가되었습니다.");
}
@@ -95,10 +94,10 @@ public function index(Request $request): View|Response
{
// HTMX 요청 시 전체 페이지 리로드
if ($request->header('HX-Request')) {
return response('', 200)->header('HX-Redirect', TenantHelper::route('categories.index'));
return response('', 200)->header('HX-Redirect', route('categories.index'));
}
$tenantId = TenantHelper::getEffectiveTenantId();
$tenantId = session('selected_tenant_id');
$tenant = $tenantId ? Tenant::find($tenantId) : null;
$isHQ = $tenantId == 1;