Asynchronous User List Loading, Fixed Issues 2005, 2014, 2021

app/controllers/ExperimentController.php

@@ -73,9 +73,10 @@ public function createSubmit()
                 "allowedFileSize" => $allowedFileSize
             );
 
-            $users = SharingUtilities::getAllUserProfiles($_POST['project'], ResourceType::PROJECT);
+            $users = SharingUtilities::getProfilesForSharedUsers($_POST['project'], ResourceType::PROJECT);
+            $owner = array();
 
-            return View::make("experiment/create-complete", array("expInputs" => $experimentInputs, "users" => json_encode($users)));
+            return View::make("experiment/create-complete", array("expInputs" => $experimentInputs, "users" => json_encode($users), "owner" => json_encode($owner)));
         } else if (isset($_POST['save']) || isset($_POST['launch'])) {
             $expId = ExperimentUtilities::create_experiment();
 
@@ -90,7 +91,7 @@ public function createSubmit()
                     <a href=' . URL::to('/') . '"/experiment/summary?expId=' . $expId . '">go directly</a> to experiment summary page.</p>');
 
             }*/
-            $users = SharingUtilities::getAllUserProfiles($expId, ResourceType::EXPERIMENT);
+            $users = SharingUtilities::getProfilesForSharedUsers($expId, ResourceType::EXPERIMENT);
             return Redirect::to('experiment/summary?expId=' . $expId);
         } else
             return Redirect::to("home")->with("message", "Something went wrong here. Please file a bug report using the link in the Help menu.");
@@ -135,14 +136,22 @@ public function summary()
 
             $users = SharingUtilities::getProfilesForSharedUsers(Input::get("expId"), ResourceType::EXPERIMENT);
 
