Merge pull request #331 from cabhishek/develop

Correctly determine size of files in Directory output viewer
Netflix · Jul 28, 2016 · d5fd8dd · d5fd8dd
2 parents 843d7bd + a5600eb
commit d5fd8dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/genie-web/package.json b/genie-web/package.json
@@ -17,6 +17,7 @@
     "url": "https://github.com/Netflix/genie/issues"
   },
   "dependencies": {
+    "filesize": "^3.3.0",
     "jquery": "^2.2.3",
     "moment": "^2.13.0",
     "react": "^15.1.0",

diff --git a/genie-web/src/main/resources/static/scripts/OutputDirectory.js b/genie-web/src/main/resources/static/scripts/OutputDirectory.js
@@ -4,6 +4,7 @@ import { Link } from 'react-router';
 import TableHeader from './components/TableHeader';
 import SiteHeader from './components/SiteHeader';
 import SiteFooter from './components/SiteFooter';
+import filesize from 'filesize';
 
 import { genieJobsUrl, fileUrl, momentFormat, fetch } from './utils';
 
@@ -96,7 +97,7 @@ const FileRow = (props) =>
         <Link target="_blank" to={fileUrl(props.file.url)}>{props.file.name}</Link>
       </span>
     </td>
-    <td>{props.file.size} kb</td>
+    <td>{filesize(props.file.size)}</td>
     <td className="col-xs-3">{momentFormat(props.file.lastModified)}</td>
   </tr>;
 
@@ -117,7 +118,7 @@ const DirectoryRow = (props) =>
         <Link to={genieJobsUrl(props.directory.url)}>{props.directory.name}</Link>
       </span>
     </td>
-    <td>{props.directory.size} kb</td>
+    <td>--</td>
     <td className="col-xs-3">{momentFormat(props.directory.lastModified)}</td>
   </tr>;