Close Milestone 0.0.0-rc.8

apps/Core/Components/Apps/AppsComponent.php

@@ -14,7 +14,7 @@ class AppsComponent extends BaseComponent
      */
     public function viewAction()
     {
-        $typesArr = $this->apps->types->types;
+        $typesArr = $this->apps->types->getInstalledAppTypes();
 
         $this->view->types = $typesArr;
 
@@ -189,7 +189,7 @@ public function viewAction()
                 }
 
                 //Views
-                $viewsArr = $this->modules->views->getViewsForAppType($app['app_type']);
+                $viewsArr = $this->modules->views->getViewsForAppType($app['app_type'], false);
                 if (count($viewsArr) === 1) {
                     array_push($mandatoryViews, $this->helper->first($viewsArr)['name']);
 
@@ -259,6 +259,8 @@ public function viewAction()
                     return;
                 }
                 $this->view->acceptableUsernames = $this->apps->getAcceptableUsernamesForAppId();
+
+                $this->view->dashboards = $this->basepackages->dashboards->init()->getDashboardsByAppType($app['app_type']);
             } else {
                 $this->view->app = null;
                 $domains = $this->domains->domains;
@@ -286,9 +288,10 @@ public function viewAction()
                 $this->view->publicStorages = $publicStorages;
 
                 $this->view->privateStorages = $privateStorages;
+
+                $this->view->dashboards = [];
             }
 
-            $this->view->dashboards = $this->basepackages->dashboards->init()->dashboards;
             $this->view->roles = $this->basepackages->roles->init()->roles;
             $this->view->pick('apps/view');
 
