@finos/legend-application-studio 28.20.0 → 28.21.0

package/src/components/editor/editor-group/ingest-editor/IngestDefinitionEditor.tsx

@@ -17,8 +17,6 @@
 import { observer } from 'mobx-react-lite';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
-  CheckCircleIcon,
-  CopyIcon,
   Dialog,
   Modal,
   ModalBody,
@@ -29,24 +27,16 @@ import {
   PanelContent,
   PanelHeader,
   PanelHeaderActions,
-  RocketIcon,
   EyeIcon,
   ModalHeaderActions,
   CustomSelectorInput,
 } from '@finos/legend-art';
-import {
-  generateUrlToDeployOnOpen,
-  IngestDefinitionEditorState,
-} from '../../../../stores/editor/editor-state/element-editor-state/ingest/IngestDefinitionEditorState.js';
+import { IngestDefinitionEditorState } from '../../../../stores/editor/editor-state/element-editor-state/ingest/IngestDefinitionEditorState.js';
 import { CodeEditor } from '@finos/legend-lego/code-editor';
 import React, { useEffect, useState } from 'react';
 import { CODE_EDITOR_LANGUAGE } from '@finos/legend-code-editor';
 import { flowResult } from 'mobx';
-import { useAuth } from 'react-oidc-context';
-import {
-  IngestDefinitionDeploymentResponse,
-  IngestDefinitionValidationResponse,
-} from '@finos/legend-server-lakehouse';
+
 import { useApplicationNavigationContext } from '@finos/legend-application';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../__lib__/LegendStudioApplicationNavigationContext.js';
 import {
@@ -55,145 +45,6 @@ import {
 } from '@finos/legend-query-builder';
 import type { MatViewDataSet } from '@finos/legend-graph';
 
-const IngestValidationError = observer(
-  (props: {
-    state: IngestDefinitionEditorState;
-    validateResponse: IngestDefinitionValidationResponse;
-  }) => {
-    const { state, validateResponse } = props;
-    const applicationStore = state.editorStore.applicationStore;
-    const closeModal = (): void =>
-      state.setValidateAndDeployResponse(undefined);
-    return (
-      <Dialog
-        open={true}
-        classes={{
-          root: 'editor-modal__root-container',
-          container: 'editor-modal__container',
-          paper: 'editor-modal__content',
-        }}
-        onClose={closeModal}
-      >
-        <Modal
-          darkMode={
-            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
-          }
-          className="editor-modal"
-        >
-          <ModalHeader>
-            <ModalTitle title={'Validation Error'} />
-          </ModalHeader>
-          <ModalBody>
-            <PanelContent>
-              <CodeEditor
-                inputValue={JSON.stringify(validateResponse, null, 2)}
-                isReadOnly={true}
-                language={CODE_EDITOR_LANGUAGE.JSON}
-              />
-            </PanelContent>
-          </ModalBody>
-          <ModalFooter>
-            <ModalFooterButton
-              onClick={closeModal}
-              text="Close"
-              type="secondary"
-            />
-          </ModalFooter>
-        </Modal>
-      </Dialog>
-    );
-  },
-);
-
-const IngestDeploymentResponseModal = observer(
-  (props: {
-    closeModal: () => void;
-    deploymentResponse: IngestDefinitionDeploymentResponse;
-    copyHandler: (text: string, successMessage: string) => void;
-  }) => {
-    const { closeModal, deploymentResponse, copyHandler } = props;
-    const copyURN = (text: string): void => {
-      copyHandler(text, 'Ingest URN copied to clipboard');
-    };
-    return (
-      <Dialog
-        open={true}
-        classes={{
-          root: 'ingestion-modal__root-container',
-          container: 'ingestion-modal__container',
-          paper: 'ingestion-modal__content',
-        }}
-      >
-        <Modal darkMode={true} className="ingestion-modal">
-          <ModalHeader>
-            <ModalTitle
-              icon={<CheckCircleIcon className="ingestion-modal--success" />}
-              title="Deployment Response"
-            ></ModalTitle>
-          </ModalHeader>
-          <ModalBody>
-            <div className="ingestion-modal__urn">
-              <div className="ingestion-modal__urn__info">
-                <div className="panel__content__form__section__header__label">
-                  Deployment URN
-                </div>
-                <div className="ingestion-modal__urn__value">
-                  {deploymentResponse.ingestDefinitionUrn}
-                </div>
-              </div>
-              <div className="ingestion-modal__urn__copy">
-                <button
-                  className="ingestion-modal__urn__copy--btn"
-                  tabIndex={-1}
-                  title="Copy"
-                  onClick={() => {
-                    copyURN(deploymentResponse.ingestDefinitionUrn);
-                  }}
-                >
-                  <CopyIcon />
-                </button>
-              </div>
-            </div>
-            <div className="ingestion-modal__write">
-              <div className="ingestion-modal__write__label">
-                Write Location
-              </div>
-              <div className="ingestion-modal__write--value">
-                {deploymentResponse.write_location ? (
-                  <CodeEditor
-                    inputValue={JSON.stringify(
-                      deploymentResponse.write_location,
-                      null,
-                      2,
-                    )}
-                    isReadOnly={true}
-                    language={CODE_EDITOR_LANGUAGE.JSON}
-                    extraEditorOptions={{
-                      wordWrap: 'on',
-                    }}
-                    hideActionBar={true}
-                  />
-                ) : (
-                  <div className="ingestion-modal__write--no-value">
-                    No write location provided
-                  </div>
-                )}
-              </div>
-            </div>
-          </ModalBody>
-          <ModalFooter>
-            <ModalFooterButton
-              onClick={closeModal}
-              text="Close"
-              type="secondary"
-            />
-          </ModalFooter>
-        </Modal>
-      </Dialog>
-    );
-  },
-);
-
 export const IngestLineageModal = observer(
   (props: { ingestDefinitionEditorState: IngestDefinitionEditorState }) => {
     const { ingestDefinitionEditorState } = props;
@@ -319,70 +170,6 @@ export const IngestDefinitionEditor = observer(() => {
       IngestDefinitionEditorState,
     );
   const ingestDef = ingestDefinitionEditorState.ingest;
-  const auth = useAuth();
-  const deployIngest = (): void => {
-    // Trigger OAuth flow if not authenticated
-    if (!auth.isAuthenticated) {
-      // remove this redirect if we move to do oauth at the beginning of opening studio
-      auth
-        .signinRedirect({
-          state: generateUrlToDeployOnOpen(ingestDefinitionEditorState),
-        })
-        .catch(editorStore.applicationStore.alertUnhandledError);
-      return;
-    }
-    // Use the token for deployment
-    const token = auth.user?.access_token;
-    if (token) {
-      flowResult(ingestDefinitionEditorState.deploy(token)).catch(
-        editorStore.applicationStore.alertUnhandledError,
-      );
-    } else {
-      editorStore.applicationStore.notificationService.notifyError(
-        'Authentication failed. No token available.',
-      );
-    }
-  };
-
-  const renderDeploymentResponse = (): React.ReactNode => {
-    const response = ingestDefinitionEditorState.deploymentResponse;
-    if (response instanceof IngestDefinitionValidationResponse) {
-      return (
-        <IngestValidationError
-          state={ingestDefinitionEditorState}
-          validateResponse={response}
-        />
-      );
-    } else if (response instanceof IngestDefinitionDeploymentResponse) {
-      const copyHanlder = (text: string, successMessage: string): void => {
-        ingestDefinitionEditorState.editorStore.applicationStore.clipboardService
-          .copyTextToClipboard(text)
-          .then(() =>
-            ingestDefinitionEditorState.editorStore.applicationStore.notificationService.notifySuccess(
-              successMessage,
-              undefined,
-              2500,
-            ),
-          )
-          .catch(
-            ingestDefinitionEditorState.editorStore.applicationStore
-              .alertUnhandledError,
-          );
-      };
-      return (
-        <IngestDeploymentResponseModal
-          closeModal={() =>
-            ingestDefinitionEditorState.setValidateAndDeployResponse(undefined)
-          }
-          deploymentResponse={response}
-          copyHandler={copyHanlder}
-        />
-      );
-    }
-    return null;
-  };
-
-  const isValid = ingestDefinitionEditorState.validForDeployment;
   const isValidForLineage = ingestDefinitionEditorState.validForLineageViewer;
   useEffect(() => {
     ingestDefinitionEditorState.generateElementGrammar();
@@ -392,18 +179,6 @@ export const IngestDefinitionEditor = observer(() => {
     LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY.INGEST_DEFINITION_EDITOR,
   );
 
-  useEffect(() => {
-    if (ingestDefinitionEditorState.deployOnOpen) {
-      flowResult(ingestDefinitionEditorState.init_with_deploy(auth)).catch(
-        editorStore.applicationStore.alertUnhandledError,
-      );
-    }
-  }, [
-    auth,
-    editorStore.applicationStore.alertUnhandledError,
-    ingestDefinitionEditorState,
-  ]);
-
   const viewLineage = () => {
     const firstMatViewQuery =
       ingestDefinitionEditorState.ingest
@@ -444,20 +219,6 @@ export const IngestDefinitionEditor = observer(() => {
                   </div>
                 </button>
               </div>
-              <div className="btn__dropdown-combo btn__dropdown-combo--primary">
-                <button
-                  className="btn__dropdown-combo__label"
-                  onClick={deployIngest}
-                  title={ingestDefinitionEditorState.validationMessage}
-                  tabIndex={-1}
-                  disabled={!isValid}
-                >
-                  <RocketIcon className="btn__dropdown-combo__label__icon" />
-                  <div className="btn__dropdown-combo__label__title">
-                    Deploy
-                  </div>
-                </button>
-              </div>
             </div>
           </PanelHeaderActions>
         </PanelHeader>
@@ -471,7 +232,6 @@ export const IngestDefinitionEditor = observer(() => {
         <IngestLineageModal
           ingestDefinitionEditorState={ingestDefinitionEditorState}
         />
-        {renderDeploymentResponse()}
       </PanelContent>
     </div>
   );

package/src/stores/editor/EditorTabManagerState.ts

@@ -49,6 +49,7 @@ import {
 import { makeObservable, action, observable } from 'mobx';
 import type { EditorState } from './editor-state/EditorState.js';
 import { ClassEditorState } from './editor-state/element-editor-state/ClassEditorState.js';
+import { DatabaseEditorState } from './editor-state/element-editor-state/DatabaseEditorState.js';
 import { PackageableConnectionEditorState } from './editor-state/element-editor-state/connection/ConnectionEditorState.js';
 import { PackageableDataEditorState } from './editor-state/element-editor-state/data/DataEditorState.js';
 import { ElementEditorState } from './editor-state/element-editor-state/ElementEditorState.js';
@@ -169,11 +170,9 @@ export class EditorTabManagerState extends TabManagerState {
       return new UMLEditorState(this.editorStore, element);
     } else if (element instanceof ConcreteFunctionDefinition) {
       return new FunctionEditorState(this.editorStore, element);
-    } else if (
-      element instanceof Measure ||
-      element instanceof Database ||
-      element instanceof FlatData
-    ) {
+    } else if (element instanceof Database) {
+      return new DatabaseEditorState(this.editorStore, element);
+    } else if (element instanceof Measure || element instanceof FlatData) {
       return new UnsupportedElementEditorState(this.editorStore, element);
     } else if (element instanceof PackageableRuntime) {
       return new PackageableRuntimeEditorState(this.editorStore, element);