@finos/legend-application-studio 26.1.8 → 26.1.10

package/src/components/editor/editor-group/EditorGroup.tsx

@@ -66,8 +66,7 @@ import { UnsupportedElementEditor } from './UnsupportedElementEditor.js';
 import { getPrettyLabelForRevision } from '../../../stores/editor/editor-state/entity-diff-editor-state/EntityDiffEditorState.js';
 import { GenerationSpecificationEditorState } from '../../../stores/editor/editor-state/GenerationSpecificationEditorState.js';
 import { GenerationSpecificationEditor } from './GenerationSpecificationEditor.js';
-import { FileGenerationViewerState } from '../../../stores/editor/editor-state/FileGenerationViewerState.js';
-import { FileGenerationViewer } from './FileGenerationViewer.js';
+import { ArtifactGenerationViewer } from './ArtifactGenerationViewer.js';
 import type { DSL_LegendStudioApplicationPlugin_Extension } from '../../../stores/LegendStudioApplicationPlugin.js';
 import { useEditorStore } from '../EditorStoreProvider.js';
 import { PackageableDataEditorState } from '../../../stores/editor/editor-state/element-editor-state/data/DataEditorState.js';
@@ -77,6 +76,7 @@ import { TabManager, type TabState } from '@finos/legend-lego/application';
 import { INTERNAL__UnknownFunctionActivatorEdtiorState } from '../../../stores/editor/editor-state/element-editor-state/INTERNAL__UnknownFunctionActivatorEditorState.js';
 import { INTERNAL__UnknownFunctionActivatorEdtior } from './INTERNAL__UnknownFunctionActivatorEdtior.js';
 import { getElementIcon } from '../../ElementIconUtils.js';
