Merge pull request #34 from rupadana/dev

fix: adding panel name
rupadana · Mar 10, 2024 · 4b78c09 · 4b78c09
2 parents e110f01 + c535d95
commit 4b78c09
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/routes/api.php b/routes/api.php
@@ -6,7 +6,7 @@
 use Rupadana\ApiService\Exceptions\InvalidTenancyConfiguration;
 
 Route::prefix('api')
-    ->name('api')
+    ->name('api.')
     ->group(function () {
         if (ApiService::tenancyAwareness() && (! ApiService::isRoutePrefixedByPanel() || ! ApiService::isTenancyEnabled())) {
             throw new InvalidTenancyConfiguration("Tenancy awareness is enabled!. Please set 'api-service.route.panel_prefix=true' and 'api-service.tenancy.enabled=true'");
@@ -21,14 +21,15 @@
                 $tenantRoutePrefix = $panel->getTenantRoutePrefix();
                 $tenantSlugAttribute = $panel->getTenantSlugAttribute();
                 $panelRoutePrefix = ApiService::isRoutePrefixedByPanel() ? '{panel}' : '';
+                $panelNamePrefix = $panelRoutePrefix ? $panel->getId() . '.' : '';
 
                 if (
                     $hasTenancy &&
                     ApiService::isTenancyEnabled() &&
                     ApiService::tenancyAwareness()
                 ) {
                     Route::prefix($panelRoutePrefix . '/' . (($tenantRoutePrefix) ? "{$tenantRoutePrefix}/" : '') . '{tenant' . (($tenantSlugAttribute) ? ":{$tenantSlugAttribute}" : '') . '}')
-                        ->name($panelRoutePrefix . '.')
+                        ->name($panelNamePrefix)
                         ->group(function () use ($panel) {
                             $apiServicePlugin = $panel->getPlugin('api-service');
                             $apiServicePlugin->route($panel);
@@ -37,7 +38,7 @@
 
                 if (! ApiService::tenancyAwareness()) {
                     Route::prefix($panelRoutePrefix)
-                        ->name($panelRoutePrefix . '.')
+                        ->name($panelNamePrefix)
                         ->group(function () use ($panel) {
                             $apiServicePlugin = $panel->getPlugin('api-service');
                             $apiServicePlugin->route($panel);