@@ -343,7 +346,7 @@ public function addAction()
     {
         $this->requestIsPost();
 
-        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type']);
+        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type'], false);
 
         if (count($viewsArr) === 0) {
             $this->addResponse('No Views Available for app type ' . $this->postData()['app_type'] . ' cannot proceed!', 1);
@@ -378,7 +381,7 @@ public function updateAction()
             $this->apps->packagesData->responseCode
         );
 
-        $this->addToNotification('update', 'Updated app ' . $this->postData()['name'], null, $this->apps->packagesData->last);
+        $this->addToNotification('update', 'Updated app', null, $this->apps->packagesData->last ?? []);
     }
 
     /**
@@ -517,7 +520,7 @@ public function getViewsForAppTypeAction()
     {
         $this->requestIsPost();
 
-        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type']);
+        $viewsArr = $this->modules->views->getViewsForAppType($this->postData()['app_type'], false);
 
         if ($viewsArr && count($viewsArr) > 0) {
             $views = [];

apps/Core/Components/Auth/AuthComponent.php

@@ -172,11 +172,7 @@ public function sendTwoFaEmailAction()
     {
         $this->requestIsPost();
 
-        try {
-            $this->access->auth->twoFa->sendTwoFaEmail($this->postData());
-        } catch (\Exception $e) {
-            var_dump($e);die();
-        }
+        $this->access->auth->twoFa->sendTwoFaEmail($this->postData());
 
         $this->addResponse(
             $this->access->auth->twoFa->packagesData->responseMessage,

apps/Core/Components/Dashboards/DashboardsComponent.php

@@ -35,14 +35,11 @@ public function viewAction()
                     $dashboardId = $this->getData()['id'];
 
                     $dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
-                    $dashboard['is_app_default'] = false;
 
                     if (isset($this->app['settings']['defaultDashboard'])) {
                         if ($this->app['settings']['defaultDashboard'] == $dashboard['id']) {
-                            $dashboard['is_app_default'] = true;
+                            $dashboard['app_default'] = true;
                         }
-
-                        $this->view->isAppDefault = true;
                     }
 
                     if (isset($dashboard['shared']) && is_string($dashboard['shared'])) {
@@ -66,19 +63,31 @@ public function viewAction()
                         $dashboard['shared'] = [];
                     }
 
+                    //Default
+                    if ($dashboard['user_default']) {
+                        if (is_string($dashboard['user_default'])) {
+                            $dashboard['user_default'] = $this->helper->decode($dashboard['user_default'], true);
+                        }
+
+                        if (in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                            $dashboard['user_default'] = true;
+                        }
+                    }
+
                     $this->view->dashboard = $dashboard;
                 }
 
                 $this->view->pick('dashboards/dashboards/dashboard');
 
                 return;
-            } else {
+            } else {//List of all dashboards
+                $dashboardId = 0;
+
                 if (isset($this->app['settings']['defaultDashboard'])) {
                     $dashboardId = $this->app['settings']['defaultDashboard'];
                 }
 
-                $dashboards = $this->basepackages->dashboards->dashboards;
-                $dashboards = msort($dashboards, 'is_default');
+                $dashboards = $this->basepackages->dashboards->getDashboardsByAppType($this->app['app_type']);
 
                 if ($this->access->auth->account()) {
                     foreach ($dashboards as $dashboardKey => &$dashboard) {
@@ -110,18 +119,23 @@ public function viewAction()
                         }
 
                         //Default
-                        if ($dashboard['is_default'] && !$isShared) {
-                            $dashboardId = $dashboard['id'];
+                        if ($dashboard['user_default']) {
+                            if (is_string($dashboard['user_default'])) {
+                                $dashboard['user_default'] = $this->helper->decode($dashboard['user_default'], true);
+                            }
 
-                            $dashboard['name'] = $dashboard['name'] . ' (User Default)';
+                            if (in_array($this->access->auth->account()['id'], $dashboard['user_default'])) {
+                                $dashboard['name'] = $dashboard['name'] . ' (User Default)';
+                                $dashboardId = $dashboard['id'];
+                            }
                         }
                     }
                 }
 
-                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
-
                 $this->view->dashboards = $dashboards;
 
+                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+
                 $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree();
             }
         }
@@ -222,6 +236,19 @@ public function getDashboardWidgetsAction()
         );
     }
 
+    public function getDashboardsByAppTypeAction()
+    {
+        $this->requestIsPost();
+
+        $this->basepackages->dashboards->getDashboardsByAppType($this->postData()['app_type']);
+
+        $this->addResponse(
+            $this->basepackages->dashboards->packagesData->responseMessage,
+            $this->basepackages->dashboards->packagesData->responseCode,
+            $this->basepackages->dashboards->packagesData->responseData
+        );
+    }
+
     public function searchAccountAction()
     {
         $this->requestIsPost();

apps/Core/Components/Devtools/Modules/ModulesComponent.php

@@ -99,7 +99,6 @@ public function viewAction()
 				$modulesArr = $this->processModulesArr(msort($this->modules->{$modulesType}->{$modulesType}, 'name'));
 				${$modulesType . 'CategoryArr'} = $modulesArr['categoryArr'];
 			}
-
 			if ($modulesArr['modules'] && count($modulesArr['modules']) > 0) {
 				$modules[$modulesType]['value'] = ucfirst($modulesType);
 				$modules[$modulesType]['childs'] = $modulesArr['modules'];
@@ -193,7 +192,7 @@ public function viewAction()
 									 $module['module_details']['category'] === 'providers')
 								) {
 									if ($module['module_details']['category'] === 'basepackagesApis') {
-										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/ApiClientServices/Apis/';
+										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/Api/Apis/';
 									} else if (str_starts_with($module['module_details']['category'], 'basepackages')) {
 										$moduleLocation = 'system/Base/Installer/Packages/Setup/Register/Modules/Packages/Basepackages/';
 									} else if ($module['module_details']['category'] === 'providers') {
@@ -236,8 +235,12 @@ public function viewAction()
 
 									$routePath = implode('/', $pathArr) . '/Install/';
 								} else if ($module['module_details']['module_type'] === 'views') {
-									if (isset($module['module_details']['base_view_module_id']) && $module['module_details']['base_view_module_id'] != 0) {
-										$baseView = $this->modules->views->getViewById($module['module_details']['base_view_module_id']);
+									if ($module['module_details']['is_subview'] == true) {
+										if ($module['module_details']['base_view_module_id'] != 0) {
+											$baseView = $this->modules->views->getViewById($module['module_details']['base_view_module_id']);
+										} else {
+											$baseView['name'] = 'Default';
+										}
 
 										$pathArr = preg_split('/(?=[A-Z])/', ucfirst($module['module_details']['name']), -1, PREG_SPLIT_NO_EMPTY);
 

apps/Core/Components/Devtools/Test/TestComponent.php

@@ -7,30 +7,40 @@
 
 class TestComponent extends BaseComponent
 {
-    protected $sourceDir = 'system/Base/Providers/BasepackagesServiceProvider/Packages/Geo/Data/';
-
     /**
      * @acl(name=view)
      */
     public function viewAction()
     {
-        // var_dump($this->opCache->setCache('guru', ['guru'=>123], 'guru'));
-        // var_dump($this->opCache->getCache('guru', 'guru'));
-        // var_dump($this->opCache->removeCache());
+        // $install = new \Apps\Fintech\Components\Dashboards\Install\Install;
+
+        // $install->init()->install();
+        // $adminComponents = $this->basepackages->utils->scanDir('apps/Core/Components/', true);
 
-        // $dicData = new DevtoolsDicExtractData;
+        // foreach ($adminComponents['files'] as $adminComponentKey => $adminComponent) {
+        //     if (strpos($adminComponent, 'component.json')) {
+        //         try {
+        //             $jsonFile =
+        //                 $this->helper->decode(
+        //                     $this->localContent->read($adminComponent),
+        //                     true
+        //                 );
+        //         } catch (\throwable $e) {
+        //             throw new \Exception($e->getMessage() . '. Problem reading component.json at location ' . $adminComponent);
+        //         }
 
-        // $dicData->processDicData();
+        //         if ($jsonFile['menu'] && $jsonFile['menu'] !== 'false') {
+        //             $this->basepackages->menus->addMenu($jsonFile);
+        //         }
+        //     }
+        // }
     }
 
     /**
      * @api_acl(name=view)
      */
     public function apiViewAction()
     {
-        // usleep(50000);
-        // sleep(10);
-        // var_dump($_SESSION);
         $this->addResponse('Test', 0, ['connection' => $this->connection->getId(), 'session' => $this->session->getId()]);
     }
 

