@finos/legend-query-builder 0.6.24 → 0.6.27

package/lib/stores/QueryBuilderState.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-query-builder",
-  "version": "0.6.24",
+  "version": "0.6.27",
   "description": "Legend query builder core",
   "keywords": [
     "legend",
@@ -41,17 +41,17 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@ag-grid-community/client-side-row-model": "29.0.0",
-    "@ag-grid-community/core": "29.0.0",
-    "@ag-grid-community/react": "29.0.0",
-    "@ag-grid-community/styles": "29.0.0",
-    "@finos/legend-application": "10.2.15",
-    "@finos/legend-art": "5.0.25",
-    "@finos/legend-graph": "22.2.6",
-    "@finos/legend-server-depot": "4.3.1",
-    "@finos/legend-shared": "6.2.18",
-    "@finos/legend-storage": "3.0.33",
-    "@testing-library/react": "13.4.0",
+    "@ag-grid-community/client-side-row-model": "29.1.0",
+    "@ag-grid-community/core": "29.1.0",
+    "@ag-grid-community/react": "29.1.0",
+    "@ag-grid-community/styles": "29.1.0",
+    "@finos/legend-application": "10.2.18",
+    "@finos/legend-art": "5.0.27",
+    "@finos/legend-graph": "22.3.0",
+    "@finos/legend-server-depot": "4.4.0",
+    "@finos/legend-shared": "6.2.20",
+    "@finos/legend-storage": "3.0.35",
+    "@testing-library/react": "14.0.0",
     "@types/papaparse": "5.3.7",
     "@types/react": "18.0.28",
     "@types/react-dom": "18.0.11",
@@ -65,14 +65,14 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.0.41",
-    "@jest/globals": "29.4.2",
+    "@finos/legend-dev-utils": "2.0.42",
+    "@jest/globals": "29.4.3",
     "cross-env": "7.0.3",
     "eslint": "8.34.0",
-    "jest": "29.4.2",
+    "jest": "29.4.3",
     "npm-run-all": "4.1.5",
     "rimraf": "4.1.2",
-    "sass": "1.58.1",
+    "sass": "1.58.3",
     "typescript": "4.9.5"
   },
   "peerDependencies": {

package/src/components/QueryBuilder.tsx

@@ -39,6 +39,7 @@ import {
   ModalFooter,
   ModalHeader,
   BlankPanelContent,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import { QueryBuilderFilterPanel } from './filter/QueryBuilderFilterPanel.js';
 import { QueryBuilderExplorerPanel } from './explorer/QueryBuilderExplorerPanel.js';
@@ -233,12 +234,7 @@ const renderCheckEntitlementsEditor = (
           </BlankPanelContent>
         </ModalBody>
         <ModalFooter>
-          <button
-            className="btn modal__footer__close-btn"
-            onClick={handleClose}
-          >
-            Close
-          </button>
+          <ModalFooterButton text="Close" onClick={handleClose} />
         </ModalFooter>
       </Modal>
     </Dialog>
@@ -370,6 +366,12 @@ export const QueryBuilder = observer(
                 )}
               </div>
               <div className="query-builder__sub-header__content__actions">
+                <div
+                  title="Query title"
+                  className="query-builder__sub-header__query__title"
+                >
+                  {queryBuilderState.titleOfQuery}
+                </div>
                 <div className="query-builder__sub-header__actions">
                   <DropdownMenu
                     className="query-builder__sub-header__custom-action"

package/src/components/QueryBuilderComponentTestUtils.tsx

@@ -62,9 +62,15 @@ export const TEST__setUpQueryBuilder = async (
     entities,
     graphManagerState.graphBuildState,
   );
+
+  const history = createMemoryHistory();
+  const navigator = new WebApplicationNavigator(history);
+  TEST__provideMockedWebApplicationNavigator({ mock: navigator });
+
   const applicationStore = TEST__provideMockedApplicationStore(
     TEST__getGenericApplicationConfig(),
     pluginManager,
+    { navigator },
   );
 
   const queryBuilderState = new INTERNAL__BasicQueryBuilderState(
@@ -93,11 +99,6 @@ export const TEST__setUpQueryBuilder = async (
     );
   }
 
-  const history = createMemoryHistory();
-  const navigator = new WebApplicationNavigator(history);
-  applicationStore.navigator = navigator;
-  TEST__provideMockedWebApplicationNavigator({ mock: navigator });
-
   const renderResult = render(
     <Router history={history}>
       <TEST__ApplicationStoreProvider

package/src/components/QueryBuilderConstantExpressionPanel.tsx

@@ -28,6 +28,7 @@ import {
   Modal,
   ModalBody,
   ModalFooter,
+  ModalFooterButton,
   ModalHeader,
   PanelFormSection,
   PanelFormTextField,
@@ -49,6 +50,7 @@ import { buildDefaultInstanceValue } from '../stores/shared/ValueSpecificationEd
 import { variableExpression_setName } from '../stores/shared/ValueSpecificationModifierHelper.js';
 import { BasicValueSpecificationEditor } from './shared/BasicValueSpecificationEditor.js';
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
+import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.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.
@@ -135,7 +137,7 @@ const QueryBuilderConstantExpressionEditor = observer(
                 Type
               </div>
               <div className="panel__content__form__section__header__prompt">
-                Data type of the parameter.
+                Data type of the constant.
               </div>
               <CustomSelectorInput
                 placeholder="Choose a type..."
@@ -172,17 +174,13 @@ const QueryBuilderConstantExpressionEditor = observer(
           </ModalBody>
           <ModalFooter>
             {isCreating && (
-              <button
-                className="btn modal__footer__close-btn btn--dark"
+              <ModalFooterButton
+                text="Create"
+                inProgress={Boolean(validationMessage)}
                 onClick={onAction}
-                disabled={Boolean(validationMessage)}
-              >
-                Create
-              </button>
+              />
             )}
-            <button className="btn modal__footer__close-btn" onClick={close}>
-              Close
-            </button>
+            <ModalFooterButton text="Close" onClick={close} />
           </ModalFooter>
         </Modal>
       </Dialog>
@@ -226,7 +224,10 @@ export const QueryBuilderConstantExpressionPanel = observer(
     };
 
     return (
-      <div className="panel query-builder__variables">
+      <div
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_CONSTANTS}
+        className="panel query-builder__variables"
+      >
         <div className="panel__header">
           <div className="panel__header__title">
             <div className="panel__header__title__label">constants</div>

package/src/components/QueryBuilderDiffPanel.tsx

@@ -26,6 +26,7 @@ import {
   Dialog,
   disposeDiffEditor,
   useResizeDetector,
+  Button,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import { editor as monacoEditorAPI } from 'monaco-editor';
@@ -195,9 +196,7 @@ export const QueryBuilderDiffViewPanel = observer(
               )}
             </div>
             <div className="query-builder__diff-panel__actions">
-              <button className="btn btn--dark" onClick={close}>
-                Close
-              </button>
+              <Button text="close" onClick={close} />
             </div>
           </div>
         </div>

package/src/components/QueryBuilderParametersPanel.tsx

@@ -52,6 +52,7 @@ import { variableExpression_setName } from '../stores/shared/ValueSpecificationM
 import { LambdaParameterState } from '../stores/shared/LambdaParameterState.js';
 import { LambdaParameterValuesEditor } from './shared/LambdaParameterValuesEditor.js';
 import { VariableViewer } from './shared/QueryBuilderVariableSelector.js';
+import { QUERY_BUILDER_TEST_ID } from './QueryBuilder_TestID.js';
 
 type MultiplicityOption = { label: string; value: Multiplicity };
 
@@ -71,12 +72,16 @@ const VariableExpressionEditor = observer(
     const { queryBuilderState, lambdaParameterState } = props;
     const applicationStore = useApplicationStore();
     const queryParametersState = queryBuilderState.parametersState;
+    const allVariableNames = queryBuilderState.allVariableNames;
     const isCreating =
       !queryParametersState.parameterStates.includes(lambdaParameterState);
     const varState = lambdaParameterState.parameter;
     const multiplity = varState.multiplicity;
     const validationMessage = !varState.name
       ? `Parameter name can't be empty`
+      : allVariableNames.filter((e) => e === varState.name).length >
+        (isCreating ? 0 : 1)
+      ? 'Parameter Name Already Exists'
       : (isCreating &&
           queryParametersState.parameterStates.find(
             (p) => p.parameter.name === varState.name,
@@ -200,13 +205,11 @@ const VariableExpressionEditor = observer(
           </ModalBody>
           <ModalFooter>
             {isCreating && (
-              <button
-                className="btn modal__footer__close-btn btn--dark"
+              <ModalFooterButton
+                text="Create"
+                inProgress={Boolean(validationMessage)}
                 onClick={onAction}
-                disabled={Boolean(validationMessage)}
-              >
-                Create
-              </button>
+              />
             )}
             <ModalFooterButton onClick={close} text="Close" />
           </ModalFooter>
@@ -247,7 +250,10 @@ export const QueryBuilderParametersPanel = observer(
     };
 
     return (
-      <div className="panel query-builder__variables">
+      <div
+        data-testid={QUERY_BUILDER_TEST_ID.QUERY_BUILDER_PARAMETERS}
+        className="panel query-builder__variables"
+      >
         <div className="panel__header">
           <div className="panel__header__title">
             <div className="panel__header__title__label">parameters</div>

package/src/components/QueryBuilderPropertyExpressionEditor.tsx

@@ -25,6 +25,7 @@ import {
   ModalHeader,
   ModalBody,
   ModalFooter,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import {
@@ -304,7 +305,25 @@ export const QueryBuilderPropertyExpressionEditor = observer(
     const { propertyExpressionState } = props;
     const handleClose = (): void =>
       propertyExpressionState.setIsEditingDerivedProperty(false);
-
+    const isParameterCompatibleWithDerivedProperty = (
+      variable: VariableExpression,
+      derivedProperties: QueryBuilderDerivedPropertyExpressionState[],
+    ): boolean =>
+      Boolean(
+        derivedProperties.find((dp) => {
+          if (!variable.genericType?.value.rawType) {
+            return false;
+          }
+          return (
+            isSuperType(
+              dp.derivedProperty.genericType.value.rawType,
+              variable.genericType.value.rawType,
+            ) ||
+            dp.derivedProperty.genericType.value.rawType.name ===
+              variable.genericType.value.rawType.name
+          );
+        }),
+      );
     return (
       <Dialog
         open={Boolean(
@@ -334,16 +353,17 @@ export const QueryBuilderPropertyExpressionEditor = observer(
             <ModalBody className="query-builder__variables__modal__body">
               <VariableSelector
                 queryBuilderState={propertyExpressionState.queryBuilderState}
+                filterBy={(v: VariableExpression) =>
+                  isParameterCompatibleWithDerivedProperty(
+                    v,
+                    propertyExpressionState.derivedPropertyExpressionStates,
+                  )
+                }
               />
             </ModalBody>
           </ModalBody>
           <ModalFooter>
-            <button
-              className="btn modal__footer__close-btn"
-              onClick={handleClose}
-            >
-              Done
-            </button>
+            <ModalFooterButton text="Done" onClick={handleClose} />
           </ModalFooter>
         </Modal>
       </Dialog>

package/src/components/QueryBuilder_TestID.ts

@@ -27,4 +27,6 @@ export enum QUERY_BUILDER_TEST_ID {
   QUERY_BUILDER_EXPLORER = 'query__builder__explorer',
   QUERY_BUILDER_PROPERTY_SEARCH_PANEL = 'query__builder__property__search__panel',
   QUERY_BUILDER_RESULT_PANEL = 'query__builder__result__panel',
+  QUERY_BUILDER_PARAMETERS = 'query-builder__parameters',
+  QUERY_BUILDER_CONSTANTS = 'query-builder__constants',
 }

package/src/components/explorer/QueryBuilderExplorerPanel.tsx

@@ -52,6 +52,7 @@ import {
   ModalBody,
   ModalFooter,
   ModalHeader,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import {
   type QueryBuilderExplorerTreeDragSource,
@@ -62,12 +63,16 @@ import {
   QueryBuilderExplorerTreeSubTypeNodeData,
   getQueryBuilderPropertyNodeData,
   getQueryBuilderSubTypeNodeData,
+  buildPropertyExpressionFromExplorerTreeNodeData,
 } from '../../stores/explorer/QueryBuilderExplorerState.js';
 import { useDrag } from 'react-dnd';
 import { QueryBuilderPropertyInfoTooltip } from '../shared/QueryBuilderPropertyInfoTooltip.js';
 import type { QueryBuilderState } from '../../stores/QueryBuilderState.js';
 import { flowResult } from 'mobx';
-import { prettyPropertyName } from '../../stores/QueryBuilderPropertyEditorState.js';
+import {
+  getPropertyChainName,
+  prettyPropertyName,
+} from '../../stores/QueryBuilderPropertyEditorState.js';
 import {
   type Type,
   type Multiplicity,
@@ -89,6 +94,8 @@ import { getClassPropertyIcon } from '../shared/ElementIconUtils.js';
 import { QUERY_BUILDER_TEST_ID } from '../QueryBuilder_TestID.js';
 import { filterByType, guaranteeNonNullable } from '@finos/legend-shared';
 import { QueryBuilderPropertySearchPanel } from './QueryBuilderPropertySearchPanel.js';
+import { QueryBuilderTDSState } from '../../stores/fetch-structure/tds/QueryBuilderTDSState.js';
+import { QueryBuilderSimpleProjectionColumnState } from '../../stores/fetch-structure/tds/projection/QueryBuilderProjectionColumnState.js';
 
 const checkForDeprecatedNode = (
   node: QueryBuilderExplorerTreeNodeData,
@@ -260,9 +267,7 @@ const QueryBuilderExplorerPreviewDataModal = observer(
             )}
           </ModalBody>
           <ModalFooter>
-            <button className="btn modal__footer__close-btn" onClick={close}>
-              Close
-            </button>
+            <ModalFooterButton text="Close" onClick={close} />
           </ModalFooter>
         </Modal>
       </Dialog>
@@ -298,7 +303,36 @@ const QueryBuilderExplorerContextMenu = observer(
             (childNode) =>
               !(childNode.type instanceof Class) &&
               childNode.mappingData.mapped,
-          );
+          )
+          .filter((childNode) => {
+            const propertyExpression =
+              buildPropertyExpressionFromExplorerTreeNodeData(
+                childNode,
+                queryBuilderState.explorerState,
+              );
+            if (
+              queryBuilderState.fetchStructureState.implementation instanceof
+              QueryBuilderTDSState
+            ) {
+              const currentProjectColumns =
+                queryBuilderState.fetchStructureState.implementation.projectionColumns.find(
+                  (currCol) => {
+                    if (
+                      currCol instanceof QueryBuilderSimpleProjectionColumnState
+                    ) {
+                      return (
+                        currCol.propertyExpressionState.path === childNode.id &&
+                        currCol.columnName ===
+                          getPropertyChainName(propertyExpression, true)
+                      );
+                    }
+                    return undefined;
+                  },
+                );
+              return currentProjectColumns === undefined;
+            }
+            return true;
+          });
         nodesToAdd.forEach((nodeToAdd) =>
           queryBuilderState.fetchStructureState.fetchProperty(nodeToAdd),
         );

package/src/components/explorer/QueryBuilderMilestoningEditor.tsx

@@ -35,6 +35,7 @@ import {
   Modal,
   ModalBody,
   ModalFooter,
+  ModalFooterButton,
   ModalHeader,
   PanelEntryDropZonePlaceholder,
   PanelFormSection,
@@ -279,9 +280,7 @@ export const MilestoningParametersEditor = observer(
             </div>
           </ModalBody>
           <ModalFooter>
-            <button className="btn modal__footer__close-btn" onClick={close}>
-              Close
-            </button>
+            <ModalFooterButton text="Close" onClick={close} />
           </ModalFooter>
         </Modal>
       </Dialog>

package/src/components/fetch-structure/QueryBuilderPostFilterPanel.tsx

@@ -34,7 +34,7 @@ import {
   ExpandIcon,
   CompressIcon,
   CircleIcon,
-  BrushIcon,
+  TrashIcon,
   NewFolderIcon,
   PlusCircleIcon,
   InfoCircleIcon,
@@ -926,7 +926,7 @@ const QueryBuilderPostFilterPanelContent = observer(
               tabIndex={-1}
               title="Cleanup Tree"
             >
-              <BrushIcon />
+              <TrashIcon />
             </button>
             <button
               className="panel__header__action"

package/src/components/fetch-structure/QueryBuilderResultModifierPanel.tsx

@@ -27,6 +27,9 @@ import {
   ModalFooter,
   ModalHeader,
   SortIcon,
+  DropdownMenu,
+  MenuContent,
+  MenuContentItem,
 } from '@finos/legend-art';
 import {
   COLUMN_SORT_TYPE,
@@ -64,16 +67,12 @@ const ColumnSortEditor = observer(
       }
     };
     const sortType = sortState.sortType;
-    const toggleSortType = (): void => {
-      sortState.setSortType(
-        sortType === COLUMN_SORT_TYPE.ASC
-          ? COLUMN_SORT_TYPE.DESC
-          : COLUMN_SORT_TYPE.ASC,
-      );
-    };
+
     const deleteColumnSort = (): void =>
       tdsState.resultSetModifierState.deleteSortColumn(sortState);
-
+    const changeSortBy = (sortOp: COLUMN_SORT_TYPE) => (): void => {
+      sortState.setSortType(sortOp);
+    };
     return (
       <div className="panel__content__form__section__list__item query-builder__projection__options__sort">
         <CustomSelectorInput
@@ -87,13 +86,34 @@ const ColumnSortEditor = observer(
           value={value}
           darkMode={!applicationStore.TEMPORARY__isLightThemeEnabled}
         />
-        <button
-          className="btn--dark btn--sm query-builder__projection__options__sort__type-btn"
-          tabIndex={-1}
-          onClick={toggleSortType}
+        <div className="query-builder__projection__options__sort__sortby">
+          {sortType.toLowerCase()}
+        </div>
+        <DropdownMenu
+          content={
+            <MenuContent>
+              {Object.values(COLUMN_SORT_TYPE).map((op) => (
+                <MenuContentItem key={op} onClick={changeSortBy(op)}>
+                  {op.toLowerCase()}
+                </MenuContentItem>
+              ))}
+            </MenuContent>
+          }
+          menuProps={{
+            anchorOrigin: { vertical: 'bottom', horizontal: 'left' },
+            transformOrigin: { vertical: 'top', horizontal: 'left' },
+            elevation: 7,
+          }}
         >
-          <SortIcon />
-        </button>
+          <div
+            className="query-builder__projection__options__sort__sortby--btn"
+            tabIndex={-1}
+            title="Choose SortBy Operator..."
+          >
+            <SortIcon />
+          </div>
+        </DropdownMenu>
+
         <button
           className="query-builder__projection__options__sort__remove-btn btn--dark btn--caution"
           onClick={deleteColumnSort}

package/src/components/fetch-structure/QueryBuilderTDSPanel.tsx

@@ -35,7 +35,7 @@ import {
   OptionsIcon,
   PlusIcon,
   PanelContent,
-  BrushIcon,
+  TrashIcon,
 } from '@finos/legend-art';
 import {
   type QueryBuilderExplorerTreeDragSource,
@@ -583,7 +583,7 @@ export const QueryBuilderTDSPanel = observer(
                 : 'Clear all projection columns'
             }
           >
-            <BrushIcon className="query-builder__icon query-builder__icon__query-option--small" />
+            <TrashIcon className="query-builder__icon query-builder__icon__query-option--small" />
           </button>
           <button
             className="panel__header__action"

package/src/components/fetch-structure/QueryBuilderTDSWindowPanel.tsx

@@ -42,6 +42,7 @@ import {
   Modal,
   ModalFooter,
   PanelFormSection,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import { assertErrorThrown, guaranteeNonNullable } from '@finos/legend-shared';
 import { observer } from 'mobx-react-lite';
@@ -513,13 +514,9 @@ const QueryBuilderWindowColumnModalEditor = observer(
           </div>
           <ModalFooter>
             {createNewWindow ? (
-              <button className="btn modal__footer__close-btn" onClick={create}>
-                Create
-              </button>
+              <ModalFooterButton text="Create" onClick={create} />
             ) : (
-              <button className="btn modal__footer__close-btn" onClick={close}>
-                Close
-              </button>
+              <ModalFooterButton text="Close" onClick={close} />
             )}
           </ModalFooter>
         </Modal>

package/src/components/filter/QueryBuilderFilterPanel.tsx

@@ -29,7 +29,7 @@ import {
   FilledTriangleIcon,
   CompressIcon,
   ExpandIcon,
-  BrushIcon,
+  TrashIcon,
   NewFolderIcon,
   CircleIcon,
   CaretDownIcon,
@@ -850,7 +850,7 @@ export const QueryBuilderFilterPanel = observer(
               tabIndex={-1}
               title="Cleanup Tree"
             >
-              <BrushIcon />
+              <TrashIcon />
             </button>
             <button
               className="panel__header__action"