Merge pull request #421 from intersystems/changed-file-user-tooltip

tooltip now shows user who made uncommitted change

Author: isc-tleavitt

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed JS errors in Studio on certain operations (#416)
+- Tooltip in workspace now shows user who made uncommitted change if not current user (#411)
 - Files are added to source control upon creation properly (#404)
 - Files show in uncommitted queue when automatically added (#407)
 - WebUI workspace view now works properly for filenames with spaces (#423)

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -2172,9 +2172,10 @@ webui.NewChangedFilesView = function(workspaceView) {
         webui.git("status -u --porcelain", function(data) {
             $.get("api/uncommitted", function (uncommitted) {
                 var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
+                var otherUserUncommittedItems = JSON.parse(uncommitted)["other users' changes"];
                 self.filesCount = 0;
 
-                function addItemToFileList(fileList, indexStatus, workingTreeStatus, model, isOtherUserChange) {
+                function addItemToFileList(fileList, indexStatus, workingTreeStatus, model, isOtherUserChange, otherUser) {
                     var formCheck;
                     if (isOtherUserChange) {
                         formCheck = $('<div class="form-check changes-check other-user"></div>');
@@ -2201,7 +2202,7 @@ webui.NewChangedFilesView = function(workspaceView) {
 
                     var checkboxLabel;
                     if (isOtherUserChange) {
-                        checkboxLabel = $('<label class="form-check-label file-item-label other-user-label" data-toggle="tooltip" title="File changed by another user">' + webui.peopleIcon +'</label>').append(model);
+                        checkboxLabel = $('<label class="form-check-label file-item-label other-user-label" data-toggle="tooltip" data-placement="top" title="File changed by: ' + otherUser + '">' + webui.peopleIcon +'</label>').append(model);
                     } else {
                         checkboxLabel = $('<label class="form-check-label file-item-label"></label>').text(model);
                     }
@@ -2237,7 +2238,8 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true);
+                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }
 
                 });

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -2172,9 +2172,10 @@ webui.NewChangedFilesView = function(workspaceView) {
         webui.git("status -u --porcelain", function(data) {
             $.get("api/uncommitted", function (uncommitted) {
                 var uncommittedItems = JSON.parse(uncommitted)["current user's changes"];
+                var otherUserUncommittedItems = JSON.parse(uncommitted)["other users' changes"];
                 self.filesCount = 0;
 
-                function addItemToFileList(fileList, indexStatus, workingTreeStatus, model, isOtherUserChange) {
+                function addItemToFileList(fileList, indexStatus, workingTreeStatus, model, isOtherUserChange, otherUser) {
                     var formCheck;
                     if (isOtherUserChange) {
                         formCheck = $('<div class="form-check changes-check other-user"></div>');
@@ -2201,7 +2202,7 @@ webui.NewChangedFilesView = function(workspaceView) {
 
                     var checkboxLabel;
                     if (isOtherUserChange) {
-                        checkboxLabel = $('<label class="form-check-label file-item-label other-user-label" data-toggle="tooltip" title="File changed by another user">' + webui.peopleIcon +'</label>').append(model);
+                        checkboxLabel = $('<label class="form-check-label file-item-label other-user-label" data-toggle="tooltip" data-placement="top" title="File changed by: ' + otherUser + '">' + webui.peopleIcon +'</label>').append(model);
                     } else {
                         checkboxLabel = $('<label class="form-check-label file-item-label"></label>').text(model);
                     }
@@ -2237,7 +2238,8 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (isForCurrentUser) {
                         addItemToFileList(fileList, indexStatus, workingTreeStatus, model, false);
                     } else {
-                        addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true);
+                        var otherUser = otherUserUncommittedItems[model.replace(/\//g, '\\')];
+                        addItemToFileList(fileList, indexStatus, workingTreeStatus, model, true, otherUser);
                     }
 
                 });