@finos/legend-application-studio 28.16.3 → 28.16.6

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

@@ -34,6 +34,7 @@ import {
   Modal,
   ModalBody,
   ModalFooter,
+  ModalFooterButton,
   MenuContentItem,
   MenuContent,
   PanelFormBooleanField,
@@ -111,7 +112,12 @@ const ShareProjectModal = observer(
 
     return (
       <Dialog onClose={closeModal} open={open}>
-        <Modal darkMode={true} className="modal--no-padding">
+        <Modal
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
+          className="modal--no-padding"
+        >
           <PanelLoadingIndicator isLoading={isDispatchingAction} />
           <ModalBody>
             <div className="project-overview__share-project__modal__info-entry">
@@ -134,7 +140,10 @@ const ShareProjectModal = observer(
                             }
                           : null
                       }
-                      darkMode={true}
+                      darkMode={
+                        !applicationStore.layoutService
+                          .TEMPORARY__isLightColorThemeEnabled
+                      }
                     />
                   </div>
                 ) : (
@@ -154,13 +163,12 @@ const ShareProjectModal = observer(
             </div>
           </ModalBody>
           <ModalFooter>
-            <button
-              className="btn--wide btn--dark"
+            <ModalFooterButton
+              className="btn--wide"
+              text="Copy Link"
               disabled={isFetchingProject}
               onClick={copyProjectElementLink}
-            >
-              Copy Link
-            </button>
+            />
           </ModalFooter>
         </Modal>
       </Dialog>
@@ -680,7 +688,10 @@ const PatchEditor = observer(() => {
                 placeholder={'Select source version'}
                 isClearable={true}
                 escapeClearsValue={true}
-                darkMode={true}
+                darkMode={
+                  !applicationStore.layoutService
+                    .TEMPORARY__isLightColorThemeEnabled
+                }
               />
             </div>
           </div>
@@ -747,7 +758,10 @@ const PatchEditor = observer(() => {
                     placeholder={'Select patch you want to release'}
                     isClearable={true}
                     escapeClearsValue={true}
-                    darkMode={true}
+                    darkMode={
+                      !applicationStore.layoutService
+                        .TEMPORARY__isLightColorThemeEnabled
+                    }
                   />
                 </div>
               </div>

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

@@ -162,6 +162,8 @@ const ServiceFailViewer = observer(
     failure: ServiceRegistrationResult | undefined;
   }) => {
     const { globalBulkServiceRegistrationState, failure } = props;
+    const applicationStore =
+      globalBulkServiceRegistrationState.editorStore.applicationStore;
     const closeLogViewer = (): void =>
       globalBulkServiceRegistrationState.setFailingView(undefined);
     return (
@@ -174,7 +176,12 @@ const ServiceFailViewer = observer(
           paper: 'editor-modal__content',
         }}
       >
-        <Modal darkMode={true} className="editor-modal">
+        <Modal
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
+          className="editor-modal"
+        >
           <ModalHeader title={guaranteeNonNullable(failure?.service).path} />
           <ModalBody>
             {failure instanceof ServiceRegistrationFail && (
@@ -186,7 +193,11 @@ const ServiceFailViewer = observer(
             )}
           </ModalBody>
           <ModalFooter>
-            <ModalFooterButton text="Close" onClick={closeLogViewer} />
+            <ModalFooterButton
+              text="Close"
+              onClick={closeLogViewer}
+              type="secondary"
+            />
           </ModalFooter>
         </Modal>
       </Dialog>
@@ -199,6 +210,7 @@ export const RegisterService = observer(
     globalBulkServiceRegistrationState: GlobalBulkServiceRegistrationState;
   }) => {
     const editorStore = useEditorStore();
+    const applicationStore = editorStore.applicationStore;
     const services = editorStore.graphManagerState.graph.ownServices;
     const toggleSelectAllServices = (): void => {
       editorStore.globalBulkServiceRegistrationState.selectAllServices
@@ -334,7 +346,10 @@ export const RegisterService = observer(
             }
           >
             <Modal
-              darkMode={true}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
               className={clsx(
                 'editor-modal bulk-service-registration__service__editor',
               )}

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

@@ -198,6 +198,7 @@ const WorkflowJobLogsViewer = observer(
     logState: WorkflowLogState;
   }) => {
     const { workflowState, logState } = props;
+    const applicationStore = workflowState.editorStore.applicationStore;
     const job = guaranteeNonNullable(logState.job);
     const jobIsInProgress = job.status === WorkflowJobStatus.IN_PROGRESS;
     const closeLogViewer = (): void => {
@@ -220,7 +221,12 @@ const WorkflowJobLogsViewer = observer(
           paper: 'editor-modal__content',
         }}
       >
-        <Modal darkMode={true} className="editor-modal">
+        <Modal
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
+          className="editor-modal"
+        >
           <PanelLoadingIndicator
             isLoading={logState.fetchJobLogState.isInProgress}
           />
@@ -245,7 +251,11 @@ const WorkflowJobLogsViewer = observer(
             />
           </ModalBody>
           <ModalFooter>
-            <ModalFooterButton text="Close" onClick={closeLogViewer} />
+            <ModalFooterButton
+              text="Close"
+              onClick={closeLogViewer}
+              type="secondary"
+            />
           </ModalFooter>
         </Modal>
       </Dialog>

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

@@ -31,6 +31,7 @@ import {
   ModalBody,
   ModalFooter,
   ModalHeader,
+  ModalFooterButton,
 } from '@finos/legend-art';
 import type {
   EntityChangeConflict,
@@ -108,7 +109,12 @@ export const WorkspaceSyncConflictResolver = observer(() => {
       classes={{ container: 'search-modal__container' }}
       PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
     >
-      <Modal darkMode={true} className="editor-modal query-builder__dialog">
+      <Modal
+        darkMode={
+          !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+        }
+        className="editor-modal query-builder__dialog"
+      >
         <ModalHeader title="Resolve Merge Conflicts" />
         <ModalBody>
           <ResizablePanelGroup orientation="vertical">
@@ -255,17 +261,18 @@ export const WorkspaceSyncConflictResolver = observer(() => {
           </ResizablePanelGroup>
         </ModalBody>
         <ModalFooter>
-          <button
-            className="btn btn--dark"
-            disabled={Boolean(conflicts.length)}
+          <ModalFooterButton
+            text="Apply Resolutions"
             title="Apply Resolutions"
+            disabled={Boolean(conflicts.length)}
             onClick={applyResolutions}
-          >
-            Apply Resolutions
-          </button>
-          <button className="btn btn--dark" title="Aborts" onClick={abort}>
-            Abort
-          </button>
+          />
+          <ModalFooterButton
+            text="Abort"
+            title="Aborts"
+            onClick={abort}
+            type="secondary"
+          />
         </ModalFooter>
       </Modal>
     </Dialog>

package/src/components/editor/side-bar/testable/GlobalTestRunner.tsx

@@ -184,6 +184,7 @@ const TestFailViewer = observer(
     failure: TestError | AssertFail;
   }) => {
     const { globalTestRunnerState, failure } = props;
+    const applicationStore = globalTestRunnerState.editorStore.applicationStore;
     const id =
       failure instanceof TestError
         ? failure.atomicTest.id
@@ -201,7 +202,12 @@ const TestFailViewer = observer(
           paper: 'editor-modal__content',
         }}
       >
-        <Modal darkMode={true} className="editor-modal">
+        <Modal
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
+          className="editor-modal"
+        >
           <PanelLoadingIndicator
             isLoading={globalTestRunnerState.isDispatchingOwnProjectAction}
           />
@@ -231,7 +237,11 @@ const TestFailViewer = observer(
               )}
           </ModalBody>
           <ModalFooter>
-            <ModalFooterButton text="Close" onClick={closeLogViewer} />
+            <ModalFooterButton
+              text="Close"
+              onClick={closeLogViewer}
+              type="secondary"
+            />
           </ModalFooter>
         </Modal>
       </Dialog>

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

@@ -626,6 +626,7 @@ const ImportProjectTab = observer(() => {
 
 export const CreateProjectModal = observer(() => {
   const setupStore = useWorkspaceSetupStore();
+  const applicationStore = setupStore.applicationStore;
   const allowCreatingNewProject =
     setupStore.sdlcServerClient.features.canCreateProject;
   const [selectedTab, setSelectedTab] = useState(
@@ -654,7 +655,12 @@ export const CreateProjectModal = observer(() => {
       classes={{ container: 'search-modal__container' }}
       PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
     >
-      <Modal darkMode={true} className="workspace-setup__create-project-modal">
+      <Modal
+        darkMode={
+          !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+        }
+        className="workspace-setup__create-project-modal"
+      >
         <div className="workspace-setup__create-project-modal__header">
           <div className="workspace-setup__create-project-modal__header__label">
             Create Project

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

@@ -134,7 +134,9 @@ export const CreateWorkspaceModal = observer(
         PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
       >
         <Modal
-          darkMode={true}
+          darkMode={
+            !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+          }
           className="workspace-setup__create-workspace-modal"
         >
           <div className="modal__title">
@@ -187,7 +189,10 @@ export const CreateWorkspaceModal = observer(
                   value={selectedPatchOption}
                   isClearable={true}
                   escapeClearsValue={true}
-                  darkMode={true}
+                  darkMode={
+                    !applicationStore.layoutService
+                      .TEMPORARY__isLightColorThemeEnabled
+                  }
                 />
               </div>
               <PanelFormBooleanField

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

@@ -315,7 +315,12 @@ const SandboxAccessModal = observer(() => {
 
   return (
     <Dialog open={true} onClose={closeModal}>
-      <Modal darkMode={true} className="sandbox-project-modal">
+      <Modal
+        darkMode={
+          !applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
+        }
+        className="sandbox-project-modal"
+      >
         <div className="sandbox-project-modal__header">
           <div className="sandbox-project-modal__header__label">
             Create Sandbox Project
@@ -511,7 +516,10 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                             placeholder="Search for project..."
                             isClearable={true}
                             escapeClearsValue={true}
-                            darkMode={true}
+                            darkMode={
+                              !applicationStore.layoutService
+                                .TEMPORARY__isLightColorThemeEnabled
+                            }
                             formatOptionLabel={getProjectOptionLabelFormatter(
                               applicationStore,
                               setupStore.currentProjectConfigurationStatus,
@@ -569,7 +577,10 @@ export const WorkspaceSetup = withWorkspaceSetupStore(
                             }
                             isClearable={true}
                             escapeClearsValue={true}
-                            darkMode={true}
+                            darkMode={
+                              !applicationStore.layoutService
+                                .TEMPORARY__isLightColorThemeEnabled
+                            }
                             optionCustomization={{
                               rowHeight: window.innerHeight * 0.03,
                             }}

package/src/stores/editor/editor-state/element-editor-state/data/EmbeddedDataState.ts

@@ -16,7 +16,7 @@
 import {
   type EmbeddedData,
   type ModelData,
-  type DataElement,
+  DataElement,
   RelationalCSVData,
   type Database,
   type RelationalCSVDataTable,
@@ -310,6 +310,11 @@ export class RelationalCSVDataState extends EmbeddedDataState {
 export interface EmbeddedDataStateOption {
   hideSource?: boolean;
 }
+export class UnsupportedDataState extends EmbeddedDataState {
+  label(): string {
+    return 'Unsupported embedded data';
+  }
+}
 
 export class DataElementReferenceState extends EmbeddedDataState {
   override embeddedData: DataElementReference;
@@ -341,17 +346,15 @@ export class DataElementReferenceState extends EmbeddedDataState {
   }
 
   buildValueState(options?: EmbeddedDataStateOption): EmbeddedDataState {
-    return buildEmbeddedDataEditorState(
-      this.embeddedData.dataElement.value.data,
-      this.editorStore,
-      this.options,
-    );
-  }
-}
-
-export class UnsupportedDataState extends EmbeddedDataState {
-  label(): string {
-    return 'Unsupported embedded data';
+    const packagableEl = this.embeddedData.dataElement.value;
+    if (packagableEl instanceof DataElement) {
+      return buildEmbeddedDataEditorState(
+        packagableEl.data,
+        this.editorStore,
+        this.options,
+      );
+    }
+    return new UnsupportedDataState(this.editorStore, this.embeddedData);
   }
 }
 

package/src/stores/editor/utils/TestableUtils.ts

@@ -58,6 +58,7 @@ import {
   PrimitiveInstanceValue,
   PrimitiveType,
   LambdaFunctionInstanceValue,
+  DataElement,
 } from '@finos/legend-graph';
 import {
   assertTrue,
@@ -65,6 +66,7 @@ import {
   generateEnumerableNameFromToken,
   getNullableFirstEntry,
   guaranteeNonEmptyString,
+  guaranteeType,
   isNonNullable,
   LogEvent,
   returnUndefOnError,
@@ -197,7 +199,8 @@ export class EmbeddedDataCreatorFromEmbeddedData
     return val;
   }
   visit_DataElementReference(data: DataElementReference): EmbeddedData {
-    return data.dataElement.value.data.accept_EmbeddedDataVisitor(
+    const datElement = guaranteeType(data.dataElement.value, DataElement);
+    return datElement.data.accept_EmbeddedDataVisitor(
       new EmbeddedDataCreatorFromEmbeddedData(this.editorStore),
     );
   }