0.0.0-rc.7

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "phpunit"]
 	path = phpunit
 	url = https://github.com/sp-framework/phpunit.git
-[submodule "apps/Core/Packages/Devtools/GeoExtractData/Data"]
-	path = apps/Core/Packages/Devtools/GeoExtractData/Data
-	url = https://github.com/sp-framework/geodata.git
 [submodule "docker"]
 	path = docker
 	url = https://github.com/sp-framework/docker-sp-core.git
+[submodule "apps/Core/Packages/Devtools/GeoExtractData/Data"]
+	path = apps/Core/Packages/Devtools/GeoExtractData/Data
+	url = https://github.com/sp-framework/geodata.git

apps/Core/Components/Dashboards/DashboardsComponent.php

@@ -12,61 +12,166 @@ class DashboardsComponent extends BaseComponent
     public function viewAction()
     {
         if (isset($this->getData()['widgets'])) {
+            $this->getNewToken();
+
             if ($this->getData()['widgets'] == 'info') {
-                $this->getNewToken();
                 return $this->basepackages->widgets->getWidget($this->getData()['id'], 'info')['info'];
-            } else if ($this->getData()['widgets'] == 'content') {
+            } else if ($this->getData()['widgets'] == 'content') {//This is when we add the widget via list of widgets in dashboard.
                 $dashboardWidget = $this->basepackages->dashboards->getDashboardWidgetById($this->getData()['id'], $this->getData()['did']);
+
                 $dashboardWidget['getWidgetData'] = true;
 
-                $this->getNewToken();
                 return $this->basepackages->widgets->getWidget($this->getData()['wid'], 'content', $dashboardWidget)['content'];
             }
         } else {
+            if (is_string($this->app['settings'])) {
+                $this->app['settings'] = $this->helper->decode($this->app['settings'], true);
+            }
+
             if (isset($this->getData()['id'])) {
-                $dashboardId = $this->getData()['id'];
-            } else {
-                $app = $this->apps->getAppInfo();
+                $this->view->sharedAccounts = [];
+
+                if ($this->getData()['id'] != 0) {
+                    $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;
+                        }
+
+                        $this->view->isAppDefault = true;
+                    }
+
+                    if (isset($dashboard['shared']) && is_string($dashboard['shared'])) {
+                        $dashboard['shared'] = $this->helper->decode($dashboard['shared'], true);
+                    }
+
+                    if ($dashboard['shared'] && count($dashboard['shared']) > 0) {
+                        $sharedAccounts = [];
 
-                if (is_string($app['settings'])) {
-                    $app['settings'] = $this->helper->decode($app['settings'], true);
+                        foreach ($dashboard['shared'] as $accountId) {
+                            $account = $this->basepackages->accounts->getAccountById($accountId);
+
+                            if ($account) {
+                                $sharedAccounts[] =
+                                    ['id' => $account['id'], 'email' => $account['email']];
+                            }
+                        }
+
+                        $this->view->sharedAccounts = $sharedAccounts;
+                    } else {
+                        $dashboard['shared'] = [];
+                    }
+
+                    $this->view->dashboard = $dashboard;
                 }
 
-                if (isset($app['settings']['defaultDashboard'])) {
-                    $dashboardId = $app['settings']['defaultDashboard'];
+                $this->view->pick('dashboards/dashboards/dashboard');
+
+                return;
+            } else {
+                if (isset($this->app['settings']['defaultDashboard'])) {
+                    $dashboardId = $this->app['settings']['defaultDashboard'];
                 }
-            }
-        }
 
-        $dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+                $dashboards = $this->basepackages->dashboards->dashboards;
+                $dashboards = msort($dashboards, 'is_default');
+
+                if ($this->access->auth->account()) {
+                    foreach ($dashboards as $dashboardKey => &$dashboard) {
+                        //Check app default dashboard
+                        if ($dashboard['id'] == $dashboardId) {
+                            $dashboard['name'] = $dashboard['name'] . ' (App Default)';
+
+                            continue;
+                        }
+
+                        //Check shared
+                        $isShared = false;
+                        if ($dashboard['shared']) {
+                            if (is_string($dashboard['shared'])) {
+                                $dashboard['shared'] = $this->helper->decode($dashboard['shared'], true);
+                            }
 
-        $this->view->setViewsDir($this->modules->views->getPhalconViewPath() . $this->getURI());
+                            if (in_array($this->access->auth->account()['id'], $dashboard['shared'])) {
+                                $dashboard['name'] = $dashboard['name'] . ' (Shared By ' . $this->basepackages->accounts->getAccountById($dashboard['created_by'])['email'] . ')';
+                                $isShared = true;
+                            }
+                        }
 
-        $this->view->dashboard = $dashboard;
+                        //Check Creator
+                        if ($dashboard['created_by'] != $this->access->auth->account()['id'] &&
+                            !$isShared
+                        ) {
+                            unset($dashboards[$dashboardKey]);
+                        }
 
-        $this->view->dashboards = $this->basepackages->dashboards->dashboards;
+                        //Default
+                        if ($dashboard['is_default'] && !$isShared) {
+                            $dashboardId = $dashboard['id'];
 
-        $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree();
+                            $dashboard['name'] = $dashboard['name'] . ' (User Default)';
+                        }
+                    }
+                }
+
+                $this->view->dashboard = $this->basepackages->dashboards->getDashboardById($dashboardId, true, false);
+
+                $this->view->dashboards = $dashboards;
+
+                $this->view->widgetsTree = $this->basepackages->widgets->getWidgetsTree();
+            }
+        }
     }
 
