terrier-engine 4.37.0 → 4.37.2

package/data-dive/queries/columns.ts

@@ -124,18 +124,15 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
 
     modelDef!: ModelDef
     table!: TableRef
-    columnStates: ColumnState[] = []
+    columnEditors: Record<string, ColumnEditor> = {}
     columnCount = 0
 
     tableFields!: FormFields<TableRef>
 
-    updateColumnEditors() {
-        this.assignCollection('columns', ColumnEditor, this.columnStates)
-    }
-
-    addState(col: ColumnRef) {
+    addEditor(col: ColumnRef) {
         this.columnCount += 1
-        this.columnStates.push({schema: this.state.schema, columnsEditor: this, id: `column-${this.columnCount}`, column: col})
+        const state = {schema: this.state.schema, columnsEditor: this, id: `column-${this.columnCount}`, column: col}
+        this.columnEditors[state.id] = this.makePart(ColumnEditor, state)
     }
 
 
@@ -148,9 +145,8 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
         // initialize the columns states
         const columns: ColumnRef[] = this.table.columns || []
         for (const col of columns) {
-            this.addState(col)
+            this.addEditor(col)
         }
-        this.updateColumnEditors()
 
         this.setTitle(`Columns for ${this.state.tableView.displayName}`)
         this.setIcon('glyp-columns')
@@ -172,7 +168,7 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
         })
 
         this.onClick(removeKey, m => {
-            this.removeColumn(m.data.id)
+            this.removeEditor(m.data.id)
         })
 
         this.onClick(addSingleKey, m => {
@@ -193,16 +189,20 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
         const colDef = this.modelDef.columns[col]
         log.info(`Add column ${col}`, colDef)
         if (colDef) {
-            this.addState({name: colDef.name})
-            this.updateColumnEditors()
+            this.addEditor({name: colDef.name})
             this.dirty()
         } else {
             alert(`Unknown column name '${col}'`)
         }
     }
 
+    get currentEditorStates(): ColumnState[] {
+        return Object.values(this.columnEditors).map(e => e.state)
+    }
+
     get currentColumnNames(): Set<string> {
-        return new Set(this.columnStates.map(s => s.column.name))
+        const states = this.currentEditorStates
+        return new Set(states.map(s => s.column.name))
     }
 
     renderContent(parent: PartTag): void {
@@ -223,8 +223,11 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
                 header.div('.function').label({text: "Function"})
                 header.div('.group-by').label({text: "Group By?"})
             })
-            this.renderCollection(table, 'columns')
-                .class('dd-editor-row-container')
+            table.div('dd-editor-row-container', container => {
+                for (const id of Object.keys(this.columnEditors)) {
+                    container.part(this.columnEditors[id])
+                }
+            })
         })
 
         // common column quick links
@@ -258,17 +261,21 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
 
     }
 
-    removeColumn(id: string) {
-        const col = Arrays.find(this.columnStates, c => c.id == id)
-        if (col) {
-            this.columnStates = Arrays.without(this.columnStates, col)
-            this.updateColumnEditors()
+    removeEditor(id: string) {
+        const editor = this.columnEditors[id]
+        if (editor) {
+            log.info(`Removing column ${id}`)
+            this.removeChild(editor)
+            delete this.columnEditors[id]
+        }
+        else {
+            log.warn(`No editor for column ${id}`)
         }
     }
 
     async serialize(): Promise<ColumnRef[]> {
-        const parts = this.getCollectionParts("columns")
-        return await Promise.all(parts.map(async part => {
+        const editors = Object.values(this.columnEditors)
+        return await Promise.all(editors.map(async part => {
             return await (part as ColumnEditor).serialize()
         }))
     }
@@ -296,8 +303,9 @@ export class ColumnsEditorModal extends ModalPart<ColumnsEditorState> {
         Validation.validateQuery(query)
 
         // copy the column errors over
+        const editors = Object.values(this.columnEditors)
         for (let i = 0; i < columns.length; i++) {
-            this.columnStates[i].column.errors = columns[i].errors
+            editors[i].state.column.errors = columns[i].errors
         }
 
         this.dirty()

package/package.json

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

package/terrier/api.ts

@@ -115,15 +115,16 @@ async function get<ResponseType>(url: string, params: QueryParams | Record<strin
  * @param url the URL of the API endpoint
  * @param body the body of the request (will be transmitted as JSON)
  */
-async function safePost<ResponseType>(url: string, body: Record<string, unknown>): Promise<ResponseType> {
+async function safePost<ResponseType>(url: string, body: Record<string, unknown> | FormData): Promise<ResponseType> {
     log.debug(`Safe posting to ${url} with body`, body)
-    const response = await apiRequest<ResponseType>(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(body)
-    })
+    const config: RequestInit = { method: 'POST' }
+    if (body instanceof FormData) {
+        config.body = body
+    } else {
+        config.body = JSON.stringify(body)
+        config.headers = { 'Content-Type': 'application/json' }
+    }
+    const response = await apiRequest<ResponseType>(url, config)
     if (response.status == 'error') {
         throw new ApiException(response.message)
     }
@@ -139,7 +140,7 @@ async function safePost<ResponseType>(url: string, body: Record<string, unknown>
  */
 async function post<ResponseType>(url: string, body: Record<string, unknown> | FormData): Promise<ResponseType & ApiResponse> {
     log.debug(`Posting to ${url} with body`, body)
-    const config = { method: 'POST' } as RequestInit
+    const config: RequestInit = { method: 'POST' }
     if (body instanceof FormData) {
         config.body = body
     } else {