uuid models support for nesting modules

yamaha252 · yamaha252 · commit 36517b3f6323 · 2023-07-31T16:43:15.000+05:00
diff --git a/src/Http/Controllers/Admin/AppSettingsController.php b/src/Http/Controllers/Admin/AppSettingsController.php
@@ -33,7 +33,7 @@ protected function setUpController(): void
         }
     }
 
-    public function update(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $model = AppSetting::findOrFail($id);
 
diff --git a/src/Http/Controllers/Admin/FileLibraryController.php b/src/Http/Controllers/Admin/FileLibraryController.php
@@ -106,7 +106,7 @@ public function filters(): TableFilters
         ]);
     }
 
-    public function index(?int $parentModuleId = null): mixed
+    public function index(int|string|null $parentModuleId = null): mixed
     {
         if ($this->request->has('except')) {
             $prependScope['exceptIds'] = $this->request->get('except');
@@ -172,7 +172,7 @@ protected function getRequestFilters(): array
     }
 
     /**
-     * @param int|null $parentModuleId
+     * @param int|string|null $parentModuleId
      * @return JsonResponse
      * @throws BindingResolutionException
      */
diff --git a/src/Http/Controllers/Admin/GroupController.php b/src/Http/Controllers/Admin/GroupController.php
@@ -100,7 +100,7 @@ public function edit(int|string|TwillModelContract $id): mixed
         return parent::edit($id);
     }
 
-    public function update(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $this->authorizableOptions['edit'] = 'edit-group';
 
diff --git a/src/Http/Controllers/Admin/MediaLibraryController.php b/src/Http/Controllers/Admin/MediaLibraryController.php
@@ -106,7 +106,7 @@ public function filters(): TableFilters
         ]);
     }
 
-    public function index(?int $parentModuleId = null): array
+    public function index(int|string|null $parentModuleId = null): array
     {
         if ($this->request->has('except')) {
             $prependScope['exceptIds'] = $this->request->get('except');
@@ -150,7 +150,7 @@ protected function getRequestFilters(): array
     }
 
     /**
-     * @param int|null $parentModuleId
+     * @param int|string|null $parentModuleId
      * @return
      */
     public function store($parentModuleId = null)
diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
@@ -259,7 +259,7 @@ abstract class ModuleController extends Controller
     protected $submodule = false;
 
     /**
-     * @var int|null
+     * @var int|string|null
      */
     protected $submoduleParentId = null;
 
@@ -970,7 +970,7 @@ protected function getParentModuleIdFromRequest(Request $request)
     /**
      * @return IlluminateView|JsonResponse
      */
-    public function index(?int $parentModuleId = null): mixed
+    public function index(int|string|null $parentModuleId = null): mixed
     {
         $this->authorizeOption('list', $this->moduleName);
 
@@ -1032,7 +1032,7 @@ public function browser(): JsonResponse
     }
 
     /**
-     * @param int|null $parentModuleId
+     * @param int|string|null $parentModuleId
      * @return \Illuminate\Http\JsonResponse
      */
     public function store($parentModuleId = null)
@@ -1093,7 +1093,7 @@ public function store($parentModuleId = null)
     /**
      * @param Request $request
      * @param int|string $id
-     * @param int|null $submoduleId
+     * @param int|string|null $submoduleId
      * @return \Illuminate\Http\RedirectResponse
      */
     public function show($id, $submoduleId = null)
@@ -1169,7 +1169,7 @@ public function edit(TwillModelContract|int|string $id): mixed
         );
     }
 
-    public function create(int $parentModuleId = null): JsonResponse|RedirectResponse|IlluminateView
+    public function create(int|string $parentModuleId = null): JsonResponse|RedirectResponse|IlluminateView
     {
         if (! $this->getIndexOption('skipCreateModal')) {
             return Redirect::to(
@@ -1205,7 +1205,7 @@ public function create(int $parentModuleId = null): JsonResponse|RedirectRespons
         );
     }
 
-    public function update(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         [$item, $id] = $this->itemAndIdFromRequest($id);
 
@@ -1435,7 +1435,7 @@ public function bulkPublish(): JsonResponse
         );
     }
 
