terrier-engine 4.7.3 → 4.7.5

package/data-dive/queries/columns.ts

@@ -11,6 +11,7 @@ import {Dropdown} from "../../terrier/dropdowns"
 import DiveEditor from "../dives/dive-editor"
 import Messages from "tuff-core/messages"
 import Arrays from "tuff-core/arrays"
+import {ColumnValidationError} from "./validation"
 
 const log = new Logger("Columns")
 
@@ -57,9 +58,25 @@ export type ColumnRef = {
     alias?: string
     grouped?: boolean
     function?: AggFunction | DateFunction
+    errors?: ColumnValidationError[]
 }
 
 
+/**
+ * Computes the name of the resulting select clause.
+ * @param table
+ * @param col
+ */
+function computeSelectName(table: TableRef, col: ColumnRef): string {
+    if (col.alias?.length) {
+        return col.alias
+    } else if (table.prefix?.length) {
+        return `${table.prefix}${col.name}`
+    } else {
+        return col.name
+    }
+}
+
 
 ////////////////////////////////////////////////////////////////////////////////
 // Rendering
@@ -405,7 +422,8 @@ class SelectColumnsDropdown extends Dropdown<{modelDef: ModelDef, callback: Sele
 
 const Columns = {
     render,
-    functionType
+    functionType,
+    computeSelectName
 }
 
 export default Columns

package/data-dive/queries/filters.ts

@@ -13,6 +13,7 @@ import Format from "../../terrier/format"
 import DiveEditor from "../dives/dive-editor"
 import Messages from "tuff-core/messages"
 import Arrays from "tuff-core/arrays"
+import {SelectOptions} from "tuff-core/forms"
 
 const log = new Logger("Filters")
 
@@ -27,8 +28,33 @@ type BaseFilter = {
     edit_label?: string
 }
 
-export const DirectOperators = ['eq', 'ne', 'ilike', 'lt', 'gt', 'lte', 'gte'] as const
-export type DirectOperator = typeof DirectOperators[number]
+const directOperators = ['eq', 'ne', 'ilike', 'lt', 'gt', 'lte', 'gte'] as const
+export type DirectOperator = typeof directOperators[number]
+
+/**
+ * Computes the operator options for the given column type.
+ * @param type
+ */
+function operatorOptions(type: string): SelectOptions {
+    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']
+            break
+        case 'float':
+        case 'integer':
+        case 'cents':
+            operators = ['eq', 'ne', 'lt', 'gt', 'lte', 'gte']
+            break
+    }
+    return operators.map(op => {
+        return {
+            value: op,
+            title: operatorDisplay(op)
+        }
+    })
+}
 
 export type DirectFilter = BaseFilter & {
     filter_type: 'direct'
@@ -73,7 +99,7 @@ function operatorDisplay(op: DirectOperator): string {
         case 'ne':
             return '≠'
         case 'ilike':
-            return '~'
+            return '≈'
         case 'lt':
             return '<'
         case 'lte':
@@ -369,10 +395,8 @@ class DirectFilterEditor extends FilterEditor<DirectFilter> {
             col.div('.tt-readonly-field', {text: this.state.column})
         })
         parent.div('.operator', col => {
-            const operatorOptions = DirectOperators.map(op => {
-                return {title: operatorDisplay(op), value: op}
-            })
-            this.select(col, 'operator', operatorOptions)
+            const opts = operatorOptions(this.columnDef?.type || 'text')
+            this.select(col, 'operator', opts)
         })
         parent.div('.filter', col => {
             switch (this.state.column_type) {

package/data-dive/queries/queries.ts

@@ -11,6 +11,7 @@ import inflection from "inflection"
 import Messages from "tuff-core/messages"
 import Strings from "tuff-core/strings"
 import Arrays from "tuff-core/arrays"
+import {ColumnRef} from "./columns"
 
 const log = new Logger("Queries")
 
@@ -28,13 +29,41 @@ export type Query = {
 
 
 ////////////////////////////////////////////////////////////////////////////////
-// Validation
+// Utilities
+////////////////////////////////////////////////////////////////////////////////
+
+type ColumnFunction = (table: TableRef, col: ColumnRef) => any
+
+function eachColumnForTable(table: TableRef, fn: ColumnFunction) {
+    if (table.columns) {
+        for (const col of table.columns) {
+            fn(table, col)
+        }
+    }
+    if (table.joins) {
+        for (const joinedTable of Object.values(table.joins)) {
+            eachColumnForTable(joinedTable, fn)
+        }
+    }
+}
+
+/**
+ * Recursively iterates over all columns in a query.
+ * @param query
+ */
+function eachColumn(query: Query, fn: ColumnFunction) {
+    eachColumnForTable(query.from, fn)
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Server-Side Validation
 ////////////////////////////////////////////////////////////////////////////////
 
 /**
  * Type for the response to a server-side query validation.
  */
-export type QueryValidation = ApiResponse & {
+export type QueryServerValidation = ApiResponse & {
     query: Query
     sql?: string
     sql_html?: string
@@ -47,8 +76,8 @@ export type QueryValidation = ApiResponse & {
  * Has the server validate the given query and generate SQL for it.
  * @param query
  */
-async function validate(query: Query): Promise<QueryValidation> {
-    return await api.post<QueryValidation>("/data_dive/validate_query.json", {query})
+async function validate(query: Query): Promise<QueryServerValidation> {
+    return await api.post<QueryServerValidation>("/data_dive/validate_query.json", {query})
 }
 
 
@@ -258,6 +287,7 @@ export class QueryModelPicker extends TerrierPart<QueryModelPickerState> {
 ////////////////////////////////////////////////////////////////////////////////
 
 const Queries = {
+    eachColumn,
     validate,
     preview,
     renderPreview

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

@@ -1,5 +1,5 @@
 import {PartTag} from "tuff-core/parts"
-import Queries, {Query, QueryResult, QueryValidation} from "./queries"
+import Queries, {Query, QueryResult, QueryServerValidation} from "./queries"
 import Tables, {FromTableView} from "./tables"
 import {Logger} from "tuff-core/logging"
 import QueryForm, {QuerySettings, QuerySettingsColumns} from "./query-form"
@@ -9,6 +9,7 @@ import Html from "tuff-core/html"
 import ContentPart from "../../terrier/parts/content-part"
 import {TabContainerPart} from "../../terrier/tabs"
 import Messages from "tuff-core/messages"
+import Validation, {QueryClientValidation} from "./validation"
 
 const log = new Logger("QueryEditor")
 
@@ -17,7 +18,7 @@ const log = new Logger("QueryEditor")
 // Keys
 ////////////////////////////////////////////////////////////////////////////////
 
-const validationKey = Messages.typedKey<QueryValidation>()
+const validationKey = Messages.typedKey<QueryServerValidation>()
 
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -60,9 +61,9 @@ class SettingsPart extends ContentPart<SubEditorState> {
 
 class SqlPart extends ContentPart<SubEditorState> {
 
-    validation?: QueryValidation
+    validation?: QueryServerValidation
 
-    setValidation(validation: QueryValidation) {
+    setValidation(validation: QueryServerValidation) {
         this.validation = validation
         this.dirty()
     }
@@ -156,11 +157,13 @@ export default class QueryEditor extends ContentPart<QueryEditorState> {
     settingsPart!: SettingsPart
     sqlPart!: SqlPart
     previewPart!: PreviewPart
+    clientValidation!: QueryClientValidation
 
     updatePreviewKey = Messages.untypedKey()
 
     async init() {
         const query = this.state.query
+        this.clientValidation = Validation.validateQuery(query)
 
         log.info("Initializing query editor", query)
 
@@ -180,7 +183,7 @@ export default class QueryEditor extends ContentPart<QueryEditorState> {
         this.previewPart = this.tabs.upsertTab({key: 'preview', title: 'Preview', icon: 'glyp-table', classes: ['no-padding'], click: {key: this.updatePreviewKey}},
             PreviewPart, {editor: this, query})
 
-        this.tableEditor = this.makePart(FromTableView, {schema: this.state.schema, table: this.state.query.from})
+        this.tableEditor = this.makePart(FromTableView, {schema: this.state.schema, queryEditor: this, table: this.state.query.from})
 
         this.listenMessage(Tables.updatedKey, m => {
             log.info(`Table ${m.data.model} updated`, m.data)
@@ -219,10 +222,14 @@ export default class QueryEditor extends ContentPart<QueryEditorState> {
     }
 
     async validate() {
+        // server-side validation
         const res = await Queries.validate(this.state.query)
         log.info(`Query validated`, res)
         this.emitMessage(validationKey, res)
         this.sqlPart.setValidation(res)
+
+        // client-side validation
+        this.clientValidation = Validation.validateQuery(this.state.query)
         this.dirty()
     }
 

package/data-dive/queries/tables.ts

@@ -11,6 +11,7 @@ import TerrierFormPart from "../../terrier/parts/terrier-form-part"
 import DiveEditor from "../dives/dive-editor"
 import Messages from "tuff-core/messages"
 import Arrays from "tuff-core/arrays"
+import QueryEditor from "./query-editor"
 
 const log = new Logger("Tables")
 
@@ -48,7 +49,9 @@ const updatedKey = Messages.typedKey<TableRef>()
  * Only keep one (the last one traversed) per table/column combination.
  * This means that some filters may clobber others, but I think it will yield
  * the desired result most of the time.
+ * @param schema
  * @param table
+ * @param filters
  */
 function computeFilterInputs(schema: SchemaDef, table: TableRef, filters: Record<string, FilterInput>) {
     for (const f of table.filters || []) {
@@ -67,7 +70,7 @@ function computeFilterInputs(schema: SchemaDef, table: TableRef, filters: Record
 // View
 ////////////////////////////////////////////////////////////////////////////////
 
-export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaDef, table: T }> {
+export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaDef, queryEditor: QueryEditor, table: T }> {
 
     schema!: SchemaDef
     table!: T
@@ -88,7 +91,7 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
         this.modelDef = this.schema.models[this.table.model]
         this.tableName = inflection.titleize(inflection.tableize(this.table.model))
         this.displayName = this.tableName
-        this.updatedJoinedViews()
+        this.updateJoinedViews()
 
         this.onClick(this.editColumnsKey, _ => {
             log.info(`Edit ${this.displayName} Columns`)
@@ -155,7 +158,7 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
                     log.info(`Creating joined table`, newTable)
                     this.table.joins ||= {}
                     this.table.joins[newTable.belongs_to] = newTable
-                    this.updatedJoinedViews()
+                    this.updateJoinedViews()
                 }
                 this.app.showModal(JoinedTableEditorModal, {table, belongsTo, callback, parentTable: this.state.table as TableRef})
             }
@@ -165,9 +168,9 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
     /**
      * Re-generates all views for the joined tables.
      */
-    updatedJoinedViews() {
+    updateJoinedViews() {
         const states = Object.values(this.table.joins || {}).map(table => {
-            return {schema: this.schema, table}
+            return {schema: this.schema, queryEditor: this.state.queryEditor, table}
         })
         this.assignCollection('joined', JoinedTableView, states)
         for (const part of this.getCollectionParts('joined')) {
@@ -242,6 +245,12 @@ export class TableView<T extends TableRef> extends ContentPart<{ schema: SchemaD
                 for (const col of this.table.columns) {
                     section.div('.column.line', line => {
                         Columns.render(line, col)
+                        if (col.errors?.length) {
+                            line.class('error')
+                            for (const error of col.errors) {
+                                line.div('.error-message').text(error.message)
+                            }
+                        }
                     })
                 }
             }

package/data-dive/queries/validation.ts

@@ -0,0 +1,73 @@
+import Queries, {Query} from "./queries"
+import Columns, {ColumnRef} from "./columns"
+
+export type ColumnValidationError = {
+    message: string
+}
+
+export type QueryClientValidation = {
+    columns: ColumnValidationError[]
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Client-Side Validation
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Validates that a query will produce valid SQL.
+ */
+function validateQuery(query: Query): QueryClientValidation {
+
+    const validation: QueryClientValidation = {
+        columns: []
+    }
+
+    function addColumnError(col: ColumnRef, message: string) {
+        const error = {message}
+        col.errors ||= []
+        col.errors.push(error)
+        validation.columns.push(error)
+    }
+
+    const usedNames: Set<string> = new Set<string>()
+
+    let isGrouped = false
+    Queries.eachColumn(query, (table, col) => {
+        // clear the errors
+        col.errors = undefined
+
+        // determine if there's a _group by_ in the query
+        if (col.grouped) {
+            isGrouped = true
+        }
+
+        // each select name should only be used once
+        const selectName = Columns.computeSelectName(table, col)
+        if (usedNames.has(selectName)) {
+            addColumnError(col, `<strong>${selectName}</strong> has already been selected for a different column`)
+        }
+        usedNames.add(selectName)
+    })
+
+    // if the query is grouped, ensure that all other column refs
+    // are either grouped or have an aggregate function
+    if (isGrouped) {
+        Queries.eachColumn(query, (_, col) => {
+            if (!col.grouped && !col.function) {
+                addColumnError(col, `<strong>${col.name}</strong> must be grouped or have an aggregate function`)
+            }
+        })
+    }
+
+    return validation
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Export
+////////////////////////////////////////////////////////////////////////////////
+
+const Validation = {
+    validateQuery
+}
+export default Validation

package/package.json

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

package/terrier/gen/hub-icons.ts

@@ -117,6 +117,14 @@ import EditRaw from '../images/icons/edit.svg?raw'
 // @ts-ignore
 import EditSrc from '../images/icons/edit.svg'
 // @ts-ignore
+import ExistingChildRaw from '../images/icons/existing_child.svg?raw'
+// @ts-ignore
+import ExistingChildSrc from '../images/icons/existing_child.svg'
+// @ts-ignore
+import ExistingParentRaw from '../images/icons/existing_parent.svg?raw'
+// @ts-ignore
+import ExistingParentSrc from '../images/icons/existing_parent.svg'
+// @ts-ignore
 import FeatureRaw from '../images/icons/feature.svg?raw'
 // @ts-ignore
 import FeatureSrc from '../images/icons/feature.svg'
@@ -209,6 +217,14 @@ import MinusRaw from '../images/icons/minus.svg?raw'
 // @ts-ignore
 import MinusSrc from '../images/icons/minus.svg'
 // @ts-ignore
+import NewChildRaw from '../images/icons/new_child.svg?raw'
+// @ts-ignore
+import NewChildSrc from '../images/icons/new_child.svg'
+// @ts-ignore
+import NewParentRaw from '../images/icons/new_parent.svg?raw'
+// @ts-ignore
+import NewParentSrc from '../images/icons/new_parent.svg'
+// @ts-ignore
 import NightRaw from '../images/icons/night.svg?raw'
 // @ts-ignore
 import NightSrc from '../images/icons/night.svg'
@@ -470,6 +486,14 @@ export const IconDefs: Record<HubIconName,{ raw: string, src: string }> = {
         raw: EditRaw,
         src: EditSrc,
     },
+    "hub-existing_child": {
+        raw: ExistingChildRaw,
+        src: ExistingChildSrc,
+    },
+    "hub-existing_parent": {
+        raw: ExistingParentRaw,
+        src: ExistingParentSrc,
+    },
     "hub-feature": {
         raw: FeatureRaw,
         src: FeatureSrc,
@@ -562,6 +586,14 @@ export const IconDefs: Record<HubIconName,{ raw: string, src: string }> = {
         raw: MinusRaw,
         src: MinusSrc,
     },
+    "hub-new_child": {
+        raw: NewChildRaw,
+        src: NewChildSrc,
+    },
+    "hub-new_parent": {
+        raw: NewParentRaw,
+        src: NewParentSrc,
+    },
     "hub-night": {
         raw: NightRaw,
         src: NightSrc,
@@ -713,7 +745,7 @@ export const IconDefs: Record<HubIconName,{ raw: string, src: string }> = {
 }
 
 const Names = [
-    'hub-active', 'hub-admin', 'hub-archive', 'hub-arrow_down', 'hub-arrow_left', 'hub-arrow_right', 'hub-arrow_up', 'hub-assign', 'hub-attachment', 'hub-back', 'hub-badge', 'hub-board', 'hub-branch', 'hub-bug', 'hub-calculator', 'hub-checkmark', 'hub-close', 'hub-clypboard', 'hub-comment', 'hub-complete', 'hub-dashboard', 'hub-data_pull', 'hub-data_update', 'hub-database', 'hub-day', 'hub-delete', 'hub-documentation', 'hub-edit', 'hub-feature', 'hub-flex', 'hub-forward', 'hub-github', 'hub-history', 'hub-home', 'hub-image', 'hub-inbox', 'hub-info', 'hub-internal', 'hub-issue', 'hub-lane', 'hub-lane_asap', 'hub-lane_days', 'hub-lane_hours', 'hub-lane_weeks', 'hub-lanes_board', 'hub-level_complete', 'hub-level_highway', 'hub-level_on_ramp', 'hub-level_parking', 'hub-metrics', 'hub-minus', 'hub-night', 'hub-origin', 'hub-pending', 'hub-plus', 'hub-post', 'hub-posts', 'hub-pr_closed', 'hub-pr_merged', 'hub-pr_open', 'hub-prioritized', 'hub-project', 'hub-question', 'hub-reaction', 'hub-read_mail', 'hub-recent', 'hub-refresh', 'hub-related_posts', 'hub-request', 'hub-settings', 'hub-status', 'hub-step_deploy', 'hub-step_develop', 'hub-step_investigate', 'hub-step_review', 'hub-step_test', 'hub-steps', 'hub-steps_board', 'hub-subscribe', 'hub-support', 'hub-terrier', 'hub-thumbs_up', 'hub-type', 'hub-unprioritized', 'hub-upload', 'hub-user', 'hub-users', 'hub-week'
+    'hub-active', 'hub-admin', 'hub-archive', 'hub-arrow_down', 'hub-arrow_left', 'hub-arrow_right', 'hub-arrow_up', 'hub-assign', 'hub-attachment', 'hub-back', 'hub-badge', 'hub-board', 'hub-branch', 'hub-bug', 'hub-calculator', 'hub-checkmark', 'hub-close', 'hub-clypboard', 'hub-comment', 'hub-complete', 'hub-dashboard', 'hub-data_pull', 'hub-data_update', 'hub-database', 'hub-day', 'hub-delete', 'hub-documentation', 'hub-edit', 'hub-existing_child', 'hub-existing_parent', 'hub-feature', 'hub-flex', 'hub-forward', 'hub-github', 'hub-history', 'hub-home', 'hub-image', 'hub-inbox', 'hub-info', 'hub-internal', 'hub-issue', 'hub-lane', 'hub-lane_asap', 'hub-lane_days', 'hub-lane_hours', 'hub-lane_weeks', 'hub-lanes_board', 'hub-level_complete', 'hub-level_highway', 'hub-level_on_ramp', 'hub-level_parking', 'hub-metrics', 'hub-minus', 'hub-new_child', 'hub-new_parent', 'hub-night', 'hub-origin', 'hub-pending', 'hub-plus', 'hub-post', 'hub-posts', 'hub-pr_closed', 'hub-pr_merged', 'hub-pr_open', 'hub-prioritized', 'hub-project', 'hub-question', 'hub-reaction', 'hub-read_mail', 'hub-recent', 'hub-refresh', 'hub-related_posts', 'hub-request', 'hub-settings', 'hub-status', 'hub-step_deploy', 'hub-step_develop', 'hub-step_investigate', 'hub-step_review', 'hub-step_test', 'hub-steps', 'hub-steps_board', 'hub-subscribe', 'hub-support', 'hub-terrier', 'hub-thumbs_up', 'hub-type', 'hub-unprioritized', 'hub-upload', 'hub-user', 'hub-users', 'hub-week'
 ] as const
 
 export type HubIconName = typeof Names[number]

package/terrier/images/icons/existing_child.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><circle cx="16" cy="8" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><path stroke="currentColor" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5"/><path fill="currentColor" d="M15 11h2v5h-2zM19.415 23.65l3.826 4.464a1 1 0 0 0 1.518 0l3.826-4.463a1 1 0 0 0-.76-1.651h-7.65a1 1 0 0 0-.76 1.65Z"/></g></svg>

package/terrier/images/icons/existing_parent.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><path stroke="currentColor" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v3"/><path fill="currentColor" d="M15 9h2v7h-2z"/><path fill="currentColor" d="m11.415 8.35 3.826-4.464a1 1 0 0 1 1.518 0l3.826 4.463a1 1 0 0 1-.76 1.651h-7.65a1 1 0 0 1-.76-1.65Z"/></g></svg>

package/terrier/images/icons/new_child.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="8" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><circle cx="8" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="5" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><path stroke="currentColor" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12.023a2 2 0 0 1 2 1.977l.011.977"/><path fill="currentColor" d="M15 11h2v5h-2zM24 21a1 1 0 0 1 1 1v.999L26 23a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0v-1h-1a1 1 0 0 1 0-2h1v-1a1 1 0 0 1 1-1Z"/></g></svg>

package/terrier/images/icons/new_parent.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="3" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><path stroke="currentColor" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v3"/><path fill="currentColor" d="M15 13h2v3h-2z"/><circle cx="16" cy="8" r="5" fill="currentColor" fill-opacity="0.33" stroke="currentColor" stroke-linejoin="round" stroke-width="2"/><path fill="currentColor" d="M16 5a1 1 0 0 1 1 1v.999L18 7a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0V9h-1a1 1 0 0 1 0-2h1V6a1 1 0 0 1 1-1Z"/></g></svg>

package/terrier/images/optimized/icon-existing_child.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><circle cx="16" cy="8" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><path stroke="#000" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5"/><path fill="#000" d="M15 11h2v5h-2zM19.415 23.65l3.826 4.464a1 1 0 0 0 1.518 0l3.826-4.463a1 1 0 0 0-.76-1.651h-7.65a1 1 0 0 0-.76 1.65Z"/></g></svg>

package/terrier/images/optimized/icon-existing_parent.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><path stroke="#000" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v3"/><path fill="#000" d="M15 9h2v7h-2z"/><path fill="#000" d="m11.415 8.35 3.826-4.464a1 1 0 0 1 1.518 0l3.826 4.463a1 1 0 0 1-.76 1.651h-7.65a1 1 0 0 1-.76-1.65Z"/></g></svg>

package/terrier/images/optimized/icon-new_child.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="8" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><circle cx="8" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="5" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><path stroke="#000" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12.023a2 2 0 0 1 2 1.977l.011.977"/><path fill="#000" d="M15 11h2v5h-2zM24 21a1 1 0 0 1 1 1v.999L26 23a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0v-1h-1a1 1 0 0 1 0-2h1v-1a1 1 0 0 1 1-1Z"/></g></svg>

package/terrier/images/optimized/icon-new_parent.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="8" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><circle cx="24" cy="24" r="3" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><path stroke="#000" stroke-linejoin="round" stroke-width="2" d="M8 21v-3a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v3"/><path fill="#000" d="M15 13h2v3h-2z"/><circle cx="16" cy="8" r="5" fill="#000" fill-opacity=".25" stroke="#000" stroke-linejoin="round" stroke-width="2"/><path fill="#000" d="M16 5a1 1 0 0 1 1 1v.999L18 7a1 1 0 0 1 0 2h-1v1a1 1 0 0 1-2 0V9h-1a1 1 0 0 1 0-2h1V6a1 1 0 0 1 1-1Z"/></g></svg>

package/terrier/images/raw/icon-existing_child.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-existing_child</title>
+    <g id="icon-existing_child" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval-Copy" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="8" cy="24" r="3"></circle>
+        <circle id="Oval-Copy-2" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="16" cy="8" r="3"></circle>
+        <path d="M8,21 L8,18 C8,16.8954305 8.8954305,16 10,16 L22,16 C23.1045695,16 24,16.8954305 24,18 L24,23 L24,23" id="Path-100" stroke="#000000" stroke-width="2" stroke-linejoin="round"></path>
+        <rect id="Rectangle" fill="#000000" x="15" y="11" width="2" height="5"></rect>
+        <path d="M22.1507914,20.914964 L26.6142006,24.7407434 C27.0335265,25.1001655 27.082088,25.7314655 26.7226659,26.1507914 C26.6893412,26.1896702 26.6530794,26.2259319 26.6142006,26.2592566 L22.1507914,30.085036 C21.7314655,30.4444581 21.1001655,30.3958966 20.7407434,29.9765707 C20.5853922,29.7953276 20.5,29.5644906 20.5,29.3257794 L20.5,21.6742206 C20.5,21.1219359 20.9477153,20.6742206 21.5,20.6742206 C21.7387113,20.6742206 21.9695483,20.7596128 22.1507914,20.914964 Z" id="Path-101" fill="#000000" transform="translate(24, 25.5) scale(1, -1) rotate(-90) translate(-24, -25.5)"></path>
+    </g>
+</svg>

package/terrier/images/raw/icon-existing_parent.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-existing_parent</title>
+    <g id="icon-existing_parent" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval-Copy" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="8" cy="24" r="3"></circle>
+        <circle id="Oval-Copy-2" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="24" cy="24" r="3"></circle>
+        <path d="M8,21 L8,18 C8,16.8954305 8.8954305,16 10,16 L22,16 C23.1045695,16 24,16.8954305 24,18 L24,21 L24,21" id="Path-100" stroke="#000000" stroke-width="2" stroke-linejoin="round"></path>
+        <rect id="Rectangle" fill="#000000" x="15" y="9" width="2" height="7"></rect>
+        <path d="M14.1507914,1.91496403 L18.6142006,5.7407434 C19.0335265,6.10016555 19.082088,6.73146553 18.7226659,7.15079137 C18.6893412,7.18967018 18.6530794,7.22593191 18.6142006,7.2592566 L14.1507914,11.085036 C13.7314655,11.4444581 13.1001655,11.3958966 12.7407434,10.9765707 C12.5853922,10.7953276 12.5,10.5644906 12.5,10.3257794 L12.5,2.67422064 C12.5,2.12193589 12.9477153,1.67422064 13.5,1.67422064 C13.7387113,1.67422064 13.9695483,1.7596128 14.1507914,1.91496403 Z" id="Path-101" fill="#000000" transform="translate(16, 6.5) rotate(-90) translate(-16, -6.5)"></path>
+    </g>
+</svg>

package/terrier/images/raw/icon-new_child.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-new-child</title>
+    <g id="icon-new-child" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="16" cy="8" r="3"></circle>
+        <circle id="Oval-Copy" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="8" cy="24" r="3"></circle>
+        <circle id="Oval-Copy-2" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="24" cy="24" r="5"></circle>
+        <path d="M8,21 L8,18 C8,16.8954305 8.8954305,16 10,16 L22.0231969,16 C23.1186657,16 24.0102814,16.8812743 24.0230608,17.9766686 L24.0344614,18.9538745 L24.0344614,18.9538745" id="Path-100" stroke="#000000" stroke-width="2" stroke-linejoin="round"></path>
+        <rect id="Rectangle" fill="#000000" x="15" y="11" width="2" height="5"></rect>
+        <path d="M24,21 C24.5522847,21 25,21.4477153 25,22 L25,22.999 L26,23 C26.5522847,23 27,23.4477153 27,24 C27,24.5522847 26.5522847,25 26,25 L25,25 L25,26 C25,26.5522847 24.5522847,27 24,27 C23.4477153,27 23,26.5522847 23,26 L23,25 L22,25 C21.4477153,25 21,24.5522847 21,24 C21,23.4477153 21.4477153,23 22,23 L23,23 L23,22 C23,21.4477153 23.4477153,21 24,21 Z" id="Combined-Shape" fill="#000000"></path>
+    </g>
+</svg>

package/terrier/images/raw/icon-new_parent.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon-new_parent</title>
+    <g id="icon-new_parent" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval-Copy" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="8" cy="24" r="3"></circle>
+        <circle id="Oval-Copy-2" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="24" cy="24" r="3"></circle>
+        <path d="M8,21 L8,18 C8,16.8954305 8.8954305,16 10,16 L22,16 C23.1045695,16 24,16.8954305 24,18 L24,21 L24,21" id="Path-100" stroke="#000000" stroke-width="2" stroke-linejoin="round"></path>
+        <rect id="Rectangle" fill="#000000" x="15" y="13" width="2" height="3"></rect>
+        <circle id="Oval-Copy-2" stroke="#000000" stroke-width="2" fill-opacity="0.25" fill="#000000" stroke-linejoin="round" cx="16" cy="8" r="5"></circle>
+        <path d="M16,5 C16.5522847,5 17,5.44771525 17,6 L17,6.999 L18,7 C18.5522847,7 19,7.44771525 19,8 C19,8.55228475 18.5522847,9 18,9 L17,9 L17,10 C17,10.5522847 16.5522847,11 16,11 C15.4477153,11 15,10.5522847 15,10 L15,9 L14,9 C13.4477153,9 13,8.55228475 13,8 C13,7.44771525 13.4477153,7 14,7 L15,7 L15,6 C15,5.44771525 15.4477153,5 16,5 Z" id="Combined-Shape" fill="#000000"></path>
+    </g>
+</svg>