@finos/legend-query-builder 4.14.38 → 4.14.40

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -60,7 +60,6 @@ import {
 import { useDrag, useDragLayer, useDrop } from 'react-dnd';
 import {
   type QueryBuilderExplorerTreeDragSource,
-  type QueryBuilderExplorerTreePropertyNodeData,
   buildPropertyExpressionFromExplorerTreeNodeData,
   QUERY_BUILDER_EXPLORER_TREE_DND_TYPE,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
@@ -729,15 +728,6 @@ const QueryBuilderFilterConditionEditor = observer(
     const applicationStore = useApplicationStore();
     const changeOperator = (val: QueryBuilderFilterOperator) => (): void =>
       node.condition.changeOperator(val);
-    const changeProperty = (
-      propertyNode: QueryBuilderExplorerTreePropertyNodeData,
-    ): void =>
-      node.condition.changeProperty(
-        buildPropertyExpressionFromExplorerTreeNodeData(
-          propertyNode,
-          queryBuilderState.explorerState,
-        ),
-      );
     // Drag and Drop on filter condition value
     const handleDrop = useCallback(
       (item: QueryBuilderVariableDragSource): void => {
@@ -815,7 +805,6 @@ const QueryBuilderFilterConditionEditor = observer(
             <div className="query-builder-filter-tree__condition-node__property">
               <QueryBuilderPropertyExpressionBadge
                 propertyExpressionState={node.condition.propertyExpressionState}
-                onPropertyExpressionChange={changeProperty}
               />
             </div>
             <DropdownMenu

package/src/components/shared/BasicValueSpecificationEditor.tsx

@@ -776,6 +776,98 @@ const setCollectionValue = (
   instanceValue_setValues(valueSpecification, result, obseverContext);
 };
 
+const EnumCollectionInstanceValueEditor = observer(
+  (props: {
+    valueSpecification: CollectionInstanceValue;
+    observerContext: ObserverContext;
+    saveEdit: () => void;
+  }) => {
+    const { valueSpecification, observerContext, saveEdit } = props;
+    const applicationStore = useApplicationStore();
+    const enumType = guaranteeType(
+      valueSpecification.genericType?.value.rawType,
+      Enumeration,
+    );
+
+    const [selectedOptions, setSelectedOptions] = useState<
+      { label: string; value: Enum }[]
+    >(
+      (valueSpecification.values as EnumValueInstanceValue[])
+        .filter((valueSpec) => valueSpec.values[0]?.value !== undefined)
+        .map((valueSpec) => ({
+          label: valueSpec.values[0]!.value.name,
+          value: valueSpec.values[0]!.value,
+        })),
+    );
+
+    const availableOptions = enumType.values
+      .filter(
+        (value) =>
+          !selectedOptions.some(
+            (selectedValue) => selectedValue.value.name === value.name,
+          ),
+      )
+      .map((value) => ({
+        label: value.name,
+        value: value,
+      }));
+
+    const changeValue = (
+      newSelectedOptions: { value: Enum; label: string }[],
+    ): void => {
+      setSelectedOptions(newSelectedOptions);
+    };
+
+    const updateValueSpecAndSaveEdit = (): void => {
+      const result = selectedOptions
+        .map((value) => {
+          const enumValueInstanceValue = new EnumValueInstanceValue(
+            GenericTypeExplicitReference.create(new GenericType(enumType)),
+          );
+          instanceValue_setValues(
+            enumValueInstanceValue,
+            [EnumValueExplicitReference.create(value.value)],
+            observerContext,
+          );
+          return enumValueInstanceValue;
+        })
+        .filter(isNonNullable);
+      instanceValue_setValues(valueSpecification, result, observerContext);
+      saveEdit();
+    };
+
+    return (
+      <>
+        <CustomSelectorInput
+          className="value-spec-editor__enum-collection-selector"
+          options={availableOptions}
+          isMulti={true}
+          onChange={changeValue}
+          onBlur={updateValueSpecAndSaveEdit}
+          onKeyDown={(event: KeyboardEvent): void => {
+            if (event.key === 'Enter' && !event.shiftKey) {
+              updateValueSpecAndSaveEdit();
+            }
+          }}
+          value={selectedOptions}
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
+          placeholder="Select value"
+          autoFocus={true}
+          menuIsOpen={true}
+        />
+        <button
+          className="value-spec-editor__list-editor__save-button btn--dark"
+          onClick={updateValueSpecAndSaveEdit}
+        >
+          <SaveIcon />
+        </button>
+      </>
+    );
+  },
+);
+
 const COLLECTION_PREVIEW_CHAR_LIMIT = 50;
 
 const getPlaceHolder = (expectedType: Type): string => {
@@ -836,6 +928,11 @@ const CollectionValueInstanceValueEditor = observer(
       if (editable) {
         setEditable(false);
         setShowAdvancedEditorPopover(false);
+        setValueSpecification(valueSpecification);
+      }
+    };
+    const updateValueSpecAndSaveEdit = (): void => {
+      if (editable) {
         setCollectionValue(
           valueSpecification,
           expectedType,
@@ -843,7 +940,7 @@ const CollectionValueInstanceValueEditor = observer(
           obseverContext,
         );
         setText(stringifyValue(valueSpecification.values));
-        setValueSpecification(valueSpecification);
+        saveEdit();
       }
     };
 
@@ -861,7 +958,7 @@ const CollectionValueInstanceValueEditor = observer(
         (event.relatedTarget as HTMLButtonElement | undefined)?.name !==
         expandButtonName
       ) {
-        saveEdit();
+        updateValueSpecAndSaveEdit();
       }
     };
 
@@ -891,7 +988,7 @@ const CollectionValueInstanceValueEditor = observer(
                 onChange={changeValueTextArea}
                 onKeyDown={(event): void => {
                   if (event.key === 'Enter' && !event.shiftKey) {
-                    saveEdit();
+                    updateValueSpecAndSaveEdit();
                   }
                 }}
               />
@@ -903,37 +1000,47 @@ const CollectionValueInstanceValueEditor = observer(
             </BasePopover>
           )}
           <div className={clsx('value-spec-editor', className)}>
-            <textarea
-              ref={inputRef}
-              className={clsx(
-                'panel__content__form__section__input value-spec-editor__input value-spec-editor__textarea ',
-              )}
-              spellCheck={false}
-              value={text}
-              placeholder={placeholder}
-              onChange={changeValueTextArea}
-              onKeyDown={(event): void => {
-                if (event.key === 'Enter' && !event.shiftKey) {
-                  saveEdit();
-                }
-              }}
-              onBlur={handleOnBlur}
-            />
-            <button
-              className="value-spec-editor__list-editor__expand-button btn--dark"
-              onClick={() => setShowAdvancedEditorPopover(true)}
-              tabIndex={-1}
-              name={expandButtonName}
-              title="Expand window..."
-            >
-              <FilledWindowMaximizeIcon />
-            </button>
-            <button
-              className="value-spec-editor__list-editor__save-button btn--dark"
-              onClick={saveEdit}
-            >
-              <SaveIcon />
-            </button>
+            {expectedType instanceof Enumeration ? (
+              <EnumCollectionInstanceValueEditor
+                valueSpecification={valueSpecification}
+                observerContext={obseverContext}
+                saveEdit={saveEdit}
+              />
+            ) : (
+              <>
+                <textarea
+                  ref={inputRef}
+                  className={clsx(
+                    'panel__content__form__section__input value-spec-editor__input value-spec-editor__textarea ',
+                  )}
+                  spellCheck={false}
+                  value={text}
+                  placeholder={placeholder}
+                  onChange={changeValueTextArea}
+                  onKeyDown={(event): void => {
+                    if (event.key === 'Enter' && !event.shiftKey) {
+                      updateValueSpecAndSaveEdit();
+                    }
+                  }}
+                  onBlur={handleOnBlur}
+                />
+                <button
+                  className="value-spec-editor__list-editor__expand-button btn--dark"
+                  onClick={() => setShowAdvancedEditorPopover(true)}
+                  tabIndex={-1}
+                  name={expandButtonName}
+                  title="Expand window..."
+                >
+                  <FilledWindowMaximizeIcon />
+                </button>
+                <button
+                  className="value-spec-editor__list-editor__save-button btn--dark"
+                  onClick={saveEdit}
+                >
+                  <SaveIcon />
+                </button>
+              </>
+            )}
             <button
               className="value-spec-editor__reset-btn"
               name="Reset"

package/src/stores/QueryBuilder_LegendApplicationPlugin_Extension.ts

@@ -86,6 +86,7 @@ export type QueryBuilderHeaderActionConfiguration = {
 export type QueryBuilderMenuActionConfiguration = {
   key: string;
   title?: string;
+  disableFunc?: (queryBuilderState: QueryBuilderState) => void;
   label: string;
   onClick: (queryBuilderState: QueryBuilderState) => void;
   icon?: React.ReactNode;

package/src/stores/watermark/QueryBuilderWatermarkState.ts

@@ -50,7 +50,6 @@ export class QueryBuilderWatermarkState implements Hashable {
       ),
     );
 
-    watermarkConstant.values = ['watermarkValue'];
     return watermarkConstant;
   }