terrier-engine 4.4.13 → 4.4.19

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

@@ -58,8 +58,8 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
 
         this.schema = await Schema.get()
 
-        // progress is # queries + 1 for the output
-        const total = (this.state.dive.query_data?.queries?.length || 0) + 1
+        // progress is # queries +1 for creating and run and +1 for the output
+        const total = (this.state.dive.query_data?.queries?.length || 0) + 2
         this.progressBar = this.makePart(ProgressBarPart, {total})
 
         // initialize the inputs
@@ -111,6 +111,7 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
     }
 
     async createRun() {
+        this.progressBar.setProgress(0, 'primary')
         const newRun: UnpersistedDdDiveRun = {
             dd_dive_id: this.state.dive.id,
             status: 'initial',
@@ -125,12 +126,12 @@ export class DiveRunModal extends ModalPart<{dive: DdDive }> {
         } else {
             this.alertToast(`Error creating dive run: ${res.message}`)
         }
+        this.progressBar.increment()
         this.dirty()
     }
 
     beginStreaming(run: DdDiveRun) {
         this.run = run
-        this.progressBar.setProgress(0, 'primary')
         Api.stream(`/data_dive/stream_run/${this.run.id}`)
             .on<RunQueryResult>('query_result', res => {
                 this.queryResults[res.id] = res

package/package.json

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

package/terrier/forms.ts

@@ -3,8 +3,7 @@ import {strings} from "tuff-core"
 import {DbErrors} from "./db-client"
 import {PartTag} from "tuff-core/parts"
 import {InputTag, InputTagAttrs} from "tuff-core/html"
-import TerrierPart from "./parts/terrier-part";
-import {an} from "vitest/dist/types-ad1c3f45";
+import TerrierPart from "./parts/terrier-part"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Options
@@ -64,7 +63,7 @@ export class TerrierFormFields<T extends FormPartData> extends FormFields<T> {
      */
     renderErrorBubble(parent: PartTag) {
         if (this.errors) {
-            (this.part as TerrierPart<an>).renderErrorBubble(parent, this.errors)
+            (this.part as TerrierPart<any>).renderErrorBubble(parent, this.errors)
         }
     }
 }

package/terrier/schema.ts

@@ -1,10 +1,15 @@
 import Api from "./api"
-import inflection from "inflection";
+import inflection from "inflection"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Schema Definitions
 ////////////////////////////////////////////////////////////////////////////////
 
+/**
+ * Possible visibility for models and columns.
+ */
+export type MetaVisibility = 'common' | 'uncommon' | 'never'
+
 /**
  * Definition for a single column in the schema.
  */
@@ -15,6 +20,7 @@ export type ColumnDef = {
     type: string
     possible_values?: string[]
     default?: string
+    visibility?: MetaVisibility
 }
 
 /**
@@ -34,6 +40,7 @@ export type HasManyDef = {
     model: string
 }
 
+
 /**
  * Definition for a single model in the schema.
  */
@@ -45,7 +52,7 @@ export type ModelDef = {
     has_many: Record<string, HasManyDef>
     metadata?: {
         description?: string
-        common?: boolean
+        visibility?: MetaVisibility
     }
 }
 
@@ -96,7 +103,7 @@ function belongsToDisplay(belongsTo: BelongsToDef): string {
  * @param schema
  */
 function commonModels(schema: SchemaDef): ModelDef[] {
-    return Object.values(schema.models).filter(m => m.metadata?.common)
+    return Object.values(schema.models).filter(m => m.metadata?.visibility == 'common')
 }
 
 /**
@@ -104,7 +111,9 @@ function commonModels(schema: SchemaDef): ModelDef[] {
  * @param schema
  */
 function uncommonModels(schema: SchemaDef): ModelDef[] {
-    return Object.values(schema.models).filter(m => !(m.metadata?.common))
+    return Object.values(schema.models).filter(m => {
+        return !m.metadata?.visibility || m.metadata?.visibility == 'uncommon'
+    })
 }