+            $owner = array();
+            if (strcmp(Session::get("username"), $experiment->userName) !== 0) {
+                $owner[$experiment->userName] = $users[$experiment->userName];
+                $users = array_diff_key($users, $owner);
+            }
+
             $data = array(
                 "expId" => Input::get("expId"),
                 "experiment" => $experiment,
                 "project" => $project,
                 "jobDetails" => $jobDetails,
                 "expVal" => $expVal,
                 "autoRefresh"=> $autoRefresh,
-                "users" => json_encode($users)
+                "users" => json_encode($users),
+                "owner" => json_encode($owner),
+                "can_write" => SharingUtilities::userCanWrite(Session::get("username"), $experiment->experimentId, ResourceType::EXPERIMENT)
             );
             if( Input::has("dashboard"))
             {
@@ -199,47 +208,58 @@ public function expChange()
 
     public function editView()
     {
-        $queueDefaults = array("queueName" => Config::get('pga_config.airavata')["queue-name"],
-            "nodeCount" => Config::get('pga_config.airavata')["node-count"],
-            "cpuCount" => Config::get('pga_config.airavata')["total-cpu-count"],
-            "wallTimeLimit" => Config::get('pga_config.airavata')["wall-time-limit"]
-        );
+        if (SharingUtilities::userCanWrite(Session::get("username"), $_GET['expId'], ResourceType::EXPERIMENT) === true) {
+            $queueDefaults = array("queueName" => Config::get('pga_config.airavata')["queue-name"],
+                "nodeCount" => Config::get('pga_config.airavata')["node-count"],
+                "cpuCount" => Config::get('pga_config.airavata')["total-cpu-count"],
+                "wallTimeLimit" => Config::get('pga_config.airavata')["wall-time-limit"]
+            );
 
-        $experiment = ExperimentUtilities::get_experiment($_GET['expId']);
-        $expVal = ExperimentUtilities::get_experiment_values($experiment);
-        $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment);
+            $experiment = ExperimentUtilities::get_experiment($_GET['expId']);
+            $expVal = ExperimentUtilities::get_experiment_values($experiment);
+            $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment);
 
-        $computeResources = CRUtilities::create_compute_resources_select($experiment->executionId, $expVal['scheduling']->resourceHostId);
-
-        $clonedExp = false; $savedExp = false;
-        if( Input::has("clonedExp"))
-            $clonedExp = true;
-        if( Input::has("savedExp"))
-            $savedExp = true;
-
-        $experimentInputs = array(
-            "clonedExp" => $clonedExp,
-            "savedExp" => $savedExp,
-            "disabled" => ' ',
-            "experimentName" => $experiment->experimentName,
-            "experimentDescription" => $experiment->description,
-            "application" => $experiment->executionId,
-            "autoSchedule" => $experiment->userConfigurationData->airavataAutoSchedule,
-            "userDN" => $experiment->userConfigurationData->userDN,
-            "allowedFileSize" => Config::get('pga_config.airavata')["server-allowed-file-size"],
-            'experiment' => $experiment,
-            "queueDefaults" => $queueDefaults,
-            'computeResources' => $computeResources,
-            "resourceHostId" => $expVal['scheduling']->resourceHostId,
-            'project' => $experiment->projectId,
-            'expVal' => $expVal,
-            'cloning' => true,
-            'advancedOptions' => Config::get('pga_config.airavata')["advanced-experiment-options"]
-        );
+            $computeResources = CRUtilities::create_compute_resources_select($experiment->executionId, $expVal['scheduling']->resourceHostId);
+
+            $clonedExp = false; $savedExp = false;
+            if( Input::has("clonedExp"))
+                $clonedExp = true;
+            if( Input::has("savedExp"))
+                $savedExp = true;
+
+            $experimentInputs = array(
+                "clonedExp" => $clonedExp,
+                "savedExp" => $savedExp,
+                "disabled" => ' ',
+                "experimentName" => $experiment->experimentName,
+                "experimentDescription" => $experiment->description,
+                "application" => $experiment->executionId,
+                "autoSchedule" => $experiment->userConfigurationData->airavataAutoSchedule,
+                "userDN" => $experiment->userConfigurationData->userDN,
+                "allowedFileSize" => Config::get('pga_config.airavata')["server-allowed-file-size"],
+                'experiment' => $experiment,
+                "queueDefaults" => $queueDefaults,
+                'computeResources' => $computeResources,
+                "resourceHostId" => $expVal['scheduling']->resourceHostId,
+                'project' => $experiment->projectId,
+                'expVal' => $expVal,
+                'cloning' => true,
+                'advancedOptions' => Config::get('pga_config.airavata')["advanced-experiment-options"]
+            );
+
+            $users = SharingUtilities::getProfilesForSharedUsers($_GET['expId'], ResourceType::EXPERIMENT);
 
-        $users = SharingUtilities::getAllUserProfiles($_GET['expId'], ResourceType::EXPERIMENT);
+            $owner = array();
+            if (strcmp(Session::get("username"), $experiment->userName) !== 0) {
+                $owner[$experiment->userName] = $users[$experiment->userName];
+                $users = array_diff_key($users, $owner);
+            }
 
-        return View::make("experiment/edit", array("expInputs" => $experimentInputs, "users" => json_encode($users)));
+            return View::make("experiment/edit", array("expInputs" => $experimentInputs, "users" => json_encode($users), "owner" => json_encode($owner)));
+        }
+        else {
+            Redirect::to("experiment/summary?expId=" . $experiment->experimentId)->with("error", "You do not have permission to edit this experiment");
+        }
     }
 
     public function cloneExperiment()
@@ -258,22 +278,24 @@ public function cloneExperiment()
 
     public function editSubmit()
     {
-        if (isset($_POST['save']) || isset($_POST['launch'])) {
-            $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable
-            $updatedExperiment = ExperimentUtilities::apply_changes_to_experiment($experiment, Input::all());
+        if (SharingUtilities::userCanWrite(Session::get("username"), Input::get('expId'), ResourceType::EXPERIMENT)) {
+            if (isset($_POST['save']) || isset($_POST['launch'])) {
+                $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable
+                $updatedExperiment = ExperimentUtilities::apply_changes_to_experiment($experiment, Input::all());
 
-            ExperimentUtilities::update_experiment($experiment->experimentId, $updatedExperiment);
+                ExperimentUtilities::update_experiment($experiment->experimentId, $updatedExperiment);
 
-            if (isset($_POST['save'])) {
-                $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable
-            }
-            if (isset($_POST['launch'])) {
-                ExperimentUtilities::launch_experiment($experiment->experimentId);
-            }
+                if (isset($_POST['save'])) {
+                    $experiment = ExperimentUtilities::get_experiment(Input::get('expId')); // update local experiment variable
+                }
+                if (isset($_POST['launch'])) {
+                    ExperimentUtilities::launch_experiment($experiment->experimentId);
+                }
 
-            return Redirect::to('experiment/summary?expId=' . $experiment->experimentId);
-        } else
-            return View::make("home");
+                return Redirect::to('experiment/summary?expId=' . $experiment->experimentId);
+            } else
+                return View::make("home");
+        }
     }
 
     public function getQueueView()
