Jkmarx/details owner name bug

refinery/ui/source/js/commons/services/users.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function userFactory ($q, $resource, settings) {
+function userFactory ($q, $resource, _, settings) {
   var userService = {};
   var userResource = $resource(
     settings.appRoot + settings.refineryApi + '/users/:uuid/',
@@ -45,17 +45,18 @@ function userFactory ($q, $resource, settings) {
   userService.get = function (uuid) {
     if (store[uuid] === undefined) {
       return getUserData(uuid).then(function (data) {
-        store[uuid] = {
-          affiliation: data.affiliation,
-          email: data.user.email,
-          firstName: data.user.first_name,
-          fullName: (data.user.first_name + ' ' + data.user.last_name).trim(),
-          lastName: data.user.last_name,
-          userId: data.user.id,
-          userName: data.user.username,
-          userProfileUuid: data.uuid
-        };
-
+        if (_.has(data, 'user')) {
+          store[uuid] = {
+            affiliation: data.affiliation,
+            email: data.user.email,
+            firstName: data.user.first_name,
+            fullName: (data.user.first_name + ' ' + data.user.last_name).trim(),
+            lastName: data.user.last_name,
+            userId: data.user.id,
+            userName: data.user.username,
+            userProfileUuid: data.uuid
+          };
+        }
         return store[uuid];
       });
     }
@@ -67,4 +68,4 @@ function userFactory ($q, $resource, settings) {
 
 angular
   .module('refineryApp')
-  .factory('userService', ['$q', '$resource', 'settings', userFactory]);
+  .factory('userService', ['$q', '$resource', '_', 'settings', userFactory]);

refinery/ui/source/js/data-set-about/ctrls/sharing-ctrl.js

@@ -6,7 +6,8 @@ function AboutSharingCtrl (
   $scope,
   $location,
   $window,
-  $log
+  $log,
+  _
   ) {
   var vm = this;
   vm.dataSetSharing = dataSetAboutFactory.dataSetSharing;
@@ -29,9 +30,9 @@ function AboutSharingCtrl (
 
   vm.refreshOwnerName = function (userUuid) {
     userService.get(userUuid).then(function (response) {
-      if (response.fullName) {
+      if (_.has(response, 'fullName') && response.fullName) {
         vm.ownerName = response.fullName;
-      } else {
+      } else if (_.has(response, 'userName') && response.userName) {
         vm.ownerName = response.userName;
       }
     });
@@ -51,6 +52,7 @@ angular
     '$location',
     '$window',
     '$log',
+    '_',
     AboutSharingCtrl
   ]);
 

refinery/ui/source/js/data-set-about/partials/sharing.html

@@ -18,6 +18,9 @@ <h4>Owner</h4>
       {{ ASCtrl.ownerName }}
       </a>
     </span>
+     <span ng-if="!ASCtrl.dataSetSharing.is_owner && !ASCtrl.ownerName">
+      <em>Owner's information not available.</em>
+    </span>
   </p>
 
 <div ng-if="ASCtrl.groupList.length > 0">