Javascript structure refactoring: Second version

lib/Controller/Region.php

@@ -90,7 +90,7 @@ public function __construct(
     }
 
     /**
-     * Edit Form
+     * Get region by id
      * @param Request $request
      * @param Response $response
      * @param $id
@@ -100,15 +100,14 @@ public function __construct(
      * @throws NotFoundException
      * @throws ControllerNotImplemented
      */
-    public function editForm(Request $request, Response $response, $id)
+    public function get(Request $request, Response $response, $id)
     {
         $region = $this->regionFactory->getById($id);
 
         if (!$this->getUser()->checkEditable($region)) {
             throw new AccessDeniedException();
         }
 
-        $this->getState()->template = 'region-form-edit';
         $this->getState()->setData([
             'region' => $region,
             'layout' => $this->layoutFactory->getById($region->layoutId),
@@ -118,33 +117,6 @@ public function editForm(Request $request, Response $response, $id)
         return $this->render($request, $response);
     }
 
-    /**
-     * Delete Form
-     * @param Request $request
-     * @param Response $response
-     * @param $id
-     * @return \Psr\Http\Message\ResponseInterface|Response
-     * @throws AccessDeniedException
-     * @throws GeneralException
-     * @throws NotFoundException
-     * @throws ControllerNotImplemented
-     */
-    public function deleteForm(Request $request, Response $response, $id)
-    {
-        $region = $this->regionFactory->getById($id);
-
-        if (!$this->getUser()->checkDeleteable($region))
-            throw new AccessDeniedException();
-
-        $this->getState()->template = 'region-form-delete';
-        $this->getState()->setData([
-            'region' => $region,
-            'layout' => $this->layoutFactory->getById($region->layoutId),
-        ]);
-
-        return $this->render($request, $response);
-    }
-
     /**
      * Add a region
      * @param Request $request

lib/Controller/Widget.php

@@ -310,14 +310,14 @@ public function addWidget(Request $request, Response $response, $type, $id)
     }
 
     /**
-     * Edit Widget Form
+     * Get Widget
      * @param Request $request
      * @param Response $response
      * @param $id
      * @return \Psr\Http\Message\ResponseInterface|Response
      * @throws \Xibo\Support\Exception\GeneralException
      */
-    public function editWidgetForm(Request $request, Response $response, $id)
+    public function getWidget(Request $request, Response $response, $id)
     {
         // Load the widget
         $widget = $this->widgetFactory->loadByWidgetId($id);
@@ -600,44 +600,6 @@ public function editWidget(Request $request, Response $response, $id)
         return $this->render($request, $response);
     }
 
-    /**
-     * Delete Widget Form
-     * @param Request $request
-     * @param Response $response
-     * @param $id
-     * @return \Psr\Http\Message\ResponseInterface|Response
-     * @throws AccessDeniedException
-     * @throws GeneralException
-     * @throws NotFoundException
-     * @throws \Xibo\Support\Exception\ControllerNotImplemented
-     */
-    public function deleteWidgetForm(Request $request, Response $response, $id)
-    {
-        $widget = $this->widgetFactory->loadByWidgetId($id);
-
-        if (!$this->getUser()->checkDeleteable($widget)) {
-            throw new AccessDeniedException(__('This Widget is not shared with you with delete permission'));
-        }
-
-        $error = false;
-        $module = null;
-        try {
-            $module = $this->moduleFactory->getByType($widget->type);
-        } catch (NotFoundException $notFoundException) {
-            $error = true;
-        }
-
-        // Pass to view
-        $this->getState()->template = 'module-form-delete';
-        $this->getState()->setData([
-            'widgetId' => $id,
-            'module' => $module,
-            'error' => $error,
-        ]);
-
-        return $this->render($request, $response);
-    }
-
     /**
      * Delete a Widget
      * @SWG\Delete(

lib/routes-web.php

@@ -184,8 +184,7 @@
     ->setName('region.preview');
 
 $app->group('', function(\Slim\Routing\RouteCollectorProxy $group) {
-    $group->get('/region/form/edit/{id}', ['\Xibo\Controller\Region', 'editForm'])->setName('region.edit.form');
-    $group->get('/region/form/delete/{id}', ['\Xibo\Controller\Region', 'deleteForm'])->setName('region.delete.form');
+    $group->get('/region/{id}', ['\Xibo\Controller\Region', 'get'])->setName('region.get');
 
     // Designer
     $group->get('/playlist/form/library/assign/{id}', ['\Xibo\Controller\Playlist','libraryAssignForm'])->setName('playlist.library.assign.form');
@@ -202,8 +201,7 @@
 
 $app->group('', function (\Slim\Routing\RouteCollectorProxy $group) {
     // Widget functions
-    $group->get('/playlist/widget/form/edit/{id}', ['\Xibo\Controller\Widget','editWidgetForm'])->setName('module.widget.edit.form');
-    $group->get('/playlist/widget/form/delete/{id}', ['\Xibo\Controller\Widget','deleteWidgetForm'])->setName('module.widget.delete.form');
+    $group->get('/playlist/widget/{id}', ['\Xibo\Controller\Widget','getWidget'])->setName('module.widget.get');
     $group->get('/playlist/widget/form/transition/edit/{type}/{id}', ['\Xibo\Controller\Widget','editWidgetTransitionForm'])->setName('module.widget.transition.edit.form');
     $group->get('/playlist/widget/form/audio/{id}', ['\Xibo\Controller\Widget','widgetAudioForm'])->setName('module.widget.audio.form');
     $group->get('/playlist/widget/form/expiry/{id}', ['\Xibo\Controller\Widget','widgetExpiryForm'])->setName('module.widget.expiry.form');