+
{item.text}
{#if item.description}
{item.description}
@@ -334,4 +446,12 @@
:global(.new-concept, .new-keyword) {
@apply h-full;
}
+
+ /* Style the combobox item's parent div with a background color depending on type of search. */
+ :global(.bx--list-box__menu-item:not(.bx--list-box__menu-item--highlighted):has(.isSignal)) {
+ @apply bg-blue-50;
+ }
+ :global(.bx--list-box__menu-item:not(.bx--list-box__menu-item--highlighted):has(.isConcept)) {
+ @apply bg-emerald-100;
+ }
diff --git a/web/blueprint/src/lib/components/schemaView/SchemaField.svelte b/web/blueprint/src/lib/components/schemaView/SchemaField.svelte
index b5e5d2fc3..82c342941 100644
--- a/web/blueprint/src/lib/components/schemaView/SchemaField.svelte
+++ b/web/blueprint/src/lib/components/schemaView/SchemaField.svelte
@@ -35,7 +35,7 @@
export let sourceField: LilacField | undefined = undefined;
export let indent = 0;
- $: isSignal = isSignalField(field, schema);
+ $: isSignal = isSignalField(field);
$: isSignalRoot = isSignalRootField(field);
$: isSourceField = !isSignal;
@@ -269,7 +269,7 @@
{/if}
-
+
{#if expandedDetails}
@@ -285,7 +285,7 @@
{schema}
field={childField}
indent={indent + 1}
- sourceField={isSourceField && isSignalField(childField, schema) ? field : sourceField}
+ sourceField={isSourceField && isSignalField(childField) ? field : sourceField}
/>
{/each}
{/if}
diff --git a/web/blueprint/src/lib/view_utils.ts b/web/blueprint/src/lib/view_utils.ts
index 846231256..ff07c757c 100644
--- a/web/blueprint/src/lib/view_utils.ts
+++ b/web/blueprint/src/lib/view_utils.ts
@@ -1,5 +1,6 @@
import {
L,
+ PATH_WILDCARD,
VALUE_KEY,
childFields,
deserializePath,
@@ -177,7 +178,7 @@ export function isPathVisible(
// Signal columns are not visible by default. Because children inherit from parents, we only need
// need to check for the parent.
const field = getField(schema, pathArray);
- const isSignal = isSignalField(field!, schema);
+ const isSignal = isSignalField(field!);
if (isSignal) {
return false;
@@ -746,3 +747,16 @@ export function getChars(text: string): string[] {
export function stringLength(text: string): number {
return getChars(text).length;
}
+
+/** Returns a short-form field name for displaying. */
+export function shortFieldName(path: Path): string {
+ if (path.length === 0) {
+ throw new Error('Cannot get short name for empty path');
+ }
+ return [...path].reverse().find(p => p !== PATH_WILDCARD)!;
+}
+
+export function displayPath(path: Path): string {
+ const result = path.join('.');
+ return result.replaceAll(`.${PATH_WILDCARD}`, '[]');
+}
diff --git a/web/lib/src/lilac.spec.ts b/web/lib/src/lilac.spec.ts
index f46044910..fdf1cabd8 100644
--- a/web/lib/src/lilac.spec.ts
+++ b/web/lib/src/lilac.spec.ts
@@ -303,8 +303,8 @@ describe('lilac', () => {
describe('utilities', () => {
it('isSignalField', () => {
- expect(isSignalField(schema.fields!.comment_text!, schema)).toEqual(false);
- expect(isSignalField(schema.fields!.comment_text.fields!.pii, schema)).toEqual(true);
+ expect(isSignalField(schema.fields!.comment_text!)).toEqual(false);
+ expect(isSignalField(schema.fields!.comment_text.fields!.pii)).toEqual(true);
});
});
diff --git a/web/lib/src/lilac.ts b/web/lib/src/lilac.ts
index 3fc4e99ad..6debaab1b 100644
--- a/web/lib/src/lilac.ts
+++ b/web/lib/src/lilac.ts
@@ -37,6 +37,7 @@ export type Op = BinaryFilter['op'] | UnaryFilter['op'] | ListFilter['op'];
export type LilacField
= Field & {
path: Path;
+ parent?: LilacField;
// Overwrite the fields and repeated_field properties to be LilacField
repeated_field?: LilacField;
fields?: Record;
@@ -202,25 +203,20 @@ export function getValueNodes(row: LilacValueNode, path: Path): LilacValueNode[]
return list.filter(value => pathIsMatching(path, L.path(value)));
}
-/**
- * Determine if field is produced by a signal. We do this by walking the schema from the root to the
- * field, and checking if a parent has a signal.
- */
-export function isSignalField(
- field: LilacField,
- schema: LilacField,
- hasSignalRootParent = false
-): boolean {
- if (isSignalRootField(schema)) {
- hasSignalRootParent = true;
+/** Determine if a field is produced by a signal. */
+export function isSignalField(field: LilacField): boolean {
+ return getSignalInfo(field) != null;
+}
+
+/** If a field is produced by a signal, it returns the signal information. Otherwise returns null. */
+export function getSignalInfo(field: LilacField): Signal | null {
+ if (field.signal) {
+ return field.signal;
}
- if (schema === field) return hasSignalRootParent;
- if (schema.fields != null) {
- return Object.values(schema.fields).some(f => isSignalField(field, f, hasSignalRootParent));
- } else if (schema.repeated_field != null) {
- return isSignalField(field, schema.repeated_field, hasSignalRootParent);
+ if (field.parent) {
+ return getSignalInfo(field.parent);
}
- return false;
+ return null;
}
/** True if the field was the root field produced by a signal. */
@@ -262,12 +258,14 @@ export function deserializeField(field: Field, path: Path = []): LilacField {
for (const [fieldName, field] of Object.entries(fields)) {
const lilacChildField = deserializeField(field, [...path, fieldName]);
lilacChildField.path = [...path, fieldName];
+ lilacChildField.parent = lilacField;
lilacField.fields[fieldName] = lilacChildField;
}
}
if (repeated_field != null) {
const lilacChildField = deserializeField(repeated_field, [...path, PATH_WILDCARD]);
lilacChildField.path = [...path, PATH_WILDCARD];
+ lilacChildField.parent = lilacField;
lilacField.repeated_field = lilacChildField;
}
return lilacField;