* implementing Sharing Permissions - STEP 14.2 - added another type of timestamp for permissions and a parameter for EmulateForceRefresh

* obtaining last timestamps now has notes/projects/permissions
* reworked the automatic refresh routine on the JS side to check conditions over all 3 types

Author: imfx77

Assets/js/notes.js

@@ -1715,22 +1715,29 @@ static CheckAndTriggerRefresh(lastModifiedTimestamp) {
     //console.log(lastModifiedTimestamp);
     //console.log(lastRefreshedTimestamp);
 
-    if (is_project && !is_sharing && lastRefreshedTimestamp < lastModifiedTimestamp.notes) {
-        _TodoNotes_Requests_.RefreshNotes(project_id, user_id);
-    }
-    if (!is_sharing && lastRefreshedTimestamp < lastModifiedTimestamp.projects) {
-        const is_custom = $("#refProjectId").attr('data-is-custom');
-        const is_global = $("#refProjectId").attr('data-is-global');
-        const is_owner = $("#refProjectId").attr('data-is-owner');
-        if (is_custom && !is_global && !is_owner) {
+    if (is_sharing) {
+        // Sharing permissions view
+        if (!is_project && (lastRefreshedTimestamp < lastModifiedTimestamp.projects || lastRefreshedTimestamp < lastModifiedTimestamp.permissions)) {
+            //alert('RefreshAll sharing');
             _TodoNotes_Requests_.RefreshAll(project_id, user_id, is_sharing);
+        }
+    } else {
+        // Note list view
+        if (lastRefreshedTimestamp < lastModifiedTimestamp.permissions) {
+                //alert('RefreshAll notes');
+                _TodoNotes_Requests_.RefreshAll(project_id, user_id, is_sharing);
         } else {
-            _TodoNotes_Requests_.RefreshTabs(user_id);
+            if (is_project && lastRefreshedTimestamp < lastModifiedTimestamp.notes) {
+                //alert('RefreshNotes');
+                _TodoNotes_Requests_.RefreshNotes(project_id, user_id);
+            }
+            if (lastRefreshedTimestamp < lastModifiedTimestamp.projects) {
+                //alert('RefreshTabs');
+                _TodoNotes_Requests_.RefreshTabs(user_id);
+            }
         }
     }
-    if (is_sharing && !is_project && lastRefreshedTimestamp < lastModifiedTimestamp.max) {
-        _TodoNotes_Requests_.RefreshAll(project_id, user_id, is_sharing);
-    }
+
     if (lastRefreshedTimestamp < lastModifiedTimestamp.max) {
         $("#refProjectId").attr('data-timestamp', lastModifiedTimestamp.max);
     }

Controller/TodoNotesController.php

@@ -745,7 +745,7 @@ public function SetSharingPermission()
         } else {
             // All other cases Global/Private+Owner/Regular should be valid for sharing !
             $this->todoNotesModel->SetSharingPermission($project_id, $user_id, $shared_user_id, $shared_permission);
-            $timestamp = $this->todoNotesModel->EmulateForceRefresh();
+            $timestamp = $this->todoNotesModel->EmulateForceRefresh('permissions');
             $this->flash->success(t('TodoNotes__DASHBOARD_OPERATION_SHARING_NOTE_LIST_SUCCESS'));
         }
 

Model/TodoNotesModel.php

@@ -991,7 +991,7 @@ public function UpdateCustomNoteListsPositions($user_id, $customListsPositions)
     }
 
     // Emulate a global force refresh by updating a modified/archived timestamp to the special `zero` entry
-    public function EmulateForceRefresh()
+    public function EmulateForceRefresh($type = 'projects')
     {
         // Get current unixtime
         $timestamp = time();
@@ -1001,13 +1001,13 @@ public function EmulateForceRefresh()
             ->eq('user_id', 0)
             ->eq('position', 0)
             ->eq('is_active', -1)
-            ->update(array('date_modified' => $timestamp));
+            ->update(array('category' => $type, 'date_modified' => $timestamp));
 
         $this->db->table(self::TABLE_NOTES_ARCHIVE_ENTRIES)
             ->eq('project_id', 0)
             ->eq('user_id', 0)
             ->eq('date_modified', -1)
-            ->update(array('date_archived' => $timestamp));
+            ->update(array('category' => $type, 'date_archived' => $timestamp));
 
         return $timestamp;
     }
@@ -1031,21 +1031,28 @@ public function GetLastModifiedTimestamp($project_id, $user_id)
         }
 
         $forceRefresh = $this->db->table(self::TABLE_NOTES_ENTRIES)
-            ->columns('date_modified')
+            ->columns('date_modified', 'category')
             ->eq('project_id', 0)
             ->eq('user_id', 0)
             ->eq('position', 0)
             ->eq('is_active', -1)
             ->findOne();
 
         $timestampProjects = 0;
-        if ($forceRefresh && count($forceRefresh) == 1) {
-            $timestampProjects = $forceRefresh['date_modified'];
+        $timestampPermissions = 0;
+        if ($forceRefresh && count($forceRefresh) == 2) {
+            if ($forceRefresh['category'] == "projects") {
+                $timestampProjects = $forceRefresh['date_modified'];
+            }
+            if ($forceRefresh['category'] == 'permissions') {
+                $timestampPermissions = $forceRefresh['date_modified'];
+            }
         }
 
         return array(
             'notes' => $timestampNotes,
             'projects' => $timestampProjects,
+            'permissions' => $timestampPermissions,
             'max' => max($timestampNotes, $timestampProjects),
         );
     }
@@ -1262,20 +1269,27 @@ public function GetLastArchivedTimestamp($project_id, $user_id)
         }
 
         $forceRefresh = $this->db->table(self::TABLE_NOTES_ARCHIVE_ENTRIES)
-            ->columns('date_archived')
+            ->columns('date_archived', 'category')
             ->eq('project_id', 0)
             ->eq('user_id', 0)
             ->eq('date_modified', -1)
             ->findOne();
 
         $timestampProjects = 0;
-        if ($forceRefresh && count($forceRefresh) == 1) {
-            $timestampProjects = $forceRefresh['date_archived'];
+        $timestampPermissions = 0;
+        if ($forceRefresh && count($forceRefresh) == 2) {
+            if ($forceRefresh['category'] == 'projects') {
+                $timestampProjects = $forceRefresh['date_archived'];
+            }
+            if ($forceRefresh['category'] == 'permissions') {
+                $timestampPermissions = $forceRefresh['date_archived'];
+            }
         }
 
         return array(
             'notes' => $timestampNotes,
             'projects' => $timestampProjects,
+            'permissions' => $timestampPermissions,
             'max' => max($timestampNotes, $timestampProjects),
         );
     }

Template/project/data.php

@@ -1199,9 +1199,6 @@
 print '<div class="hideMe" id="refProjectId"';
 print ' data-user="' . $user_id . '"';
 print ' data-project="' . $project_id . '"';
-print ' data-is-custom="' . $projectAccess['is_custom'] . '"';
-print ' data-is-global="' . $projectAccess['is_global'] . '"';
-print ' data-is-owner="' . $projectAccess['is_owner'] . '"';
 print ' data-readonly="' . $isReadOnlyMode . '"';
 print ' data-note="' . (isset($note_id) ? $note_id : 0) . '"';
 print ' data-timestamp="' . $current_time . '"';