Fix edit links for referenced modules with route prefixes

MamlukiSn · Jun 28, 2021 · 81f84c3 · 81f84c3
1 parent 9c5f48f
commit 81f84c3
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/config/twill.php b/config/twill.php
@@ -194,4 +194,14 @@
         'zh-Hans',
         'ru',
     ],
+    /*
+    |--------------------------------------------------------------------------
+    | Admin Module route prefixes
+    |--------------------------------------------------------------------------
+    |
+    | Used to link modules referenced by medias and files and that have route prefixes
+    |
+     */
+    'module_route_prefixes' => [
+    ],
 ];
diff --git a/src/Helpers/routes_helpers.php b/src/Helpers/routes_helpers.php
@@ -80,3 +80,36 @@ function isActiveNavigation($navigationElement, $navigationKey, $activeNavigatio
         return $urlsAreMatching;
     }
 }
+
+if (!function_exists('moduleRouteExists')) {
+    /**
+     * @param string $moduleName
+     * @param string $prefix
+     * @param string $action
+     * @param array $parameters
+     * @param bool $absolute
+     * @return bool
+     */
+    function moduleRouteExists($moduleName, $prefix, $action)
+    {
+        // Fix module name case
+        $moduleName = Str::camel($moduleName);
+
+        // Create base route name
+        $routeName = 'admin.' . ($prefix ? $prefix . '.' : '');
+
+        // Prefix it with module name only if prefix doesn't contains it already
+        if (
+            config('twill.allow_duplicates_on_route_names', true) ||
+            ($prefix !== $moduleName &&
+                !Str::endsWith($prefix, '.' . $moduleName))
+        ) {
+            $routeName .= "{$moduleName}.";
+        }
+
+        //  Add the action name
+        $routeName .= $action;
+
+        return Route::has($routeName);
+    }
+}
diff --git a/src/Models/File.php b/src/Models/File.php
@@ -90,7 +90,7 @@ public function getOwnerDetails()
                     'titleKey' => $model->titleKey,
                     'model'=>$model,
                     'module'=>$module,
-                    'edit' => moduleRoute($module, config('twill.block_editor.browser_route_prefixes.' . $module), 'edit', $model->id),
+                    'edit' => moduleRouteExists($module,config('twill.module_route_prefixes.' . $module),'edit', $model->id ) ? moduleRoute($module, config('twill.module_route_prefixes.' . $module), 'edit', $model->id) : null,
                 ] : [];
 
             }
@@ -102,7 +102,7 @@ public function getOwnerDetails()
                 'titleKey' => $item->titleKey,
                 'model'=>$item,
                 'module'=>$module,
-                'edit' => moduleRoute($module, config('twill.block_editor.browser_route_prefixes.' . $module), 'edit', $item->id),
+                'edit' => moduleRouteExists($module,config('twill.module_route_prefixes.' . $module),'edit', $item->id ) ? moduleRoute($module, config('twill.module_route_prefixes.' . $module), 'edit', $item->id) : null,
             ];
 
         })->filter()->values()->toArray();

diff --git a/src/Models/Media.php b/src/Models/Media.php
@@ -175,7 +175,7 @@ public function getOwnerDetails()
                     'titleKey' => $model->titleKey,
                     'model'=>$model,
                     'module'=>$module,
-                    'edit' => moduleRoute($module, config('twill.block_editor.browser_route_prefixes.' . $module), 'edit', $model->id),
+                    'edit' => moduleRouteExists($module,config('twill.module_route_prefixes.' . $module),'edit', $model->id ) ? moduleRoute($module, config('twill.module_route_prefixes.' . $module), 'edit', $model->id) : null,
                 ] : [];
 
             }
@@ -187,7 +187,7 @@ public function getOwnerDetails()
                 'titleKey' => $item->titleKey,
                 'model'=>$item,
                 'module'=>$module,
-                'edit' => moduleRoute($module, config('twill.block_editor.browser_route_prefixes.' . $module), 'edit', $item->id),
+                'edit' =>  moduleRouteExists($module,config('twill.module_route_prefixes.' . $module),'edit', $item->id ) ? moduleRoute($module, config('twill.module_route_prefixes.' . $module), 'edit', $item->id) : null,
             ];
 
         })->filter()->values()->toArray();