@finos/legend-query-builder 0.4.4 → 0.5.0

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression } from '@finos/legend-graph';
+import { type LambdaFunction, SimpleFunctionExpression } from '@finos/legend-graph';
 import type { QueryBuilderState } from '../QueryBuilderState.js';
-export declare const processWatermarkExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState) => void;
+export declare const processWatermarkExpression: (expression: SimpleFunctionExpression, queryBuilderState: QueryBuilderState, parentLambda: LambdaFunction) => void;
 //# sourceMappingURL=QueryBuilderWatermarkStateBuilder.d.ts.map

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkStateBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,eAAO,MAAM,0BAA0B,eACzB,wBAAwB,qBACjB,iBAAiB,KACnC,IAqBF,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkStateBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,cAAc,EACnB,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAGjE,eAAO,MAAM,0BAA0B,eACzB,wBAAwB,qBACjB,iBAAiB,gBACtB,cAAc,KAC3B,IAsBF,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.js

@@ -17,13 +17,13 @@ import { SimpleFunctionExpression, matchFunctionName, } from '@finos/legend-grap
 import { assertTrue, guaranteeType } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
 import { QueryBuilderValueSpecificationProcessor } from '../QueryBuilderStateBuilder.js';
-export const processWatermarkExpression = (expression, queryBuilderState) => {
+export const processWatermarkExpression = (expression, queryBuilderState, parentLambda) => {
     // check preceding expression
     const precedingExpression = guaranteeType(expression.parametersValues[0], SimpleFunctionExpression, `Can't process forWatermark() expression: only support forWatermark() immediately following an expression`);
     assertTrue(matchFunctionName(precedingExpression.functionName, [
         QUERY_BUILDER_SUPPORTED_FUNCTIONS.GET_ALL,
     ]), `Can't process forWatermark() expression: only support forWatermark() immediately following getAll()`);
-    QueryBuilderValueSpecificationProcessor.process(precedingExpression, queryBuilderState);
+    QueryBuilderValueSpecificationProcessor.process(precedingExpression, parentLambda, queryBuilderState);
     const watermarkValue = expression.parametersValues[1];
     queryBuilderState.watermarkState.setValue(watermarkValue);
 };

package/lib/stores/watermark/QueryBuilderWatermarkStateBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkStateBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,uCAAuC,EAAE,MAAM,gCAAgC,CAAC;AAEzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,UAAoC,EACpC,iBAAoC,EAC9B,EAAE;IACR,6BAA6B;IAC7B,MAAM,mBAAmB,GAAG,aAAa,CACvC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,0GAA0G,CAC3G,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAClD,iCAAiC,CAAC,OAAO;KAC1C,CAAC,EACF,qGAAqG,CACtG,CAAC;IAEF,uCAAuC,CAAC,OAAO,CAC7C,mBAAmB,EACnB,iBAAiB,CAClB,CAAC;IAEF,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtD,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkStateBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkStateBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAEL,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAEzG,OAAO,EAAE,uCAAuC,EAAE,MAAM,gCAAgC,CAAC;AAEzF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,UAAoC,EACpC,iBAAoC,EACpC,YAA4B,EACtB,EAAE;IACR,6BAA6B;IAC7B,MAAM,mBAAmB,GAAG,aAAa,CACvC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9B,wBAAwB,EACxB,0GAA0G,CAC3G,CAAC;IACF,UAAU,CACR,iBAAiB,CAAC,mBAAmB,CAAC,YAAY,EAAE;QAClD,iCAAiC,CAAC,OAAO;KAC1C,CAAC,EACF,qGAAqG,CACtG,CAAC;IAEF,uCAAuC,CAAC,OAAO,CAC7C,mBAAmB,EACnB,YAAY,EACZ,iBAAiB,CAClB,CAAC;IAEF,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IACtD,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;AAC5D,CAAC,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SimpleFunctionExpression } from '@finos/legend-graph';
+import { type LambdaFunction } from '@finos/legend-graph';
 import type { QueryBuilderWatermarkState } from './QueryBuilderWatermarkState.js';
-export declare const buildWatermarkExpression: (watermarkState: QueryBuilderWatermarkState, getAllFunc: SimpleFunctionExpression) => SimpleFunctionExpression | undefined;
+export declare const buildWatermarkExpression: (watermarkState: QueryBuilderWatermarkState, lambdaFunction: LambdaFunction) => void;
 //# sourceMappingURL=QueryBuilderWatermarkValueSpecificationBuilder.d.ts.map

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EAEzB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,cAC9B,wBAAwB,KACnC,wBAAwB,GAAG,SAiB7B,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.d.ts","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,eAAO,MAAM,wBAAwB,mBACnB,0BAA0B,kBAC1B,cAAc,KAC7B,IAqBF,CAAC"}

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js

