admin_url

resources/views/partials/menu.blade.php

@@ -1,7 +1,7 @@
 @if(Dcat\Admin\Admin::Menu()->show($item))
     @if(!isset($item['children']))
         @php
-            $url = Dcat\Admin\Admin::menu()->getAdminPath($item['uri']);
+            $url = Dcat\Admin\Admin::menu()->getUrl($item['uri']);
         @endphp
 
         <li {!! Dcat\Admin\Admin::Menu()->isActive($item) ? 'class="active"' : '' !!}>

src/Controllers/AuthController.php

@@ -102,7 +102,7 @@ class AuthController extends Controller
 
         return $content
             ->header(trans('admin.user_setting'))
-            ->body($form->edit(Admin::user()->id));
+            ->body($form->edit(Admin::user()->getKey()));
     }
 
     /**
@@ -115,10 +115,10 @@ class AuthController extends Controller
         $form = $this->settingForm();
 
         if (!$this->validateCredentialsWhenUpdatingPassword()) {
-            $form->addValidationMessages('old_password', trans('admin.old_password_error'));
+            $form->responseValidationMessages('old_password', trans('admin.old_password_error'));
         }
 
-        return $form->update(Admin::user()->id);
+        return $form->update(Admin::user()->getKey());
     }
 
     protected function validateCredentialsWhenUpdatingPassword()
@@ -173,7 +173,7 @@ class AuthController extends Controller
                 return $form->model()->password;
             });
 
-        $form->setAction(admin_base_path('auth/setting'));
+        $form->setAction(admin_url('auth/setting'));
 
         $form->ignore(['password_confirmation', 'old_password']);
 

src/Controllers/MenuController.php

@@ -32,7 +32,7 @@ class MenuController extends Controller
 
                 $row->column(5, function (Column $column) {
                     $form = new \Dcat\Admin\Widgets\Form();
-                    $form->action(admin_base_path('auth/menu'));
+                    $form->action(admin_url('auth/menu'));
 
                     $menuModel = config('admin.database.menu_model');
                     $permissionModel = config('admin.database.permissions_model');

src/Extension/Grid/BuildExtensionButton.php

@@ -26,7 +26,7 @@ CSS
     {
         $submit = trans('admin.submit');
 
-        $url = admin_base_path('helpers/extensions/create');
+        $url = admin_url('helpers/extensions/create');
 
         Admin::script(
             <<<JS

src/Extension/Grid/ImportButton.php

@@ -39,7 +39,7 @@ HTML;
         $confirm = trans('admin.confirm');
         $cancel  = trans('admin.cancel');
 
-        $url = admin_base_path('helpers/extensions/import');
+        $url = admin_url('helpers/extensions/import');
 
         Admin::script(
             <<<JS

src/Form/Field/File.php

@@ -73,7 +73,7 @@ class File extends Field
 
         $fileLimit = $this->options['fileNumLimit'] ?? 1;
         if ($fileLimit < count($value)) {
-            $this->form->addValidationMessages(
+            $this->form->responseValidationMessages(
                 $this->column,
                 trans('admin.uploader.max_file_limit', ['attribute' => $this->label, 'max' => $fileLimit])
             );

src/Form/Field/SelectResource.php

@@ -107,16 +107,13 @@ class SelectResource extends Field
     /**
      * Set source path.
      *
-     * @param $source
+     * @param string $source
+     *
      * @return $this
      */
     public function path($source)
     {
-        if ($source && URL::isValidUrl($source)) {
-            $this->source = $source;
-        } else {
-            $this->source = admin_base_path($source);
-        }
+        $this->source = admin_url($source);
 
         return $this;
     }

src/Form/Field/WebUploader.php

@@ -86,7 +86,7 @@ trait WebUploader
      */
     public function url(string $server)
     {
-        $this->options['server'] = URL::isValidUrl($server) ? $server : admin_base_path($server);
+        $this->options['server'] = admin_url($server);
 
         return $this;
     }
@@ -124,7 +124,7 @@ trait WebUploader
      */
     public function deleteUrl(string $server)
     {
-        $this->options['deleteUrl'] = URL::isValidUrl($server) ? $server : admin_base_path($server);
+        $this->options['deleteUrl'] = admin_url($server);
 
         return $this;
     }