@@ -305,14 +327,48 @@ public function browseView()
         $expContainer = ExperimentUtilities::get_expsearch_results_with_pagination(Input::all(), $this->limit,
             ($pageNo - 1) * $this->limit);
         $experimentStates = ExperimentUtilities::getExpStates();
+
+        $can_write = array();
+        foreach ($expContainer as $experiment) {
+            $can_write[$experiment['experiment']->experimentId] = SharingUtilities::userCanWrite(Session::get("username"), $experiment['experiment']->experimentId, ResourceType::EXPERIMENT);
+        }
+
         return View::make('experiment/browse', array(
             'input' => Input::all(),
             'pageNo' => $pageNo,
             'limit' => $this->limit,
             'expStates' => $experimentStates,
-            'expContainer' => $expContainer
+            'expContainer' => $expContainer,
+            'can_write' => $can_write
         ));
     }
+
+    /**
+     * Generate JSON containing permissions information for this project.
+     *
+     * This function retrieves the user profile and permissions for every user
+     * other than the client that has access to the project. In the event that
+     * the project does not exist, return an error message.
+     */
+    public function sharedUsers()
+    {
+        if (Session::has("authz-token") && array_key_exists('resourceId', $_GET)) {
+            return Response::json(SharingUtilities::getProfilesForSharedUsers($_GET['resourceId'], ResourceType::EXPERIMENT));
+        }
+        else {
+            return Response::json(array("error" => "Error: No project specified"));
+        }
+    }
+
+    public function unsharedUsers()
+    {
+        if (Session::has("authz-token") && array_key_exists('resourceId', $_GET)) {
+            return Response::json(SharingUtilities::getProfilesForUnsharedUsers($_GET['resourceId'], ResourceType::EXPERIMENT));
+        }
+        else {
+            return Response::json(array("error" => "Error: No experiment specified"));
+        }
+    }
 }
 
 ?>

app/controllers/ProjectController.php

@@ -26,8 +26,7 @@ public function __construct()
     public function createView()
     {
         $users = SharingUtilities::getAllUserProfiles();
-        //var_dump($users);exit;
-        return View::make("project/create", array("users" => json_encode($users)));
+        return View::make("project/create", array("users" => json_encode($users), "owner" => json_encode(array())));
     }
 
     public function createSubmit()
