mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-15 17:24:10 +00:00
Every main_menu entry moves from numeric group (1/2/3) to string-based group + group_label + priority. Groups now carry their own i18n label and child entries are sorted by an explicit priority field instead of config-array order, so module-contributed menu items can slot into any existing group at any position.
BootstrapController merges module-registered menu items into main_menu (previously they lived in a separate module_menu response key) and introduces a user_menu response key for items modules want to place in the avatar dropdown. The global store follows suit: moduleMenu becomes userMenu, menuGroups is a computed that sorts by priority, and hasActiveModules drops out.
New admin Appearance setting page with a single toggle for whether sidebar group labels render — so instances that prefer a compact sidebar can hide the Documents/Administration/Modules headings without losing the grouping itself. CompanyLayout watches route meta and re-bootstraps when the admin-mode flag flips so the sidebar repaints with the right menu on navigation across the admin boundary.
Test suites updated: module menu merging is asserted against main_menu (name: 'module-{slug}') rather than the old module_menu response; HelloWorldIntegrationTest verifies the schema translation path; CompanyModulesIndexTest covers the display_name attachment.
157 lines
6.0 KiB
PHP
157 lines
6.0 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers\Company\General;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Resources\CompanyInvitationResource;
|
|
use App\Http\Resources\CompanyResource;
|
|
use App\Http\Resources\UserResource;
|
|
use App\Models\Company;
|
|
use App\Models\CompanyInvitation;
|
|
use App\Models\CompanySetting;
|
|
use App\Models\Currency;
|
|
use App\Models\Module;
|
|
use App\Models\Setting;
|
|
use App\Traits\GeneratesMenuTrait;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Request;
|
|
use InvoiceShelf\Modules\Registry as ModuleRegistry;
|
|
use Silber\Bouncer\BouncerFacade;
|
|
|
|
class BootstrapController extends Controller
|
|
{
|
|
use GeneratesMenuTrait;
|
|
|
|
/**
|
|
* Handle the incoming request.
|
|
*
|
|
* @return JsonResponse
|
|
*/
|
|
public function __invoke(Request $request)
|
|
{
|
|
$current_user = $request->user();
|
|
$current_user_settings = $current_user->getAllSettings();
|
|
$companies = $current_user->companies;
|
|
|
|
$pendingInvitations = CompanyInvitation::forUser($current_user)
|
|
->pending()
|
|
->with(['company', 'role', 'invitedBy'])
|
|
->get();
|
|
|
|
$global_settings = Setting::getSettings([
|
|
'api_token',
|
|
'admin_portal_theme',
|
|
'admin_portal_logo',
|
|
'login_page_logo',
|
|
'login_page_heading',
|
|
'login_page_description',
|
|
'admin_page_title',
|
|
'copyright_text',
|
|
'save_pdf_to_disk',
|
|
'show_sidebar_group_labels',
|
|
]);
|
|
|
|
// Super admin mode — return admin-only menu with all companies listed
|
|
if ($current_user->isSuperAdmin() && $request->has('admin_mode')) {
|
|
return response()->json([
|
|
'current_user' => new UserResource($current_user),
|
|
'current_user_settings' => $current_user_settings,
|
|
'current_user_abilities' => [],
|
|
'companies' => CompanyResource::collection($companies),
|
|
'current_company' => null,
|
|
'current_company_settings' => [],
|
|
'current_company_currency' => Currency::first(),
|
|
'config' => config('invoiceshelf'),
|
|
'global_settings' => $global_settings,
|
|
'main_menu' => $this->generateMenu('admin_menu', $current_user),
|
|
'setting_menu' => [],
|
|
'modules' => [],
|
|
'admin_mode' => true,
|
|
'pending_invitations' => CompanyInvitationResource::collection($pendingInvitations),
|
|
]);
|
|
}
|
|
|
|
// User has no companies — return minimal bootstrap
|
|
if ($companies->isEmpty()) {
|
|
return response()->json([
|
|
'current_user' => new UserResource($current_user),
|
|
'current_user_settings' => $current_user_settings,
|
|
'current_user_abilities' => [],
|
|
'companies' => [],
|
|
'current_company' => null,
|
|
'current_company_settings' => [],
|
|
'current_company_currency' => Currency::first(),
|
|
'config' => config('invoiceshelf'),
|
|
'global_settings' => $global_settings,
|
|
'main_menu' => [],
|
|
'setting_menu' => [],
|
|
'modules' => [],
|
|
'pending_invitations' => CompanyInvitationResource::collection($pendingInvitations),
|
|
]);
|
|
}
|
|
|
|
$main_menu = $this->generateMenu('main_menu', $current_user);
|
|
$setting_menu = $this->generateMenu('setting_menu', $current_user);
|
|
|
|
// Merge module-registered menu items into the main menu so they
|
|
// participate in the unified group + priority ordering.
|
|
foreach (ModuleRegistry::allMenu() as $slug => $item) {
|
|
$main_menu[] = [
|
|
'title' => __($item['title']),
|
|
'link' => $item['link'],
|
|
'icon' => $item['icon'],
|
|
'name' => 'module-'.$slug,
|
|
'group' => $item['group'] ?? 'modules',
|
|
'group_label' => $item['group_label'] ?? 'navigation.modules',
|
|
'priority' => $item['priority'] ?? 100,
|
|
];
|
|
}
|
|
|
|
$current_company = Company::find($request->header('company'));
|
|
|
|
if ((! $current_company) || ($current_company && ! $current_user->hasCompany($current_company->id))) {
|
|
$current_company = $current_user->companies()->first();
|
|
}
|
|
|
|
$current_company_settings = CompanySetting::getAllSettings($current_company->id);
|
|
|
|
$current_company_currency = $current_company_settings->has('currency')
|
|
? Currency::find($current_company_settings->get('currency'))
|
|
: Currency::first();
|
|
|
|
BouncerFacade::refreshFor($current_user);
|
|
|
|
return response()->json([
|
|
'current_user' => new UserResource($current_user),
|
|
'current_user_settings' => $current_user_settings,
|
|
'current_user_abilities' => $current_user->getAbilities(),
|
|
'companies' => CompanyResource::collection($companies),
|
|
'current_company' => new CompanyResource($current_company),
|
|
'current_company_settings' => $current_company_settings,
|
|
'current_company_currency' => $current_company_currency,
|
|
'config' => config('invoiceshelf'),
|
|
'global_settings' => $global_settings,
|
|
'main_menu' => $main_menu,
|
|
'setting_menu' => $setting_menu,
|
|
'modules' => Module::where('enabled', true)->pluck('name'),
|
|
'user_menu' => collect(ModuleRegistry::allUserMenu())
|
|
->map(fn (array $item, string $slug) => [
|
|
...$item,
|
|
'title' => __($item['title']),
|
|
'name' => 'module-'.$slug,
|
|
])
|
|
->sortBy('priority')
|
|
->values()
|
|
->all(),
|
|
'pending_invitations' => CompanyInvitationResource::collection($pendingInvitations),
|
|
]);
|
|
}
|
|
|
|
public function currentCompany(Request $request)
|
|
{
|
|
$company = Company::find($request->header('company'));
|
|
|
|
return new CompanyResource($company);
|
|
}
|
|
}
|