@finos/legend-application-studio 18.1.0 → 19.0.0

package/src/components/workspace-review/WorkspaceReviewPanel.tsx

@@ -149,7 +149,8 @@ export const WorkspaceReviewPanel = observer(() => {
         </div>
         <div className="workspace-review-panel__header__actions">
           <DropdownMenu
-            className="workspace-review-panel__element-view"
+            className="workspace-review-panel__element-view__type"
+            title="View as..."
             content={
               <div className="workspace-review-panel__element-view__options">
                 <div
@@ -171,14 +172,9 @@ export const WorkspaceReviewPanel = observer(() => {
               transformOrigin: { vertical: 'top', horizontal: 'right' },
             }}
           >
-            <button
-              className="workspace-review-panel__element-view__type"
-              title="View as..."
-            >
-              <div className="workspace-review-panel__element-view__type__label">
-                {currentEditorState.diffMode}
-              </div>
-            </button>
+            <div className="workspace-review-panel__element-view__type__label">
+              {currentEditorState.diffMode}
+            </div>
           </DropdownMenu>
         </div>
       </ContextMenu>

package/src/components/workspace-review/WorkspaceReviewSideBar.tsx

@@ -26,7 +26,6 @@ import {
   InfoCircleIcon,
   PanelContent,
 } from '@finos/legend-art';
-import { formatDistanceToNow } from 'date-fns';
 import { EntityDiffViewState } from '../../stores/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
 import { LEGEND_STUDIO_TEST_ID } from '../LegendStudioTestID.js';
 import { flowResult } from 'mobx';
@@ -35,6 +34,7 @@ import { entityDiffSorter } from '../../stores/EditorSDLCState.js';
 import { useWorkspaceReviewStore } from './WorkspaceReviewStoreProvider.js';
 import { useEditorStore } from '../editor/EditorStoreProvider.js';
 import { useApplicationStore } from '@finos/legend-application';
+import { formatDistanceToNow } from '@finos/legend-shared';
 
 export const WorkspaceReviewSideBar = observer(() => {
   const reviewStore = useWorkspaceReviewStore();

package/src/components/workspace-setup/CreateProjectModal.tsx

@@ -124,10 +124,7 @@ const CreateNewProjectTab = observer(() => {
   const disableSubmit =
     dispatchingActions || !projectName || !artifactId || !groupId;
 
-  const handleSubmit = (
-    event: React.FormEvent<HTMLFormElement | HTMLButtonElement>,
-  ): void => {
-    event.preventDefault();
+  const handleSubmit = (): void => {
     if (projectName && groupId && artifactId) {
       if (allowCreatingNewProject) {
         flowResult(
@@ -158,7 +155,12 @@ const CreateNewProjectTab = observer(() => {
     );
   }
   return (
-    <form onSubmit={handleSubmit}>
+    <form
+      onSubmit={(event) => {
+        event.preventDefault();
+        handleSubmit();
+      }}
+    >
       <PanelLoadingIndicator
         isLoading={setupStore.createOrImportProjectState.isInProgress}
       />
@@ -437,10 +439,7 @@ const ImportProjectTab = observer(() => {
   const disableSubmit =
     dispatchingActions || !projectIdentifier || !artifactId || !groupId;
 
-  const handleSubmit = (
-    event: React.FormEvent<HTMLFormElement | HTMLButtonElement>,
-  ): void => {
-    event.preventDefault();
+  const handleSubmit = (): void => {
     if (importProjectSuccessReport) {
       applicationStore.navigator.visitAddress(
         importProjectSuccessReport.reviewUrl,
@@ -455,7 +454,12 @@ const ImportProjectTab = observer(() => {
   };
 
   return (
-    <form onSubmit={handleSubmit}>
+    <form
+      onSubmit={(event) => {
+        event.preventDefault();
+        handleSubmit();
+      }}
+    >
       <PanelLoadingIndicator
         isLoading={setupStore.createOrImportProjectState.isInProgress}
       />

package/src/components/workspace-setup/CreateWorkspaceModal.tsx

@@ -78,10 +78,6 @@ export const CreateWorkspaceModal = observer(
     const onClose = (): void => {
       setupStore.setShowCreateWorkspaceModal(false);
     };
-    const handleSubmit = (event: React.FormEvent<HTMLFormElement>): void => {
-      event.preventDefault();
-      createWorkspace();
-    };
 
     return (
       <Dialog
@@ -103,7 +99,12 @@ export const CreateWorkspaceModal = observer(
               }
             />
           </div>
-          <form onSubmit={handleSubmit}>
+          <form
+            onSubmit={(event) => {
+              event.preventDefault();
+              createWorkspace();
+            }}
+          >
             <PanelLoadingIndicator
               isLoading={setupStore.createWorkspaceState.isInProgress}
             />

package/src/components/workspace-setup/WorkspaceSetup.tsx

@@ -227,7 +227,12 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                     </div>
                   )}
                 </div>
-                <form onSubmit={handleProceed}>
+                <form
+                  onSubmit={(event) => {
+                    event.preventDefault();
+                    handleProceed();
+                  }}
+                >
                   <div className="workspace-setup__selector">
                     <div
                       className="workspace-setup__selector__icon"

package/src/index.ts

@@ -60,7 +60,6 @@ export * from './components/shared/ProjectSelectorUtils.js';
 export * from './components/shared/WorkspaceSelectorUtils.js';
 export { ClassFormEditor } from './components/editor/edit-panel/uml-editor/ClassEditor.js';
 export { TypeTree } from './components/shared/TypeTree.js';
-export { StudioTextInputEditor } from './components/shared/StudioTextInputEditor.js';
 
 // test
 export {

package/src/stores/EditorConfig.ts

@@ -14,36 +14,6 @@
  * limitations under the License.
  */
 
-export enum LEGEND_STUDIO_HOTKEY {
-  SYNC_WITH_WORKSPACE = 'SYNC_WITH_WORKSPACE',
-  CREATE_ELEMENT = 'CREATE_ELEMENT',
-  OPEN_ELEMENT = 'OPEN_ELEMENT',
-  TOGGLE_TEXT_MODE = 'TOGGLE_TEXT_MODE',
-  GENERATE = 'GENERATE',
-  COMPILE = 'COMPILE',
-  TOGGLE_AUX_PANEL = 'TOGGLE_AUX_PANEL',
-  TOGGLE_MODEL_LOADER = 'TOGGLE_MODEL_LOADER',
-  TOGGLE_SIDEBAR_EXPLORER = 'TOGGLE_SIDEBAR_EXPLORER',
-  TOGGLE_SIDEBAR_CHANGES = 'TOGGLE_SIDEBAR_CHANGES',
-  TOGGLE_SIDEBAR_WORKSPACE_REVIEW = 'TOGGLE_SIDEBAR_WORKSPACE_REVIEW',
-  TOGGLE_SIDEBAR_WORKSPACE_UPDATER = 'TOGGLE_SIDEBAR_WORKSPACE_UPDATER',
-}
-
-export const LEGEND_STUDIO_HOTKEY_MAP = Object.freeze({
-  [LEGEND_STUDIO_HOTKEY.SYNC_WITH_WORKSPACE]: 'ctrl+s',
-  [LEGEND_STUDIO_HOTKEY.CREATE_ELEMENT]: 'ctrl+shift+n',
-  [LEGEND_STUDIO_HOTKEY.OPEN_ELEMENT]: 'ctrl+p',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_MODEL_LOADER]: 'f2',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_TEXT_MODE]: 'f8',
-  [LEGEND_STUDIO_HOTKEY.COMPILE]: 'f9',
-  [LEGEND_STUDIO_HOTKEY.GENERATE]: 'f10',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_AUX_PANEL]: 'ctrl+`',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_SIDEBAR_EXPLORER]: 'ctrl+shift+x',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_SIDEBAR_CHANGES]: 'ctrl+shift+g',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_SIDEBAR_WORKSPACE_REVIEW]: 'ctrl+shift+m',
-  [LEGEND_STUDIO_HOTKEY.TOGGLE_SIDEBAR_WORKSPACE_UPDATER]: 'ctrl+shift+u',
-});
-
 export enum EDITOR_MODE {
   STANDARD = 'STANDARD',
   CONFLICT_RESOLUTION = 'CONFLICT_RESOLUTION',

package/src/stores/EditorGraphState.ts

@@ -362,7 +362,7 @@ export class EditorGraphState {
 
   private redirectToModelImporterForDebugging(error: Error): void {
     if (this.editorStore.isInConflictResolutionMode) {
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: `Can't de-serialize graph model from entities`,
         prompt: `Please refresh the application and abort conflict resolution`,
       });
@@ -641,7 +641,7 @@ export class EditorGraphState {
     try {
       this.isApplicationLeavingTextMode = true;
       this.clearCompilationError();
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: 'Compiling graph before leaving text mode...',
         showLoading: true,
       });
@@ -653,9 +653,12 @@ export class EditorGraphState {
             // surpress the modal to reveal error properly in the text editor
             // if the blocking modal is not dismissed, the edior will not be able to gain focus as modal has a focus trap
             // therefore, the editor will not be able to get the focus
-            { onError: () => this.editorStore.setBlockingAlert(undefined) },
+            {
+              onError: () =>
+                this.editorStore.applicationStore.setBlockingAlert(undefined),
+            },
           )) as Entity[];
-        this.editorStore.setBlockingAlert({
+        this.editorStore.applicationStore.setBlockingAlert({
           message: 'Leaving text mode and rebuilding graph...',
           showLoading: true,
         });
@@ -685,13 +688,11 @@ export class EditorGraphState {
           this.editorStore.applicationStore.notifyWarning(
             `Compilation failed: ${error.message}`,
           );
-          this.editorStore.setActionAlertInfo({
+          this.editorStore.applicationStore.setActionAlertInfo({
             message: 'Project is not in a compiled state',
             prompt:
               'All changes made since the last time the graph was built successfully will be lost',
             type: ActionAlertType.CAUTION,
-            onEnter: (): void => this.editorStore.setBlockGlobalHotkeys(true),
-            onClose: (): void => this.editorStore.setBlockGlobalHotkeys(false),
             actions: [
               {
                 label: 'Discard Changes',
@@ -716,7 +717,7 @@ export class EditorGraphState {
       );
     } finally {
       this.isApplicationLeavingTextMode = false;
-      this.editorStore.setBlockingAlert(undefined);
+      this.editorStore.applicationStore.setBlockingAlert(undefined);
     }
   }
 

package/src/stores/EditorSDLCState.ts

@@ -297,12 +297,14 @@ export class EditorSDLCState {
       (error instanceof NetworkClientError &&
         error.response.status === HttpStatus.NOT_FOUND)
     ) {
-      this.editorStore.setBlockingAlert({
+      this.editorStore.applicationStore.setBlockingAlert({
         message: 'Current project or workspace no longer exists',
         prompt: 'Please refresh the application',
       });
     } else {
-      this.editorStore.setBlockingAlert({ message: error.message });
+      this.editorStore.applicationStore.setBlockingAlert({
+        message: error.message,
+      });
     }
   }