+    /**
+     * @acl(name=add)
+     */
     public function addAction()
     {
-        return;
+        $this->requestIsPost();
+
+        $this->basepackages->dashboards->addDashboard($this->postData());
+
+        $this->addResponse(
+            $this->basepackages->dashboards->packagesData->responseMessage,
+            $this->basepackages->dashboards->packagesData->responseCode
+        );
     }
 
+    /**
+     * @acl(name=update)
+     */
     public function updateAction()
     {
-        return;
+        $this->requestIsPost();
+
+        $this->basepackages->dashboards->updateDashboard($this->postData());
+
+        $this->addResponse(
+            $this->basepackages->dashboards->packagesData->responseMessage,
+            $this->basepackages->dashboards->packagesData->responseCode
+        );
     }
 
+    /**
+     * @acl(name=remove)
+     */
     public function removeAction()
     {
-        return;
+        $this->requestIsPost();
+
+        $this->basepackages->dashboards->removeDashboard($this->postData());
+
+        $this->addResponse(
+            $this->basepackages->dashboards->packagesData->responseMessage,
+            $this->basepackages->dashboards->packagesData->responseCode
+        );
     }
 
-    /**
-     * @acl(name=add)
-     */
     public function addWidgetToDashboardAction()
     {
         $this->requestIsPost();
@@ -80,9 +185,6 @@ public function addWidgetToDashboardAction()
         );
     }
 
-    /**
-     * @acl(name=update)
-     */
     public function updateWidgetToDashboardAction()
     {
         $this->requestIsPost();
@@ -95,9 +197,6 @@ public function updateWidgetToDashboardAction()
         );
     }
 
-    /**
-     * @acl(name=remove)
-     */
     public function removeWidgetFromDashboardAction()
     {
         $this->requestIsPost();
@@ -110,16 +209,68 @@ public function removeWidgetFromDashboardAction()
         );
     }
 
-    public function getWidgetContentAction()
+    public function getDashboardWidgetsAction()
     {
         $this->requestIsPost();
 
-        $this->basepackages->dashboards->getWidgetContent($this->postData());
+        $this->basepackages->dashboards->getDashboardWidgets($this->postData());
 
         $this->addResponse(
             $this->basepackages->dashboards->packagesData->responseMessage,
             $this->basepackages->dashboards->packagesData->responseCode,
             $this->basepackages->dashboards->packagesData->responseData
         );
     }
+
+    public function searchAccountAction()
+    {
+        $this->requestIsPost();
+
+        if ($this->postData()['search']) {
+            $searchQuery = $this->postData()['search'];
+
+            if (strlen($searchQuery) < 3) {
+                return;
+            }
+
+            $searchAccounts = $this->basepackages->accounts->searchAccountInternal($searchQuery);
+
+            if ($searchAccounts) {
+                $currentAccount = $this->access->auth->account();
+
+                if ($currentAccount) {
+                    foreach ($searchAccounts as $accountKey => &$account) {
+                        if ($account['id'] == $currentAccount['id']) {
+                            unset($accounts[$accountKey]);
+                            continue;
+                        }
+
+                        $profile = $this->basepackages->profiles->getProfile($account['id']);
+
+                        $account['name'] = $profile['full_name'];
+                    }
+
+                    $this->addResponse(
+                        $this->basepackages->accounts->packagesData->responseMessage,
+                        $this->basepackages->accounts->packagesData->responseCode,
+                        ['accounts' => $searchAccounts]
+                    );
+                } else {
+                    $this->addResponse(
+                        $this->basepackages->accounts->packagesData->responseMessage,
+                        $this->basepackages->accounts->packagesData->responseCode,
+                        ['accounts' => $searchAccounts]
+                    );
+                }
+            } else {
+                $this->addResponse(
+                    $this->basepackages->accounts->packagesData->responseMessage,
+                    $this->basepackages->accounts->packagesData->responseCode,
+                    ['accounts' => []]
+                );
+            }
+        } else {
+            $this->addResponse('search query missing', 1);
+        }
+    }
 }

