From 39f66896a2d3b75b1a6aacda74df0b44126255d0 Mon Sep 17 00:00:00 2001
From: Lukas Olson <olson.lukas@gmail.com>
Date: Tue, 10 Apr 2018 15:01:16 -0700
Subject: [PATCH] Fix the way workpad dates are saved and displayed (#444)

* Fix the way workpad dates are saved and displayed

* Don't display the date if there isn't one
---
 public/components/workpad_loader/workpad_loader.js | 4 ++--
 server/routes/workpad.js                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/components/workpad_loader/workpad_loader.js b/public/components/workpad_loader/workpad_loader.js
index d3b53678e4778..f43f61ab98ca5 100644
--- a/public/components/workpad_loader/workpad_loader.js
+++ b/public/components/workpad_loader/workpad_loader.js
@@ -9,7 +9,7 @@ import { WorkpadCreate } from './workpad_create';
 import { WorkpadSearch } from './workpad_search';
 import './workpad_loader.less';
 
-const formatDate = date => moment(date).format('MMM D, YYYY @ h:mma');
+const formatDate = date => date && moment(date).format('MMM D, YYYY @ h:mma');
 
 export class WorkpadLoader extends React.PureComponent {
   static propTypes = {
@@ -95,8 +95,8 @@ export class WorkpadLoader extends React.PureComponent {
         <thead>
           <tr>
             <th>Workpad name</th>
-            <th>Updated</th>
             <th>Created</th>
+            <th>Updated</th>
             <th>&nbsp;</th>
           </tr>
         </thead>
diff --git a/server/routes/workpad.js b/server/routes/workpad.js
index 1433c8a5b4f75..3c3036e452918 100644
--- a/server/routes/workpad.js
+++ b/server/routes/workpad.js
@@ -48,7 +48,7 @@ export function workpad(server) {
         {
           ...req.payload,
           '@timestamp': now,
-          '@created': workpad['@created'],
+          '@created': workpad.attributes['@created'],
         },
         { overwrite: true, id }
       );