@finos/legend-application-studio 26.1.9 → 26.1.11

package/src/components/editor/editor-group/element-generation-editor/FileGenerationEditor.tsx

@@ -967,7 +967,7 @@ export const FileGenerationConfigurationEditor = observer(
     const applicationStore = useApplicationStore();
     const fileGeneration = fileGenerationState.fileGeneration;
     const fileGenerationConfiguration =
-      editorStore.graphState.graphGenerationState.getFileGenerationConfiguration(
+      editorStore.graphState.graphGenerationState.globalFileGenerationState.getFileGenerationConfiguration(
         fileGeneration.type,
       ).properties;
     const debouncedRegenerate = useMemo(

package/src/components/editor/editor-group/element-generation-editor/FileSystemViewer.tsx

@@ -17,10 +17,6 @@
 import { Fragment } from 'react';
 import { observer } from 'mobx-react-lite';
 import { flowResult } from 'mobx';
-import {
-  getTextContent,
-  getEditorLanguageForFormat,
-} from '../../../../stores/editor/editor-state/FileGenerationViewerState.js';
 import { guaranteeNonNullable } from '@finos/legend-shared';
 import {
   type TreeNodeContainerProps,
@@ -56,6 +52,10 @@ import {
 import { useApplicationStore } from '@finos/legend-application';
 import type { DSL_Generation_LegendStudioApplicationPlugin_Extension } from '../../../../stores/extensions/DSL_Generation_LegendStudioApplicationPlugin_Extension.js';
 import { CodeEditor } from '@finos/legend-lego/code-editor';
+import {
+  getEditorLanguageForFormat,
+  getTextContent,
+} from '../../../../stores/editor/editor-state/ArtifactGenerationViewerState.js';
 
 export const FileSystemTreeNodeContainer: React.FC<
   TreeNodeContainerProps<

package/src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.tsx

@@ -44,7 +44,6 @@ import {
   type InnerSchemaSetEditorState,
   SCHEMA_SET_TAB_TYPE,
 } from '../../../../stores/editor/editor-state/element-editor-state/external-format/DSL_ExternalFormat_SchemaSetEditorState.js';
-import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/FileGenerationViewerState.js';
 import { guaranteeNonNullable, prettyCONSTName } from '@finos/legend-shared';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
@@ -59,6 +58,7 @@ import {
   CODE_EDITOR_LANGUAGE,
   CodeEditor,
 } from '@finos/legend-lego/code-editor';
+import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/ArtifactGenerationViewerState.js';
 
 const SchemaLoader = observer(
   (props: {

package/src/components/editor/editor-group/mapping-editor/DEPRECATED__MappingTestEditor.tsx

@@ -260,30 +260,30 @@ const MappingTestQueryEditor = observer(
             <div className="panel__header__title__label">query</div>
           </div>
           <div className="panel__header__actions">
-            <div className="mapping-test-editor__action-btn">
+            <div className="btn__dropdown-combo">
               <button
-                className="mapping-test-editor__action-btn__label"
+                className="btn__dropdown-combo__label"
                 onClick={editWithQueryBuilder()}
                 title="Edit Query"
                 tabIndex={-1}
               >
-                <PencilIcon className="mapping-test-editor__action-btn__label__icon" />
-                <div className="mapping-test-editor__action-btn__label__title">
+                <PencilIcon className="btn__dropdown-combo__label__icon" />
+                <div className="btn__dropdown-combo__label__title">
                   Edit Query
                 </div>
               </button>
               <DropdownMenu
-                className="mapping-test-editor__action-btn__dropdown-btn"
+                className="btn__dropdown-combo__dropdown-btn"
                 content={
                   <MenuContent>
                     <MenuContentItem
-                      className="mapping-test-editor__action-btn__option"
+                      className="btn__dropdown-combo__option"
                       onClick={editWithQueryBuilder(true)}
                     >
                       Text Mode
                     </MenuContentItem>
                     <MenuContentItem
-                      className="mapping-test-editor__action-btn__option"
+                      className="btn__dropdown-combo__option"
                       onClick={clearQuery}
                     >
                       Clear Query
@@ -302,15 +302,7 @@ const MappingTestQueryEditor = observer(
         </div>
         {!isStubbed_RawLambda(queryState.query) && (
           <PanelContent>
-            <div
-              className="mapping-test-editor__query-panel__query"
-              title="Double click to edit in query builder"
-              onDoubleClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                editWithQueryBuilder()();
-              }}
-            >
+            <div className="mapping-test-editor__query-panel__query">
               <CodeEditor
                 inputValue={queryState.lambdaString}
                 isReadOnly={true}
@@ -791,64 +783,66 @@ export const DEPRECATED__MappingTestEditor = observer(
             ))}
           </div>
           <div className="panel__header__actions mapping-test-editor__header__actions">
-            {testState.isRunningTest ? (
-              <button
-                className="mapping-test-editor__stop-btn"
-                onClick={cancelTest}
-                tabIndex={-1}
-              >
-                <div className="btn--dark btn--caution mapping-test-editor__stop-btn__label">
-                  <PauseCircleIcon className="mapping-test-editor__stop-btn__label__icon" />
-                  <div className="mapping-test-editor__stop-btn__label__title">
-                    Stop
-                  </div>
-                </div>
-              </button>
-            ) : (
-              <div className="mapping-test-editor__action-btn">
+            <div className="mapping-test-editor__action-btn btn__dropdown-combo btn__dropdown-combo--primary">
+              {testState.isRunningTest ? (
                 <button
-                  className="mapping-test-editor__action-btn__label"
-                  onClick={runTest}
-                  disabled={
-                    testState.isExecutingTest || testState.isGeneratingPlan
-                  }
+                  className="btn__dropdown-combo__canceler"
+                  onClick={cancelTest}
                   tabIndex={-1}
                 >
-                  <PlayIcon className="mapping-test-editor__action-btn__label__icon" />
-                  <div className="mapping-test-editor__action-btn__label__title">
-                    Run Test
+                  <div className="btn--dark btn--caution btn__dropdown-combo__canceler__label">
+                    <PauseCircleIcon className="btn__dropdown-combo__canceler__label__icon" />
+                    <div className="btn__dropdown-combo__canceler__label__title">
+                      Stop
+                    </div>
                   </div>
                 </button>
-                <DropdownMenu
-                  className="mapping-test-editor__action-btn__dropdown-btn"
-                  disabled={
-                    testState.isExecutingTest || testState.isGeneratingPlan
-                  }
-                  content={
-                    <MenuContent>
-                      <MenuContentItem
-                        className="mapping-test-editor__action-btn__option"
-                        onClick={generatePlan}
-                      >
-                        Generate Plan
-                      </MenuContentItem>
-                      <MenuContentItem
-                        className="mapping-test-editor__action-btn__option"
-                        onClick={debugPlanGeneration}
-                      >
-                        Debug
-                      </MenuContentItem>
-                    </MenuContent>
-                  }
-                  menuProps={{
-                    anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
-                    transformOrigin: { vertical: 'top', horizontal: 'right' },
-                  }}
-                >
-                  <CaretDownIcon />
-                </DropdownMenu>
-              </div>
-            )}
+              ) : (
+                <>
+                  <button
+                    className="btn__dropdown-combo__label"
+                    onClick={runTest}
+                    disabled={
+                      testState.isExecutingTest || testState.isGeneratingPlan
+                    }
+                    tabIndex={-1}
+                  >
+                    <PlayIcon className="btn__dropdown-combo__label__icon" />
+                    <div className="btn__dropdown-combo__label__title">
+                      Run Test
+                    </div>
+                  </button>
+                  <DropdownMenu
+                    className="btn__dropdown-combo__dropdown-btn"
+                    disabled={
+                      testState.isExecutingTest || testState.isGeneratingPlan
+                    }
+                    content={
+                      <MenuContent>
+                        <MenuContentItem
+                          className="btn__dropdown-combo__option"
+                          onClick={generatePlan}
+                        >
+                          Generate Plan
+                        </MenuContentItem>
+                        <MenuContentItem
+                          className="btn__dropdown-combo__option"
+                          onClick={debugPlanGeneration}
+                        >
+                          Debug
+                        </MenuContentItem>
+                      </MenuContent>
+                    }
+                    menuProps={{
+                      anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
+                      transformOrigin: { vertical: 'top', horizontal: 'right' },
+                    }}
+                  >
+                    <CaretDownIcon />
+                  </DropdownMenu>
+                </>
+              )}
+            </div>
           </div>
         </div>
         <div className="mapping-test-editor__content">

package/src/components/editor/editor-group/mapping-editor/InstanceSetImplementationEditor.tsx

@@ -419,7 +419,7 @@ const MappingFilterEditor = observer(
               isReadOnly ||
               instanceSetImplementationState.isConvertingTransformLambdaObjects
             }
-            forceBackdrop={!!filterState.parserError}
+            forceBackdrop={Boolean(filterState.parserError)}
             lambdaEditorState={filterState}
             expectedType={PrimitiveType.BOOLEAN}
           />

package/src/components/editor/editor-group/mapping-editor/MappingExecutionBuilder.tsx

@@ -47,6 +47,7 @@ import {
   PanelHeader,
   PanelHeaderActions,
   Panel,
+  PauseCircleIcon,
 } from '@finos/legend-art';
 import { observer } from 'mobx-react-lite';
 import {
@@ -721,6 +722,9 @@ export const MappingExecutionBuilder = observer(
     const applicationStore = useApplicationStore();
     const { queryState, inputDataState } = executionState;
     // execute
+    const cancelExecution = applicationStore.guardUnhandledError(() =>
+      flowResult(executionState.cancelExecution()),
+    );
     const generatePlan = applicationStore.guardUnhandledError(() =>
       flowResult(executionState.generatePlan(false)),
     );
@@ -780,54 +784,71 @@ export const MappingExecutionBuilder = observer(
                 <FlaskIcon />
               </button>
             )}
-            <div className="mapping-execution-builder__action-btn">
-              <button
-                className="mapping-execution-builder__action-btn__label"
-                onClick={execute}
-                disabled={
-                  isStubbed_RawLambda(queryState.query) ||
-                  !inputDataState.isValid ||
-                  executionState.isGeneratingPlan ||
-                  executionState.isExecuting
-                }
-                tabIndex={-1}
-              >
-                <PlayIcon className="mapping-execution-builder__action-btn__label__icon" />
-                <div className="mapping-execution-builder__action-btn__label__title">
-                  Run Query
-                </div>
-              </button>
-              <DropdownMenu
-                className="mapping-execution-builder__action-btn__dropdown-btn"
-                disabled={
-                  isStubbed_RawLambda(queryState.query) ||
-                  !inputDataState.isValid ||
-                  executionState.isGeneratingPlan ||
-                  executionState.isExecuting
-                }
-                content={
-                  <MenuContent>
-                    <MenuContentItem
-                      className="mapping-execution-builder__action-btn__option"
-                      onClick={generatePlan}
-                    >
-                      Generate Plan
-                    </MenuContentItem>
-                    <MenuContentItem
-                      className="mapping-execution-builder__action-btn__option"
-                      onClick={debugPlanGeneration}
-                    >
-                      Debug
-                    </MenuContentItem>
-                  </MenuContent>
-                }
-                menuProps={{
-                  anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
-                  transformOrigin: { vertical: 'top', horizontal: 'right' },
-                }}
-              >
-                <CaretDownIcon />
-              </DropdownMenu>
+            <div className="mapping-execution-builder__action-btn btn__dropdown-combo btn__dropdown-combo--primary">
+              {executionState.isExecuting ? (
+                <button
+                  className="btn__dropdown-combo__canceler"
+                  onClick={cancelExecution}
+                  tabIndex={-1}
+                >
+                  <div className="btn--dark btn--caution btn__dropdown-combo__canceler__label">
+                    <PauseCircleIcon className="btn__dropdown-combo__canceler__label__icon" />
+                    <div className="btn__dropdown-combo__canceler__label__title">
+                      Stop
+                    </div>
+                  </div>
+                </button>
+              ) : (
+                <>
+                  <button
+                    className="btn__dropdown-combo__label"
+                    onClick={execute}
+                    disabled={
+                      isStubbed_RawLambda(queryState.query) ||
+                      !inputDataState.isValid ||
+                      executionState.isGeneratingPlan ||
+                      executionState.isExecuting
+                    }
+                    tabIndex={-1}
+                  >
+                    <PlayIcon className="btn__dropdown-combo__label__icon" />
+                    <div className="btn__dropdown-combo__label__title">
+                      Run Query
+                    </div>
+                  </button>
+                  <DropdownMenu
+                    className="btn__dropdown-combo__dropdown-btn"
+                    disabled={
+                      isStubbed_RawLambda(queryState.query) ||
+                      !inputDataState.isValid ||
+                      executionState.isGeneratingPlan ||
+                      executionState.isExecuting
+                    }
+                    content={
+                      <MenuContent>
+                        <MenuContentItem
+                          className="btn__dropdown-combo__option"
+                          onClick={generatePlan}
+                        >
+                          Generate Plan
+                        </MenuContentItem>
+                        <MenuContentItem
+                          className="btn__dropdown-combo__option"
+                          onClick={debugPlanGeneration}
+                        >
+                          Debug
+                        </MenuContentItem>
+                      </MenuContent>
+                    }
+                    menuProps={{
+                      anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
+                      transformOrigin: { vertical: 'top', horizontal: 'right' },
+                    }}
+                  >
+                    <CaretDownIcon />
+                  </DropdownMenu>
+                </>
+              )}
             </div>
           </div>
         </div>

package/src/components/editor/editor-group/mapping-editor/MappingExplorer.tsx

@@ -168,7 +168,7 @@ export const MappingExplorerContextMenu = observer(
 
     const allowRemoveFilter =
       mappingElement instanceof PureInstanceSetImplementation &&
-      !!mappingElement.filter;
+      Boolean(mappingElement.filter);
 
     return (
       <MenuContent ref={ref}>
@@ -390,7 +390,7 @@ const MappingElementTreeNodeContainer = observer(
               {getMappingElementLabel(mappingElement, editorStore).value}
             </div>
             {mappingElement instanceof PureInstanceSetImplementation &&
-              !!mappingElement.filter && (
+              Boolean(mappingElement.filter) && (
                 <div className="mapping-explorer__item__label__filter-icon">
                   <FilterIcon />
                 </div>

package/src/components/editor/editor-group/mapping-editor/MappingTestableEditor.tsx

@@ -62,6 +62,7 @@ import {
   PanelLoadingIndicator,
   ContextMenu,
   ModalHeader,
+  PanelFormSection,
 } from '@finos/legend-art';
 import {
   assertErrorThrown,
@@ -225,12 +226,15 @@ const CreateTestSuiteModal = observer(
           </ModalHeader>
           <ModalBody>
             <PanelLoadingIndicator
+              className="panel-loading-indicator--in__modal"
               isLoading={creatorState.isCreatingSuiteState.isInProgress}
             />
             {creatorState.isCreatingSuiteState.message && (
-              <div className="service-registration-editor__progress-msg">
-                {`${creatorState.isCreatingSuiteState.message}...`}
-              </div>
+              <PanelFormSection>
+                <div className="service-registration-editor__progress-msg">
+                  {`${creatorState.isCreatingSuiteState.message}...`}
+                </div>
+              </PanelFormSection>
             )}
             <PanelFormTextField
               ref={inputRef}
@@ -746,15 +750,7 @@ const MappingTestableQueryEditor = observer(
         </div>
         {!isStubbed_RawLambda(queryState.query) && (
           <PanelContent>
-            <div
-              className="mapping-test-editor__query-panel__query"
-              title="Double click to edit in query builder"
-              onDoubleClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                editWithQueryBuilder()();
-              }}
-            >
+            <div className="mapping-test-editor__query-panel__query">
               <CodeEditor
                 inputValue={queryState.lambdaString}
                 isReadOnly={true}