From c0a8deb12af0659b2b11a4281deefdd62c4f3e64 Mon Sep 17 00:00:00 2001
From: Jared Stoffan <jstoffan@users.noreply.github.com>
Date: Tue, 11 Dec 2018 13:05:27 -0800
Subject: [PATCH] fix(sidebar): Use correct timestamps for file details (#700)

---
 flow-typed/box-ui-elements.js                                 | 2 ++
 src/components/ContentSidebar/SidebarFileProperties.js        | 4 ++--
 .../ContentSidebar/__tests__/SidebarFileProperties-test.js    | 4 ++--
 .../__snapshots__/SidebarFileProperties-test.js.snap          | 4 ++--
 src/constants.js                                              | 2 ++
 src/util/__tests__/fields-test.js                             | 4 ++++
 src/util/fields.js                                            | 4 ++++
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/flow-typed/box-ui-elements.js b/flow-typed/box-ui-elements.js
index b947b57c52..af6921613c 100644
--- a/flow-typed/box-ui-elements.js
+++ b/flow-typed/box-ui-elements.js
@@ -296,6 +296,8 @@ type BoxItem = {
     item_collection?: BoxItemCollection,
     path_collection?: BoxPathCollection,
     interacted_at?: string,
+    content_created_at?: string,
+    content_modified_at?: string,
     modified_at?: string,
     created_at?: string,
     shared_link?: SharedLink,
diff --git a/src/components/ContentSidebar/SidebarFileProperties.js b/src/components/ContentSidebar/SidebarFileProperties.js
index 3f123b7148..f623bc26d4 100644
--- a/src/components/ContentSidebar/SidebarFileProperties.js
+++ b/src/components/ContentSidebar/SidebarFileProperties.js
@@ -62,9 +62,9 @@ const SidebarFileProperties = ({
     return (
         <LoadingIndicatorWrapper isLoading={isLoading}>
             <ItemProperties
-                createdAt={file.created_at}
+                createdAt={file.content_created_at}
                 description={file.description}
-                modifiedAt={file.modified_at}
+                modifiedAt={file.content_modified_at}
                 owner={getProp(file, 'owned_by.name')}
                 size={getFileSize(file.size, intl.locale)}
                 uploader={getProp(file, 'created_by.name')}
diff --git a/src/components/ContentSidebar/__tests__/SidebarFileProperties-test.js b/src/components/ContentSidebar/__tests__/SidebarFileProperties-test.js
index 6ff73559ef..4f94b56071 100644
--- a/src/components/ContentSidebar/__tests__/SidebarFileProperties-test.js
+++ b/src/components/ContentSidebar/__tests__/SidebarFileProperties-test.js
@@ -13,9 +13,9 @@ describe('components/ContentSidebar/SidebarFileProperties', () => {
     const getMountWrapper = props => mount(<SidebarFilePropertiesComponent {...props} />);
     const props = {
         file: {
-            created_at: '2018-04-18T16:56:05.352Z',
+            content_created_at: '2018-04-18T16:56:05.352Z',
+            content_modified_at: '2018-04-18T16:56:05.352Z',
             description: 'foo',
-            modified_at: '2018-04-18T16:56:05.352Z',
             owned_by: {
                 name: 'foo',
             },
diff --git a/src/components/ContentSidebar/__tests__/__snapshots__/SidebarFileProperties-test.js.snap b/src/components/ContentSidebar/__tests__/__snapshots__/SidebarFileProperties-test.js.snap
index edfa11dab8..38d7a68c7e 100644
--- a/src/components/ContentSidebar/__tests__/__snapshots__/SidebarFileProperties-test.js.snap
+++ b/src/components/ContentSidebar/__tests__/__snapshots__/SidebarFileProperties-test.js.snap
@@ -121,12 +121,12 @@ exports[`components/ContentSidebar/SidebarFileProperties render() should not ren
 <SidebarFileProperties
   file={
     Object {
-      "created_at": "2018-04-18T16:56:05.352Z",
+      "content_created_at": "2018-04-18T16:56:05.352Z",
+      "content_modified_at": "2018-04-18T16:56:05.352Z",
       "created_by": Object {
         "name": "foo",
       },
       "description": "foo",
-      "modified_at": "2018-04-18T16:56:05.352Z",
       "owned_by": Object {
         "name": "foo",
       },
diff --git a/src/constants.js b/src/constants.js
index 284754282d..d7de9b0f40 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -78,6 +78,8 @@ export const FIELD_ITEM_EXPIRATION = 'expires_at';
 export const FIELD_PERMISSIONS = 'permissions';
 export const FIELD_ITEM_COLLECTION = 'item_collection';
 export const FIELD_PATH_COLLECTION = 'path_collection';
+export const FIELD_CONTENT_CREATED_AT: 'content_created_at' = 'content_created_at';
+export const FIELD_CONTENT_MODIFIED_AT: 'content_modified_at' = 'content_modified_at';
 export const FIELD_MODIFIED_AT: 'modified_at' = 'modified_at';
 export const FIELD_RESTORED_FROM = 'restored_from';
 export const FIELD_CREATED_AT = 'created_at';
diff --git a/src/util/__tests__/fields-test.js b/src/util/__tests__/fields-test.js
index c4cd4159e6..6e5e2a475a 100644
--- a/src/util/__tests__/fields-test.js
+++ b/src/util/__tests__/fields-test.js
@@ -21,6 +21,8 @@ import {
     FIELD_ITEM_COLLECTION,
     FIELD_ITEM_EXPIRATION,
     FIELD_PATH_COLLECTION,
+    FIELD_CONTENT_CREATED_AT,
+    FIELD_CONTENT_MODIFIED_AT,
     FIELD_MODIFIED_AT,
     FIELD_CREATED_AT,
     FIELD_SHARED_LINK,
@@ -99,6 +101,8 @@ describe('util/fields', () => {
             FIELD_FILE_VERSION,
             FIELD_SHARED_LINK,
             FIELD_PERMISSIONS,
+            FIELD_CONTENT_CREATED_AT,
+            FIELD_CONTENT_MODIFIED_AT,
             FIELD_CREATED_AT,
             FIELD_CREATED_BY,
             FIELD_MODIFIED_AT,
diff --git a/src/util/fields.js b/src/util/fields.js
index 741735db16..3eb1e0cbe9 100644
--- a/src/util/fields.js
+++ b/src/util/fields.js
@@ -17,6 +17,8 @@ import {
     FIELD_ITEM_COLLECTION,
     FIELD_ITEM_EXPIRATION,
     FIELD_PATH_COLLECTION,
+    FIELD_CONTENT_CREATED_AT,
+    FIELD_CONTENT_MODIFIED_AT,
     FIELD_MODIFIED_AT,
     FIELD_CREATED_AT,
     FIELD_SHARED_LINK,
@@ -76,6 +78,8 @@ const SIDEBAR_FIELDS_TO_FETCH = [
     FIELD_FILE_VERSION,
     FIELD_SHARED_LINK,
     FIELD_PERMISSIONS,
+    FIELD_CONTENT_CREATED_AT,
+    FIELD_CONTENT_MODIFIED_AT,
     FIELD_CREATED_AT,
     FIELD_CREATED_BY,
     FIELD_MODIFIED_AT,