Fix the way workpad dates are saved and displayed (elastic#444)

* Fix the way workpad dates are saved and displayed * Don't display the date if there isn't one
w33ble · Apr 10, 2018 · 39f6689 · 39f6689
1 parent c4460b9
commit 39f6689
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -48,7 +48,7 @@ export function workpad(server) {
         {
           ...req.payload,
           '@timestamp': now,
-          '@created': workpad['@created'],
+          '@created': workpad.attributes['@created'],
         },
         { overwrite: true, id }
       );