@finos/legend-application-studio 28.21.16 → 28.21.17

package/src/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.tsx

@@ -1068,6 +1068,13 @@ const ProjectDependencyInlineExclusionsSelector = observer(
           );
 
         const visitedNodes = new Set<string>();
+        const currentProjectCoordinate = generateGAVCoordinates(
+          editorStore.projectConfigurationEditorState
+            .currentProjectConfiguration.groupId,
+          editorStore.projectConfigurationEditorState
+            .currentProjectConfiguration.artifactId,
+          undefined,
+        );
         const traverseNode = (nodeId: string) => {
           if (visitedNodes.has(nodeId)) {
             return;
@@ -1090,7 +1097,8 @@ const ProjectDependencyInlineExclusionsSelector = observer(
               if (
                 existingExclusionCoordinates.indexOf(coordinate) === -1 &&
                 coordinate !==
-                  `${projectDependency.groupId}:${projectDependency.artifactId}`
+                  `${projectDependency.groupId}:${projectDependency.artifactId}` &&
+                coordinate !== currentProjectCoordinate
               ) {
                 transitiveDeps.set(coordinate, {
                   label: generateGAVCoordinates(
@@ -1125,6 +1133,10 @@ const ProjectDependencyInlineExclusionsSelector = observer(
         projectDependency.groupId,
         projectDependency.artifactId,
         projectDependency.versionId,
+        editorStore.projectConfigurationEditorState.currentProjectConfiguration
+          .groupId,
+        editorStore.projectConfigurationEditorState.currentProjectConfiguration
+          .artifactId,
       ]);
 
     useEffect(() => {
@@ -1141,7 +1153,6 @@ const ProjectDependencyInlineExclusionsSelector = observer(
       if (!option) {
         return;
       }
-
       try {
         dependencyEditorState.addExclusionByCoordinate(
           projectDependency.projectId,
@@ -1310,7 +1321,13 @@ const ProjectVersionDependencyEditor = observer(
     const projectDisabled =
       !configState.associatedProjectsAndVersionsFetched ||
       configState.isReadOnly;
+    const currentProjectCoordinates = generateGAVCoordinates(
+      configState.currentProjectConfiguration.groupId,
+      configState.currentProjectConfiguration.artifactId,
+      undefined,
+    );
     const projectsOptions = Array.from(configState.projects.values())
+      .filter((project) => project.coordinates !== currentProjectCoordinates)
       .map(buildProjectOption)
       .sort(compareLabelFn);
     const onProjectSelectionChange = async (

package/src/components/editor/editor-group/uml-editor/ClassEditor.tsx

@@ -159,6 +159,7 @@ const PropertyBasicEditor = observer(
     const { property, _class, editorState, deleteProperty, isReadOnly } = props;
 
     const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
     const isInheritedProperty =
       property._OWNER instanceof Class && property._OWNER !== _class;
     const isPropertyFromAssociation = property._OWNER instanceof Association;
@@ -340,6 +341,10 @@ const PropertyBasicEditor = observer(
               placeholder="Choose a type..."
               filterOption={filterOption}
               formatOptionLabel={getPackageableElementOptionFormatter({})}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           )}
           {!isIndirectProperty && !isReadOnly && !isEditingType && (
@@ -713,6 +718,10 @@ const DerivedPropertyBasicEditor = observer(
                 placeholder="Choose a type..."
                 filterOption={filterOption}
                 formatOptionLabel={getPackageableElementOptionFormatter({})}
+                darkMode={
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
+                }
               />
             )}
             {!isInheritedProperty && !isReadOnly && !isEditingType && (
@@ -1044,6 +1053,7 @@ const SuperTypeEditor = observer(
 
     const { superType, _class, deleteSuperType, isReadOnly } = props;
     const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
     // Type
     const superTypeOptions = editorStore.graphManagerState.usableClasses
       .filter(
@@ -1136,6 +1146,10 @@ const SuperTypeEditor = observer(
             placeholder="Choose a class"
             filterOption={filterOption}
             formatOptionLabel={getPackageableElementOptionFormatter({})}
+            darkMode={
+              !applicationStore.layoutService
+                .TEMPORARY__isLightColorThemeEnabled
+            }
           />
           <button
             className="uml-element-editor__basic__detail-btn"
@@ -1472,6 +1486,7 @@ const SupertypesEditor = observer(
 const TaggedValuesEditor = observer(
   (props: { _class: Class; editorState: ClassEditorState }) => {
     const { _class, editorState } = props;
+    const applicationStore = useApplicationStore();
     const isReadOnly = editorState.isReadOnly;
 
     const deleteTaggedValue =
@@ -1519,6 +1534,10 @@ const TaggedValuesEditor = observer(
               taggedValue={taggedValue}
               deleteValue={deleteTaggedValue(taggedValue)}
               isReadOnly={isReadOnly}
+              darkTheme={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           ))}
         </PanelContentLists>
@@ -1530,6 +1549,7 @@ const TaggedValuesEditor = observer(
 const StereotypesEditor = observer(
   (props: { _class: Class; editorState: ClassEditorState }) => {
     const { _class, editorState } = props;
+    const applicationStore = useApplicationStore();
     const isReadOnly = editorState.isReadOnly;
 
     const deleteStereotype =
@@ -1579,6 +1599,10 @@ const StereotypesEditor = observer(
               stereotype={stereotype}
               deleteStereotype={deleteStereotype(stereotype)}
               isReadOnly={isReadOnly}
+              darkTheme={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
             />
           ))}
         </PanelContentLists>

package/src/components/editor/editor-group/uml-editor/PropertyEditor.tsx

@@ -45,6 +45,7 @@ import {
 import { LEGEND_STUDIO_TEST_ID } from '../../../../__lib__/LegendStudioTesting.js';
 import { isNonNullable, prettyCONSTName } from '@finos/legend-shared';
 import { UML_EDITOR_TAB } from '../../../../stores/editor/editor-state/element-editor-state/UMLEditorState.js';
+import { useApplicationStore } from '@finos/legend-application';
 import {
   type AbstractProperty,
   type StereotypeReference,
@@ -81,6 +82,9 @@ export const PropertyEditor = observer(
     isReadOnly: boolean;
   }) => {
     const { property, deselectProperty, isReadOnly } = props;
+    const applicationStore = useApplicationStore();
+    const darkMode =
+      !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
     // Tab
     const [selectedTab, setSelectedTab] = useState<UML_EDITOR_TAB>(
       property instanceof Property
@@ -272,6 +276,7 @@ export const PropertyEditor = observer(
                       escapeClearsValue={true}
                       isClearable={true}
                       disabled={isReadOnly}
+                      darkMode={darkMode}
                     />
                   </PanelFormSection>
                 </PanelForm>
@@ -290,6 +295,7 @@ export const PropertyEditor = observer(
                       taggedValue={taggedValue}
                       deleteValue={_deleteTaggedValue(taggedValue)}
                       isReadOnly={isReadOnly}
+                      darkTheme={darkMode}
                     />
                   ))}
                 </PanelContentLists>
@@ -309,6 +315,7 @@ export const PropertyEditor = observer(
                       stereotype={stereotype}
                       deleteStereotype={_deleteStereotype(stereotype)}
                       isReadOnly={isReadOnly}
+                      darkTheme={darkMode}
                     />
                   ))}
                 </PanelContentLists>

package/src/stores/editor/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.ts

@@ -444,6 +444,23 @@ export class ProjectDependencyEditorState {
       return;
     }
 
+    const currentProjectCoordinate = generateGAVCoordinates(
+      this.configState.currentProjectConfiguration.groupId,
+      this.configState.currentProjectConfiguration.artifactId,
+      undefined,
+    );
+    const exclusionCoordinate = generateGAVCoordinates(
+      guaranteeNonNullable(exclusion.groupId),
+      guaranteeNonNullable(exclusion.artifactId),
+      undefined,
+    );
+    if (exclusionCoordinate === currentProjectCoordinate) {
+      this.editorStore.applicationStore.notificationService.notifyWarning(
+        'You cannot exclude your own project from a dependency',
+      );
+      return;
+    }
+
     const existingExclusion = this.findExistingExclusion(
       dependencyId,
       generateGAVCoordinates(