Added demo mode and fixed some frontend bugs

CONFIG_README.md

@@ -9,7 +9,7 @@ it needs some security preparations.
     - Install QCharts using composer ```composer install arnulfosolis/qcharts```
         + If you choose to add QCharts as a part of the project,
         then go ahead and add the QCharts directory in the target project.
-    - Then, make sure to add the three QCharts Bundles in the target's AppKernel.
+    - Then, make sure to add the three QCharts Bundles in the target's ```AppKernel```.
         + ```QCharts\ApiBundle\ApiBundle```
         + ```QCharts\FrontendBundle\FrontendBundle```
         + ```QCharts\CoreBundle\CoreBundle```
@@ -81,11 +81,15 @@ core:
             - super_admin: role that manages users and has access the snapshot console.
         + Tip: QCharts works better when the roles are organized in a hierarchical way. 
         + Map the wished roles to use to give your users availability to use QCharts.
+    - QCharts comes with a demo option called ```allow_demo_users```, this option
+     allows ALL users to access the application in a ```user``` mode, without the possibility to add
+     Favorites.
 
 ```yml
 #Full example of QChart's configurations 
 #QCharts
 core:
+    allow_demo_users: False
     urls:
        redirects: #custom user information urls
            login: /myLogin

QCharts/ApiBundle/Controller/ApiController.php

@@ -44,13 +44,14 @@ static public function getNotValidCredentials()
      * @param $authService
      * @param array $roles
      * @param $role
+     * @param bool $allow_demo_users
      * @return bool
      * @throws InvalidCredentialsException
      */
-    public static function checkCredentials($authService, array $roles, $role)
+    public static function checkCredentials($authService, array $roles, $role, $allow_demo_users = false)
     {
         /** @var AuthorizationChecker $authService */
-        if ($authService->isGranted($roles[$role]))
+        if ($authService->isGranted($roles[$role]) || $allow_demo_users)
         {
             return true;
         }
@@ -510,8 +511,9 @@ public function getAction(Request $request)
 		$authChecker = $this->get('security.authorization_checker');
 		$queryService = $this->get('qcharts.query');
         $roles = $this->getParameter('qcharts.user_roles');
+        $allow_demo_users = $this->getParameter('qcharts.allow_demo_users');
 
-		if (!$authChecker->isGranted($roles["user"]))
+		if (!$authChecker->isGranted($roles["user"]) && !$allow_demo_users)
         {
 			return $this->getCredentialsNotValid($roles["user"]);
 		}

QCharts/ApiBundle/Controller/ApiDirectoryController.php

@@ -70,6 +70,7 @@ public function registerAction(Request $request)
             $formFactory = $this->get("form.factory");
             $doctrine = $this->get("doctrine");
             $directory = new Directory();
+            /** @var FormInterface $form */
             $form = $formFactory->create(new DirectoryType($doctrine), $directory);
             $form->submit($request->request->get($form->getName()));
 
@@ -295,7 +296,9 @@ public function getAction(Request $request)
     {
         $authChecker = $this->get("security.authorization_checker");
         $roles = $this->getParameter('qcharts.user_roles');
-        if (!$authChecker->isGranted($roles["user"]))
+        $allow_demo_users = $this->getParameter('qcharts.allow_demo_users');
+
+        if (!$authChecker->isGranted($roles["user"]) && !$allow_demo_users)
         {
             return new JsonResponse(ApiController::getNotValidCredentials());
         }
@@ -307,11 +310,13 @@ public function getAction(Request $request)
             $directoryService = $this->get("qcharts.directory.directory_service");
             $tree = $directoryService->getDirectories($rootDirectory);
             $serializer = $this->get("qcharts.serializer");
+
             $responseData = [
                 "status" => 200,
                 "textStatus" => "Directories returned",
                 "directories" => $tree
             ];
+
             $responseData = $serializer->serialize($responseData, 'json');
         }
         catch (NotFoundException $e)
@@ -363,8 +368,9 @@ public function queriesInDirectoryAction(Request $request)
         $authChecker = $this->get("security.authorization_checker");
         $roles = $this->getParameter("qcharts.user_roles");
         $serializer = $this->get("qcharts.serializer");
+        $allow_demo_users = $this->getParameter('qcharts.allow_demo_users');
 
-        if (!$authChecker->isGranted($roles["user"]))
+        if (!$authChecker->isGranted($roles["user"]) && !$allow_demo_users)
         {
             return new JsonResponse(ApiController::getNotValidCredentials());
         }

QCharts/ApiBundle/Controller/DatabaseController.php

@@ -14,6 +14,7 @@
 use QCharts\CoreBundle\Exception\ParameterNotPassedException;
 use QCharts\CoreBundle\Exception\SQLException;
 use QCharts\CoreBundle\Exception\ValidationFailedException;
+use QCharts\CoreBundle\Service\QueryService;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use QCharts\CoreBundle\Exception\NoTableNamesException;
 use QCharts\CoreBundle\Exception\NotFoundException;
@@ -74,8 +75,9 @@ public function chartDataAction(Request $request)
         $snapshotService = $this->get("qcharts.core.snapshot_service");
 
         $roles = $this->getParameter('qcharts.user_roles');
+        $allow_demo_users = $this->getParameter('qcharts.allow_demo_users');
 
-        if ($authChecker->isGranted($roles["user"]))
+        if ($authChecker->isGranted($roles["user"]) || $allow_demo_users)
         {
             $opts = [];
             try
@@ -493,8 +495,9 @@ public function runAction(Request $request)
 
         $roles = $this->getParameter('qcharts.user_roles');
 
-        if (!$authChecker->isGranted($roles["admin"])) {
-            return $this->getCredentialsNotValid();
+        if (!$authChecker->isGranted($roles["admin"]))
+        {
+            return new JsonResponse(ApiController::getNotValidCredentials());
         }
 
         $query = $request->request->get('query');

QCharts/ApiBundle/Controller/FavoriteController.php

@@ -101,7 +101,7 @@ public function registerFavoriteAction(Request $request)
 
         try
         {
-            ApiController::checkCredentials($authService, $roles, "user");
+            ApiController::checkCredentials($authService, $roles, ApiController::USER);
 
             $user = $this->getUser();
             $queryId = $request->request->get("q", null);
@@ -117,7 +117,7 @@ public function registerFavoriteAction(Request $request)
         {
             $options = [
                 "status" => $e->getCode(),
-                "textStatus" => $e->getMessage()
+                "textStatus" => "To add to favorites valid credentials are required. {$e->getMessage()}"
             ];
         }
         catch (InstanceNotFoundException $e)

QCharts/ApiBundle/Controller/UrlController.php

@@ -27,9 +27,11 @@ public function urlsAction()
         //return the URLs for using the user admin
         $roles = $this->getParameter('qcharts.user_roles');
         $authChecker = $this->get("security.authorization_checker");
+        $allow_demo_users = $this->getParameter('qcharts.allow_demo_users');
+
         try
         {
-            ApiController::checkCredentials($authChecker, $roles, "user");
+            ApiController::checkCredentials($authChecker, $roles, ApiController::USER, $allow_demo_users);
 
             $tableInfo = $this->generateUrl('qcharts.api.table_info');
             $tablesUrl = $this->generateUrl('qcharts.api.tables');

QCharts/ApiBundle/Exception/ExceptionMessage.php

@@ -8,6 +8,6 @@ class ExceptionMessage
 {
     static public function CREDENTIALS_NOT_VALID($role)
     {
-        return "The given credentials were not valid, {$role} needed";
+        return "The given credentials were not valid, the role '{$role}' is needed";
     }
 }

QCharts/CoreBundle/DependencyInjection/Configuration.php

@@ -114,6 +114,10 @@ public function getConfigTreeBuilder()
                         ->end()
                     ->end()
                 ->end()
+                ->booleanNode('allow_demo_users')
+                    ->defaultFalse()
+                    ->info('Allow access to anonymous visitors to access the application')
+                ->end()
             ->end()
         ;
 

QCharts/CoreBundle/DependencyInjection/CoreExtension.php

@@ -33,5 +33,6 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('qcharts.user_roles', $config["roles"]);
         $container->setParameter('qcharts.urls', $config["urls"]);
         $container->setParameter('qcharts.variables', $config);
+        $container->setParameter('qcharts.allow_demo_users', $config["allow_demo_users"]);
     }
 }

QCharts/FrontendBundle/Controller/MainController.php

@@ -17,8 +17,9 @@ public function mainAction()
         $authChecker = $this->get("security.authorization_checker");
         $roles = $this->getParameter("qcharts.user_roles");
         $urls = $this->getParameter("qcharts.urls");
+        $allow_demo_users = $this->getParameter("qcharts.allow_demo_users");
 
-        if ($authChecker->isGranted($roles["user"]))
+        if ($authChecker->isGranted($roles["user"]) || $allow_demo_users)
         {
             try
             {

QCharts/FrontendBundle/Controller/QueryController.php

@@ -30,8 +30,9 @@ public function showAction($queryId = null)
         $authChecker = $this->get("security.authorization_checker");
         $roles = $this->getParameter("qcharts.user_roles");
         $urls = $this->getParameter("qcharts.urls");
+        $allow_demo_users = $this->getParameter("qcharts.allow_demo_users");
 
-        if (!$authChecker->isGranted($roles["user"]))
+        if (!$authChecker->isGranted($roles["user"]) && !$allow_demo_users)
         {
             return new RedirectResponse($urls["redirects"]["login"]);
         }

QCharts/FrontendBundle/Resources/public/js/favorite/favorite.js

@@ -66,7 +66,16 @@ FavoriteCommunicator.prototype.removeFavorite = function(q, callback) {
                 }
                 return;
             }
-            store.modalController.popConnectionError();
+
+            var dataInfo = {
+                title: "While removing it from favorites...",
+                body: response["textStatus"],
+                footer: ""
+            };
+            store.modalController.init();
+            store.modalController.setModal(dataInfo);
+            store.modalController.setSmallModal();
+            store.modalController.pop();
         }, function() {
             //error
             store.modalController.popConnectionError();
@@ -94,9 +103,18 @@ FavoriteCommunicator.prototype.addFavorite = function(q, callback) {
                 return;
             }
 
-            store.modalController.popConnectionError();
-
-        }, function() {
+            var dataInfo = {
+                title: "While adding to favorites...",
+                body: response["textStatus"],
+                footer: ""
+            };
+            store.modalController.init();
+            store.modalController.setModal(dataInfo);
+            store.modalController.setSmallModal();
+            store.modalController.pop();
+
+        }, function(response) {
+            console.log(response);
             store.modalController.popConnectionError();
         });
 
@@ -121,9 +139,9 @@ FavoriteController.prototype.constructor = FavoriteController;
 
 FavoriteController.prototype.initialize = function() {
     var store = this;
-    console.log(this);
+    //console.log(this);
     if (this.urls == undefined) {
-        console.log("not cahced urls");
+        //console.log("not cahced urls");
         this.init(function() {
             store.fetchFavorites(function(favorites) {
                 store.favorites = store.optimizeFavorites(favorites);

QCharts/FrontendBundle/Resources/public/js/table/directoryClasses.js

@@ -42,7 +42,7 @@ DirectoryFetcher.prototype.fetchContentFromDirectory = function(directoryId, cal
     };
 
     var data = this.getObject('get', this.urls["directory"]["base"], content);
-    console.log(data);
+    //console.log(data);
     var store = this;
 
     this.loadingIcon.setLoading(true);
@@ -80,7 +80,7 @@ DirectoryFetcher.prototype.fetchQueriesInDirectory = function(directoryId, callb
 
     var data = this.getObject('get', this.urls["directory"]["query"], content);
 
-    console.log(data);
+    //console.log(data);
     var store = this;
 
     this.service(data).then(function(r) {
@@ -333,7 +333,7 @@ DirectoryController.prototype.filterObjects = function (content) {
  * @param cellCallback
  */
 DirectoryController.prototype.addObjects = function(content, cellCallback) {
-    console.log(content);
+    //console.log(content);
     var store = this;
 
     if (this.onlyTimeMachineFiles) {
@@ -362,10 +362,11 @@ DirectoryController.prototype.addObjects = function(content, cellCallback) {
             var left = store.createColumn("col-xs-10");
 
             left.addEventListener("click", function() {
-                if (cellCallback == undefined) {
+                if (cellCallback === undefined) {
                     window.location = redirectUrl;
+                } else {
+                    cellCallback(elem);
                 }
-                cellCallback(elem);
             });
 
             var buttons = [{
@@ -400,7 +401,7 @@ DirectoryController.prototype.addObjects = function(content, cellCallback) {
                 //change the content from the right section!
                 var heart = store.createBeatingHeart(elem["id"], function() {
                     //clicked on the heart!
-                    console.log("clicked");
+                    //console.log("clicked");
                     var queryId = this.getAttribute("query-id");
                     store.favoriteController.removeFavorite(queryId, function() {
                         //update view
@@ -446,9 +447,9 @@ DirectoryController.prototype.setUp = function(response, animate) {
     var content = response["directories"];
 
     //set up the breadcrumbs
-    console.log("current folder on setup:" + this.currentDir);
+    //console.log("current folder on setup:" + this.currentDir);
 
-    console.log(response);
+    //console.log(response);
     var store = this;
 
     this.configuration["cache"] = content;
@@ -467,7 +468,7 @@ DirectoryController.prototype.setUp = function(response, animate) {
         }
         path.unshift({id:undefined, name:"."});
         this.configuration["history"] = path;
-        console.log(this.configuration);
+        //console.log(this.configuration);
         this.isInit = false;
     }
 

QCharts/FrontendBundle/Resources/public/js/table/tableControlller.js

@@ -40,7 +40,7 @@ SnapshotTableController.prototype.init = function() {
 
     this.fetchUrls(function(urls) {
         store.urls = urls;
-        console.log(urls);
+        //console.log(urls);
         store.resultFetcher.url = urls["chart"];
         store.fetchResults();
     });

QCharts/FrontendBundle/Resources/views/blocks/admin/admin.html.twig

@@ -38,7 +38,7 @@
 {% endblock %}
 
 {% block stylesheets %}
-    {% stylesheets '@FrontendBundle/Resources/public/css/table/*' %}
+    {% stylesheets '@FrontendBundle/Resources/public/css/vendor/dataTables/datatables.min.css' %}
     <link rel="stylesheet" href="{{asset_url}}"/>
     {% endstylesheets %}
 {% endblock %}

QCharts/FrontendBundle/Resources/views/blocks/registerQuery/confirmed.html.twig

@@ -8,7 +8,4 @@
 {% endblock %}
 
 {% block stylesheets %}
-	{% stylesheets '@FrontendBundle/Resources/public/css/general/*' %}
-	<link rel="stylesheet" href="{{asset_url}}"/>
-	{% endstylesheets %}
 {% endblock %}

QCharts/FrontendBundle/Resources/views/blocks/registerQuery/invalidQuery.html.twig

@@ -16,7 +16,4 @@
 {% endblock %}
 
 {% block stylesheets %}
-	{% stylesheets '@FrontendBundle/Resources/public/css/general/*' %}
-	<link rel="stylesheet" href="{{asset_url}}"/>
-	{% endstylesheets %}
 {% endblock %}

QCharts/FrontendBundle/Resources/views/blocks/showQuery/invalidQuery.html.twig

@@ -11,7 +11,4 @@
 {% endblock %}
 
 {% block stylesheets %}
-	{% stylesheets '@FrontendBundle/Resources/public/css/general/*' %}
-		<link rel="stylesheet" href="{{asset_url}}"/>
-	{% endstylesheets %}
 {% endblock %}