Merge pull request #83 from ibi-group/pretty-survey-response-dates

fix(CDPUserDashboard): pretty date rendering for merged surveys

components/CDPUserDashboard.tsx

@@ -19,6 +19,7 @@ type CDPZipProps = {
   downloadedAt?: number
   file: CDPFile
   onClick: (key: string) => void
+  tripDataSuffix: string
 }
 
 const CDP_FILES_URL = `${process.env.API_BASE_URL}/api/secure/connected-data`
@@ -33,7 +34,9 @@ const CDPZip = (props: CDPZipProps): JSX.Element => (
     onClick={() => props.onClick(props.file.key)}
     title={`Download ${props.file.key}`}
   >
-    <div className="ms-2 me-auto">{getDateFromCDPFileName(props.file.key)}</div>
+    <div className="ms-2 me-auto">
+      {getDateFromCDPFileName(props.file.key, props.tripDataSuffix)}
+    </div>
     <div>
       {props.downloadedAt && (
         <Badge className="mr-1" pill variant="success">
@@ -52,12 +55,14 @@ const FileListing = ({
   cdpUser,
   downloadedFiles,
   files,
-  setCurrentlyDownloadingFile
+  setCurrentlyDownloadingFile,
+  tripDataSuffix
 }: {
   cdpUser?: CDPUser
   downloadedFiles: string[]
   files: CDPFile[]
   setCurrentlyDownloadingFile: (file: string) => void
+  tripDataSuffix: string
 }): JSX.Element =>
   files?.length === 0 ? (
     <Alert variant="info">
@@ -76,6 +81,7 @@ const FileListing = ({
             file={file}
             key={file.key}
             onClick={setCurrentlyDownloadingFile}
+            tripDataSuffix={tripDataSuffix}
           />
         )
       })}
@@ -168,6 +174,7 @@ const CDPUserDashboard = (props: Props): JSX.Element => {
           downloadedFiles={downloadedFiles}
           files={files.filter(isSurveyResponse(false))}
           setCurrentlyDownloadingFile={setCurrentlyDownloadingFile}
+          tripDataSuffix="-anon-trip-data"
         />
       </Tab>
       {surveyResponses.length > 0 && (
@@ -187,6 +194,7 @@ const CDPUserDashboard = (props: Props): JSX.Element => {
                 (b.key.match(/\//g) || []).length
             )}
             setCurrentlyDownloadingFile={setCurrentlyDownloadingFile}
+            tripDataSuffix="-merged"
           />
         </Tab>
       )}

util/ui.ts

@@ -97,10 +97,12 @@ export const getActiveUserTypes = (): {
  *
  * Able to handle all the date/time formats that are generated by the CDP.
  */
-export const getDateFromCDPFileName = (filename: string): string => {
-  const TRIP_DATA_SUFFIX = '-anon-trip-data'
-  const date = filename.split(TRIP_DATA_SUFFIX)?.[0].split('/')?.[1]
-  if (!date || !filename.includes(TRIP_DATA_SUFFIX)) return filename
+export const getDateFromCDPFileName = (
+  filename: string,
+  tripDataSuffix: string
+): string => {
+  const date = filename.split(tripDataSuffix)?.[0].split('/')?.[1]
+  if (!date || !filename.includes(tripDataSuffix)) return filename
 
   const parsedDate =
     getDateOnlyFromCDPFileName(date) || getDateAndTimeFromCDPFileName(date)