Sidebar and MenuItems clean up (#298)

* Remove Sidebar fetching from `frontend` * Remove leftover Sidebar code from packages * Remove Sidebar from core * Fix rename `filesystem` * Add migration file * Fix lint
EnAccess · Sep 30, 2024 · 46aa423 · 46aa423
1 parent a3c801a
commit 46aa423
Show file tree

Hide file tree

Showing 59 changed files with 157 additions and 1,624 deletions.
diff --git a/src/backend/app/Console/Commands/AddEBikesItemToNavbar.php b/src/backend/app/Console/Commands/AddEBikesItemToNavbar.php
diff --git a/src/backend/app/Console/Commands/MenuItemsGenerator.php b/src/backend/app/Console/Commands/MenuItemsGenerator.php
diff --git a/src/backend/app/Console/Commands/ShiftMeterParameterConfigurationsToMeters.php b/src/backend/app/Console/Commands/ShiftMeterParameterConfigurationsToMeters.php
diff --git a/src/backend/app/Http/Controllers/CompanyController.php b/src/backend/app/Http/Controllers/CompanyController.php
@@ -7,7 +7,6 @@
 use App\Services\CompanyDatabaseService;
 use App\Services\CompanyService;
 use App\Services\MainSettingsService;
-use App\Services\MenuItemsService;
 use App\Services\MpmPluginService;
 use App\Services\PluginsService;
 use App\Services\RegistrationTailService;
@@ -23,7 +22,6 @@ public function __construct(
         private CompanyService $companyService,
         private CompanyDatabaseService $companyDatabaseService,
         private PluginsService $pluginsService,
-        private MenuItemsService $menuItemsService,
         private UserService $userService,
         private DatabaseProxyManagerService $databaseProxyManagerService,
         private MpmPluginService $mpmPluginService,
@@ -110,7 +108,6 @@ function () use ($company, $plugins) {
                 return response()->json([
                     'message' => 'Congratulations! you have registered to MicroPowerManager successfully. You will be redirected to dashboard  in seconds..',
                     'company' => $company,
-                    'sidebarData' => $this->menuItemsService->getAll(),
                 ], 201);
             }
         );

diff --git a/src/backend/app/Http/Controllers/PluginController.php b/src/backend/app/Http/Controllers/PluginController.php
@@ -4,7 +4,6 @@
 
 use App\Http\Resources\ApiResource;
 use App\Services\CompanyDatabaseService;
-use App\Services\MenuItemsService;
 use App\Services\MpmPluginService;
 use App\Services\PluginsService;
 use App\Services\RegistrationTailService;
@@ -17,7 +16,6 @@ public function __construct(
         private PluginsService $pluginsService,
         private MpmPluginService $mpmPluginService,
         private CompanyDatabaseService $companyDatabaseService,
-        private MenuItemsService $menuItemsService,
         private RegistrationTailService $registrationTailService,
     ) {
     }
@@ -53,16 +51,10 @@ public function update(Request $request, $mpmPluginId): ApiResource
             }
 
             $updatedPlugin = $this->pluginsService->update($plugin, $pluginData);
-            $ExistingMenuItem = $this->menuItemsService->checkMenuItemIsExistsForTag($mpmPlugin);
-
-            if (!$ExistingMenuItem) {
-                $this->companyDatabaseService->addPluginSpecificMenuItemsToCompanyDatabase($mpmPlugin);
-            }
 
             $this->registrationTailService->addMpmPluginToRegistrationTail($registrationTail, $mpmPlugin);
         } else {
             $updatedPlugin = $this->pluginsService->update($plugin, $pluginData);
-            $this->menuItemsService->removeMenuItemAndSubmenuItemForMenuItemName($mpmPlugin);
 
             $this->registrationTailService->removeMpmPluginFromRegistrationTail($registrationTail, $mpmPlugin);
         }

diff --git a/src/backend/app/Http/Controllers/SidebarController.php b/src/backend/app/Http/Controllers/SidebarController.php
diff --git a/src/backend/app/Models/MenuItems.php b/src/backend/app/Models/MenuItems.php
diff --git a/src/backend/app/Models/SubMenuItems.php b/src/backend/app/Models/SubMenuItems.php
diff --git a/src/backend/app/Services/CompanyDatabaseService.php b/src/backend/app/Services/CompanyDatabaseService.php
@@ -73,13 +73,6 @@ public function getAll(?int $limit = null): Collection
     public function addPluginSpecificMenuItemsToCompanyDatabase($plugin, ?int $companyId = null): void
     {
         $rootClass = $plugin['root_class'];
-        try {
-            $menuItemService = app()->make(sprintf('Inensus\%s\Services\MenuItemService', $rootClass));
-        } catch (\Exception $exception) {
-            // we return here if company chooses a plugin which does not have UI components
-            return;
-        }
-        $menuItems = $menuItemService->createMenuItems();
 
         if ($companyId !== null) {
             /** @var DatabaseProxyManagerService $databaseProxyManagerService */