feat(preview): use uploader_display_name for sidebar uploader info (#2091)

Author: omgrief

src/constants.js

@@ -139,6 +139,7 @@ export const FIELD_APP: 'app' = 'app';
 export const FIELD_OCCURRED_AT: 'occurred_at' = 'occurred_at';
 export const FIELD_RENDERED_TEXT: 'rendered_text' = 'rendered_text';
 export const FIELD_RETENTION: 'retention' = 'retention';
+export const FIELD_UPLOADER_DISPLAY_NAME: 'uploader_display_name' = 'uploader_display_name';
 
 /* ----------------------- Permissions --------------------------- */
 export const PERMISSION_CAN_PREVIEW = 'can_preview';

src/elements/content-sidebar/SidebarFileProperties.js

@@ -15,6 +15,7 @@ import { INTERACTION_TARGET, DETAILS_TARGETS } from '../common/interactionTarget
 import withErrorHandling from './withErrorHandling';
 import type { ClassificationInfo } from './flowTypes';
 import type { BoxItem } from '../../common/types/core';
+import { PLACEHOLDER_USER } from '../../constants';
 
 type Props = {
     classification?: ClassificationInfo,
@@ -55,7 +56,12 @@ const SidebarFileProperties = ({
                     : {}
             }
             size={getFileSize(file.size, intl.locale)}
-            uploader={getProp(file, 'created_by.name')}
+            // use uploader_display_name if uploaded anonymously
+            uploader={
+                getProp(file, 'created_by.id') === PLACEHOLDER_USER.id
+                    ? getProp(file, 'uploader_display_name')
+                    : getProp(file, 'created_by.name')
+            }
         />
     </LoadingIndicatorWrapper>
 );

src/elements/content-sidebar/__tests__/SidebarFileProperties.test.js

@@ -1,8 +1,10 @@
+import set from 'lodash/set';
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 import ItemProperties from '../../../features/item-details/ItemProperties';
 import InlineError from '../../../components/inline-error/InlineError';
 import SidebarFileProperties, { SidebarFilePropertiesComponent } from '../SidebarFileProperties';
+import { PLACEHOLDER_USER } from '../../../constants';
 
 describe('elements/content-sidebar/SidebarFileProperties', () => {
     const getWrapper = props => shallow(<SidebarFilePropertiesComponent {...props} />);
@@ -22,6 +24,7 @@ describe('elements/content-sidebar/SidebarFileProperties', () => {
             permissions: {
                 can_rename: true,
             },
+            uploader_display_name: 'File Request',
         },
         onDescriptionChange: jest.fn(),
         intl: {
@@ -54,6 +57,14 @@ describe('elements/content-sidebar/SidebarFileProperties', () => {
             expect(wrapper).toMatchSnapshot();
         });
 
+        test('should render ItemProperties for anonymous uploaders', () => {
+            const propsHere = set({ ...props }, 'file.created_by.id', PLACEHOLDER_USER.id);
+            const wrapper = getWrapper(propsHere);
+
+            expect(wrapper.find(ItemProperties)).toHaveLength(1);
+            expect(wrapper).toMatchSnapshot();
+        });
+
         test('should render an error', () => {
             const fakeError = {
                 id: 'foo',

src/elements/content-sidebar/__tests__/__snapshots__/SidebarFileProperties.test.js.snap

@@ -20,6 +20,26 @@ exports[`elements/content-sidebar/SidebarFileProperties render() should render I
 </LoadingIndicatorWrapper>
 `;
 
+exports[`elements/content-sidebar/SidebarFileProperties render() should render ItemProperties for anonymous uploaders 1`] = `
+<LoadingIndicatorWrapper>
+  <ItemProperties
+    createdAt="2018-04-18T16:56:05.352Z"
+    description="foo"
+    descriptionTextareaProps={
+      Object {
+        "data-resin-target": "description",
+      }
+    }
+    modifiedAt="2018-04-18T16:56:05.352Z"
+    onDescriptionChange={[MockFunction]}
+    owner="foo"
+    retentionPolicyProps={Object {}}
+    size="1 B"
+    uploader="File Request"
+  />
+</LoadingIndicatorWrapper>
+`;
+
 exports[`elements/content-sidebar/SidebarFileProperties render() should render an error 1`] = `
 <Fragment>
   <InlineError

src/utils/__tests__/fields.test.js

@@ -55,6 +55,7 @@ import {
     FIELD_RESTORED_FROM,
     FIELD_RETENTION,
     FIELD_URL,
+    FIELD_UPLOADER_DISPLAY_NAME,
     PLACEHOLDER_USER,
 } from '../../constants';
 
@@ -124,6 +125,7 @@ describe('util/fields', () => {
             FIELD_RESTORED_FROM,
             FIELD_AUTHENTICATED_DOWNLOAD_URL,
             FIELD_IS_DOWNLOAD_AVAILABLE,
+            FIELD_UPLOADER_DISPLAY_NAME,
         ]);
     });
 

src/utils/fields.js

@@ -33,6 +33,7 @@ import {
     FIELD_DESCRIPTION,
     FIELD_REPRESENTATIONS,
     FIELD_SHA1,
+    FIELD_UPLOADER_DISPLAY_NAME,
     FIELD_WATERMARK_INFO,
     FIELD_AUTHENTICATED_DOWNLOAD_URL,
     FIELD_FILE_VERSION,
@@ -106,6 +107,7 @@ const SIDEBAR_FIELDS_TO_FETCH = [
     FIELD_RESTORED_FROM,
     FIELD_AUTHENTICATED_DOWNLOAD_URL,
     FIELD_IS_DOWNLOAD_AVAILABLE,
+    FIELD_UPLOADER_DISPLAY_NAME,
 ];
 
 // Fields needed for preview