-    public function duplicate(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function duplicate(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         [$item, $id] = $this->itemAndIdFromRequest($id);
 
@@ -1475,7 +1475,7 @@ public function duplicate(int|string|TwillModelContract $id, ?int $submoduleId =
         );
     }
 
-    public function destroy(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function destroy(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         [$item, $id] = $this->itemAndIdFromRequest($id);
 
diff --git a/src/Http/Controllers/Admin/RoleController.php b/src/Http/Controllers/Admin/RoleController.php
@@ -87,7 +87,7 @@ protected function indexItemData($item): array
         return ['edit' => $canEdit ? $this->getModuleRoute($item->id, 'edit') : null];
     }
 
-    public function index(?int $parentModuleId = null): mixed
+    public function index(int|string|null $parentModuleId = null): mixed
     {
         // Superadmins can reorder groups to determine the access-level of each one.
         // A given group can't edit other groups with a higher access-level.
@@ -103,7 +103,7 @@ public function edit(int|string|TwillModelContract $id): mixed
         return parent::edit($id);
     }
 
-    public function update(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $this->authorizableOptions['edit'] = 'edit-role';
 
diff --git a/src/Http/Controllers/Admin/SingletonModuleController.php b/src/Http/Controllers/Admin/SingletonModuleController.php
@@ -11,7 +11,7 @@ abstract class SingletonModuleController extends ModuleController
 {
     protected $permalinkBase = '';
 
-    public function index(?int $parentModuleId = null): mixed
+    public function index(int|string|null $parentModuleId = null): mixed
     {
         throw new \Exception("{$this->getModelName()} has no index");
     }
diff --git a/src/Http/Controllers/Admin/UserController.php b/src/Http/Controllers/Admin/UserController.php
@@ -296,7 +296,7 @@ public function edit(int|string|TwillModelContract $id): mixed
         return parent::edit($id);
     }
 
-    public function update(int|string|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $this->authorizableOptions['edit'] = 'edit-user';
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ protected function setUpController(): void`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function update(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`36`	`+ public function update(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`37`	`37`	`{`
`38`	`38`	`$model = AppSetting::findOrFail($id);`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public function filters(): TableFilters`
`106`	`106`	`]);`
`107`	`107`	`}`
`108`	`108`
`109`		`- public function index(?int $parentModuleId = null): mixed`
	`109`	`+ public function index(int\|string\|null $parentModuleId = null): mixed`
`110`	`110`	`{`
`111`	`111`	`if ($this->request->has('except')) {`
`112`	`112`	`$prependScope['exceptIds'] = $this->request->get('except');`
`@@ -172,7 +172,7 @@ protected function getRequestFilters(): array`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`/**`
`175`		`- * @param int\|null $parentModuleId`
	`175`	`+ * @param int\|string\|null $parentModuleId`
`176`	`176`	`* @return JsonResponse`
`177`	`177`	`* @throws BindingResolutionException`
`178`	`178`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function edit(int\|string\|TwillModelContract $id): mixed`
`100`	`100`	`return parent::edit($id);`
`101`	`101`	`}`
`102`	`102`
`103`		`- public function update(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`103`	`+ public function update(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`104`	`104`	`{`
`105`	`105`	`$this->authorizableOptions['edit'] = 'edit-group';`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ abstract class ModuleController extends Controller`
`259`	`259`	`protected $submodule = false;`
`260`	`260`
`261`	`261`	`/**`
`262`		`- * @var int\|null`
	`262`	`+ * @var int\|string\|null`
`263`	`263`	`*/`
`264`	`264`	`protected $submoduleParentId = null;`
`265`	`265`
`@@ -970,7 +970,7 @@ protected function getParentModuleIdFromRequest(Request $request)`
`970`	`970`	`/**`
`971`	`971`	`* @return IlluminateView\|JsonResponse`
`972`	`972`	`*/`
`973`		`- public function index(?int $parentModuleId = null): mixed`
	`973`	`+ public function index(int\|string\|null $parentModuleId = null): mixed`
`974`	`974`	`{`
`975`	`975`	`$this->authorizeOption('list', $this->moduleName);`
`976`	`976`
`@@ -1032,7 +1032,7 @@ public function browser(): JsonResponse`
`1032`	`1032`	`}`
`1033`	`1033`
`1034`	`1034`	`/**`
`1035`		`- * @param int\|null $parentModuleId`
	`1035`	`+ * @param int\|string\|null $parentModuleId`
`1036`	`1036`	`* @return \Illuminate\Http\JsonResponse`
`1037`	`1037`	`*/`
`1038`	`1038`	`public function store($parentModuleId = null)`
`@@ -1093,7 +1093,7 @@ public function store($parentModuleId = null)`
`1093`	`1093`	`/**`
`1094`	`1094`	`* @param Request $request`
`1095`	`1095`	`* @param int\|string $id`
`1096`		`- * @param int\|null $submoduleId`
	`1096`	`+ * @param int\|string\|null $submoduleId`
`1097`	`1097`	`* @return \Illuminate\Http\RedirectResponse`
`1098`	`1098`	`*/`
`1099`	`1099`	`public function show($id, $submoduleId = null)`
`@@ -1169,7 +1169,7 @@ public function edit(TwillModelContract\|int\|string $id): mixed`
`1169`	`1169`	`);`
`1170`	`1170`	`}`
`1171`	`1171`
`1172`		`- public function create(int $parentModuleId = null): JsonResponse\|RedirectResponse\|IlluminateView`
	`1172`	`+ public function create(int\|string $parentModuleId = null): JsonResponse\|RedirectResponse\|IlluminateView`
`1173`	`1173`	`{`
`1174`	`1174`	`if (! $this->getIndexOption('skipCreateModal')) {`
`1175`	`1175`	`return Redirect::to(`
`@@ -1205,7 +1205,7 @@ public function create(int $parentModuleId = null): JsonResponse\|RedirectRespons`
`1205`	`1205`	`);`
`1206`	`1206`	`}`
`1207`	`1207`
`1208`		`- public function update(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`1208`	`+ public function update(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`1209`	`1209`	`{`
`1210`	`1210`	`[$item, $id] = $this->itemAndIdFromRequest($id);`
`1211`	`1211`
`@@ -1435,7 +1435,7 @@ public function bulkPublish(): JsonResponse`
`1435`	`1435`	`);`
`1436`	`1436`	`}`
`1437`	`1437`
`1438`		`- public function duplicate(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`1438`	`+ public function duplicate(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`1439`	`1439`	`{`
`1440`	`1440`	`[$item, $id] = $this->itemAndIdFromRequest($id);`
`1441`	`1441`
`@@ -1475,7 +1475,7 @@ public function duplicate(int\|string\|TwillModelContract $id, ?int $submoduleId =`
`1475`	`1475`	`);`
`1476`	`1476`	`}`
`1477`	`1477`
`1478`		`- public function destroy(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`1478`	`+ public function destroy(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`1479`	`1479`	`{`
`1480`	`1480`	`[$item, $id] = $this->itemAndIdFromRequest($id);`
`1481`	`1481`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ protected function indexItemData($item): array`
`87`	`87`	`return ['edit' => $canEdit ? $this->getModuleRoute($item->id, 'edit') : null];`
`88`	`88`	`}`
`89`	`89`
`90`		`- public function index(?int $parentModuleId = null): mixed`
	`90`	`+ public function index(int\|string\|null $parentModuleId = null): mixed`
`91`	`91`	`{`
`92`	`92`	`// Superadmins can reorder groups to determine the access-level of each one.`
`93`	`93`	`// A given group can't edit other groups with a higher access-level.`
`@@ -103,7 +103,7 @@ public function edit(int\|string\|TwillModelContract $id): mixed`
`103`	`103`	`return parent::edit($id);`
`104`	`104`	`}`
`105`	`105`
`106`		`- public function update(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`106`	`+ public function update(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`107`	`107`	`{`
`108`	`108`	`$this->authorizableOptions['edit'] = 'edit-role';`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ abstract class SingletonModuleController extends ModuleController`
`11`	`11`	`{`
`12`	`12`	`protected $permalinkBase = '';`
`13`	`13`
`14`		`- public function index(?int $parentModuleId = null): mixed`
	`14`	`+ public function index(int\|string\|null $parentModuleId = null): mixed`
`15`	`15`	`{`
`16`	`16`	`throw new \Exception("{$this->getModelName()} has no index");`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ public function edit(int\|string\|TwillModelContract $id): mixed`
`296`	`296`	`return parent::edit($id);`
`297`	`297`	`}`
`298`	`298`
`299`		`- public function update(int\|string\|TwillModelContract $id, ?int $submoduleId = null): JsonResponse`
	`299`	`+ public function update(int\|string\|TwillModelContract $id, int\|string\|null $submoduleId = null): JsonResponse`
`300`	`300`	`{`
`301`	`301`	`$this->authorizableOptions['edit'] = 'edit-user';`
`302`	`302`