apps/Core/Components/Devtools/Extractgeodata/ExtractgeodataComponent.php

@@ -38,9 +38,11 @@ public function processAction()
         }
 
         try {
+            $success = false;
+
             if (isset($this->postData()['geo']) && $this->postData()['geo'] == 'true') {
-                $this->geoExtractDataPackage->downloadGeoData();
-                $this->geoExtractDataPackage->processGeoData();
+                $success = $this->geoExtractDataPackage->downloadGeoData();
+                $success = $this->geoExtractDataPackage->processGeoData();
             }
 
             if (isset($this->postData()['timezone']) && $this->postData()['timezone'] == 'true') {
@@ -49,16 +51,18 @@ public function processAction()
             }
 
             if (isset($this->postData()['ip']) && $this->postData()['ip'] == 'true') {
-                $this->geoExtractDataPackage->downloadGeoIpv4Data();
-                $this->geoExtractDataPackage->unzipGeoIpv4Data();
-                $this->geoExtractDataPackage->processGeoIpv4Data();
-                $this->geoExtractDataPackage->downloadGeoIpv6Data();
-                $this->geoExtractDataPackage->unzipGeoIpv6Data();
-                $this->geoExtractDataPackage->processGeoIpv6Data();
-                $this->geoExtractDataPackage->mergeGeoIpData();
+                $success = $this->geoExtractDataPackage->downloadGeoIpv4Data();
+                $success = $this->geoExtractDataPackage->unzipGeoIpv4Data();
+                $success = $this->geoExtractDataPackage->processGeoIpv4Data();
+                $success = $this->geoExtractDataPackage->downloadGeoIpv6Data();
+                $success = $this->geoExtractDataPackage->unzipGeoIpv6Data();
+                $success = $this->geoExtractDataPackage->processGeoIpv6Data();
+                $success = $this->geoExtractDataPackage->mergeGeoIpData();
             }
 
-            $this->geoExtractDataPackage->zipData();
+            if ($success) {
+                $this->geoExtractDataPackage->zipData();
+            }
 
             $this->addResponse(
                 $this->geoExtractDataPackage->packagesData->responseMessage,
@@ -150,14 +154,18 @@ protected function registerProgressMethods()
             return false;
         }
 
-        $methods = array_merge($methods,
-            [
+        if ((isset($this->postData()['geo']) && $this->postData()['geo'] == 'true') ||
+            (isset($this->postData()['geo']) && $this->postData()['geo'] == 'true')
+        ) {
+            $methods = array_merge($methods,
                 [
-                    'method'    => 'zipData',
-                    'text'      => 'Zip Geo Location Data...',
+                    [
+                        'method'    => 'zipData',
+                        'text'      => 'Zip Geo Location Data...',
+                    ]
                 ]
-            ]
-        );
+            );
+        }
 
         $this->basepackages->progress->registerMethods($methods);
 

apps/Core/Components/Errors/ErrorsComponent.php

@@ -41,6 +41,13 @@ public function idNotFoundAction()
         $this->addResponse('Id Not Found', 1);
     }
 
+    public function permissionDeniedAction()
+    {
+        $this->view->pick('common/errors/permissiondenied');
+
+        $this->addResponse('Permission denied, contact administrator!', 1);
+    }
+
     public function serverErrorAction()
     {
         $this->view->pick('common/errors/servererror');

apps/Core/Components/Modules/ModulesComponent.php

@@ -241,6 +241,19 @@ public function processQueueAction()
 		}
 	}
 
+	public function saveQueueSettingsAction()
+	{
+		$this->requestIsPost();
+
+		$this->modules->queues->saveQueueSettings($this->postData());
+
+		$this->addResponse(
+			$this->modules->queues->packagesData->responseMessage,
+			$this->modules->queues->packagesData->responseCode,
+			$this->modules->queues->packagesData->responseData ?? []
+		);
+	}
+
 	public function saveModuleSettingsAction()
 	{
 		$this->requestIsPost();