terrier-engine 4.35.0 → 4.36.1

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

@@ -6,7 +6,6 @@ import QueryEditor from "../queries/query-editor"
 import {Logger} from "tuff-core/logging"
 import QueryForm from "../queries/query-form"
 import {TabContainerPart} from "../../terrier/tabs"
-import PagePart from "../../terrier/parts/page-part"
 import ContentPart from "../../terrier/parts/content-part"
 import {ModalPart} from "../../terrier/modals"
 import {DdDive} from "../gen/models"
@@ -21,6 +20,7 @@ import {FormFields} from "tuff-core/forms"
 import Fragments from "../../terrier/fragments"
 import {DiveDeliveryForm} from "./dive-delivery"
 import DivePlotList from "../plots/dive-plot-list"
+import {DivePage} from "./dive-page"
 
 const log = new Logger("DiveEditor")
 
@@ -193,7 +193,7 @@ export default class DiveEditor extends ContentPart<DiveEditorState> {
 // Editor Page
 ////////////////////////////////////////////////////////////////////////////////
 
-export class DiveEditorPage extends PagePart<{id: string}> {
+export class DiveEditorPage extends DivePage<{id: string}> {
 
     editor!: DiveEditor
     session!: DdSession
@@ -223,6 +223,8 @@ export class DiveEditorPage extends PagePart<{id: string}> {
             icon: 'glyp-data_dive'
         })
 
+        this.addDocsAction()
+
         this.addToolbarInput('show-hints', 'checkbox', {
             title: "Hints",
             icon: 'glyp-hint',
@@ -424,3 +426,4 @@ class DuplicateQueryModal extends ModalPart<DuplicateQueryState> {
         })
     }
 }
+

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

@@ -1,5 +1,4 @@
 import {Logger} from "tuff-core/logging"
-import PagePart from "../../terrier/parts/page-part"
 import {PartTag} from "tuff-core/parts"
 import Schema, {SchemaDef} from "../../terrier/schema"
 import {DdDive, DdDiveGroup, UnpersistedDdDive, UnpersistedDdDiveGroup} from "../gen/models"
@@ -16,6 +15,7 @@ import TerrierPart from "../../terrier/parts/terrier-part"
 import {DiveRunModal} from "./dive-runs"
 import * as inflection from "inflection"
 import Schedules from "../../terrier/schedules"
+import {DivePage} from "./dive-page"
 
 const log = new Logger("DiveList")
 
@@ -204,7 +204,7 @@ export class DiveListPart extends TerrierPart<DiveListState> {
 // Page
 ////////////////////////////////////////////////////////////////////////////////
 
-export class DiveListPage extends PagePart<{}> {
+export class DiveListPage extends DivePage<{}> {
 
     listPart!: DiveListPart
     newGroupKey = Messages.untypedKey()
@@ -216,6 +216,8 @@ export class DiveListPage extends PagePart<{}> {
 
         this.listPart = this.makePart(DiveListPart, {mode: 'editor'})
 
+        this.addDocsAction()
+
         this.addAction({
             title: "New Group",
             icon: 'glyp-plus_outline',

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

@@ -0,0 +1,19 @@
+import PagePart from "../../terrier/parts/page-part"
+import Messages from "tuff-core/messages"
+
+
+export abstract class DivePage<T> extends PagePart<T> {
+
+    static docsKey = Messages.untypedKey()
+
+    addDocsAction() {
+
+        this.addAction({
+            title: 'Docs',
+            icon: 'glyp-help',
+            click: {key: DivePage.docsKey},
+            classes: ['data-dive-docs']
+        }, 'tertiary')
+    }
+
+}

package/data-dive/queries/filters.ts

@@ -30,19 +30,25 @@ type BaseFilter = {
     edit_label?: string
 }
 
-const directOperators = ['eq', 'ne', 'ilike', 'lt', 'gt', 'lte', 'gte'] as const
+const directOperators = ['eq', 'ne', 'ilike', 'lt', 'gt', 'lte', 'gte', 'contains', 'excludes'] as const
 export type DirectOperator = typeof directOperators[number]
 
 /**
  * Computes the operator options for the given column type.
  * @param type
  */
-function operatorOptions(type: string): SelectOptions {
+function operatorOptions(colDef?: ColumnDef): SelectOptions {
+    const type = colDef?.type || 'text'
     let operators: DirectOperator[] = ['eq', 'ne'] // equality is the only thing we can assume for any type
     switch (type) {
         case 'text':
         case 'string':
-            operators = ['eq', 'ne', 'ilike']
+            if (colDef?.array) {
+                operators = ['contains', 'excludes']
+            }
+            else {
+                operators = ['eq', 'ne', 'ilike']
+            }
             break
         case 'float':
         case 'integer':
@@ -111,7 +117,7 @@ function operatorDisplay(op: DirectOperator): string {
         case 'gte':
             return '≥'
         default:
-            return '?'
+            return op
     }
 }
 
@@ -402,7 +408,7 @@ class DirectFilterEditor extends FilterFields<DirectFilter> {
             col.div('.tt-readonly-field', {text: this.data.column})
         })
         parent.div('.operator', col => {
-            const opts = operatorOptions(this.columnDef?.type || 'text')
+            const opts = operatorOptions(this.columnDef)
             this.select(col, 'operator', opts)
         })
         parent.div('.filter', col => {
@@ -630,7 +636,8 @@ class AddFilterDropdown extends Dropdown<{modelDef: ModelDef, callback: AddFilte
                         return this.state.callback({id, filter_type: 'date_range', column, range: {period: 'year', relative: 0}})
                     default: // direct
                         const colType = colDef.type == 'number' || colDef.type == 'cents' ? colDef.type : 'text'
-                        return this.state.callback({id, filter_type: 'direct', column, column_type: colType, operator: 'eq', value: '0'})
+                        const defaultValue = colType == 'text' ? '' : '0'
+                        return this.state.callback({id, filter_type: 'direct', column, column_type: colType, operator: 'eq', value: defaultValue})
                 }
             }
             else {

package/package.json

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

package/terrier/list-viewer.ts

@@ -87,12 +87,11 @@ export class ListViewerDetailsContext<T extends ListItem> {
      * @param state
      */
     makePart<PartType extends Part<StateType>, StateType>(partType: PartConstructor<PartType, StateType>, state: StateType) {
-        if (this.viewer.layout == 'side') {
-            this.part = this.viewer.sideContainerPart.makePart(partType, state)
-        }
-        else {
-            this.part = this.viewer.currentItemPart?.makePart(partType, state)
-        }
+        const parentPart = (this.viewer.layout == 'side')
+            ? this.viewer.sideContainerPart
+            : this.viewer.currentItemPart
+        if (this.part) parentPart?.removeChild(this.part)
+        this.part = parentPart?.makePart(partType, state)
     }
 
     /**