@finos/legend-query-builder 0.6.24 → 0.6.27

package/src/components/shared/CustomDatePicker.tsx

@@ -56,7 +56,7 @@ import {
   valueSpecification_setGenericType,
 } from '../../stores/shared/ValueSpecificationModifierHelper.js';
 
-enum CUSTOM_DATE_PICKER_OPTION {
+export enum CUSTOM_DATE_PICKER_OPTION {
   ABSOLUTE_DATE = 'Absolute Date',
   ABSOLUTE_TIME = 'Absolute Time',
   TODAY = 'Today',
@@ -431,7 +431,7 @@ const buildPureDurationEnumValue = (
 };
 
 /**
- * Generate the pure date ajust() function based on the CustomDateOption.
+ * Generate the pure date adjust() function based on the CustomDateOption.
  */
 const buildPureAdjustDateFunction = (
   customDateOption: CustomDateOption,
@@ -634,7 +634,7 @@ const buildCustomDateOption = (
 /**
  * Build DatePickerOption from pure date functions or PrimitiveInstanceValue
  */
-const buildDatePickerOption = (
+export const buildDatePickerOption = (
   valueSpecification: SimpleFunctionExpression | PrimitiveInstanceValue,
 ): DatePickerOption => {
   if (valueSpecification instanceof SimpleFunctionExpression) {

package/src/components/shared/QueryBuilderVariableSelector.tsx

@@ -23,9 +23,10 @@ import {
   TimesIcon,
   useDragPreviewLayer,
 } from '@finos/legend-art';
-import type {
-  ValueSpecification,
-  VariableExpression,
+import {
+  SimpleFunctionExpression,
+  type ValueSpecification,
+  type VariableExpression,
 } from '@finos/legend-graph';
 import { observer } from 'mobx-react-lite';
 import { useDrag } from 'react-dnd';
@@ -36,6 +37,7 @@ import {
   QUERY_BUILDER_VARIABLE_DND_TYPE,
   VariableInfoTooltip,
 } from './BasicValueSpecificationEditor.js';
+import { buildDatePickerOption } from './CustomDatePicker.js';
 
 export const VariableViewer = observer(
   (props: {
@@ -50,8 +52,19 @@ export const VariableViewer = observer(
   }) => {
     const { variable, constantValue, actions, isReadOnly, queryBuilderState } =
       props;
+
+    const getNameOfValue = (value: ValueSpecification): string | undefined => {
+      if (value instanceof SimpleFunctionExpression) {
+        const possibleDateLabel = buildDatePickerOption(value).label;
+        if (possibleDateLabel) {
+          return possibleDateLabel;
+        }
+      }
+      return getValueSpecificationStringValue(value);
+    };
+
     const valueString = constantValue
-      ? getValueSpecificationStringValue(constantValue)
+      ? getNameOfValue(constantValue)
       : undefined;
     const name = variable.name;
     const variableType = variable.genericType?.value.rawType;
@@ -159,6 +172,7 @@ export const VariableSelector = observer(
       queryBuilderState.constantState.constants.filter((c) =>
         filterBy ? filterBy(c.variable) : true,
       );
+
     return (
       <>
         <PanelFormListItems title="Available parameters">

package/src/components/watermark/QueryBuilderWatermark.tsx

@@ -25,6 +25,7 @@ import {
   ModalFooter,
   ModalHeader,
   PanelFormSection,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import {
   areMultiplicitiesEqual,
@@ -169,12 +170,7 @@ export const QueryBuilderWatermarkEditor = observer(
             </PanelForm>
           </ModalBody>
           <ModalFooter>
-            <button
-              className="btn modal__footer__close-btn"
-              onClick={handleClose}
-            >
-              Done
-            </button>
+            <ModalFooterButton text="Done" onClick={handleClose} />
           </ModalFooter>
         </Modal>
       </Dialog>

package/src/stores/QueryBuilderState.ts

@@ -99,6 +99,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
   textEditorState: QueryBuilderTextEditorState;
   unsupportedQueryState: QueryBuilderUnsupportedQueryState;
   observableContext: ObserverContext;
+  titleOfQuery: string | undefined;
 
   queryCompileState = ActionState.create();
   showFunctionsExplorerPanel = false;
@@ -126,6 +127,7 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       fetchStructureState: observable,
       filterState: observable,
       watermarkState: observable,
+      titleOfQuery: observable,
       checkEntitlementsState: observable,
       resultState: observable,
       textEditorState: observable,
@@ -151,6 +153,8 @@ export abstract class QueryBuilderState implements CommandRegistrar {
       setMapping: action,
       setRuntimeValue: action,
 
+      setTitleOfQuery: action,
+
       resetQueryResult: action,
       resetQueryContent: action,
       changeClass: action,
@@ -253,6 +257,10 @@ export abstract class QueryBuilderState implements CommandRegistrar {
     this.runtimeValue = val;
   }
 
+  setTitleOfQuery(val: string | undefined): void {
+    this.titleOfQuery = val;
+  }
+
   get isQuerySupported(): boolean {
     return !this.unsupportedQueryState.rawLambda;
   }