@finos/legend-query-builder 4.7.2 → 4.7.3

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

@@ -30,7 +30,6 @@ import {
   PanelDropZone,
   DragPreviewLayer,
   useDragPreviewLayer,
-  OptionsIcon,
   PlusIcon,
   PanelContent,
   TrashIcon,
@@ -1063,97 +1062,92 @@ export const QueryBuilderTDSPanel = observer(
     return (
       <PanelContent>
         <div className="query-builder__projection__toolbar">
-          <button
-            className="panel__header__action"
-            onClick={openResultSetModifierEditor}
-            tabIndex={-1}
-            title="Configure result set modifiers..."
-          >
-            <OptionsIcon className="query-builder__icon query-builder__icon__query-option" />
-          </button>
-          <button
-            className="panel__header__action"
-            disabled={isEmpty}
-            onClick={clearAllProjectionColumns}
-            tabIndex={-1}
-            title={
-              isEmpty
-                ? 'No projection columns to clear'
-                : 'Clear all projection columns'
+          <div
+            className="query-builder__projection__result-modifier-prompt"
+            data-testid={
+              QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS_RESULT_MODIFIER_PROMPT
             }
           >
-            <TrashIcon className="query-builder__icon query-builder__icon__query-option--small" />
-          </button>
-          <button
-            className="panel__header__action"
-            onClick={addNewBlankDerivation}
-            tabIndex={-1}
-            title="Add a new derivation"
-          >
-            <PlusIcon />
-          </button>
-        </div>
-        <div
-          className="query-builder__projection__result-modifier-prompt"
-          data-testid={
-            QUERY_BUILDER_TEST_ID.QUERY_BUILDER_TDS_RESULT_MODIFIER_PROMPT
-          }
-        >
-          <div className="query-builder__projection__result-modifier-prompt__header">
-            <button
-              className="query-builder__projection__result-modifier-prompt__header__label"
-              onClick={openResultSetModifierEditor}
-            >
-              <CogIcon className="query-builder__projection__result-modifier-prompt__header__label__icon" />
-              <div className="query-builder__projection__result-modifier-prompt__header__label__title">
-                Query Options
-              </div>
-            </button>
-          </div>
-          {tdsState.resultSetModifierState.limit && (
-            <div className="query-builder__projection__result-modifier-prompt__group">
-              <div className="query-builder__projection__result-modifier-prompt__group__label">
-                Max Rows
-              </div>
-              <div
-                className="query-builder__projection__result-modifier-prompt__group__content"
+            <div className="query-builder__projection__result-modifier-prompt__header">
+              <button
+                className="query-builder__projection__result-modifier-prompt__header__label"
                 onClick={openResultSetModifierEditor}
+                title="Configure result set modifiers..."
               >
-                {tdsState.resultSetModifierState.limit}
-              </div>
+                <CogIcon className="query-builder__projection__result-modifier-prompt__header__label__icon" />
+                <div className="query-builder__projection__result-modifier-prompt__header__label__title">
+                  Query Options
+                </div>
+              </button>
             </div>
-          )}
-          {tdsState.resultSetModifierState.distinct && (
-            <div className="query-builder__projection__result-modifier-prompt__group">
-              <div className="query-builder__projection__result-modifier-prompt__group__label">
-                Eliminate Duplicate Rows
+            {tdsState.resultSetModifierState.limit && (
+              <div className="query-builder__projection__result-modifier-prompt__group">
+                <div className="query-builder__projection__result-modifier-prompt__group__label">
+                  Max Rows
+                </div>
+                <div
+                  className="query-builder__projection__result-modifier-prompt__group__content"
+                  onClick={openResultSetModifierEditor}
+                >
+                  {tdsState.resultSetModifierState.limit}
+                </div>
               </div>
-              <div
-                className="query-builder__projection__result-modifier-prompt__group__content"
-                onClick={openResultSetModifierEditor}
-              >
-                Yes
+            )}
+            {tdsState.resultSetModifierState.distinct && (
+              <div className="query-builder__projection__result-modifier-prompt__group">
+                <div className="query-builder__projection__result-modifier-prompt__group__label">
+                  Eliminate Duplicate Rows
+                </div>
+                <div
+                  className="query-builder__projection__result-modifier-prompt__group__content"
+                  onClick={openResultSetModifierEditor}
+                >
+                  Yes
+                </div>
               </div>
-            </div>
-          )}
-          {tdsState.resultSetModifierState.sortColumns.length > 0 && (
-            <div className="query-builder__projection__result-modifier-prompt__group">
-              <div className="query-builder__projection__result-modifier-prompt__group__label">
-                Sort
+            )}
+            {tdsState.resultSetModifierState.sortColumns.length > 0 && (
+              <div className="query-builder__projection__result-modifier-prompt__group">
+                <div className="query-builder__projection__result-modifier-prompt__group__label">
+                  Sort
+                </div>
+                {tdsState.resultSetModifierState.sortColumns.map(
+                  (columnState) => (
+                    <div
+                      className="query-builder__projection__result-modifier-prompt__group__content"
+                      key={columnState.columnState.uuid}
+                      onClick={openResultSetModifierEditor}
+                    >
+                      {`${columnState.columnState.columnName} ${columnState.sortType}`}
+                    </div>
+                  ),
+                )}
               </div>
-              {tdsState.resultSetModifierState.sortColumns.map(
-                (columnState) => (
-                  <div
-                    className="query-builder__projection__result-modifier-prompt__group__content"
-                    key={columnState.columnState.uuid}
-                    onClick={openResultSetModifierEditor}
-                  >
-                    {`${columnState.columnState.columnName} ${columnState.sortType}`}
-                  </div>
-                ),
-              )}
-            </div>
-          )}
+            )}
+          </div>
+          <div className="query-builder__projection__toolbar__actions">
+            <button
+              className="panel__header__action"
+              disabled={isEmpty}
+              onClick={clearAllProjectionColumns}
+              tabIndex={-1}
+              title={
+                isEmpty
+                  ? 'No projection columns to clear'
+                  : 'Clear all projection columns'
+              }
+            >
+              <TrashIcon className="query-builder__icon query-builder__icon__query-option--small" />
+            </button>
+            <button
+              className="panel__header__action"
+              onClick={addNewBlankDerivation}
+              tabIndex={-1}
+              title="Add a new derivation"
+            >
+              <PlusIcon />
+            </button>
+          </div>
         </div>
         <div className="query-builder__projection__content">
           <PanelDropZone

package/src/graph-manager/QueryBuilderConst.ts

@@ -18,3 +18,5 @@ export enum QUERY_BUILDER_CALENDAR_TYPE {
   NY = 'NY',
   LDN = 'LDN',
 }
+
+export const DEFAULT_LOCALE = 'en-US';

package/src/stores/QueryBuilderResultState.ts

@@ -98,13 +98,13 @@ export class QueryBuilderResultState {
       mousedOverCell: observable,
       isRunningQuery: observable,
       isSelectingCells: observable,
-      setIsSelectingCells: action,
       isQueryUsageViewerOpened: observable,
+      setIsSelectingCells: action,
       setIsRunningQuery: action,
       setExecutionResult: action,
       setExecutionDuration: action,
       setPreviewLimit: action,
-      addCellData: action,
+      addSelectedCell: action,
       setSelectedCells: action,
       setMouseOverCell: action,
       setQueryRunPromise: action,
@@ -124,43 +124,41 @@ export class QueryBuilderResultState {
     );
   }
 
-  setIsSelectingCells = (val: boolean): void => {
+  setIsSelectingCells(val: boolean): void {
     this.isSelectingCells = val;
-  };
+  }
 
-  setIsRunningQuery = (val: boolean): void => {
+  setIsRunningQuery(val: boolean): void {
     this.isRunningQuery = val;
-  };
+  }
 
-  setExecutionResult = (val: ExecutionResult | undefined): void => {
+  setExecutionResult(val: ExecutionResult | undefined): void {
     this.executionResult = val;
-  };
+  }
 
-  setExecutionDuration = (val: number | undefined): void => {
+  setExecutionDuration(val: number | undefined): void {
     this.executionDuration = val;
-  };
+  }
 
-  setPreviewLimit = (val: number): void => {
+  setPreviewLimit(val: number): void {
     this.previewLimit = Math.max(1, val);
-  };
+  }
 
-  addCellData = (val: QueryBuilderTDSResultCellData): void => {
+  addSelectedCell(val: QueryBuilderTDSResultCellData): void {
     this.selectedCells.push(val);
-  };
+  }
 
-  setSelectedCells = (val: QueryBuilderTDSResultCellData[]): void => {
+  setSelectedCells(val: QueryBuilderTDSResultCellData[]): void {
     this.selectedCells = val;
-  };
+  }
 
-  setMouseOverCell = (val: QueryBuilderTDSResultCellData | null): void => {
+  setMouseOverCell(val: QueryBuilderTDSResultCellData | null): void {
     this.mousedOverCell = val;
-  };
+  }
 
-  setQueryRunPromise = (
-    promise: Promise<ExecutionResult> | undefined,
-  ): void => {
+  setQueryRunPromise(promise: Promise<ExecutionResult> | undefined): void {
     this.queryRunPromise = promise;
-  };
+  }
 
   setIsQueryUsageViewerOpened(val: boolean): void {
     this.isQueryUsageViewerOpened = val;