@finos/legend-application-studio 16.0.2 → 17.0.0

package/src/components/editor/edit-panel/mapping-editor/NewMappingElementModal.tsx

@@ -43,7 +43,7 @@ import {
   Enumeration,
   Association,
 } from '@finos/legend-graph';
-import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../../stores/shared/ModelUtil.js';
+import { BASIC_SET_IMPLEMENTATION_TYPE } from '../../../../stores/shared/ModelClassifierUtils.js';
 import {
   buildElementOption,
   getPackageableElementOptionFormatter,
@@ -263,11 +263,7 @@ export const NewMappingElementModal = observer(() => {
             />
           )}
           <div className="search-modal__actions">
-            <button
-              className="btn btn--primary"
-              disabled={disableCreateButton}
-              color="primary"
-            >
+            <button className="btn btn--primary" disabled={disableCreateButton}>
               Create
             </button>
           </div>

package/src/components/editor/edit-panel/mapping-editor/OperationSetImplementationEditor.tsx

@@ -29,7 +29,7 @@ import {
   CORE_DND_TYPE,
   type OperationSetImplementationDropTarget,
   type MappingElementDragSource,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import { useDrop } from 'react-dnd';
 import { noop } from '@finos/legend-shared';
 import {

package/src/components/editor/edit-panel/mapping-editor/PropertyMappingsEditor.tsx

@@ -60,7 +60,7 @@ import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
   SET_IMPLEMENTATION_TYPE,
-} from '../../../../stores/shared/ModelUtil.js';
+} from '../../../../stores/shared/ModelClassifierUtils.js';
 import type { DSLMapping_LegendStudioApplicationPlugin_Extension } from '../../../../stores/DSLMapping_LegendStudioApplicationPlugin_Extension.js';
 
 export const getExpectedReturnType = (

package/src/components/editor/edit-panel/mapping-editor/PurePropertyMappingEditor.tsx

@@ -20,7 +20,7 @@ import {
   type TransformDropTarget,
   CORE_DND_TYPE,
   TypeDragSource,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import {
   type MappingElement,
   MappingEditorState,
@@ -50,7 +50,7 @@ import { getExpectedReturnType } from './PropertyMappingsEditor.js';
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../stores/shared/ModelUtil.js';
+} from '../../../../stores/shared/ModelClassifierUtils.js';
 
 const SimplePropertyMappingEditor = observer(
   (props: {

package/src/components/editor/edit-panel/mapping-editor/relational/RelationalPropertyMappingEditor.tsx

@@ -51,7 +51,7 @@ import { getExpectedReturnType } from '../PropertyMappingsEditor.js';
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../../stores/shared/ModelUtil.js';
+} from '../../../../../stores/shared/ModelClassifierUtils.js';
 
 const SimplePropertyMappingEditor = observer(
   (props: {

package/src/components/editor/edit-panel/project-configuration-editor/ProjectConfigurationEditor.tsx

@@ -60,11 +60,13 @@ import {
   SNAPSHOT_VERSION_ALIAS,
   MASTER_SNAPSHOT_ALIAS,
   type ProjectData,
-  compareSemVerVersions,
-  generateGAVCoordinates,
   type ProjectDependencyInfo,
 } from '@finos/legend-server-depot';
 import { generateViewProjectRoute } from '../../../../stores/LegendStudioRouter.js';
+import {
+  compareSemVerVersions,
+  generateGAVCoordinates,
+} from '@finos/legend-storage';
 
 interface VersionOption {
   label: string;

package/src/components/editor/edit-panel/service-editor/NewServiceModal.tsx

@@ -85,7 +85,7 @@ export const NewServiceModal = observer(
           <div className="input-group">
             <input
               ref={nameRef}
-              className="modal--simple__input input--dark input-group__input"
+              className="input input--dark input-group__input"
               disabled={isReadOnly}
               value={servicePath}
               spellCheck={false}
@@ -100,9 +100,8 @@ export const NewServiceModal = observer(
           </div>
           <div className="search-modal__actions">
             <button
-              className="modal--simple__btn btn btn--dark btn--primary"
+              className="btn btn--dark"
               disabled={Boolean(isReadOnly) || elementAlreadyExists}
-              color="primary"
               onClick={create}
             >
               Create

package/src/components/editor/edit-panel/service-editor/ServiceExecutionEditor.tsx

@@ -29,7 +29,7 @@ import {
   CORE_DND_TYPE,
   type ElementDragSource,
   type UMLEditorElementDropTarget,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import { UnsupportedEditorPanel } from '../../../editor/edit-panel/UnsupportedElementEditor.js';
 import {
   clsx,

package/src/components/editor/edit-panel/service-editor/ServiceExecutionQueryEditor.tsx

@@ -36,7 +36,7 @@ import {
   PauseCircleIcon,
   PencilIcon,
 } from '@finos/legend-art';
-import { assertErrorThrown, debounce, hashObject } from '@finos/legend-shared';
+import { assertErrorThrown, debounce } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
 import { useEditorStore } from '../../EditorStoreProvider.js';
 import {
@@ -272,10 +272,6 @@ export const ServiceExecutionQueryEditor = observer(
                   queryBuilderState.initializeWithQuery(
                     executionState.execution.func,
                   );
-                  queryBuilderState.changeDetectionState.setQueryHashCode(
-                    hashObject(executionState.execution.func),
-                  );
-                  queryBuilderState.changeDetectionState.setIsEnabled(true);
                   return queryBuilderState;
                 },
                 actionConfigs: [
@@ -294,9 +290,6 @@ export const ServiceExecutionQueryEditor = observer(
                             applicationStore.notifySuccess(
                               `Service query is updated`,
                             );
-                            queryBuilderState.changeDetectionState.setQueryHashCode(
-                              hashObject(rawLambda),
-                            );
                             embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration(
                               undefined,
                             );

package/src/components/editor/edit-panel/service-editor/ServiceRegistrationEditor.tsx

@@ -36,7 +36,8 @@ export const ServiceRegistrationEditor = observer(() => {
   const applicationStore = useApplicationStore();
   const serviceState = editorStore.getCurrentEditorState(ServiceEditorState);
   const registrationState = serviceState.registrationState;
-  // service servers
+
+  // env & execution server
   const envOptions = registrationState.options.map((info) => ({
     label: info.env.toUpperCase(),
     value: info.env,
@@ -47,7 +48,13 @@ export const ServiceRegistrationEditor = observer(() => {
         value: registrationState.serviceEnv,
       }
     : null;
-  // service types
+  const onServerEnvChange = (
+    val: { label: string; value: string } | null,
+  ): void => {
+    registrationState.updateEnv(val?.value);
+  };
+
+  // execution mode
   const serviceTypesOptions = registrationState.executionModes.map((mode) => ({
     label: prettyCONSTName(mode),
     value: mode,
@@ -63,12 +70,8 @@ export const ServiceRegistrationEditor = observer(() => {
   ): void => {
     registrationState.updateType(val?.value);
   };
-  const onServerEnvChange = (
-    val: { label: string; value: string } | null,
-  ): void => {
-    registrationState.updateEnv(val?.value);
-  };
-  // version Projection
+
+  // version
   const selectedVersion = registrationState.projectVersion
     ? {
         label:
@@ -91,18 +94,21 @@ export const ServiceRegistrationEditor = observer(() => {
       : !registrationState.versionOptions.length
       ? 'Project has no versions'
       : undefined;
+
   // activate
   const toggleActivatePostRegistration = (): void => {
     registrationState.setActivatePostRegistration(
       !registrationState.activatePostRegistration,
     );
   };
+
   // store model for full interactive
   const toggleUseStoreModel = (): void => {
     registrationState.setUseStoreModelWithFullInteractive(
       !registrationState.TEMPORARY__useStoreModel,
     );
   };
+
   // actions
   const registerService = (): void => {
     if (selectedEnvOption && selectedServiceType) {
@@ -115,6 +121,7 @@ export const ServiceRegistrationEditor = observer(() => {
     !selectedEnvOption ||
     !selectedServiceType ||
     registrationState.registrationState.isInProgress;
+
   return (
     <div
       data-testid={LEGEND_STUDIO_TEST_ID.SERVICE_REGISTRATION_EDITOR}
@@ -156,7 +163,6 @@ export const ServiceRegistrationEditor = observer(() => {
             onClick={toggleActivatePostRegistration}
           >
             <button
-              type="button"
               className={clsx('panel__content__form__section__toggler__btn', {
                 'panel__content__form__section__toggler__btn--toggled':
                   registrationState.activatePostRegistration,
@@ -214,7 +220,6 @@ export const ServiceRegistrationEditor = observer(() => {
               onClick={toggleUseStoreModel}
             >
               <button
-                type="button"
                 className={clsx('panel__content__form__section__toggler__btn', {
                   'panel__content__form__section__toggler__btn--toggled':
                     registrationState.TEMPORARY__useStoreModel,

package/src/components/editor/edit-panel/service-editor/testable/ServiceTestDataEditor.tsx

@@ -372,7 +372,7 @@ export const NewConnectionDataModal = observer(
           </div>
           <div className="modal__footer">
             <button
-              type="button"
+              type="button" // prevent this toggler being activated on form submission
               className="btn btn--dark"
               onClick={closeModal}
             >

package/src/components/editor/edit-panel/uml-editor/AssociationEditor.tsx

@@ -24,7 +24,7 @@ import {
   CORE_DND_TYPE,
   type UMLEditorElementDropTarget,
   type ElementDragSource,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import { useDrop } from 'react-dnd';
 import {
   clsx,
@@ -87,7 +87,7 @@ import {
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../stores/shared/ModelUtil.js';
+} from '../../../../stores/shared/ModelClassifierUtils.js';
 import {
   buildElementOption,
   useApplicationNavigationContext,

package/src/components/editor/edit-panel/uml-editor/ClassEditor.tsx

@@ -21,7 +21,7 @@ import {
   CORE_DND_TYPE,
   type ElementDragSource,
   type UMLEditorElementDropTarget,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import {
   clsx,
   CustomSelectorInput,
@@ -132,7 +132,7 @@ import {
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../../../stores/shared/ModelUtil.js';
+} from '../../../../stores/shared/ModelClassifierUtils.js';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../../../stores/LegendStudioApplicationNavigationContext.js';
 
 type ClassPropertyDragSource = {

package/src/components/editor/edit-panel/uml-editor/EnumerationEditor.tsx

@@ -25,7 +25,7 @@ import {
   CORE_DND_TYPE,
   type ElementDragSource,
   type UMLEditorElementDropTarget,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import { prettyCONSTName } from '@finos/legend-shared';
 import {
   BlankPanelContent,

package/src/components/editor/edit-panel/uml-editor/PropertyEditor.tsx

@@ -21,7 +21,7 @@ import {
   CORE_DND_TYPE,
   type ElementDragSource,
   type UMLEditorElementDropTarget,
-} from '../../../../stores/shared/DnDUtil.js';
+} from '../../../../stores/shared/DnDUtils.js';
 import {
   clsx,
   LockIcon,

package/src/components/editor/side-bar/CreateNewElementModal.tsx

@@ -48,7 +48,7 @@ import {
 } from '@finos/legend-application';
 import type { EmbeddedDataTypeOption } from '../../../stores/editor-state/element-editor-state/data/DataEditorState.js';
 import type { DSLData_LegendStudioApplicationPlugin_Extension } from '../../../stores/DSLData_LegendStudioApplicationPlugin_Extension.js';
-import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelUtil.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelClassifierUtils.js';
 import { EmbeddedDataType } from '../../../stores/editor-state/ExternalFormatState.js';
 
 export const getElementTypeLabel = (
@@ -206,7 +206,10 @@ const NewPureModelConnectionDriverEditor = observer(
       { label: 'ModelStore', value: undefined },
     ];
     storeOptions = storeOptions.concat(
-      editorStore.storeOptions.slice().sort(compareLabelFn),
+      editorStore.graphManagerState.usableStores
+        .map(buildElementOption)
+        .slice()
+        .sort(compareLabelFn),
     );
     const selectedStoreOption = {
       label: store?.path ?? 'ModelStore',

package/src/components/editor/side-bar/Explorer.tsx

@@ -51,15 +51,15 @@ import {
   CreateNewElementModal,
 } from './CreateNewElementModal.js';
 import { useDrag } from 'react-dnd';
-import { ElementDragSource } from '../../../stores/shared/DnDUtil.js';
+import { ElementDragSource } from '../../../stores/shared/DnDUtils.js';
 import { LEGEND_STUDIO_TEST_ID } from '../../LegendStudioTestID.js';
 import { ACTIVITY_MODE } from '../../../stores/EditorConfig.js';
-import { getTreeChildNodes } from '../../../stores/shared/PackageTreeUtil.js';
-import type { PackageTreeNodeData } from '../../../stores/shared/TreeUtil.js';
+import { getTreeChildNodes } from '../../../stores/shared/PackageTreeUtils.js';
+import type { PackageTreeNodeData } from '../../../stores/shared/TreeUtils.js';
 import {
   type GenerationTreeNodeData,
   getFileGenerationChildNodes,
-} from '../../../stores/shared/FileGenerationTreeUtil.js';
+} from '../../../stores/shared/FileGenerationTreeUtils.js';
 import { FileGenerationTree } from '../../editor/edit-panel/element-generation-editor/FileGenerationEditor.js';
 import { generateViewEntityRoute } from '../../../stores/LegendStudioRouter.js';
 import { toTitleCase } from '@finos/legend-shared';
@@ -78,7 +78,7 @@ import {
   Class,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
-import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelUtil.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from '../../../stores/shared/ModelClassifierUtils.js';
 import { useLegendStudioApplicationStore } from '../../LegendStudioBaseStoreProvider.js';
 import { queryClass } from '../edit-panel/uml-editor/ClassQueryBuilder.js';
 

package/src/components/editor/side-bar/LocalChanges.tsx

@@ -118,7 +118,6 @@ const PatchLoader = observer(() => {
         </div>
         <div className="modal__footer">
           <button
-            type="button"
             className="btn btn--dark blocking-alert__action--standard"
             onClick={upload}
             disabled={!patchState.changes?.length || !patchState.isValidPatch}
@@ -204,6 +203,7 @@ export const LocalChanges = observer(() => {
       applicationStore.alertUnhandledError,
     );
   }, [applicationStore, localChangesState]);
+
   return (
     <div className="panel local-changes">
       <div className="panel__header side-bar__header">

package/src/components/editor/side-bar/WorkspaceReview.tsx

@@ -252,7 +252,7 @@ export const WorkspaceReview = observer(() => {
                     value={workspaceReviewState.reviewTitle}
                     disabled={Boolean(workspaceReview)}
                     onChange={editReviewTitle}
-                    placeholder={'Title'}
+                    placeholder="Title"
                   />
                 </div>
                 <button

package/src/components/editor/side-bar/WorkspaceSyncConflictResolver.tsx

@@ -253,20 +253,14 @@ export const WorkspaceSyncConflictResolver = observer(() => {
         </div>
         <div className="modal__footer">
           <button
-            type="button"
-            className="btn btn--primary btn--dark"
+            className="btn btn--dark"
             disabled={Boolean(conflicts.length)}
             title="Apply Resolutions"
             onClick={applyResolutions}
           >
             Apply Resolutions
           </button>
-          <button
-            type="button"
-            title="Aborts"
-            className="btn btn--dark"
-            onClick={abort}
-          >
+          <button className="btn btn--dark" title="Aborts" onClick={abort}>
             Abort
           </button>
         </div>

package/src/components/shared/ElementIconUtils.tsx

@@ -47,7 +47,7 @@ import {
   PURE_PackageIcon,
   PURE_DataIcon,
 } from '@finos/legend-art';
-import { PACKAGEABLE_ELEMENT_TYPE } from '../../stores/shared/ModelUtil.js';
+import { PACKAGEABLE_ELEMENT_TYPE } from '../../stores/shared/ModelClassifierUtils.js';
 
 export const getClassPropertyIcon = (type: Type): React.ReactNode => {
   if (type instanceof PrimitiveType) {

package/src/components/shared/ProjectSelectorUtils.tsx

@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ArrowCircleRightIcon } from '@finos/legend-art';
+import type { Project } from '@finos/legend-server-sdlc';
+import type { LegendStudioApplicationStore } from '../../stores/LegendStudioBaseStore.js';
+import { generateViewProjectRoute } from '../../stores/LegendStudioRouter.js';
+
+export interface ProjectOption {
+  label: string;
+  value: Project;
+}
+
+export const buildProjectOption = (project: Project): ProjectOption => ({
+  label: project.name,
+  value: project,
+});
+
+export const getProjectOptionLabelFormatter = (
+  applicationStore: LegendStudioApplicationStore,
+): ((option: ProjectOption) => React.ReactNode) =>
+  function ProjectOptionLabel(option: ProjectOption): React.ReactNode {
+    const viewProject = (): void =>
+      applicationStore.navigator.openNewWindow(
+        applicationStore.navigator.generateLocation(
+          generateViewProjectRoute(option.value.projectId),
+        ),
+      );
+
+    return (
+      <div className="project-selector__option">
+        <div className="project-selector__option__label">
+          <div className="project-selector__option__label__name">
+            {option.label}
+          </div>
+        </div>
+        <button
+          type="button" // prevent this toggler being activated on form submission
+          className="project-selector__option__visit-btn"
+          tabIndex={-1}
+          onClick={viewProject}
+        >
+          <div className="project-selector__option__visit-btn__label">view</div>
+          <div className="project-selector__option__visit-btn__icon">
+            <ArrowCircleRightIcon />
+          </div>
+        </button>
+      </div>
+    );
+  };

package/src/components/shared/TypeTree.tsx

@@ -32,9 +32,9 @@ import {
   ChevronRightIcon,
 } from '@finos/legend-art';
 import { useDrag } from 'react-dnd';
-import { TypeDragSource, CORE_DND_TYPE } from '../../stores/shared/DnDUtil.js';
+import { TypeDragSource, CORE_DND_TYPE } from '../../stores/shared/DnDUtils.js';
 import { getClassPropertyIcon } from './ElementIconUtils.js';
-import type { TypeTreeNodeData } from '../../stores/shared/TreeUtil.js';
+import type { TypeTreeNodeData } from '../../stores/shared/TreeUtils.js';
 import {
   type Type,
   type Enum,
@@ -50,7 +50,7 @@ import {
 import {
   CLASS_PROPERTY_TYPE,
   getClassPropertyType,
-} from '../../stores/shared/ModelUtil.js';
+} from '../../stores/shared/ModelClassifierUtils.js';
 
 const getEnumTypeTreeNodeData = (
   _enum: Enum,

package/src/components/shared/WorkspaceSelectorUtils.tsx

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { UserIcon, UsersIcon } from '@finos/legend-art';
+import { type Workspace, WorkspaceType } from '@finos/legend-server-sdlc';
+
+export interface WorkspaceOption {
+  label: string;
+  value: Workspace;
+}
+
+export const buildWorkspaceOption = (
+  workspace: Workspace,
+): WorkspaceOption => ({
+  label: workspace.workspaceId,
+  value: workspace,
+});
+
+export const formatWorkspaceOptionLabel = (
+  option: WorkspaceOption,
+): React.ReactNode => (
+  <div className="workspace-selector__option">
+    <div className="workspace-selector__option__icon">
+      {option.value.workspaceType === WorkspaceType.GROUP ? (
+        <UsersIcon />
+      ) : (
+        <UserIcon />
+      )}
+    </div>
+    <div className="workspace-selector__option__name">{option.label}</div>
+  </div>
+);

package/src/components/workspace-setup/{ProjectCreateModal.tsx → CreateProjectModal.tsx}

@@ -24,7 +24,6 @@ import {
   PencilIcon,
   MarkdownTextViewer,
 } from '@finos/legend-art';
-import { useWorkspaceSetupStore } from './WorkspaceSetupStoreProvider.js';
 import { LEGEND_STUDIO_TEST_ID } from '../LegendStudioTestID.js';
 import { isNumber } from '@finos/legend-shared';
 import { flowResult } from 'mobx';
@@ -35,6 +34,7 @@ import {
 import { LEGEND_STUDIO_DOCUMENTATION_KEY } from '../../stores/LegendStudioDocumentation.js';
 import { LEGEND_STUDIO_APPLICATION_NAVIGATION_CONTEXT_KEY } from '../../stores/LegendStudioApplicationNavigationContext.js';
 import { useLegendStudioApplicationStore } from '../LegendStudioBaseStoreProvider.js';
+import { useWorkspaceSetupStore } from './WorkspaceSetup.js';
 
 enum CREATE_PROJECT_MODAL_TAB {
   CREATE = 'CREATE',
@@ -202,7 +202,9 @@ const CreateNewProjectTab = observer(() => {
           <input
             className="panel__content__form__section__input"
             spellCheck={false}
-            placeholder="org.finos.legend.*"
+            placeholder={
+              applicationStore.config.options.projectCreationGroupIdSuggestion
+            }
             value={groupId}
             onChange={changeGroupId}
           />
@@ -501,7 +503,9 @@ const ImportProjectTab = observer(() => {
           <input
             className="panel__content__form__section__input"
             spellCheck={false}
-            placeholder="org.finos.legend.*"
+            placeholder={
+              applicationStore.config.options.projectCreationGroupIdSuggestion
+            }
             value={groupId}
             disabled={Boolean(importProjectSuccessReport)}
             onChange={changeGroupId}