Fix/data export

src/components/kanban/Kanban.js

@@ -2,7 +2,7 @@
 //
 // Please see license.txt for details.
 
-import React, {useEffect, useState} from "react";
+import React, { useEffect, useState } from "react";
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import CountdownBadge from "../../components/countdownBadge/CountdownBadge";
 import { CardDeck, Col } from "react-bootstrap";
@@ -11,31 +11,30 @@ import { asArray, hasData } from "../../utils/utils";
 import "./Kanban.css";
 import { poe } from "../../services/serviceWrapper";
 import Loading from "../../components/loading/Loading";
-import {LK} from "../../utils/constants";
+import { LK } from "../../utils/constants";
 import ToolTipWrapper from "../tooltipWrapper/TooltipWrapper";
 
 const Kanban = props => {
   const [poeTiles, setPoeTiles] = useState([]);
   const [showPending, setIsPending] = useState(false);
 
-
-  useEffect( () =>{
+  useEffect(() => {
     const tiles = [];
     const lanes = {};
-    if(hasData(props.tiles)){
-      asArray(props.tiles).map(tile =>{
+    if (hasData(props.tiles)) {
+      asArray(props.tiles).map(tile => {
         tiles.push(createPOETile(tile)); //creates tile, adds to tile array
       });
     }
-    if(hasData(props.lanes)){
-      asArray(props.lanes).map(lane =>{
+    if (hasData(props.lanes)) {
+      asArray(props.lanes).map(lane => {
         lanes[lane.ord] = createPOELane(lane, tiles); //creates lane, associates tile, adds to lane object
       });
     }
     setColumns(lanes);
     setPoeTiles(tiles);
     setIsPending(false);
-  },[])
+  }, []);
 
   const convertTileToData = (tile, status) => {
     const req = {
@@ -57,15 +56,19 @@ const Kanban = props => {
       content: (
         <div>
           <div className="font-weight-bolder">
-            <a href={"paxDetail/"+tileData.flightId + "/" + tileData.paxId}>{tileData.paxLastName}, {tileData.paxFirstName}</a>
+            <a href={"paxDetail/" + tileData.flightId + "/" + tileData.paxId}>
+              {tileData.paxLastName}, {tileData.paxFirstName}
+            </a>
           </div>
-          <div>Flight #:
+          <div>
+            Flight #:
             <ToolTipWrapper
               data={{
                 val: tileData.flightNumber,
                 lkup: LK.CARRIER
               }}
-          ></ToolTipWrapper> </div>
+            ></ToolTipWrapper>{" "}
+          </div>
           <div> Doc #: {tileData.document.documentNumber}</div>
           <div>Reason: {tileData.hitCategory}</div>
           <div>&nbsp;</div>
@@ -145,65 +148,63 @@ const Kanban = props => {
 
   return (
     <>
-        {(props.isLoading || showPending) && <Loading></Loading>}
-        <CardDeck className="poe-page-deck">
-          <DragDropContext onDragEnd={result => onDragEnd(result, columns, setColumns)}>
-            {Object.entries(columns).map(([columnId, column], index) => {
-              return (
-                <div className="poe-drag-drop"
-                  key={columnId}
-                >
-                  <h5>{column.name}</h5>
-                  <div className="poe-droppable-div">
-                    <Droppable droppableId={columnId} key={columnId}>
-                      {(provided, snapshot) => {
-                        return (
-                          <div
-                            {...provided.droppableProps}
-                            ref={provided.innerRef}
-                            className="poe-droppable"
-                            style={{
-                              background: snapshot.isDraggingOver
-                                ? column.dragbackground
-                                : column.background,
-                            }}
-                          >
-                            {column.items.map((item, index) => {
-                              return (
-                                <Draggable
-                                  key={item.id}
-                                  draggableId={item.id}
-                                  index={index}
-                                >
-                                  {(provided, snapshot) => {
-                                    return (
-                                      <div
-                                        ref={provided.innerRef}
-                                        {...provided.draggableProps}
-                                        {...provided.dragHandleProps}
-                                          className="poe-draggable"
-                                        style={{
-                                          ...provided.draggableProps.style,
-                                        }}
-                                      >
-                                        {item.content}
-                                      </div>
-                                    );
-                                  }}
-                                </Draggable>
-                              );
-                            })}
-                            {provided.placeholder}
-                          </div>
-                        );
-                      }}
-                    </Droppable>
-                  </div>
+      {(props.isLoading || showPending) && <Loading></Loading>}
+      <CardDeck className="poe-page-deck">
+        <DragDropContext onDragEnd={result => onDragEnd(result, columns, setColumns)}>
+          {Object.entries(columns).map(([columnId, column], index) => {
+            return (
+              <div className="poe-drag-drop" key={columnId}>
+                <h5>{column.name}</h5>
+                <div className="poe-droppable-div">
+                  <Droppable droppableId={columnId} key={columnId}>
+                    {(provided, snapshot) => {
+                      return (
+                        <div
+                          {...provided.droppableProps}
+                          ref={provided.innerRef}
+                          className="poe-droppable"
+                          style={{
+                            background: snapshot.isDraggingOver
+                              ? column.dragbackground
+                              : column.background
+                          }}
+                        >
+                          {column.items.map((item, index) => {
+                            return (
+                              <Draggable
+                                key={item.id}
+                                draggableId={item.id}
+                                index={index}
+                              >
+                                {(provided, snapshot) => {
+                                  return (
+                                    <div
+                                      ref={provided.innerRef}
+                                      {...provided.draggableProps}
+                                      {...provided.dragHandleProps}
+                                      className="poe-draggable"
+                                      style={{
+                                        ...provided.draggableProps.style
+                                      }}
+                                    >
+                                      {item.content}
+                                    </div>
+                                  );
+                                }}
+                              </Draggable>
+                            );
+                          })}
+                          {provided.placeholder}
+                        </div>
+                      );
+                    }}
+                  </Droppable>
                 </div>
-              );
-            })}
-          </DragDropContext>
-        </CardDeck>
+              </div>
+            );
+          })}
+        </DragDropContext>
+      </CardDeck>
     </>
   );
 };

src/components/table/Table.js

@@ -320,14 +320,16 @@ const Table = props => {
                 </option>
               ))}
             </select>
-            <Button
-              className="export-btn"
-              variant="light"
-              size="sm"
-              onClick={() => exportData("csv", true)}
-            >
-              {<Xl8 xid="tab004">Export</Xl8>}
-            </Button>
+            {!props.disableTableDataExport && (
+              <Button
+                className="export-btn"
+                variant="light"
+                size="sm"
+                onClick={() => exportData("csv", true)}
+              >
+                {<Xl8 xid="tab004">Export</Xl8>}
+              </Button>
+            )}
             <span className="tagrightpag">
               <h3 className="title-default">
                 <i>{isPopulated ? rows.length : 0}</i>
@@ -404,6 +406,18 @@ const Table = props => {
           cellconfig.Filter = BooleanFilter;
         }
 
+        if (element.sortType !== undefined) {
+          cellconfig.sortType = element.sortType;
+        }
+        //Overrides the cell values
+        if (element.getCellExportValue !== undefined) {
+          cellconfig.getCellExportValue = element.getCellExportValue;
+        }
+        //Override the column headr
+        if (element.getColumnExportValue !== undefined) {
+          cellconfig.getColumnExportValue = element.getColumnExportValue;
+        }
+
         columns.push(cellconfig);
       }
     });
@@ -463,7 +477,8 @@ Table.propTypes = {
   stateVals: PropTypes.func,
   ignoredFields: PropTypes.arrayOf(PropTypes.string),
   enableColumnFilter: PropTypes.bool,
-  exportFileName: PropTypes.string
+  exportFileName: PropTypes.string,
+  sortType: PropTypes.func
 };
 
 export default Table;

src/components/table/table-utils.js

@@ -3,6 +3,7 @@
 // Please see license.txt for details.
 import React from "react";
 import { jsonToCSV } from "react-papaparse";
+import { titleCase } from "../../utils/utils";
 
 export const ColumnFilter = ({ column: { filterValue, setFilter } }) => {
   return (
@@ -34,7 +35,7 @@ export const BooleanFilter = ({ column: { filterValue, setFilter } }) => {
 
 export const getExportFileBlob = ({ columns, data, fileType, fileName }) => {
   if (fileType === "csv") {
-    const headerNames = columns.map(col => col.exportValue);
+    const headerNames = columns.map(col => titleCase(col.exportValue));
     const csvString = jsonToCSV({ fields: headerNames, data });
     return new Blob([csvString], { type: "text/csv" });
   }

src/pages/admin/auditLog/AuditLog.js

@@ -12,7 +12,13 @@ import SidenavContainer from "../../../components/sidenavContainer/SidenavContai
 import FilterForm from "../../../components/filterForm2/FilterForm";
 import LabelledInput from "../../../components/labelledInput/LabelledInput";
 import Main from "../../../components/main/Main";
-import { addMinutes, asArray, localeDateWithSeconds } from "../../../utils/utils";
+import {
+  addMinutes,
+  asArray,
+  dateComparator,
+  localeDateWithSeconds
+} from "../../../utils/utils";
+import { EXPORTFILENAME } from "../../../utils/constants";
 
 const AuditLog = ({ name }) => {
   const cb = () => {};
@@ -97,12 +103,17 @@ const AuditLog = ({ name }) => {
       Accessor: "timestamp",
       Xl8: true,
       Header: ["al009", "Timestamp"],
-      Cell: ({ row }) => localeDateWithSeconds(row.original.timestamp)
+      sortType: (row1, row2) =>
+        dateComparator(row1.original.timestamp, row2.original.timestamp)
     }
   ];
 
   const setDataWrapper = res => {
-    setData(res);
+    const parsedData = asArray(res).map(log => {
+      return { ...log, timestamp: localeDateWithSeconds(log.timestamp) };
+    });
+
+    setData(parsedData);
     setRefreshKey(refreshKey + 1);
     setIsLoading(false);
   };
@@ -171,6 +182,7 @@ const AuditLog = ({ name }) => {
           callback={cb}
           header={headers}
           isLoading={isLoading}
+          exportFileName={EXPORTFILENAME.AUDITLOG}
         ></Table>
       </Main>
     </>

src/pages/admin/codeEditor/airport/Airport.js

@@ -9,7 +9,7 @@ import AirportModal from "./AirportModal";
 import ConfirmationModal from "../../../../components/confirmationModal/ConfirmationModal";
 import { codeEditor } from "../../../../services/lookupService";
 import { LookupContext } from "../../../../context/data/LookupContext";
-import { ACTION, LK } from "../../../../utils/constants";
+import { ACTION, EXPORTFILENAME, LK } from "../../../../utils/constants";
 import { Fab, Action } from "react-tiny-fab";
 import "react-tiny-fab/dist/styles.css";
 
@@ -103,6 +103,7 @@ const Airports = () => {
       Xl8: true,
       Header: ["edit001", "Edit"],
       disableFilters: true,
+      disableExport: true,
       disableSortBy: true,
       Cell: ({ row }) => {
         return (
@@ -149,6 +150,7 @@ const Airports = () => {
         header={headers}
         key={refreshKey}
         enableColumnFilter={true}
+        exportFileName={EXPORTFILENAME.CODEEDITOR.AIRPORT}
       ></Table>
       <Fab icon={<i className="fa fa-plus" />} variant="info">
         <Action

src/pages/admin/codeEditor/carrier/Carrier.js

@@ -9,9 +9,10 @@ import CarrierModal from "./CarrierModal";
 import ConfirmationModal from "../../../../components/confirmationModal/ConfirmationModal";
 import { codeEditor } from "../../../../services/lookupService";
 import { LookupContext } from "../../../../context/data/LookupContext";
-import { ACTION, LK } from "../../../../utils/constants";
+import { ACTION, EXPORTFILENAME, LK } from "../../../../utils/constants";
 import { Fab, Action } from "react-tiny-fab";
 import "react-tiny-fab/dist/styles.css";
+import { getNumberExportValue } from "../../../../utils/utils";
 
 const Carriers = () => {
   const cb = function() {};
@@ -101,6 +102,7 @@ const Carriers = () => {
       Header: ["edit001", "Edit"],
       disableFilters: true,
       disableSortBy: true,
+      disableExport: true,
       Cell: ({ row }) => {
         return (
           <div className="icon-col">
@@ -112,7 +114,12 @@ const Carriers = () => {
         );
       }
     },
-    { Accessor: "iata", Xl8: true, Header: ["iata001", "IATA"] },
+    {
+      Accessor: "iata",
+      Xl8: true,
+      Header: ["iata001", "IATA"],
+      getCellExportValue: row => getNumberExportValue(row.original.iata)
+    },
     { Accessor: "icao", Xl8: true, Header: ["icao001", "ICAO"] },
     { Accessor: "name", Xl8: true, Header: ["car005", "Name"] }
   ];
@@ -142,6 +149,7 @@ const Carriers = () => {
         header={headers}
         key={refreshKey}
         enableColumnFilter={true}
+        exportFileName={EXPORTFILENAME.CODEEDITOR.CARRIER}
       ></Table>
       <Fab icon={<i className="fa fa-plus" />} variant="info">
         <Action