@@ -14,17 +14,20 @@
  * limitations under the License.
  */
 import { SimpleFunctionExpression, extractElementNameFromPath, } from '@finos/legend-graph';
+import { guaranteeNonNullable } from '@finos/legend-shared';
 import { QUERY_BUILDER_SUPPORTED_FUNCTIONS } from '../../graphManager/QueryBuilderSupportedFunctions.js';
-export const buildWatermarkExpression = (watermarkState, getAllFunc) => {
+export const buildWatermarkExpression = (watermarkState, lambdaFunction) => {
     if (!watermarkState.value) {
-        return undefined;
+        return;
     }
+    const currentExpression = guaranteeNonNullable(lambdaFunction.expressionSequence[0]);
     // main filter expression
     const watermarkExpression = new SimpleFunctionExpression(extractElementNameFromPath(QUERY_BUILDER_SUPPORTED_FUNCTIONS.WATERMARK));
     // param [0]
-    watermarkExpression.parametersValues.push(getAllFunc);
+    watermarkExpression.parametersValues.push(currentExpression);
     // param [1]
     watermarkExpression.parametersValues.push(watermarkState.value);
-    return watermarkExpression;
+    // replace watermark as main expression
+    lambdaFunction.expressionSequence[0] = watermarkExpression;
 };
 //# sourceMappingURL=QueryBuilderWatermarkValueSpecificationBuilder.js.map

package/lib/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,UAAoC,EACE,EAAE;IACxC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO,SAAS,CAAC;KAClB;IAED,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,CACxE,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAEtD,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC"}
+{"version":3,"file":"QueryBuilderWatermarkValueSpecificationBuilder.js","sourceRoot":"","sources":["../../../src/stores/watermark/QueryBuilderWatermarkValueSpecificationBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,wBAAwB,EACxB,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,iCAAiC,EAAE,MAAM,sDAAsD,CAAC;AAGzG,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,cAA0C,EAC1C,cAA8B,EACxB,EAAE;IACR,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE;QACzB,OAAO;KACR;IACD,MAAM,iBAAiB,GAAG,oBAAoB,CAC5C,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,CACrC,CAAC;IAEF,yBAAyB;IACzB,MAAM,mBAAmB,GAAG,IAAI,wBAAwB,CACtD,0BAA0B,CAAC,iCAAiC,CAAC,SAAS,CAAC,CACxE,CAAC;IAEF,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE7D,YAAY;IACZ,mBAAmB,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAEhE,uCAAuC;IACvC,cAAc,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC;AAC7D,CAAC,CAAC"}

package/lib/stores/workflows/ServiceQueryBuilderState.js

@@ -86,7 +86,7 @@ export class ServiceQueryBuilderState extends QueryBuilderState {
      */
     propagateExecutionContextChange(executionContext) {
         const mapping = executionContext.mapping;
-        this.changeMapping(mapping);
+        this.changeMapping(mapping, { keepQueryContent: true });
         this.changeRuntime(executionContext.runtimeValue);
         const compatibleClasses = getMappingCompatibleClasses(mapping, this.graphManagerState.usableClasses);
         // if there is no chosen class or the chosen one is not compatible

package/lib/stores/workflows/ServiceQueryBuilderState.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/workflows/ServiceQueryBuilderState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceQueryBuilderState.js","sourceRoot":"","sources":["../../../src/stores/workflows/ServiceQueryBuilderState.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "0.4.4",
+  "version": "0.5.0",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -44,17 +44,17 @@
     "@ag-grid-community/client-side-row-model": "28.2.1",
     "@ag-grid-community/core": "28.2.1",
     "@ag-grid-community/react": "28.2.1",
-    "@finos/legend-application": "10.0.8",
-    "@finos/legend-art": "5.0.5",
-    "@finos/legend-graph": "20.0.2",
-    "@finos/legend-server-depot": "4.1.6",
-    "@finos/legend-shared": "6.2.2",
-    "@finos/legend-storage": "3.0.17",
+    "@finos/legend-application": "10.0.9",
+    "@finos/legend-art": "5.0.6",
+    "@finos/legend-graph": "20.1.0",
+    "@finos/legend-server-depot": "4.1.7",
+    "@finos/legend-shared": "6.2.3",
+    "@finos/legend-storage": "3.0.18",
     "@testing-library/react": "13.4.0",
     "@types/papaparse": "5.3.5",
     "@types/react": "18.0.25",
-    "@types/react-dom": "18.0.8",
-    "mobx": "6.6.2",
+    "@types/react-dom": "18.0.9",
+    "mobx": "6.7.0",
     "mobx-react-lite": "3.4.0",
     "monaco-editor": "0.34.1",
     "papaparse": "5.3.2",
@@ -64,14 +64,14 @@
     "serializr": "3.0.1"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.25",
-    "@jest/globals": "29.3.0",
+    "@finos/legend-dev-utils": "2.0.26",
+    "@jest/globals": "29.3.1",
     "cross-env": "7.0.3",
     "eslint": "8.27.0",
-    "jest": "29.3.0",
+    "jest": "29.3.1",
     "npm-run-all": "4.1.5",
     "rimraf": "3.0.2",
-    "sass": "1.56.0",
+    "sass": "1.56.1",
     "typescript": "4.8.4"
   },
   "peerDependencies": {

package/src/components/QueryBuilder.tsx

@@ -56,6 +56,7 @@ import { guaranteeType } from '@finos/legend-shared';
 import { QueryBuilderGraphFetchTreeState } from '../stores/fetch-structure/graph-fetch/QueryBuilderGraphFetchTreeState.js';
 import { QueryBuilderPostTDSPanel } from './fetch-structure/QueryBuilderPostTDSPanel.js';
 import { QueryBuilderWatermarkEditor } from './watermark/QueryBuilderWatermark.js';
+import { QueryBuilderConstantExpressionPanel } from './QueryBuilderConstantExpressionPanel.js';
 
 export const QUERY_BUILDER_BACKDROP_CONTAINER_ID =
   'query-builder.backdrop-container';
@@ -187,6 +188,11 @@ export const QueryBuilder = observer(
         !queryBuilderState.showParametersPanel,
       );
     };
+    const toggleConstantPanel = (): void => {
+      queryBuilderState.constantState.setShowConstantPanel(
+        !queryBuilderState.constantState.showConstantPanel,
+      );
+    };
     const toggleShowFilterPanel = (): void => {
       queryBuilderState.filterState.setShowPanel(
         !queryBuilderState.filterState.showPanel,
@@ -305,6 +311,27 @@ export const QueryBuilder = observer(
                             </MenuContentItemLabel>
                           </MenuContentItem>
                         )}
+                        {
+                          <MenuContentItem
+                            onClick={toggleConstantPanel}
+                            disabled={
+                              !queryBuilderState.isQuerySupported ||
+                              queryBuilderState.constantState.constants.length >
+                                0
+                            }
+                          >
+                            <MenuContentItemIcon>
+                              {queryBuilderState.constantState
+                                .showConstantPanel ? (
+                                <CheckIcon />
+                              ) : null}
+                            </MenuContentItemIcon>
+                            <MenuContentItemLabel className="query-builder__sub-header__menu-content">
+                              Show Constant(s)
+                            </MenuContentItemLabel>
+                          </MenuContentItem>
+                        }
+
                         <MenuContentItem
                           onClick={toggleShowFilterPanel}
                           disabled={
@@ -441,6 +468,17 @@ export const QueryBuilder = observer(
                                 />
                               </ResizablePanel>
                             )}
+                            {/* constants panel */}
+                            {queryBuilderState.constantState
+                              .showConstantPanel && <ResizablePanelSplitter />}
+                            {queryBuilderState.constantState
+                              .showConstantPanel && (
+                              <ResizablePanel minSize={40} direction={-1}>
+                                <QueryBuilderConstantExpressionPanel
+                                  queryBuilderState={queryBuilderState}
+                                />
+                              </ResizablePanel>
+                            )}
                           </ResizablePanelGroup>
                         </QueryBuilderSidebar>
                       </ResizablePanel>

package/src/components/QueryBuilderConstantExpressionPanel.tsx

@@ -0,0 +1,284 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import {
+  type PackageableElementOption,
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+} from '@finos/legend-application';
+import {
+  BlankPanelPlaceholder,
+  CustomSelectorInput,
+  Dialog,
+  InfoCircleIcon,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
+  PanelFormSection,
+  PanelFormTextField,
+  PlusIcon,
+} from '@finos/legend-art';
+import {
+  type Type,
+  type ValueSpecification,
+  PrimitiveType,
+  VariableExpression,
+  Multiplicity,
+} from '@finos/legend-graph';
+import { generateEnumerableNameFromToken } from '@finos/legend-shared';
+import { observer } from 'mobx-react-lite';
+import { DEFAULT_CONSTANT_VARIABLE_NAME } from '../stores/QueryBuilderConfig.js';
+import type { QueryBuilderState } from '../stores/QueryBuilderState.js';
+import { QueryBuilderConstantExpressionState } from '../stores/QueryBuilderConstantsState.js';
+import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEditorHelper.js';
+import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
+import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
+import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
+
+// Note: We currently only allow constant variables for primitive types of multiplicity ONE.
+// This is why we don't show multiplicity in the editor.
+const QueryBuilderConstantExpressionEditor = observer(
+  (props: { constantState: QueryBuilderConstantExpressionState }) => {
+    const { constantState } = props;
+    const queryBuilderState = constantState.queryBuilderState;
+    const applicationStore = queryBuilderState.applicationStore;
+    const variableState = queryBuilderState.constantState;
+    const varExpression = constantState.variable;
+    const variableName = varExpression.name;
+    const allVariableNames = queryBuilderState.allVariableNames;
+    const isCreating = !variableState.constants.includes(constantState);
+    const valueSpec = constantState.value;
+    const variableType =
+      constantState.value.genericType?.value.rawType ?? PrimitiveType.STRING;
+    const selectedType = buildElementOption(variableType);
+    const close = (): void => {
+      variableState.setSelectedConstant(undefined);
+    };
+    const changeType = (val: PackageableElementOption<Type>): void => {
+      if (variableType !== val.value) {
+        constantState.changeValSpecType(val.value);
+      }
+    };
+    const typeOptions: PackageableElementOption<Type>[] =
+      queryBuilderState.graphManagerState.graph.primitiveTypes
+        .map(buildElementOption)
+        .concat(
+          queryBuilderState.graphManagerState.graph.enumerations.map(
+            buildElementOption,
+          ),
+        );
+    const validationMessage = !variableName
+      ? `Constant Name can't be empty`
+      : allVariableNames.filter((e) => e === variableName).length >
+        (isCreating ? 0 : 1)
+      ? 'Constant Name Already Exists'
+      : undefined;
+    const onAction = (): void => {
+      if (isCreating) {
+        variableState.addConstant(constantState);
+      }
+      close();
+    };
+    const resetConstantValue = (): void => {
+      const valSpec = buildDefaultInstanceValue(
+        queryBuilderState.graphManagerState.graph,
+        variableType,
+      );
+      constantState.setValueSpec(valSpec);
+    };
+
+    return (
+      <Dialog
+        open={Boolean(constantState)}
+        onClose={close}
+        classes={{
+          root: 'editor-modal__root-container',
+          container: 'editor-modal__container',
+          paper: 'editor-modal__content',
+        }}
+      >
+        <Modal
+          darkMode={true}
+          className="editor-modal query-builder__variables__modal"
+        >
+          <ModalHeader
+            title={`${isCreating ? 'Create Constant' : 'Update Constant'}`}
+          />
+          <ModalBody className="query-builder__variables__modal__body">
+            <PanelFormTextField
+              name="Constant Name"
+              prompt="Name of constant. Should be descriptive of its purpose."
+              update={(value: string | undefined): void =>
+                variableExpression_setName(varExpression, value ?? '')
+              }
+              value={varExpression.name}
+              errorMessage={validationMessage}
+              isReadOnly={false}
+            />
+            <PanelFormSection>
+              <div className="panel__content__form__section__header__label">
+                Type
+              </div>
+              <div className="panel__content__form__section__header__prompt">
+                Data type of the parameter.
+              </div>
+              <CustomSelectorInput
+                placeholder="Choose a type..."
+                options={typeOptions}
+                onChange={changeType}
+                value={selectedType}
+                darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
+                formatOptionLabel={getPackageableElementOptionFormatter({
+                  darkMode: !applicationStore.TEMPORARY__isLightThemeEnabled,
+                })}
+              />
+            </PanelFormSection>
+            <PanelFormSection>
+              <div className="panel__content__form__section__header__label">
+                Value
+              </div>
+              <div className="query-builder__variable-editor">
+                <BasicValueSpecificationEditor
+                  valueSpecification={valueSpec}
+                  setValueSpecification={(val: ValueSpecification): void => {
+                    constantState.setValueSpec(val);
+                  }}
+                  graph={queryBuilderState.graphManagerState.graph}
+                  obseverContext={queryBuilderState.observableContext}
+                  typeCheckOption={{
+                    expectedType: variableType,
+                    match: variableType === PrimitiveType.DATETIME,
+                  }}
+                  resetValue={resetConstantValue}
+                />
+              </div>
+            </PanelFormSection>
+          </ModalBody>
+          <ModalFooter>
+            {isCreating && (
+              <button
+                className="btn modal__footer__close-btn btn--dark"
+                onClick={onAction}
+                disabled={Boolean(validationMessage)}
+              >
+                Create
+              </button>
+            )}
+            <button className="btn modal__footer__close-btn" onClick={close}>
+              Close
+            </button>
+          </ModalFooter>
+        </Modal>
+      </Dialog>
+    );
+  },
+);
+
+export const QueryBuilderConstantExpressionPanel = observer(
+  (props: { queryBuilderState: QueryBuilderState }) => {
+    const { queryBuilderState } = props;
+    const constantState = queryBuilderState.constantState;
+    const graph = queryBuilderState.graphManagerState.graph;
+    const isReadOnly = !queryBuilderState.isQuerySupported;
+    const varNames = queryBuilderState.allVariableNames;
+    const addConstant = (): void => {
+      if (!isReadOnly) {
+        const defaultVal = buildDefaultInstanceValue(
+          graph,
+          PrimitiveType.STRING,
+        );
+        const constantName = generateEnumerableNameFromToken(
+          varNames,
+          DEFAULT_CONSTANT_VARIABLE_NAME,
+        );
+        const variableEx = new VariableExpression(
+          constantName,
+          Multiplicity.ONE,
+        );
+        variableEx.genericType = defaultVal.genericType;
+        const constState = new QueryBuilderConstantExpressionState(
+          queryBuilderState,
+          variableEx,
+          defaultVal,
+        );
+        constantState.setSelectedConstant(constState);
+      }
+    };
+
+    return (
+      <div className="panel query-builder__variables">
+        <div className="panel__header">
+          <div className="panel__header__title">
+            <div className="panel__header__title__label">constants</div>
+            <div
+              className="service-editor__pattern__parameters__header__info"
+              title={`Constants are static values set to a variable name that can be leveraged within your query. They remain the same for ALL executions`}
+            >
+              <InfoCircleIcon />
+            </div>
+          </div>
+          {!isReadOnly && (
+            <div className="panel__header__actions">
+              <button
+                className="panel__header__action"
+                tabIndex={-1}
+                onClick={addConstant}
+                title="Add Constant"
+              >
+                <PlusIcon />
+              </button>
+            </div>
+          )}
+        </div>
+        <div className="panel__content query-builder__variables__content">
+          <>
+            {Boolean(queryBuilderState.constantState.constants) &&
+              queryBuilderState.constantState.constants.map((constState) => (
+                <VariableViewer
+                  key={constState.uuid}
+                  variable={constState.variable}
+                  constantValue={constState.value}
+                  actions={{
+                    editVariable: () =>
+                      constantState.setSelectedConstant(constState),
+                    deleteVariable: () =>
+                      constantState.removeConstant(constState),
+                  }}
+                  isReadOnly={isReadOnly}
+                />
+              ))}
+            {!constantState.constants.length && (
+              <BlankPanelPlaceholder
+                text="Add a Constants"
+                disabled={isReadOnly}
+                onClick={addConstant}
+                clickActionType="add"
+                previewText="No constants"
+                tooltipText="Click to add a new constant"
+              />
+            )}
+          </>
+        </div>
+        {constantState.selectedConstant && (
+          <QueryBuilderConstantExpressionEditor
+            constantState={constantState.selectedConstant}
+          />
+        )}
+      </div>
+    );
+  },
+);

package/src/components/QueryBuilderDiffPanel.tsx

@@ -15,7 +15,6 @@
  */
 
 import {
-  createPassThroughOnKeyHandler,
   EDITOR_LANGUAGE,
   EDITOR_THEME,
   TAB_SIZE,
@@ -70,7 +69,6 @@ const TextDiffView = observer(
           readOnly: true,
           wordWrap: 'on',
         });
-        _editor.getOriginalEditor().onKeyDown(createPassThroughOnKeyHandler());
         setEditor(_editor);
       }
     }, [applicationStore, editor]);