Pass custom widget namespace to ajax calls

Author: arrilot

composer.json

@@ -42,5 +42,8 @@
                 "AsyncWidget": "Arrilot\\Widgets\\AsyncFacade"
             }
         }
+    },
+    "scripts": {
+        "test": "phpunit"
     }
 }

src/Controllers/WidgetController.php

@@ -28,8 +28,11 @@ public function showWidget(Request $request)
             : $factory->decryptWidgetParams($request->input('params', ''));
 
         $decodedParams = json_decode($widgetParams, true);
+        
+        $params = $decodedParams ?: [];
+        array_unshift($params, $widgetName);
 
-        return call_user_func_array([$factory, $widgetName], $decodedParams ?: []);
+        return call_user_func_array([$factory, 'run'], $params);
     }
 
     /**

src/Factories/AbstractWidgetFactory.php

@@ -35,6 +35,13 @@ abstract class AbstractWidgetFactory
      */
     public $widgetName;
 
+    /**
+     * Custom widget namespace of the widget being called if is set.
+     *
+     * @var string|null
+     */
+    public $customWidgetNamespace;
+
     /**
      * Array of widget parameters excluding the first one (config).
      *
@@ -120,9 +127,12 @@ protected function instantiateWidget(array $params = [])
 
         if (preg_match('#^(.*?)::(.*?)$#', $str, $m)) {
             $rootNamespace = $this->app->get('arrilot.widget-namespaces')->getNamespace($m[1]);
+            $this->customWidgetNamespace = $m[1];
             $str = $m[2];
+        } else {
+            $this->customWidgetNamespace = null;
         }
-
+        
         $this->widgetName = $this->parseFullWidgetNameFromString($str);
         $this->widgetFullParams = $params;
         $this->widgetConfig = (array) array_shift($params);
@@ -206,4 +216,16 @@ public function decryptWidgetParams($params)
     {
         return $this->app->make('encrypter')->decrypt($params);
     }
+
+    /**
+     * Get current widget name with optional custom widget namespace.
+     * 
+     * @return string
+     */
+    public function getWidgetNameWithCustomNamespace()
+    {
+        return $this->customWidgetNamespace 
+            ? $this->customWidgetNamespace . '::' . $this->widgetName
+            : $this->widgetName;
+    }
 }

src/Factories/JavascriptFactory.php

@@ -95,7 +95,7 @@ protected function constructAjaxCall($encryptParams = true)
         $encodedParams = json_encode($this->widgetFactory->widgetFullParams);
         $queryParams = [
             'id'     => WidgetId::get(),
-            'name'   => $this->widgetFactory->widgetName,
+            'name'   => $this->widgetFactory->getWidgetNameWithCustomNamespace(),
             'params' => $encryptParams ? $this->widgetFactory->encryptWidgetParams($encodedParams) : $encodedParams,
         ];
         if (!$encryptParams) {