@malloydata/malloy-explorer 0.0.278-dev250515234639 → 0.0.278-dev250516210719

package/dist/cjs/index.cjs

@@ -29950,6 +29950,11 @@ function getViewDefinition(parent) {
   return parent instanceof QB.ASTArrowQueryDefinition ? parent.view : parent.definition;
 }
 function getInputSchemaFromViewParent(parent) {
+  if (!parent) {
+    return {
+      fields: []
+    };
+  }
   const definition = getViewDefinition(parent);
   return definition.getInputSchema();
 }
@@ -32400,12 +32405,49 @@ const styles$g = {
     $$css: true
   }
 };
+function toFullName(path, name) {
+  return [...path || [], name].join(".");
+}
 function segmentHasLimit(segment) {
   return segment.operations.items.find((operation) => operation instanceof QB.ASTLimitViewOperation) !== void 0;
 }
 function segmentHasOrderBy(segment, name) {
   return segment.operations.items.find((operation) => operation instanceof QB.ASTOrderByViewOperation && operation.name === name) !== void 0;
 }
+function getOutputNameToInputNameMap(segment) {
+  const nameMap = /* @__PURE__ */ new Map();
+  for (const operation of segment.operations.items) {
+    if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
+      const reference = operation.field.getReference();
+      nameMap.set(operation.name, toFullName(reference.path, reference.name));
+    }
+  }
+  return nameMap;
+}
+function segmentHasOrderBySourceField(segment, path, name) {
+  const nameMap = getOutputNameToInputNameMap(segment);
+  const fullInputName = toFullName(path, name);
+  return !!segment.operations.items.find((operation) => {
+    if (operation instanceof QB.ASTOrderByViewOperation && nameMap.has(operation.name)) {
+      return fullInputName === nameMap.get(operation.name);
+    }
+    return false;
+  });
+}
+function areReferencesEqual(path1, name1, path2, name2) {
+  return name1 === name2 && (path1 || []).join(".") === (path2 || []).join(".");
+}
+function segmentHasFieldInOutputSpace(segment, path, name) {
+  const match = segment.operations.items.find((operation) => {
+    if (operation instanceof QB.ASTGroupByViewOperation || operation instanceof QB.ASTAggregateViewOperation) {
+      const reference = operation.field.getReference();
+      const isEqual = areReferencesEqual(path, name, reference.path, reference.name);
+      return isEqual;
+    }
+    return false;
+  });
+  return !!match;
+}
 function segmentNestNo(segment, name) {
   return segment.operations.items.reduce((acc, operation) => {
     if (operation instanceof QB.ASTNestViewOperation) {
@@ -32460,6 +32502,19 @@ function addNest(view, field) {
   }
   segment.addNest(field.name, rename);
 }
+function addOrderByFromSource(view, path, name, direction = "desc") {
+  const fullInputName = toFullName(path, name);
+  let orderByName = name;
+  const segment = view.getOrAddDefaultSegment();
+  const nameMap = getOutputNameToInputNameMap(segment);
+  for (const entry of nameMap.entries()) {
+    if (entry[1] === fullInputName) {
+      orderByName = entry[0];
+      break;
+    }
+  }
+  segment.addOrderBy(orderByName, direction);
+}
 function addOrderBy(view, field, direction = "desc") {
   const segment = view.getOrAddDefaultSegment();
   segment.addOrderBy(field.name, direction);
@@ -32473,6 +32528,9 @@ function addFilter(view, field, path, filter) {
   }
 }
 function getSegmentIfPresent(parent) {
+  if (!parent) {
+    return void 0;
+  }
   const definition = getViewDefinition(parent);
   if (definition instanceof QB.ASTSegmentViewDefinition) {
     return definition;
@@ -35914,62 +35972,83 @@ const FIELD_KIND_TO_TITLE = {
   dimension: "Dimensions"
 };
 function useOperations(view, field, path) {
-  const dimensionFields = React.useMemo(() => {
+  const fullName = toFullName(path, field.name);
+  const flattenedFields = React.useMemo(() => {
     const {
       fields
     } = getInputSchemaFromViewParent(view);
-    return new Set(flattenFieldsTree(fields).filter(({
-      field: field2
-    }) => field2.kind === "dimension").map(({
-      field: field2
-    }) => field2.name));
-  }, [view]);
-  const measureFields = React.useMemo(() => {
-    const {
-      fields
-    } = getInputSchemaFromViewParent(view);
-    return new Set(flattenFieldsTree(fields).filter(({
-      field: field2
-    }) => field2.kind === "measure").map(({
-      field: field2
-    }) => field2.name));
-  }, [view]);
-  const isGroupByAllowed = React.useMemo(() => {
-    if (!view) {
-      return false;
-    }
+    const inputPath = path.join(".");
+    return flattenFieldsTree(fields).filter((fieldItem) => {
+      return fieldItem.path.join(".") === inputPath;
+    });
+  }, [path, view]);
+  const matchingFieldItem = flattenedFields.find((fieldItem) => field.name === fieldItem.field.name);
+  const groupByDisabledReason = React.useMemo(() => {
     const segment = getSegmentIfPresent(view);
-    return dimensionFields.has(field.name) && !(segment == null ? void 0 : segment.hasField(field.name, path)) && isNotAnnotatedFilteredField(field);
-  }, [view, field, path, dimensionFields]);
-  const isAggregateAllowed = React.useMemo(() => {
-    if (!view) {
-      return false;
+    if ((matchingFieldItem == null ? void 0 : matchingFieldItem.field.kind) !== "dimension") {
+      return "Grouping is only available on a dimenion.";
+    }
+    if (segment == null ? void 0 : segment.hasField(field.name, path)) {
+      return "Cannot group by a field already in the view.";
+    }
+    if (!isNotAnnotatedFilteredField(field)) {
+      return "This field is annotated with #NO_UI.";
+    }
+    return "";
+  }, [view, matchingFieldItem == null ? void 0 : matchingFieldItem.field.kind, field, path]);
+  const aggregateDisabledReason = React.useMemo(() => {
+    if ((matchingFieldItem == null ? void 0 : matchingFieldItem.field.kind) !== "measure") {
+      return "Aggregation only supports measure fields.";
     }
     const segment = getSegmentIfPresent(view);
-    return measureFields.has(field.name) && !(segment == null ? void 0 : segment.hasField(field.name, path)) && isNotAnnotatedFilteredField(field);
-  }, [view, field, path, measureFields]);
-  const isFilterAllowed = React.useMemo(() => {
-    if (!view) {
-      return false;
+    if (segment == null ? void 0 : segment.hasField(field.name, path)) {
+      return "This field is already used in the query.";
     }
-    const fieldName = field.name;
-    const inputSchemaFields = getInputSchemaFromViewParent(view).fields;
-    return inputSchemaFields.filter((field2) => field2.kind === "dimension" || field2.kind === "measure").filter((field2) => FILTERABLE_TYPES.includes(field2.type.kind)).some((field2) => field2.name === fieldName);
-  }, [view, field]);
-  const isOrderByAllowed = React.useMemo(() => {
-    if (!view) {
-      return false;
+    if (!isNotAnnotatedFilteredField(field)) {
+      return "This field is annotated with #NO_UI.";
+    }
+    return "";
+  }, [matchingFieldItem == null ? void 0 : matchingFieldItem.field.kind, view, field, path]);
+  const filterDisabledReason = React.useMemo(() => {
+    if (!matchingFieldItem) {
+      return `Unexpected Error: Could not find a field ${fullName}.`;
+    }
+    if (!["dimension", "measure"].includes(matchingFieldItem.field.kind)) {
+      return `Filtering is only available for a dimension or measure.`;
+    }
+    if (!FILTERABLE_TYPES.includes(matchingFieldItem.field.type.kind)) {
+      return "Filtering only supports string, boolean, number, date and time fields.";
+    }
+    return "";
+  }, [fullName, matchingFieldItem]);
+  const orderByDisabledReason = React.useMemo(() => {
+    if (!matchingFieldItem) {
+      return `Unexpected Error: Could not find a field ${fullName}.`;
     }
-    const fieldName = field.name;
-    const outputSchemaFields = view.getOutputSchema().fields;
     const segment = getSegmentIfPresent(view);
-    return outputSchemaFields.filter((field2) => field2.kind === "dimension").filter((field2) => ORDERABLE_TYPES.includes(field2.type.kind)).filter((field2) => !segment || !segmentHasOrderBy(segment, field2.name)).some((field2) => field2.name === fieldName);
-  }, [view, field]);
+    if (segment && segmentHasOrderBySourceField(segment, path, field.name)) {
+      return "Query is already ordered by this field.";
+    }
+    if (!segment || !segmentHasFieldInOutputSpace(segment, path, field.name)) {
+      return "Order by is only available for fields in the output.";
+    }
+    if (!["dimension", "measure"].includes(matchingFieldItem.field.kind)) {
+      return "Order By is only available for dimension or measure fields.";
+    }
+    if (!ORDERABLE_TYPES.includes(matchingFieldItem.field.type.kind)) {
+      return "Order By only supports string, boolean, number, date and time fields.";
+    }
+    return "";
+  }, [matchingFieldItem, view, path, field.name, fullName]);
   return {
-    isGroupByAllowed,
-    isAggregateAllowed,
-    isFilterAllowed,
-    isOrderByAllowed
+    isGroupByAllowed: !groupByDisabledReason,
+    groupByDisabledReason,
+    isAggregateAllowed: !aggregateDisabledReason,
+    aggregateDisabledReason,
+    isFilterAllowed: !filterDisabledReason,
+    filterDisabledReason,
+    isOrderByAllowed: !orderByDisabledReason,
+    orderByDisabledReason
   };
 }
 const FILTERABLE_TYPES = ["string_type", "boolean_type", "number_type", "date_type", "timestamp_type"];
@@ -35986,22 +36065,22 @@ function FieldTokenWithActions({
   } = React.useContext(QueryEditorContext);
   const view = currentNestView ?? viewDef;
   const {
-    isGroupByAllowed,
-    isAggregateAllowed,
-    isFilterAllowed,
-    isOrderByAllowed
+    groupByDisabledReason,
+    aggregateDisabledReason,
+    filterDisabledReason,
+    orderByDisabledReason
   } = useOperations(view, field, path);
   const [isFilterPopoverOpen, setIsFilterPopoverOpen] = React.useState();
   const [isTooltipOpen, setIsTooltipOpen] = React.useState(false);
   const handleAddOperationAction = (operation, filter) => {
     if (field.kind === "dimension" || field.kind === "measure") {
-      if (operation === "groupBy" && isGroupByAllowed) {
+      if (operation === "groupBy" && !groupByDisabledReason) {
         addGroupBy(view, field, path);
-      } else if (operation === "aggregate" && isAggregateAllowed) {
+      } else if (operation === "aggregate" && !aggregateDisabledReason) {
         addAggregate(view, field, path);
-      } else if (operation === "orderBy" && isOrderByAllowed) {
-        addOrderBy(view, field);
-      } else if (operation === "filter" && isFilterAllowed && filter) {
+      } else if (operation === "orderBy" && !orderByDisabledReason) {
+        addOrderByFromSource(view, path, field.name);
+      } else if (operation === "filter" && !filterDisabledReason && filter) {
         addFilter(view, field, path, filter);
       }
       setQuery == null ? void 0 : setQuery(rootQuery == null ? void 0 : rootQuery.build());
@@ -36026,7 +36105,7 @@ function FieldTokenWithActions({
         icon: "insert",
         disabled: !(rootQuery == null ? void 0 : rootQuery.isEmpty()),
         onClick: handleSetView,
-        tooltip: "Add view",
+        tooltip: !(rootQuery == null ? void 0 : rootQuery.isEmpty()) ? "Can only add a view to an empty query." : "Add view",
         onTooltipOpenChange: setIsTooltipOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "nest",
@@ -36037,8 +36116,8 @@ function FieldTokenWithActions({
     }) : field.kind === "measure" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "aggregate",
-        tooltip: "Add as aggregate",
-        disabled: !isAggregateAllowed,
+        tooltip: aggregateDisabledReason || "Add as aggregate",
+        disabled: !!aggregateDisabledReason,
         onClick: () => handleAddOperationAction("aggregate"),
         onTooltipOpenChange: setIsTooltipOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(FilterPopover, {
@@ -36047,23 +36126,23 @@ function FieldTokenWithActions({
         setFilter: (filter) => handleAddOperationAction("filter", filter),
         trigger: /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
           icon: "filter",
-          tooltip: "Add as filter",
-          disabled: !isFilterAllowed,
+          tooltip: filterDisabledReason || "Add as filter",
+          disabled: !!filterDisabledReason,
           onTooltipOpenChange: setIsTooltipOpen
         }),
         onOpenChange: setIsFilterPopoverOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "orderBy",
-        tooltip: "Add as order by",
-        disabled: !isOrderByAllowed,
+        tooltip: orderByDisabledReason || "Add as order by",
+        disabled: !!orderByDisabledReason,
         onClick: () => handleAddOperationAction("orderBy"),
         onTooltipOpenChange: setIsTooltipOpen
       })]
     }) : field.kind === "dimension" ? /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "groupBy",
-        tooltip: "Add as group by",
-        disabled: !isGroupByAllowed,
+        tooltip: groupByDisabledReason || "Add as group by",
+        disabled: !!groupByDisabledReason,
         onClick: () => handleAddOperationAction("groupBy"),
         onTooltipOpenChange: setIsTooltipOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(FilterPopover, {
@@ -36072,20 +36151,20 @@ function FieldTokenWithActions({
         setFilter: (filter) => handleAddOperationAction("filter", filter),
         trigger: /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
           icon: "filter",
-          tooltip: "Add as filter",
-          disabled: !isFilterAllowed,
+          tooltip: filterDisabledReason || "Add as filter",
+          disabled: !!filterDisabledReason,
           onTooltipOpenChange: setIsTooltipOpen
         }),
         onOpenChange: setIsFilterPopoverOpen
       }), /* @__PURE__ */ jsxRuntime.jsx(ActionButton, {
         icon: "orderBy",
-        tooltip: "Add as order by",
-        disabled: !isOrderByAllowed,
+        tooltip: orderByDisabledReason || "Add as order by",
+        disabled: !!orderByDisabledReason,
         onClick: () => handleAddOperationAction("orderBy"),
         onTooltipOpenChange: setIsTooltipOpen
       })]
     }) : null,
-    onClick: field.kind === "dimension" && isGroupByAllowed ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && isAggregateAllowed ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => handleAddView() : void 0,
+    onClick: field.kind === "dimension" && !groupByDisabledReason ? () => handleAddOperationAction("groupBy") : field.kind === "measure" && !aggregateDisabledReason ? () => handleAddOperationAction("aggregate") : field.kind === "view" ? () => handleAddView() : void 0,
     hoverActionsVisible: isFilterPopoverOpen || isTooltipOpen,
     tooltip: /* @__PURE__ */ jsxRuntime.jsx(FieldHoverCard, {
       field,