@@ -45,31 +44,70 @@ public function summary()
         if (Input::has("projId")) {
             Session::put("projId", Input::get("projId"));
 
+            $project = ProjectUtilities::get_project(Input::get('projId'));
+
             $users = SharingUtilities::getProfilesForSharedUsers(Input::get('projId'), ResourceType::PROJECT);
 
+            $owner = array();
+            if (strcmp(Session::get("username"), $project->owner) !== 0) {
+                $owner[$project->owner] = $users[$project->owner];
+                $users = array_diff_key($users, $owner);
+            }
+
+            $experiments = ProjectUtilities::get_experiments_in_project(Input::get("projId"));
+
+            $experiment_can_write = array();
+            foreach($experiments as $experiment) {
+                if (SharingUtilities::userCanWrite(Session::get("username"), $experiment->experimentId, ResourceType::EXPERIMENT)) {
+                    $experiment_can_write[$experiment->experimentId] = true;
+                }
+                else {
+                    $experiment_can_write[$experiment->experimentId] = false;
+                }
+            }
+
             return View::make("project/summary",
-                array("projectId" => Input::get("projId"), "users" => json_encode($users)));
+                array("projectId" => Input::get("projId"),
+                      "experiments" => $experiments,
+                      "users" => json_encode($users),
+                      "owner" => json_encode($owner),
+                      "project_can_write" => SharingUtilities::userCanWrite(Session::get("username"), Input::get("projId"), ResourceType::PROJECT),
+                      "experiment_can_write" => $experiment_can_write
+                  ));
         } else
             return Redirect::to("home");
     }
 
     public function editView()
     {
         if (Input::has("projId")) {
-            $users = SharingUtilities::getAllUserProfiles(Input::get('projId'), ResourceType::PROJECT);
-
-            return View::make("project/edit",
-                array("projectId" => Input::get("projId"),
-                    "project" => ProjectUtilities::get_project($_GET['projId']),
-                     "users" => json_encode($users)
-                ));
+            if (SharingUtilities::userCanWrite(Session::get("username"), Input::get("projId"), ResourceType::PROJECT)) {
+                $project = ProjectUtilities::get_project($_GET['projId']);
+                $users = SharingUtilities::getProfilesForSharedUsers(Input::get('projId'), ResourceType::PROJECT);
+                $owner = array();
+
+                if (strcmp(Session::get("username"), $project->owner) !== 0) {
+                    $owner[$project->owner] = $users[$project->owner];
+                    $users = array_diff_key($users, $owner);
+                }
+
+                return View::make("project/edit",
+                    array("projectId" => Input::get("projId"),
+                        "project" => $project,
+                        "users" => json_encode($users),
+                        "owner" => json_encode($owner)
+                    ));
+                }
+            else {
+                return Redirect::to('project/summary?projId=' . Input::get("projId"))->with("error", "You do not have permission to edit this project.");
+            }
         } else
             return Redirect::to("home");
     }
 
     public function editSubmit()
     {
-        if (isset($_POST['save'])) {
+        if (isset($_POST['save']) && SharingUtilities::userCanWrite(Session::get("username"), Input::get("projectId"), ResourceType::PROJECT)) {
             $projectDetails = array();
             $projectDetails["owner"] = Session::get("username");
             $projectDetails["name"] = Input::get("project-name");
@@ -104,10 +142,22 @@ public function browseView()
             $projects = ProjectUtilities::get_all_user_accessible_projects_with_pagination($this->limit, ($pageNo - 1) * $this->limit);
         }
 
+        $can_write = array();
+        $user = Session::get("username");
+        foreach($projects as $project) {
+            if (SharingUtilities::userCanWrite($user, $project->projectID, ResourceType::PROJECT)) {
+                $can_write[$project->projectID] = true;
+            }
+            else {
+                $can_write[$project->projectID] = false;
+            }
+        }
+
         return View::make('project/browse', array(
             'pageNo' => $pageNo,
             'limit' => $this->limit,
-            'projects' => $projects
+            'projects' => $projects,
+            'can_write' => $can_write
         ));
     }
 
@@ -120,9 +170,8 @@ public function browseView()
      */
     public function sharedUsers()
     {
-        $response = array();
-        if (Input::has('projId')) {
-            return Response::json(SharingUtilities::getProfilesForSharedUsers());
+        if (Session::has("authz-token") && array_key_exists('resourceId', $_GET)) {
+            return Response::json(SharingUtilities::getProfilesForSharedUsers($_GET['resourceId'], ResourceType::PROJECT));
         }
         else {
             return Response::json(array("error" => "Error: No project specified"));
@@ -131,8 +180,8 @@ public function sharedUsers()
 
     public function unsharedUsers()
     {
-        if (Input::has('projId')) {
-            return Response::json(SharingUtilities::getProfilesForUnsharedUsers);
+        if (Session::has("authz-token") && array_key_exists('resourceId', $_GET)) {
+            return Response::json(SharingUtilities::getProfilesForUnsharedUsers($_GET['resourceId'], ResourceType::PROJECT));
         }
         else {
             return Response::json(array("error" => "Error: No project specified"));