+import { ArtifactGenerationViewerState } from '../../../stores/editor/editor-state/ArtifactGenerationViewerState.js';
 
 export const ViewerEditorGroupSplashScreen: React.FC = () => {
   const commandListWidth = 300;
@@ -194,7 +194,7 @@ export const EditorGroup = observer(() => {
       : [];
   const generationViewModes = (
     currentTabState instanceof ElementEditorState
-      ? editorStore.graphState.graphGenerationState.fileGenerationConfigurations
+      ? editorStore.graphState.graphGenerationState.globalFileGenerationState.fileGenerationConfigurations
           .slice()
           .sort((a, b): number => a.label.localeCompare(b.label))
       : []
@@ -309,8 +309,8 @@ export const EditorGroup = observer(() => {
           conflictEditorState={currentTabState}
         />
       );
-    } else if (currentTabState instanceof FileGenerationViewerState) {
-      return <FileGenerationViewer key={currentTabState.uuid} />;
+    } else if (currentTabState instanceof ArtifactGenerationViewerState) {
+      return <ArtifactGenerationViewer key={currentTabState.uuid} />;
     } else if (currentTabState instanceof ModelImporterState) {
       return <ModelImporter />;
     } else if (currentTabState instanceof ProjectConfigurationEditorState) {
@@ -478,7 +478,7 @@ export const EditorGroup = observer(() => {
                               key={mode.key}
                               className="editor-group__view-mode__option"
                               disabled={
-                                !editorStore.graphState.graphGenerationState.supportedFileGenerationConfigurationsForCurrentElement.includes(
+                                !editorStore.graphState.graphGenerationState.globalFileGenerationState.supportedFileGenerationConfigurationsForCurrentElement.includes(
                                   mode,
                                 )
                               }

package/src/components/editor/editor-group/connection-editor/RelationalDatabaseConnectionEditor.tsx

@@ -128,6 +128,7 @@ import {
   snowflakeDatasourceSpec_setProxyHost,
   snowflakeDatasourceSpec_setProxyPort,
   snowflakeDatasourceSpec_setQuotedIdentifiersIgnoreCase,
+  snowflakeDatasourceSpec_setEnableQueryTags,
   snowflakeDatasourceSpec_setRegion,
   snowflakeDatasourceSpec_setRole,
   snowflakeDatasourceSpec_setWarehouseName,
@@ -585,6 +586,18 @@ const SnowflakeDatasourceSpecificationEditor = observer(
             )
           }
         />
+        <PanelFormBooleanField
+          isReadOnly={isReadOnly}
+          value={sourceSpec.enableQueryTags}
+          name="Enable Query Tags"
+          prompt="Controls whether engine sets a tag on each query for identification"
+          update={(value: boolean | undefined): void =>
+            snowflakeDatasourceSpec_setEnableQueryTags(
+              sourceSpec,
+              Boolean(value),
+            )
+          }
+        />
       </>
     );
   },

package/src/components/editor/editor-group/data-editor/DataElementEditor.tsx

@@ -69,7 +69,6 @@ import {
   externalFormatData_setContentType,
   externalFormatData_setData,
 } from '../../../../stores/graph-modifier/DSL_Data_GraphModifierHelper.js';
-import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/FileGenerationViewerState.js';
 import type { ExternalFormatDataState } from '../../../../stores/editor/editor-state/element-editor-state/data/EmbeddedDataState.js';
 import { renderEmbeddedDataEditor } from './EmbeddedDataEditor.js';
 import {
@@ -79,6 +78,7 @@ import {
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../__lib__/LegendStudioApplicationNavigationContext.js';
 import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../../../__lib__/LegendStudioDocumentation.js';
 import { CodeEditor } from '@finos/legend-lego/code-editor';
+import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/ArtifactGenerationViewerState.js';
 
 export const ExternalFormatDataEditor = observer(
   (props: {

package/src/components/editor/editor-group/data-editor/EmbeddedDataEditor.tsx

@@ -27,27 +27,41 @@ import {
   MenuContent,
   MenuContentItem,
   PanelContent,
+  PURE_ClassIcon,
   PURE_DataIcon,
   WrenchIcon,
+  type SelectComponent,
+  createFilter,
 } from '@finos/legend-art';
-import { useEffect, useRef } from 'react';
+import React, { useEffect, useRef } from 'react';
 import { UnsupportedEditorPanel } from '../UnsupportedElementEditor.js';
 import {
   externalFormatData_setContentType,
   externalFormatData_setData,
+  modelStoreData_setDataModelModel,
 } from '../../../../stores/graph-modifier/DSL_Data_GraphModifierHelper.js';
 import type { DSL_Data_LegendStudioApplicationPlugin_Extension } from '../../../../stores/extensions/DSL_Data_LegendStudioApplicationPlugin_Extension.js';
-import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/FileGenerationViewerState.js';
 import {
   type EmbeddedDataState,
   DataElementReferenceState,
   ExternalFormatDataState,
   RelationalCSVDataState,
+  ModelStoreDataState,
+  ModelEmbeddedDataState,
 } from '../../../../stores/editor/editor-state/element-editor-state/data/EmbeddedDataState.js';
-import type { DataElement } from '@finos/legend-graph';
-import { buildElementOption } from '@finos/legend-lego/graph-editor';
+import {
+  PackageableElementExplicitReference,
+  type Class,
+  type DataElement,
+} from '@finos/legend-graph';
+import {
+  buildElementOption,
+  getPackageableElementOptionFormatter,
+  type PackageableElementOption,
+} from '@finos/legend-lego/graph-editor';
 import { RelationalCSVDataEditor } from './RelationalCSVDataEditor.js';
 import { CodeEditor } from '@finos/legend-lego/code-editor';
+import { getEditorLanguageForFormat } from '../../../../stores/editor/editor-state/ArtifactGenerationViewerState.js';
 
 export const ExternalFormatDataEditor = observer(
   (props: {
@@ -218,6 +232,111 @@ export const DataElementReferenceDataEditor = observer(
   },
 );
 
+export const ModelEmbeddedDataEditor = observer(
+  (props: {
+    modelDataState: ModelEmbeddedDataState;
+    modelStoreDataState: ModelStoreDataState;
+    isReadOnly: boolean;
+  }) => {
+    const { isReadOnly, modelStoreDataState, modelDataState } = props;
+    const modelData = modelDataState.modelData;
+    const classSelectorRef = useRef<SelectComponent>(null);
+    const elementFilterOption = createFilter({
+      ignoreCase: true,
+      ignoreAccents: false,
+      stringify: (option: PackageableElementOption<Class>): string =>
+        option.value.path,
+    });
+    const editorStore = modelStoreDataState.editorStore;
+    const _class = modelData.model.value;
+    const classOptions = editorStore.graphManagerState.usableClasses.map(
+      (_cl) => ({
+        value: _cl,
+        label: _cl.name,
+      }),
+    );
+
+    const selectedClassOption = {
+      value: _class,
+      label: _class.name,
+    };
+
+    const changeClass = (val: PackageableElementOption<Class> | null): void => {
+      if (val?.value) {
+        modelStoreData_setDataModelModel(
+          modelData,
+          PackageableElementExplicitReference.create(val.value),
+        );
+      }
+    };
+
+    return (
+      <div>
+        <div className="sample-data-generator__controller">
+          <div
+            className="sample-data-generator__controller__icon"
+            title="class"
+          >
+            <PURE_ClassIcon />
+          </div>
+          <CustomSelectorInput
+            ref={classSelectorRef}
+            className="sample-data-generator__controller__class-selector"
+            options={classOptions}
+            onChange={changeClass}
+            value={selectedClassOption}
+            darkMode={true}
+            filterOption={elementFilterOption}
+            formatOptionLabel={getPackageableElementOptionFormatter({
+              darkMode: true,
+            })}
+          />
+        </div>
+        <div>
+          {renderEmbeddedDataEditor(
+            modelDataState.embeddedDataState,
+            isReadOnly,
+          )}
+        </div>
+      </div>
+    );
+  },
+);
+
+export const ModelStoreDataEditor = observer(
+  (props: {
+    modelStoreDataState: ModelStoreDataState;
+    isReadOnly: boolean;
+  }) => {
+    const { isReadOnly, modelStoreDataState } = props;
+
+    return (
+      <div className="panel connection-editor">
+        {modelStoreDataState.modelDataStates.map((_modelDataState) => {
+          if (_modelDataState instanceof ModelEmbeddedDataState) {
+            return (
+              <ModelEmbeddedDataEditor
+                key={_modelDataState.uuid}
+                modelDataState={_modelDataState}
+                modelStoreDataState={modelStoreDataState}
+                isReadOnly={isReadOnly}
+              />
+            );
+          }
+
+          return (
+            <UnsupportedEditorPanel
+              key={_modelDataState.uuid}
+              text={'Unsuppored Model Data Type'}
+              isReadOnly={false}
+            />
+          );
+        })}
+      </div>
+    );
+  },
+);
+
 export const EmbeddedDataEditor = observer(
   (props: {
     embeddedDataEditorState: EmbeddedDataEditorState;
@@ -260,6 +379,13 @@ export function renderEmbeddedDataEditor(
         isReadOnly={isReadOnly}
       />
     );
+  } else if (embeddedDataState instanceof ModelStoreDataState) {
+    return (
+      <ModelStoreDataEditor
+        modelStoreDataState={embeddedDataState}
+        isReadOnly={isReadOnly}
+      />
+    );
   } else {
     const extraEmbeddedDataEditorRenderers =
       embeddedDataState.editorStore.pluginManager

package/src/components/editor/editor-group/data-editor/RelationalCSVDataEditor.tsx

@@ -21,11 +21,17 @@ import {
   Dialog,
   MenuContent,
   MenuContentItem,
+  Modal,
+  ModalBody,
+  ModalFooter,
+  ModalFooterButton,
+  ModalHeader,
   PlusIcon,
   ResizablePanel,
   ResizablePanelGroup,
   ResizablePanelSplitter,
   ResizablePanelSplitterLine,
+  UploadIcon,
 } from '@finos/legend-art';
 import type { RelationalCSVDataTable } from '@finos/legend-graph';
 import { observer } from 'mobx-react-lite';
@@ -126,6 +132,52 @@ const RelationalCSVTableContextMenu = observer(
   }),
 );
 
+const ImportModal = observer(
+  (props: { dataState: RelationalCSVDataState; isReadOnly: boolean }) => {
+    const { isReadOnly, dataState } = props;
+    const [csv, setCSV] = useState('');
+    const closeModal = (): void => dataState.closeCSVModal();
+    const importVal = (): void => {
+      dataState.importCSV(csv);
+      setCSV('');
+      closeModal();
+    };
+    const changeCSV: React.ChangeEventHandler<
+      HTMLTextAreaElement | HTMLInputElement
+    > = (event) => {
+      setCSV(event.target.value);
+    };
+    return (
+      <Dialog
+        open={dataState.showImportCSVModal}
+        onClose={closeModal}
+        classes={{ container: 'search-modal__container' }}
+        PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
+      >
+        <Modal darkMode={true} className="relational-data-editor__import">
+          <ModalHeader title="Import CSV" />
+          <ModalBody>
+            <textarea
+              className="relational-data-editor__import__textarea"
+              spellCheck={false}
+              value={csv}
+              onChange={changeCSV}
+              disabled={isReadOnly}
+            />
+          </ModalBody>
+          <ModalFooter>
+            <ModalFooterButton
+              text="Import"
+              title="Create new query"
+              onClick={importVal}
+            />
+          </ModalFooter>
+        </Modal>
+      </Dialog>
+    );
+  },
+);
+
 export const RelationalCSVDataEditor = observer(
   (props: { dataState: RelationalCSVDataState; isReadOnly: boolean }) => {
     const { dataState, isReadOnly } = props;
@@ -145,6 +197,7 @@ export const RelationalCSVDataEditor = observer(
       setSelectedTableFromContextMenu(undefined);
     const isTableActive = (table: RelationalCSVDataTable): boolean =>
       currentTableState?.table === table;
+    const showCSVModal = (): void => dataState.setShowImportCsvModal(true);
     return (
       <ResizablePanelGroup orientation="vertical">
         <ResizablePanel minSize={30} size={300}>
@@ -156,6 +209,15 @@ export const RelationalCSVDataEditor = observer(
                 </div>
               </div>
               <div className="relational-data-editor__header__actions">
+                <button
+                  className="schema-set-panel__header__action"
+                  onClick={showCSVModal}
+                  disabled={isReadOnly}
+                  tabIndex={-1}
+                  title="Import CSV"
+                >
+                  <UploadIcon />
+                </button>
                 <button
                   className="relational-data-editor__header__action"
                   onClick={openIdentifierModal}
@@ -250,6 +312,9 @@ export const RelationalCSVDataEditor = observer(
                   isReadOnly={isReadOnly}
                 />
               )}
+              {dataState.showImportCSVModal && (
+                <ImportModal dataState={dataState} isReadOnly={isReadOnly} />
+              )}
             </div>
           </div>
         </ResizablePanel>

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_NewSchemaSetDriver.tsx

@@ -78,8 +78,11 @@ export const NewSchemaSetDriverEditor = observer(() => {
     }
   };
   return (
-    <div>
-      <div className="">
+    <>
+      <div className="panel__content__form__section__header__label">
+        Schema Type
+      </div>
+      <div className="explorer__new-element-modal__driver">
         <CustomSelectorInput
           className="sub-panel__content__form__section__dropdown"
           options={options}
@@ -87,6 +90,6 @@ export const NewSchemaSetDriverEditor = observer(() => {
           value={newConnectionDriver.formatOption}
         />
       </div>
-    </div>
+    </>
   );
 });

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/MappingEditor.tsx

@@ -72,7 +72,6 @@ import {
 } from '@finos/legend-application';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../__lib__/LegendStudioApplicationNavigationContext.js';
 import type { MappingEditorTabState } from '../../../../stores/editor/editor-state/element-editor-state/mapping/MappingTabManagerState.js';
-import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../../../__lib__/LegendStudioDocumentation.js';
 import { MappingTestableEditor } from './MappingTestableEditor.js';
 
 export const MappingEditorSplashScreen: React.FC = () => {
@@ -348,7 +347,6 @@ const _MappingEditor = observer(() => {
 
 export const MappingEditorWithTestable = observer(() => {
   const editorStore = useEditorStore();
-  const applicationStore = useApplicationStore();
   const mappingEditorState =
     editorStore.tabManagerState.getCurrentEditorState(MappingEditorState);
   const isReadOnly = mappingEditorState.isReadOnly;
@@ -358,10 +356,6 @@ export const MappingEditorWithTestable = observer(() => {
     (tab: MAPPING_EDITOR_TAB): (() => void) =>
     (): void =>
       mappingEditorState.setSelectedTab(tab);
-  applicationStore.assistantService.openDocumentationEntry(
-    LEGEND_STUDIO_DOCUMENTATION_KEY.QUESTION_HOW_TO_WRITE_A_SERVICE_TEST,
-  );
-
   return (
     <div className="service-editor">
       <div className="panel">