terrier-engine 4.24.0 → 4.24.2

package/data-dive/dives/dive-list.ts

@@ -14,6 +14,8 @@ import Messages from "tuff-core/messages"
 import Arrays from "tuff-core/arrays"
 import TerrierPart from "../../terrier/parts/terrier-part"
 import {DiveRunModal} from "./dive-runs"
+import * as inflection from "inflection"
+import Schedules from "../../terrier/schedules"
 
 const log = new Logger("DiveList")
 
@@ -112,7 +114,7 @@ export class DiveListPart extends TerrierPart<DiveListState> {
 
         const groupedDives = Arrays.groupBy(this.result.dives, 'dd_dive_group_id')
 
-        parent.div('.dd-group-grid', grid => {
+        parent.div('.dd-group-grid.tt-typography', grid => {
             const groups = Arrays.sortBy(Object.values(this.groupMap), 'name')
             for (const group of groups) {
                 this.renderGroupPanel(grid, group, groupedDives[group.id] || [])
@@ -156,7 +158,8 @@ export class DiveListPart extends TerrierPart<DiveListState> {
                         a.i('.glyp-data_dive')
                             .data({tooltip: "Public Dive"})
                     }
-                    a.span().text(dive.name)
+                    a.div('.name').text(dive.name)
+                    this.renderDiveSchedule(a, dive)
                 }).data({tooltip: "Open Editor"})
                 row.a('.icon-only', a => {
                     a.i('.glyp-settings')
@@ -173,7 +176,8 @@ export class DiveListPart extends TerrierPart<DiveListState> {
                         a.i('.glyp-data_dive')
                             .data({tooltip: "Public Dive"})
                     }
-                    a.span().text(dive.name)
+                    a.div('.name').text(dive.name)
+                    this.renderDiveSchedule(a, dive)
                 })
                     .data({tooltip: "Run Dive"})
                     .emitClick(this.runDiveKey, {id: dive.id})
@@ -181,6 +185,19 @@ export class DiveListPart extends TerrierPart<DiveListState> {
         })
     }
 
+    renderDiveSchedule(row: PartTag, dive: DdDive) {
+        log.info(`Rendering dive schedule: ${dive.delivery_schedule?.schedule_type}`, dive.delivery_schedule)
+        if (!dive.delivery_schedule || dive.delivery_schedule.schedule_type == 'none') {
+            return
+        }
+        let description = Schedules.describeRegular(dive.delivery_schedule)
+        if (dive.delivery_recipients?.length) {
+            description += ` to:<br>${dive.delivery_recipients.join('<br>')}`
+        }
+        row.div(".glyp-setup.with-icon").text(inflection.titleize(dive.delivery_schedule.schedule_type))
+            .data({tooltip: description})
+    }
+
 }
 
 

package/data-dive/dives/dive-runs.ts

@@ -184,7 +184,7 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
             // inputs and outputs row
             col.div('.tt-flex.collapsible.gap.tt-form', row => {
                 // inputs
-                row.div('.tt-flex.column.shrink.dd-dive-run-inputs', col => {
+                row.div('.tt-flex.column.dd-dive-run-inputs', col => {
                     for (const filter of this.filters) {
                         this.renderInput(col, filter)
                     }
@@ -229,23 +229,24 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
         const res = this.queryResults[query.id]
         const status = res?.status || 'pending'
 
-        parent.div('.query-run', status, row => {
-            row.i(statusIcons[status])
-            row.div('.name').text(query.name)
+        parent.div('.query-run', status, runView => {
+            runView.div('.tt-flex.gap.align-center', row => {
+                row.i(statusIcons[status])
+                row.div('.name').text(query.name)
+            })
             if (res?.status == 'error') {
-                row.div('.tt-bubble.alert').text(res.message || "Error!")
+                runView.div('.tt-bubble.alert').text(res.message || "Error!")
             }
             else if (res?.message?.length) {
-                row.div('.details').text(res.message)
+                runView.div('.details').text(res.message)
             }
         })
     }
 
     renderFileOutput(parent: DivTag, fileOutput: RunFileOutput) {
         parent.a('.file-output', {href: fileOutput.url}, row => {
-            row.i('.glyp-file_spreadsheet')
-            row.div('.name').text(fileOutput.name)
-            row.div('.details.glyp-download').text("Click to download")
+            row.div('.name.glyp-file_spreadsheet.with-icon').text(fileOutput.name)
+            row.div('.details.glyp-download.with-icon').text("Click to download")
         })
     }
 

package/package.json

@@ -4,7 +4,7 @@
   "files": [
     "*"
   ],
-  "version": "4.24.0",
+  "version": "4.24.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/Terrier-Tech/terrier-engine"

package/terrier/schedules.ts

@@ -166,6 +166,32 @@ export class RegularScheduleForm extends TerrierFormPart<CombinedRegularSchedule
 
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+// Display
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Generate an english description of the given regular schedule.
+ * @param schedule
+ */
+function describeRegular(schedule: CombinedRegularSchedule): string {
+    const timeString = dayjs().hour(parseInt(schedule.hour_of_day || '0')).format('h A')
+    switch (schedule.schedule_type) {
+        case 'none':
+            return "Unscheduled"
+        case 'daily':
+            return `Daily at ${timeString}`
+        case 'weekly':
+            return `Every ${inflection.titleize(schedule.day_of_week || 'sunday')} at ${timeString}`
+        case 'monthly':
+            return `Every ${inflection.ordinalize(schedule.day_of_month || '1')} of the month at ${timeString}`
+        default:
+            throw `Invalid schedule type: ${schedule.schedule_type}`
+    }
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // Export
 ////////////////////////////////////////////////////////////////////////////////
@@ -173,7 +199,8 @@ export class RegularScheduleForm extends TerrierFormPart<CombinedRegularSchedule
 const Schedules = {
     DaysOfWeek,
     DaysOfMonth,
-    HoursOfDay
+    HoursOfDay,
+    describeRegular
 }
 export default Schedules