@@ -153,7 +153,7 @@ trait WebUploader
                 '_method' => 'PUT',
             ],
             'formData' => [
-                '_id' => Admin::user()->id,
+                '_id' => Admin::user()->getKey(),
                 'upload_column' => $this->column,
                 '_method' => 'PUT',
                 '_token' => csrf_token(),

src/Grid.php

@@ -1034,7 +1034,7 @@ HTML;
     public function resource(string $path)
     {
         if (!empty($path)) {
-            $this->resourcePath = URL::isValidUrl($path) ? $path : admin_base_path($path);
+            $this->resourcePath = admin_url($path);
         }
         return $this;
     }
@@ -1046,7 +1046,9 @@ HTML;
      */
     public function getResource()
     {
-        return $this->resourcePath ?: app('request')->getPathInfo();
+        return $this->resourcePath ?: (
+            $this->resourcePath = url(app('request')->getPathInfo())
+        );
     }
 
     /**

src/Grid/Displayers/Tree.php

@@ -71,11 +71,7 @@ class Tree extends AbstractDisplayer
 
     public function url(string $source)
     {
-        if ($source && URL::isValidUrl($source)) {
-            $this->url = $source;
-        } else {
-            $this->url = admin_base_path($source);
-        }
+        $this->url = admin_url($source);
 
         return $this;
     }

src/Grid/Filter/Presenter/SelectResource.php

@@ -113,16 +113,13 @@ class SelectResource extends Presenter
     /**
      * Set source path.
      *
-     * @param $source
+     * @param string $source
+     *
      * @return $this
      */
     public function path($source)
     {
-        if ($source && URL::isValidUrl($source)) {
-            $this->source = $source;
-        } else {
-            $this->source = admin_base_path($source);
-        }
+        $this->source = admin_url($source);
 
         return $this;
     }

src/Layout/Menu.php

@@ -119,11 +119,11 @@ class Menu
             if (empty($item['uri'])) {
                 return false;
             }
-            return trim($this->getAdminPath($item['uri']), '/') == $path;
+            return trim($this->getPath($item['uri']), '/') == $path;
         }
 
         foreach($item['children'] as $v) {
-            if ($path == trim($this->getAdminPath($v['uri']), '/')) {
+            if ($path == trim($this->getPath($v['uri']), '/')) {
                 return true;
             }
             if (!empty($v['children'])) {
@@ -167,12 +167,25 @@ class Menu
 
     /**
      * @param $uri
+     *
      * @return string
      */
-    public function getAdminPath($uri)
+    public function getPath($uri)
     {
         if (!$uri) return $uri;
 
         return url()->isValidUrl($uri) ? $uri : admin_base_path($uri);
     }
+
+    /**
+     * @param $uri
+     *
+     * @return string
+     */
+    public function getUrl($uri)
+    {
+        if (!$uri) return $uri;
+
+        return admin_url($uri);
+    }
 }

src/Show.php

@@ -470,7 +470,7 @@ class Show implements Renderable
     public function resource(string $resource)
     {
         if ($resource) {
-            $this->resource = URL::isValidUrl($resource) ? $resource : admin_base_path($resource);
+            $this->resource = admin_url($resource);
         }
 
         return $this;
@@ -489,7 +489,7 @@ class Show implements Renderable
             $segments = explode('/', $path);
             array_pop($segments);
 
-            $this->resource = implode('/', $segments);
+            $this->resource = url(implode('/', $segments));
         }
 
         return $this->resource;

src/Widgets/AjaxRequestBuilder.php

@@ -45,7 +45,7 @@ trait AjaxRequestBuilder
      */
     public function setUrl(string $url)
     {
-        $this->url = url()->isValidUrl($url) ? $url : admin_base_path($url);
+        $this->url = admin_url($url);
 
         return $this;
     }

src/Widgets/DialogForm.php

@@ -207,7 +207,7 @@ class DialogForm
     {
         if ($url) {
             $this->options['defaultUrl'] = Helper::urlWithQuery(
-                ($url && URL::isValidUrl($url)) ? $url : admin_base_path($url),
+                admin_url($url),
                 [static::QUERY_NAME => 1]
             );
         }