Updated to work with live report files and format the names

caprover · Nov 8, 2024 · 23a4c07 · 23a4c07
1 parent 929583d
commit 23a4c07
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 82 deletions.
diff --git a/src/containers/apps/appDetails/AccessLogReports.tsx b/src/containers/apps/appDetails/AccessLogReports.tsx
@@ -1,5 +1,6 @@
 import { Button, Modal } from 'antd'
 import { Component } from 'react'
+import { localize } from '../../../utils/Language'
 import { AppDetailsTabProps } from './AppDetails'
 
 interface GoAccessReport {
@@ -102,7 +103,7 @@ export default class AccessLogReports extends Component<
                                                         )
                                                     }
                                                 >
-                                                    {r.name}
+                                                    {this.reportName(r)}
                                                 </Button>
                                             </p>
                                         ))}
@@ -162,6 +163,18 @@ export default class AccessLogReports extends Component<
             })
     }
 
+    reportName(report: GoAccessReport) {
+        if (report.name.includes('Live')) {
+            return localize('goaccess_settings.live', 'Live')
+        }
+        const date = new Date(report.lastModifiedTime)
+
+        return date.toLocaleString(undefined, {
+            dateStyle: 'short',
+            timeStyle: 'medium',
+        })
+    }
+
     onReportClick(reportName: string, reportUrl: string) {
         this.setState({ reportOpen: reportName })
 

diff --git a/src/containers/monitoring/GoAccessSettingsForm.tsx b/src/containers/monitoring/GoAccessSettingsForm.tsx
@@ -10,11 +10,9 @@ interface GoAccessSettingsProps {
 
 interface GoAccessSettingsState {
     rotationFreqSelect: string | undefined
-    catchupFreqSelect: string | undefined
     logRetentionSelect: string | undefined
 
     rotationFreqCustom: string | undefined
-    catchupFreqCustom: string | undefined
     logRetentionCustom: number | undefined
 }
 
@@ -31,10 +29,6 @@ export default class GoAccessSettingsForm extends Component<
                 this.rotationFrequencyOptions,
                 props.goAccessInfo.data.rotationFrequencyCron
             ),
-            catchupFreqSelect: this.valueOrCustom(
-                this.catchupFrequencyOptions,
-                props.goAccessInfo.data.catchupFrequencyCron
-            ),
             logRetentionSelect:
                 props.goAccessInfo.data.logRetentionDays === undefined
                     ? '-1'
@@ -43,7 +37,6 @@ export default class GoAccessSettingsForm extends Component<
                           props.goAccessInfo.data.logRetentionDays.toString()
                       ),
             rotationFreqCustom: props.goAccessInfo.data.rotationFrequencyCron,
-            catchupFreqCustom: props.goAccessInfo.data.catchupFrequencyCron,
             logRetentionCustom: props.goAccessInfo.data.logRetentionDays,
         }
     }
@@ -84,32 +77,6 @@ export default class GoAccessSettingsForm extends Component<
         },
     ]
 
-    catchupFrequencyOptions = [
-        {
-            value: '* * * * *',
-            label: localize('goaccess_settings.every_minute', 'Every Minute'),
-        },
-        {
-            value: '*/10 * * * *',
-            label: localize(
-                'goaccess_settings.every_10_minute',
-                'Every 10 Minutes'
-            ),
-        },
-        {
-            value: '0 * * * *',
-            label: localize('goaccess_settings.every_hour', 'Every Hour'),
-        },
-        {
-            value: '0 0 * * *',
-            label: localize('goaccess_settings.every_day', 'Every Day'),
-        },
-        {
-            value: CUSTOM,
-            label: localize('goaccess_settings.custom', 'Custom'),
-        },
-    ]
-
     logRetentionOptions = [
         {
             value: '-1',
@@ -131,14 +98,6 @@ export default class GoAccessSettingsForm extends Component<
         }
     }
 
-    updateCatchupFrequency(selectValue?: string, customValue?: string) {
-        if (customValue !== undefined) {
-            this.setState({ catchupFreqCustom: customValue })
-        } else {
-            this.setState({ catchupFreqSelect: selectValue })
-        }
-    }
-
     updateLogRetention(selectValue?: string, customValue?: string) {
         let updated: number | undefined = undefined
         const input = selectValue ?? customValue
@@ -166,11 +125,6 @@ export default class GoAccessSettingsForm extends Component<
                 ? this.state.rotationFreqCustom
                 : this.state.rotationFreqSelect) ?? '0 0 1 * *'
 
-        updated.data.catchupFrequencyCron =
-            (this.state.catchupFreqSelect === CUSTOM
-                ? this.state.catchupFreqCustom
-                : this.state.catchupFreqSelect) ?? '0 * * * *'
-
         updated.data.logRetentionDays =
             this.state.logRetentionSelect === CUSTOM
                 ? this.state.logRetentionCustom
@@ -231,39 +185,6 @@ export default class GoAccessSettingsForm extends Component<
                             )}
                         </Form.Item>
 
-                        <Form.Item
-                            label={localize(
-                                'goaccess_settings.catchup_frequency',
-                                'Catch Up Report Processing Frequency'
-                            )}
-                        >
-                            <Select
-                                style={{ width: 200, marginRight: '1em' }}
-                                options={this.catchupFrequencyOptions}
-                                value={this.state.catchupFreqSelect}
-                                onChange={(value) =>
-                                    this.updateCatchupFrequency(value)
-                                }
-                            />
-                            {this.state.catchupFreqSelect === CUSTOM && (
-                                <Input
-                                    style={{ width: 200 }}
-                                    placeholder={localize(
-                                        'goaccess_settings.crontab_placeholder',
-                                        'Valid Crontab Expression'
-                                    )}
-                                    value={this.state.catchupFreqCustom}
-                                    required
-                                    onChange={(e) =>
-                                        this.updateCatchupFrequency(
-                                            undefined,
-                                            e.target.value
-                                        )
-                                    }
-                                />
-                            )}
-                        </Form.Item>
-
                         <Form.Item
                             label={localize(
                                 'goaccess_settings.log_retention',

diff --git a/src/locales/en-US.json b/src/locales/en-US.json
@@ -297,6 +297,7 @@
     "goaccess.link": "GoAccess website",
     "goaccess.start_goaccess": "Start GoAccess",
     "goaccess.stop_goaccess": "Stop GoAccess",
+    "goaccess.live": "Live",
     "goaccess.logs_location": "View access logs on the app details page",
     "goaccess.update": "Update GoAccess",
     "goaccess.started": "GoAccess is started and updated!",
@@ -313,7 +314,6 @@
     "goaccess_settings.indefinite": "Indefinitely",
     "goaccess_settings.goaccess_settings": "GoAccess Settings",
     "goaccess_settings.rotation_frequency": "Log Rotation and Report Generation Frequency",
-    "goaccess_settings.catchup_frequency": "Catch Up Report Processing Frequency",
     "goaccess_settings.log_retention": "Log and Report Retention Days",
     "goaccess_settings.crontab_placeholder": "Valid Crontab Expression",
     "goaccess_settings.log_retention_placeholder": "Number of days",

diff --git a/src/models/IGoAccessInfo.ts b/src/models/IGoAccessInfo.ts
@@ -2,7 +2,6 @@ export default interface IGoAccessInfo {
     isEnabled: boolean
     data: {
         rotationFrequencyCron: string
-        catchupFrequencyCron: string
         logRetentionDays?: number
     }
 }