apps/Core/Components/Home/HomeComponent.php

@@ -2,7 +2,6 @@
 
 namespace Apps\Core\Components\Home;
 
-use Phalcon\Helper\Arr;
 use System\Base\BaseComponent;
 
 class HomeComponent extends BaseComponent

apps/Core/Components/System/Api/Client/Services/ServicesComponent.php

@@ -119,10 +119,10 @@ function ($dataArr) {
     protected function replaceColumns($dataArr)
     {
         foreach ($dataArr as $dataKey => &$data) {
-            if (isset($data['in_use']) && $data['in_use'] == '0') {
-                $data['in_use'] = '<span class="badge badge-secondary text-uppercase">No</span>';
-            } else if (isset($data['in_use']) && $data['in_use'] == '1') {
+            if (isset($data['in_use']) && $data['in_use'] == '1') {
                 $data['in_use'] = '<span class="badge badge-success text-uppercase">Yes</span>';
+            } else {
+                $data['in_use'] = '<span class="badge badge-secondary text-uppercase">No</span>';
             }
 
             $data['category'] = ucfirst($data['category']);

apps/Core/Components/System/Menus/Install/component.json

@@ -0,0 +1,42 @@
+{
+    "route"         : "system/menus",
+    "name"          : "Menus",
+    "description"   : "Manage menus via this component",
+    "module_type"   : "components",
+    "app_type"      : "core",
+    "category"      : "admin",
+    "version"       : "0.0.0",
+    "repo"          : "https://.../",
+    "class"         : "Apps\\Core\\Components\\System\\Menus\\MenusComponent",
+    "dependencies"  : {
+        "core"          : {
+            "name"      : "Core",
+            "version"   : "0.0.0",
+            "repo"      : "https://.../"
+        },
+        "components"    : [],
+        "packages"      : [],
+        "middlewares"   : [],
+        "views"         : [],
+        "external"      : []
+    },
+    "menu"              : {
+        "seq"           : 7,
+        "system"      : {
+            "icon"      : "cogs",
+            "title"     : "system",
+            "childs"    : {
+                "menus" : {
+                    "title"     : "menus",
+                    "icon"      : "bars",
+                    "link"      : "system/menus"
+                }
+            }
+        }
+    },
+    "settings"          : {
+        "mandatory"     : {
+            "core"      : true
+        }
+    }
+}