terrier-engine 4.7.5 → 4.7.7

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

@@ -12,6 +12,8 @@ import {DiveSettingsModal} from "./dive-settings"
 import DdSession from "../dd-session"
 import Messages from "tuff-core/messages"
 import Arrays from "tuff-core/arrays"
+import TerrierPart from "../../terrier/parts/terrier-part"
+import {DiveRunModal} from "./dive-runs"
 
 const log = new Logger("DiveList")
 
@@ -20,43 +22,32 @@ const log = new Logger("DiveList")
 // List
 ////////////////////////////////////////////////////////////////////////////////
 
-export class DiveListPage extends PagePart<{}> {
+export type DiveListState = {
+    mode: 'editor' | 'readonly' // whether or not to allow editing or simply viewing dives
+}
 
-    newGroupKey = Messages.untypedKey()
-    editGroupKey = Messages.typedKey<{id: string}>()
-    newDiveKey = Messages.typedKey<{group_id: string}>()
-    editDiveKey = Messages.typedKey<{id: string}>()
+/**
+ * Show a list of all dive groups and dives that match the given state.
+ */
+export class DiveListPart extends TerrierPart<DiveListState> {
+
+    editGroupKey = Messages.typedKey<{ id: string }>()
+    newDiveKey = Messages.typedKey<{ group_id: string }>()
+    editDiveKey = Messages.typedKey<{ id: string }>()
+    runDiveKey = Messages.typedKey<{ id: string }>()
 
     session!: DdSession
     result!: DiveListResult
     schema!: SchemaDef
     groupMap: Record<string, DdDiveGroup> = {}
-    diveMap: Record<string,DdDive> = {}
+    diveMap: Record<string, DdDive> = {}
+
 
     async init() {
-        this.setTitle("Data Dive")
-        this.setIcon('glyp-data_dives')
 
         this.schema = await Schema.get()
         this.session = await DdSession.get()
 
-        this.mainContentWidth = 'wide'
-
-        this.addAction({
-            title: "New Group",
-            icon: 'glyp-plus_outline',
-            click: {key: this.newGroupKey}
-        }, 'tertiary')
-
-        this.onClick(this.newGroupKey, _ => {
-            log.info("Showing new dive group model")
-            const newGroup = {name: '', group_types: []}
-            this.app.showModal(GroupEditorModal, {session: this.session,
-                group: newGroup,
-                callback: _ => this.reload()
-            })
-        })
-
         this.onClick(this.editGroupKey, m => {
             log.info(`Edit group ${m.data.id}`)
             const group = this.groupMap[m.data.id]
@@ -66,8 +57,7 @@ export class DiveListPage extends PagePart<{}> {
                     group: group as UnpersistedDdDiveGroup,
                     callback: _ => this.reload()
                 })
-            }
-            else {
+            } else {
                 this.alertToast(`No group with id ${m.data.id}`)
             }
         })
@@ -91,13 +81,22 @@ export class DiveListPage extends PagePart<{}> {
             if (dive) {
                 log.info(`Editing settings for dive: ${dive.name}`)
                 this.app.showModal(DiveSettingsModal, {schema: this.schema, dive, session: this.session})
+            } else {
+                log.warn(`No dive with id ${m.data.id}`)
             }
-            else {
+        })
+
+        this.onClick(this.runDiveKey, m => {
+            const dive = this.diveMap[m.data.id] as DdDive
+            if (dive) {
+                log.info(`Running dive ${dive.name}`)
+                this.app.showModal(DiveRunModal, {dive})
+            } else {
                 log.warn(`No dive with id ${m.data.id}`)
             }
         })
 
-        await this.reload()
+        this.reload().then()
     }
 
     async reload() {
@@ -109,7 +108,7 @@ export class DiveListPage extends PagePart<{}> {
         this.dirty()
     }
 
-    renderContent(parent: PartTag): void {
+    render(parent: PartTag): any {
 
         const groupedDives = Arrays.groupBy(this.result.dives, 'dd_dive_group_id')
 
@@ -122,7 +121,7 @@ export class DiveListPage extends PagePart<{}> {
     }
 
     renderGroupPanel(parent: PartTag, group: DdDiveGroup, dives: DdDive[]) {
-        Fragments.panel(this.theme)
+        const panel = Fragments.panel(this.theme)
             .title(group.name)
             .icon((group.icon || 'glyp-data_dives') as IconName)
             .classes('group')
@@ -132,36 +131,99 @@ export class DiveListPage extends PagePart<{}> {
                     this.renderDiveRow(content, dive)
                 }
             })
-            .addAction({
+        if (this.state.mode == 'editor') {
+            panel.addAction({
                 title: "New Dive",
                 icon: 'glyp-data_dive',
                 click: {key: this.newDiveKey, data: {group_id: group.id}}
             }, 'secondary')
-            .addAction({
+            panel.addAction({
                 icon: 'glyp-settings',
                 click: {key: this.editGroupKey, data: {id: group.id}}
             }, 'tertiary')
-            .render(parent)
+        }
+        panel.render(parent)
     }
 
     renderDiveRow(parent: PartTag, dive: DdDive) {
         parent.div('.dive', row => {
-            row.a({href: routes.editor.path({id: dive.id})}, a => {
-                if (dive.visibility == 'private') {
-                    a.i('.glyp-privacy')
-                        .data({tooltip: "Private Dive"})
-                }
-                else {
-                    a.i('.glyp-data_dive')
-                }
-                a.span().text(dive.name)
-            }).data({tooltip: "Open Editor"})
-            row.a('.icon-only', a => {
-                a.i('.glyp-settings')
-            }).data({tooltip: "Dive Settings"})
-              .emitClick(this.editDiveKey, {id: dive.id})
+            if (this.state.mode == 'editor') {
+                row.a({href: routes.editor.path({id: dive.id})}, a => {
+                    if (dive.visibility == 'private') {
+                        a.i('.glyp-privacy')
+                            .data({tooltip: "Private Dive"})
+                    } else {
+                        a.i('.glyp-data_dive')
+                            .data({tooltip: "Public Dive"})
+                    }
+                    a.span().text(dive.name)
+                }).data({tooltip: "Open Editor"})
+                row.a('.icon-only', a => {
+                    a.i('.glyp-settings')
+                }).data({tooltip: "Dive Settings"})
+                    .emitClick(this.editDiveKey, {id: dive.id})
+            }
+            else {
+                // readonly mode
+                row.a(a => {
+                    if (dive.visibility == 'private') {
+                        a.i('.glyp-privacy')
+                            .data({tooltip: "Private Dive"})
+                    } else {
+                        a.i('.glyp-data_dive')
+                            .data({tooltip: "Public Dive"})
+                    }
+                    a.span().text(dive.name)
+                })
+                    .data({tooltip: "Run Dive"})
+                    .emitClick(this.runDiveKey, {id: dive.id})
+            }
         })
     }
 
 }
 
+
+////////////////////////////////////////////////////////////////////////////////
+// Page
+////////////////////////////////////////////////////////////////////////////////
+
+export class DiveListPage extends PagePart<{}> {
+
+    listPart!: DiveListPart
+    newGroupKey = Messages.untypedKey()
+
+    async init() {
+        this.setTitle("Data Dive")
+        this.setIcon('glyp-data_dives')
+        this.mainContentWidth = 'wide'
+
+        this.listPart = this.makePart(DiveListPart, {mode: 'editor'})
+
+        this.addAction({
+            title: "New Group",
+            icon: 'glyp-plus_outline',
+            click: {key: this.newGroupKey}
+        }, 'tertiary')
+
+        // we're handling this here instead of in the list part because, as of 9/15/23,
+        // attach: 'passive' doesn't seem to work for click handlers,
+        // so this handler never got called when it was inside the list part
+        this.onClick(this.newGroupKey, _ => {
+            log.info("Showing new dive group model")
+            const newGroup = {name: '', group_types: []}
+            this.app.showModal(GroupEditorModal, {
+                session: this.listPart.session,
+                group: newGroup,
+                callback: _ => this.listPart.reload()
+            })
+        })
+    }
+
+    renderContent(parent: PartTag): void {
+        parent.part(this.listPart)
+    }
+
+
+}
+

package/data-dive/queries/query-editor.ts

@@ -120,9 +120,18 @@ class PreviewPart extends ContentPart<SubEditorState> {
 
     renderContent(parent: PartTag) {
         if (this.result) {
-            parent.div('.table-container', col => {
-                Queries.renderPreview(col, this.result!)
-            })
+            if (this.result.columns?.length) {
+                parent.div('.table-container', col => {
+                    Queries.renderPreview(col, this.result!)
+                })
+            }
+            else {
+                // empty query
+                parent.div('.dd-hint-container', hintContainer => {
+                    hintContainer.div('.dd-hint.centered.glyp-columns')
+                        .text("Select at least one column")
+                })
+            }
         }
         else {
             parent.a('.tt-button.stretch', a => {

package/package.json

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

package/terrier/fragments.ts

@@ -90,11 +90,11 @@ export class PanelFragment extends ContentFragment {
         return parent.div(this.prefix, panel => {
             if (this._title?.length) {
                 panel.div(`.${noTtPrefix}-header`, header => {
-                    header.h2(h2 => {
+                    header.h3(h3 => {
                         if (this._icon) {
-                            this.theme.renderIcon(h2, this._icon, 'link')
+                            this.theme.renderIcon(h3, this._icon, 'link')
                         }
-                        h2.div('.title', {text: this._title})
+                        h3.div('.title', {text: this._title})
                     })
                     this.theme.renderActions(header, this.actions.tertiary)
                 })