@finos/legend-application-studio 28.16.5 → 28.16.6
Sign up to get free protection for your applications and to get access to all the features.
- package/lib/components/LegendStudioAppInfo.d.ts.map +1 -1
- package/lib/components/LegendStudioAppInfo.js +1 -1
- package/lib/components/LegendStudioAppInfo.js.map +1 -1
- package/lib/components/editor/EmbeddedQueryBuilder.d.ts.map +1 -1
- package/lib/components/editor/EmbeddedQueryBuilder.js +1 -1
- package/lib/components/editor/EmbeddedQueryBuilder.js.map +1 -1
- package/lib/components/editor/QuickInput.d.ts.map +1 -1
- package/lib/components/editor/QuickInput.js +3 -1
- package/lib/components/editor/QuickInput.js.map +1 -1
- package/lib/components/editor/command-center/ProjectSearchCommand.d.ts.map +1 -1
- package/lib/components/editor/command-center/ProjectSearchCommand.js +5 -2
- package/lib/components/editor/command-center/ProjectSearchCommand.js.map +1 -1
- package/lib/components/editor/editor-group/GenerationSpecificationEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/GenerationSpecificationEditor.js +4 -2
- package/lib/components/editor/editor-group/GenerationSpecificationEditor.js.map +1 -1
- package/lib/components/editor/editor-group/RuntimeEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/RuntimeEditor.js +6 -3
- package/lib/components/editor/editor-group/RuntimeEditor.js.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/ConnectionEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/ConnectionEditor.js +6 -3
- package/lib/components/editor/editor-group/connection-editor/ConnectionEditor.js.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.d.ts.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.js +7 -2
- package/lib/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.js.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/DatabaseModelBuilder.d.ts.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/DatabaseModelBuilder.js +1 -1
- package/lib/components/editor/editor-group/connection-editor/DatabaseModelBuilder.js.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/RelationalDatabaseConnectionEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/connection-editor/RelationalDatabaseConnectionEditor.js +14 -4
- package/lib/components/editor/editor-group/connection-editor/RelationalDatabaseConnectionEditor.js.map +1 -1
- package/lib/components/editor/editor-group/data-editor/EmbeddedDataEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/data-editor/EmbeddedDataEditor.js +8 -3
- package/lib/components/editor/editor-group/data-editor/EmbeddedDataEditor.js.map +1 -1
- package/lib/components/editor/editor-group/data-editor/RelationalCSVDataEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/data-editor/RelationalCSVDataEditor.js +5 -2
- package/lib/components/editor/editor-group/data-editor/RelationalCSVDataEditor.js.map +1 -1
- package/lib/components/editor/editor-group/diff-editor/EntityChangeConflictEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/diff-editor/EntityChangeConflictEditor.js +2 -1
- package/lib/components/editor/editor-group/diff-editor/EntityChangeConflictEditor.js.map +1 -1
- package/lib/components/editor/editor-group/element-generation-editor/FileGenerationEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/element-generation-editor/FileGenerationEditor.js +2 -1
- package/lib/components/editor/editor-group/element-generation-editor/FileGenerationEditor.js.map +1 -1
- package/lib/components/editor/editor-group/end-to-end-flow-editor/ConnectionToQueryWorkflowEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/end-to-end-flow-editor/ConnectionToQueryWorkflowEditor.js +2 -2
- package/lib/components/editor/editor-group/end-to-end-flow-editor/ConnectionToQueryWorkflowEditor.js.map +1 -1
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_BindingElementEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_BindingElementEditor.js +5 -1
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_BindingElementEditor.js.map +1 -1
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.js +3 -2
- package/lib/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.js.map +1 -1
- package/lib/components/editor/editor-group/function-activator/FunctionEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/function-activator/FunctionEditor.js +5 -3
- package/lib/components/editor/editor-group/function-activator/FunctionEditor.js.map +1 -1
- package/lib/components/editor/editor-group/function-activator/HostedServiceFunctionActivatorEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/function-activator/HostedServiceFunctionActivatorEditor.js +2 -1
- package/lib/components/editor/editor-group/function-activator/HostedServiceFunctionActivatorEditor.js.map +1 -1
- package/lib/components/editor/editor-group/function-activator/SnowflakeAppFunctionActivatorEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/function-activator/SnowflakeAppFunctionActivatorEditor.js +2 -1
- package/lib/components/editor/editor-group/function-activator/SnowflakeAppFunctionActivatorEditor.js.map +1 -1
- package/lib/components/editor/editor-group/function-activator/testable/FunctionTestableEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/function-activator/testable/FunctionTestableEditor.js +12 -8
- package/lib/components/editor/editor-group/function-activator/testable/FunctionTestableEditor.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/EnumerationMappingEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/EnumerationMappingEditor.js +3 -1
- package/lib/components/editor/editor-group/mapping-editor/EnumerationMappingEditor.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/InstanceSetImplementationSourceSelectorModal.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/InstanceSetImplementationSourceSelectorModal.js +2 -1
- package/lib/components/editor/editor-group/mapping-editor/InstanceSetImplementationSourceSelectorModal.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/MappingExecutionBuilder.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/MappingExecutionBuilder.js +3 -1
- package/lib/components/editor/editor-group/mapping-editor/MappingExecutionBuilder.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/MappingTestableEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/MappingTestableEditor.js +12 -4
- package/lib/components/editor/editor-group/mapping-editor/MappingTestableEditor.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/NewMappingElementModal.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/NewMappingElementModal.js +5 -2
- package/lib/components/editor/editor-group/mapping-editor/NewMappingElementModal.js.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/legacy/MappingTestMigrationTool.d.ts.map +1 -1
- package/lib/components/editor/editor-group/mapping-editor/legacy/MappingTestMigrationTool.js +2 -1
- package/lib/components/editor/editor-group/mapping-editor/legacy/MappingTestMigrationTool.js.map +1 -1
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.js +5 -4
- package/lib/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/BulkServiceRegistrationEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/BulkServiceRegistrationEditor.js +5 -2
- package/lib/components/editor/editor-group/service-editor/BulkServiceRegistrationEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceEditor.js +2 -1
- package/lib/components/editor/editor-group/service-editor/ServiceEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionEditor.js +7 -2
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.js +3 -2
- package/lib/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceRegistrationEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/ServiceRegistrationEditor.js +5 -2
- package/lib/components/editor/editor-group/service-editor/ServiceRegistrationEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestDataEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestDataEditor.js +15 -6
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestDataEditor.js.map +1 -1
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestsEditor.d.ts.map +1 -1
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestsEditor.js +8 -3
- package/lib/components/editor/editor-group/service-editor/testable/ServiceTestsEditor.js.map +1 -1
- package/lib/components/editor/editor-group/testable/TestableSharedComponents.d.ts.map +1 -1
- package/lib/components/editor/editor-group/testable/TestableSharedComponents.js +10 -4
- package/lib/components/editor/editor-group/testable/TestableSharedComponents.js.map +1 -1
- package/lib/components/editor/panel-group/SQLPlaygroundPanel.d.ts.map +1 -1
- package/lib/components/editor/panel-group/SQLPlaygroundPanel.js +17 -4
- package/lib/components/editor/panel-group/SQLPlaygroundPanel.js.map +1 -1
- package/lib/components/editor/side-bar/CreateNewElementModal.d.ts.map +1 -1
- package/lib/components/editor/side-bar/CreateNewElementModal.js +19 -9
- package/lib/components/editor/side-bar/CreateNewElementModal.js.map +1 -1
- package/lib/components/editor/side-bar/Explorer.d.ts.map +1 -1
- package/lib/components/editor/side-bar/Explorer.js +5 -2
- package/lib/components/editor/side-bar/Explorer.js.map +1 -1
- package/lib/components/editor/side-bar/LocalChanges.d.ts.map +1 -1
- package/lib/components/editor/side-bar/LocalChanges.js +3 -2
- package/lib/components/editor/side-bar/LocalChanges.js.map +1 -1
- package/lib/components/editor/side-bar/ProjectOverview.d.ts.map +1 -1
- package/lib/components/editor/side-bar/ProjectOverview.js +8 -5
- package/lib/components/editor/side-bar/ProjectOverview.js.map +1 -1
- package/lib/components/editor/side-bar/RegisterService.d.ts.map +1 -1
- package/lib/components/editor/side-bar/RegisterService.js +5 -2
- package/lib/components/editor/side-bar/RegisterService.js.map +1 -1
- package/lib/components/editor/side-bar/WorkflowManager.d.ts.map +1 -1
- package/lib/components/editor/side-bar/WorkflowManager.js +2 -1
- package/lib/components/editor/side-bar/WorkflowManager.js.map +1 -1
- package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.d.ts.map +1 -1
- package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.js +3 -3
- package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.js.map +1 -1
- package/lib/components/editor/side-bar/testable/GlobalTestRunner.d.ts.map +1 -1
- package/lib/components/editor/side-bar/testable/GlobalTestRunner.js +3 -2
- package/lib/components/editor/side-bar/testable/GlobalTestRunner.js.map +1 -1
- package/lib/components/workspace-setup/CreateProjectModal.d.ts.map +1 -1
- package/lib/components/workspace-setup/CreateProjectModal.js +2 -1
- package/lib/components/workspace-setup/CreateProjectModal.js.map +1 -1
- package/lib/components/workspace-setup/CreateWorkspaceModal.d.ts.map +1 -1
- package/lib/components/workspace-setup/CreateWorkspaceModal.js +3 -2
- package/lib/components/workspace-setup/CreateWorkspaceModal.js.map +1 -1
- package/lib/components/workspace-setup/WorkspaceSetup.d.ts.map +1 -1
- package/lib/components/workspace-setup/WorkspaceSetup.js +5 -3
- package/lib/components/workspace-setup/WorkspaceSetup.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +1 -1
- package/package.json +11 -11
- package/src/components/LegendStudioAppInfo.tsx +6 -1
- package/src/components/editor/EmbeddedQueryBuilder.tsx +3 -1
- package/src/components/editor/QuickInput.tsx +11 -2
- package/src/components/editor/command-center/ProjectSearchCommand.tsx +14 -3
- package/src/components/editor/editor-group/GenerationSpecificationEditor.tsx +8 -2
- package/src/components/editor/editor-group/RuntimeEditor.tsx +15 -3
- package/src/components/editor/editor-group/connection-editor/ConnectionEditor.tsx +12 -3
- package/src/components/editor/editor-group/connection-editor/DatabaseBuilderWizard.tsx +13 -4
- package/src/components/editor/editor-group/connection-editor/DatabaseModelBuilder.tsx +6 -1
- package/src/components/editor/editor-group/connection-editor/RelationalDatabaseConnectionEditor.tsx +36 -7
- package/src/components/editor/editor-group/data-editor/EmbeddedDataEditor.tsx +13 -3
- package/src/components/editor/editor-group/data-editor/RelationalCSVDataEditor.tsx +12 -2
- package/src/components/editor/editor-group/diff-editor/EntityChangeConflictEditor.tsx +4 -1
- package/src/components/editor/editor-group/element-generation-editor/FileGenerationEditor.tsx +4 -1
- package/src/components/editor/editor-group/end-to-end-flow-editor/ConnectionToQueryWorkflowEditor.tsx +6 -2
- package/src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_BindingElementEditor.tsx +13 -3
- package/src/components/editor/editor-group/external-format-editor/DSL_ExternalFormat_SchemaSetElementEditor.tsx +12 -6
- package/src/components/editor/editor-group/function-activator/FunctionEditor.tsx +16 -4
- package/src/components/editor/editor-group/function-activator/HostedServiceFunctionActivatorEditor.tsx +4 -1
- package/src/components/editor/editor-group/function-activator/SnowflakeAppFunctionActivatorEditor.tsx +4 -1
- package/src/components/editor/editor-group/function-activator/testable/FunctionTestableEditor.tsx +25 -10
- package/src/components/editor/editor-group/mapping-editor/EnumerationMappingEditor.tsx +11 -2
- package/src/components/editor/editor-group/mapping-editor/InstanceSetImplementationSourceSelectorModal.tsx +10 -2
- package/src/components/editor/editor-group/mapping-editor/MappingExecutionBuilder.tsx +5 -1
- package/src/components/editor/editor-group/mapping-editor/MappingTestableEditor.tsx +42 -11
- package/src/components/editor/editor-group/mapping-editor/NewMappingElementModal.tsx +9 -2
- package/src/components/editor/editor-group/mapping-editor/legacy/MappingTestMigrationTool.tsx +4 -1
- package/src/components/editor/editor-group/project-configuration-editor/ProjectDependencyEditor.tsx +18 -4
- package/src/components/editor/editor-group/service-editor/BulkServiceRegistrationEditor.tsx +12 -3
- package/src/components/editor/editor-group/service-editor/ServiceEditor.tsx +4 -1
- package/src/components/editor/editor-group/service-editor/ServiceExecutionEditor.tsx +14 -3
- package/src/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.tsx +13 -6
- package/src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx +12 -3
- package/src/components/editor/editor-group/service-editor/testable/ServiceTestDataEditor.tsx +48 -18
- package/src/components/editor/editor-group/service-editor/testable/ServiceTestsEditor.tsx +14 -3
- package/src/components/editor/editor-group/testable/TestableSharedComponents.tsx +35 -8
- package/src/components/editor/panel-group/SQLPlaygroundPanel.tsx +29 -5
- package/src/components/editor/side-bar/CreateNewElementModal.tsx +42 -11
- package/src/components/editor/side-bar/Explorer.tsx +8 -2
- package/src/components/editor/side-bar/LocalChanges.tsx +12 -6
- package/src/components/editor/side-bar/ProjectOverview.tsx +23 -9
- package/src/components/editor/side-bar/RegisterService.tsx +18 -3
- package/src/components/editor/side-bar/WorkflowManager.tsx +12 -2
- package/src/components/editor/side-bar/WorkspaceSyncConflictResolver.tsx +17 -10
- package/src/components/editor/side-bar/testable/GlobalTestRunner.tsx +12 -2
- package/src/components/workspace-setup/CreateProjectModal.tsx +7 -1
- package/src/components/workspace-setup/CreateWorkspaceModal.tsx +7 -2
- package/src/components/workspace-setup/WorkspaceSetup.tsx +14 -3
@@ -82,6 +82,7 @@ import {
|
|
82
82
|
BasicValueSpecificationEditor,
|
83
83
|
buildDefaultInstanceValue,
|
84
84
|
} from '@finos/legend-query-builder';
|
85
|
+
import { useApplicationStore } from '@finos/legend-application';
|
85
86
|
|
86
87
|
export const SharedDataElementModal = observer(
|
87
88
|
(props: {
|
@@ -92,6 +93,7 @@ export const SharedDataElementModal = observer(
|
|
92
93
|
close: () => void;
|
93
94
|
}) => {
|
94
95
|
const { filterBy, isReadOnly, close, editorStore, handler } = props;
|
96
|
+
const applicationStore = editorStore.applicationStore;
|
95
97
|
const dataElements =
|
96
98
|
editorStore.graphManagerState.graph.dataElements.filter((e) =>
|
97
99
|
filterBy ? filterBy(e) : true,
|
@@ -123,7 +125,12 @@ export const SharedDataElementModal = observer(
|
|
123
125
|
classes={{ container: 'search-modal__container' }}
|
124
126
|
PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
|
125
127
|
>
|
126
|
-
<Modal
|
128
|
+
<Modal
|
129
|
+
darkMode={
|
130
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
131
|
+
}
|
132
|
+
className="service-test-data-modal"
|
133
|
+
>
|
127
134
|
<ModalBody>
|
128
135
|
<div className="panel__content__form__section">
|
129
136
|
<div className="panel__content__form__section__header__label">
|
@@ -137,7 +144,10 @@ export const SharedDataElementModal = observer(
|
|
137
144
|
onChange={onDataElementChange}
|
138
145
|
formatOptionLabel={getPackageableElementOptionFormatter({})}
|
139
146
|
value={selectedDataElement}
|
140
|
-
darkMode={
|
147
|
+
darkMode={
|
148
|
+
!applicationStore.layoutService
|
149
|
+
.TEMPORARY__isLightColorThemeEnabled
|
150
|
+
}
|
141
151
|
/>
|
142
152
|
</div>
|
143
153
|
</div>
|
@@ -313,6 +323,8 @@ const EqualToAsssertionEditor = observer(
|
|
313
323
|
const EqualToJsonAssertFailViewer = observer(
|
314
324
|
(props: { equalToJsonAssertFailState: EqualToJsonAssertFailState }) => {
|
315
325
|
const { equalToJsonAssertFailState } = props;
|
326
|
+
const applicationStore =
|
327
|
+
equalToJsonAssertFailState.resultState.editorStore.applicationStore;
|
316
328
|
const open = (): void => equalToJsonAssertFailState.setDiffModal(true);
|
317
329
|
const close = (): void => equalToJsonAssertFailState.setDiffModal(false);
|
318
330
|
const expected = equalToJsonAssertFailState.status.expected;
|
@@ -333,7 +345,13 @@ const EqualToJsonAssertFailViewer = observer(
|
|
333
345
|
paper: 'editor-modal__content',
|
334
346
|
}}
|
335
347
|
>
|
336
|
-
<Modal
|
348
|
+
<Modal
|
349
|
+
darkMode={
|
350
|
+
!applicationStore.layoutService
|
351
|
+
.TEMPORARY__isLightColorThemeEnabled
|
352
|
+
}
|
353
|
+
className="editor-modal"
|
354
|
+
>
|
337
355
|
<ModalHeader>
|
338
356
|
<div className="equal-to-json-result__diff__summary">
|
339
357
|
<div className="equal-to-json-result__diff__header__label">
|
@@ -351,7 +369,11 @@ const EqualToJsonAssertFailViewer = observer(
|
|
351
369
|
<JSONDiffView from={expected} to={actual} lossless={true} />
|
352
370
|
</ModalBody>
|
353
371
|
<ModalFooter>
|
354
|
-
<ModalFooterButton
|
372
|
+
<ModalFooterButton
|
373
|
+
text="Close"
|
374
|
+
onClick={close}
|
375
|
+
type="secondary"
|
376
|
+
/>
|
355
377
|
</ModalFooter>
|
356
378
|
</Modal>
|
357
379
|
</Dialog>
|
@@ -682,6 +704,7 @@ export const ExternalFormatParameterEditorModal = observer(
|
|
682
704
|
updateParamValue,
|
683
705
|
contentTypeParamPair,
|
684
706
|
} = props;
|
707
|
+
const applicationStore = useApplicationStore();
|
685
708
|
const paramValue =
|
686
709
|
varExpression.genericType?.value.rawType === PrimitiveType.BYTE
|
687
710
|
? atob((valueSpec as PrimitiveInstanceValue).values[0] as string)
|
@@ -694,7 +717,9 @@ export const ExternalFormatParameterEditorModal = observer(
|
|
694
717
|
PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
|
695
718
|
>
|
696
719
|
<Modal
|
697
|
-
darkMode={
|
720
|
+
darkMode={
|
721
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
722
|
+
}
|
698
723
|
className={clsx('editor-modal lambda-editor__popup__modal')}
|
699
724
|
>
|
700
725
|
<ModalHeader>
|
@@ -718,9 +743,11 @@ export const ExternalFormatParameterEditorModal = observer(
|
|
718
743
|
</div>
|
719
744
|
</ModalBody>
|
720
745
|
<ModalFooter>
|
721
|
-
<
|
722
|
-
Close
|
723
|
-
|
746
|
+
<ModalFooterButton
|
747
|
+
text="Close"
|
748
|
+
onClick={onClose}
|
749
|
+
type="secondary"
|
750
|
+
/>
|
724
751
|
</ModalFooter>
|
725
752
|
</Modal>
|
726
753
|
</Dialog>
|
@@ -414,6 +414,9 @@ const PlayGroundSQLExecutionResultGrid = observer(
|
|
414
414
|
}) => {
|
415
415
|
const { result, useAdvancedGrid, useLocalMode } = props;
|
416
416
|
const data = parseExecutionResultData(result);
|
417
|
+
const applicationStore = useApplicationStore();
|
418
|
+
const darkMode =
|
419
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled;
|
417
420
|
|
418
421
|
if (!data) {
|
419
422
|
return (
|
@@ -438,7 +441,12 @@ const PlayGroundSQLExecutionResultGrid = observer(
|
|
438
441
|
);
|
439
442
|
|
440
443
|
return (
|
441
|
-
<div
|
444
|
+
<div
|
445
|
+
className={clsx('sql-playground__result__grid', {
|
446
|
+
'ag-theme-balham': !darkMode,
|
447
|
+
'ag-theme-balham-dark': darkMode,
|
448
|
+
})}
|
449
|
+
>
|
442
450
|
<DataGrid
|
443
451
|
rowData={data.rowData}
|
444
452
|
gridOptions={{
|
@@ -491,7 +499,12 @@ const PlayGroundSQLExecutionResultGrid = observer(
|
|
491
499
|
[],
|
492
500
|
);
|
493
501
|
return (
|
494
|
-
<div
|
502
|
+
<div
|
503
|
+
className={clsx('sql-playground__result__grid', {
|
504
|
+
'ag-theme-balham': !darkMode,
|
505
|
+
'ag-theme-balham-dark': darkMode,
|
506
|
+
})}
|
507
|
+
>
|
495
508
|
<DataGrid
|
496
509
|
rowData={data.rowData}
|
497
510
|
overlayNoRowsTemplate={`<div class="sql-playground__result__grid--empty">No results</div>`}
|
@@ -516,7 +529,12 @@ const PlayGroundSQLExecutionResultGrid = observer(
|
|
516
529
|
}
|
517
530
|
|
518
531
|
return (
|
519
|
-
<div
|
532
|
+
<div
|
533
|
+
className={clsx('sql-playground__result__grid', {
|
534
|
+
'ag-theme-balham': !darkMode,
|
535
|
+
'ag-theme-balham-dark': darkMode,
|
536
|
+
})}
|
537
|
+
>
|
520
538
|
<DataGrid
|
521
539
|
rowData={data.rowData}
|
522
540
|
overlayNoRowsTemplate={`<div class="sql-playground__result__grid--empty">No results</div>`}
|
@@ -670,7 +688,10 @@ export const SQLPlaygroundPanel = observer(() => {
|
|
670
688
|
options={connectionOptions}
|
671
689
|
onChange={changeConnection}
|
672
690
|
value={selectedConnectionOption}
|
673
|
-
darkMode={
|
691
|
+
darkMode={
|
692
|
+
!applicationStore.layoutService
|
693
|
+
.TEMPORARY__isLightColorThemeEnabled
|
694
|
+
}
|
674
695
|
placeholder="Choose a connection..."
|
675
696
|
filterOption={connectionFilterOption}
|
676
697
|
/>
|
@@ -685,7 +706,10 @@ export const SQLPlaygroundPanel = observer(() => {
|
|
685
706
|
options={connectionOptions}
|
686
707
|
onChange={changeConnection}
|
687
708
|
value={selectedConnectionOption}
|
688
|
-
darkMode={
|
709
|
+
darkMode={
|
710
|
+
!applicationStore.layoutService
|
711
|
+
.TEMPORARY__isLightColorThemeEnabled
|
712
|
+
}
|
689
713
|
placeholder="Choose a connection..."
|
690
714
|
filterOption={connectionFilterOption}
|
691
715
|
/>
|
@@ -123,6 +123,7 @@ const buildElementTypeOption = (type: string): ElementTypeSelectOption => ({
|
|
123
123
|
|
124
124
|
const NewDataElementDriverEditor = observer(() => {
|
125
125
|
const editorStore = useEditorStore();
|
126
|
+
const applicationStore = editorStore.applicationStore;
|
126
127
|
const newDataELementDriver =
|
127
128
|
editorStore.newElementState.getNewElementDriver(NewDataElementDriver);
|
128
129
|
const selectedOption = newDataELementDriver.embeddedDataOption
|
@@ -160,7 +161,9 @@ const NewDataElementDriverEditor = observer(() => {
|
|
160
161
|
options={options}
|
161
162
|
onChange={onTypeSelectionChange}
|
162
163
|
value={selectedOption}
|
163
|
-
darkMode={
|
164
|
+
darkMode={
|
165
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
166
|
+
}
|
164
167
|
/>
|
165
168
|
</div>
|
166
169
|
);
|
@@ -168,6 +171,7 @@ const NewDataElementDriverEditor = observer(() => {
|
|
168
171
|
|
169
172
|
const NewRuntimeDriverEditor = observer(() => {
|
170
173
|
const editorStore = useEditorStore();
|
174
|
+
const applicationStore = editorStore.applicationStore;
|
171
175
|
const newRuntimeDriver = editorStore.newElementState.getNewElementDriver(
|
172
176
|
NewPackageableRuntimeDriver,
|
173
177
|
);
|
@@ -195,7 +199,9 @@ const NewRuntimeDriverEditor = observer(() => {
|
|
195
199
|
options={mappingOptions}
|
196
200
|
onChange={onMappingSelectionChange}
|
197
201
|
value={selectedMappingOption}
|
198
|
-
darkMode={
|
202
|
+
darkMode={
|
203
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
204
|
+
}
|
199
205
|
/>
|
200
206
|
</div>
|
201
207
|
);
|
@@ -205,6 +211,7 @@ const NewPureModelConnectionDriverEditor = observer(
|
|
205
211
|
(props: { newConnectionValueDriver: NewPureModelConnectionDriver }) => {
|
206
212
|
const { newConnectionValueDriver } = props;
|
207
213
|
const editorStore = useEditorStore();
|
214
|
+
const applicationStore = editorStore.applicationStore;
|
208
215
|
// class
|
209
216
|
const _class = newConnectionValueDriver.class;
|
210
217
|
const classOptions = editorStore.graphManagerState.usableClasses
|
@@ -237,9 +244,14 @@ const NewPureModelConnectionDriverEditor = observer(
|
|
237
244
|
options={classOptions}
|
238
245
|
onChange={onClassSelectionChange}
|
239
246
|
value={selectedClassOption}
|
240
|
-
darkMode={
|
247
|
+
darkMode={
|
248
|
+
!applicationStore.layoutService
|
249
|
+
.TEMPORARY__isLightColorThemeEnabled
|
250
|
+
}
|
241
251
|
formatOptionLabel={getPackageableElementOptionFormatter({
|
242
|
-
darkMode:
|
252
|
+
darkMode:
|
253
|
+
!applicationStore.layoutService
|
254
|
+
.TEMPORARY__isLightColorThemeEnabled,
|
243
255
|
})}
|
244
256
|
/>
|
245
257
|
</div>
|
@@ -266,6 +278,7 @@ const NewConnectionValueDriverEditor = observer(() => {
|
|
266
278
|
|
267
279
|
const NewConnectionDriverEditor = observer(() => {
|
268
280
|
const editorStore = useEditorStore();
|
281
|
+
const applicationStore = editorStore.applicationStore;
|
269
282
|
const newConnectionDriver = editorStore.newElementState.getNewElementDriver(
|
270
283
|
NewPackageableConnectionDriver,
|
271
284
|
);
|
@@ -330,7 +343,9 @@ const NewConnectionDriverEditor = observer(() => {
|
|
330
343
|
options={connectionOptions}
|
331
344
|
onChange={onConnectionChange}
|
332
345
|
value={currentConnectionTypeOption}
|
333
|
-
darkMode={
|
346
|
+
darkMode={
|
347
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
348
|
+
}
|
334
349
|
/>
|
335
350
|
</div>
|
336
351
|
<div className="panel__content__form__section__header__label">
|
@@ -342,7 +357,9 @@ const NewConnectionDriverEditor = observer(() => {
|
|
342
357
|
options={storeOptions}
|
343
358
|
onChange={onStoreSelectionChange}
|
344
359
|
value={selectedStoreOption}
|
345
|
-
darkMode={
|
360
|
+
darkMode={
|
361
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
362
|
+
}
|
346
363
|
/>
|
347
364
|
</div>
|
348
365
|
<NewConnectionValueDriverEditor />
|
@@ -352,6 +369,7 @@ const NewConnectionDriverEditor = observer(() => {
|
|
352
369
|
|
353
370
|
const NewServiceDriverEditor = observer(() => {
|
354
371
|
const editorStore = useEditorStore();
|
372
|
+
const applicationStore = editorStore.applicationStore;
|
355
373
|
const runtimeSelectorPlaceholder = 'Choose a compatible runtime...';
|
356
374
|
const newServiceDriver =
|
357
375
|
editorStore.newElementState.getNewElementDriver(NewServiceDriver);
|
@@ -389,7 +407,9 @@ const NewServiceDriverEditor = observer(() => {
|
|
389
407
|
options={mappingOptions}
|
390
408
|
onChange={onMappingChange}
|
391
409
|
value={newServiceDriver.mappingOption}
|
392
|
-
darkMode={
|
410
|
+
darkMode={
|
411
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
412
|
+
}
|
393
413
|
/>
|
394
414
|
</div>
|
395
415
|
<div className="panel__content__form__section__header__label">
|
@@ -401,7 +421,9 @@ const NewServiceDriverEditor = observer(() => {
|
|
401
421
|
options={newServiceDriver.runtimeOptions}
|
402
422
|
onChange={onRuntimeChange}
|
403
423
|
value={newServiceDriver.runtimeOption}
|
404
|
-
darkMode={
|
424
|
+
darkMode={
|
425
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
426
|
+
}
|
405
427
|
placeholder={runtimeSelectorPlaceholder}
|
406
428
|
/>
|
407
429
|
</div>
|
@@ -411,6 +433,7 @@ const NewServiceDriverEditor = observer(() => {
|
|
411
433
|
|
412
434
|
const NewFileGenerationDriverEditor = observer(() => {
|
413
435
|
const editorStore = useEditorStore();
|
436
|
+
const applicationStore = editorStore.applicationStore;
|
414
437
|
const newConnectionDriver = editorStore.newElementState.getNewElementDriver(
|
415
438
|
NewFileGenerationDriver,
|
416
439
|
);
|
@@ -431,7 +454,9 @@ const NewFileGenerationDriverEditor = observer(() => {
|
|
431
454
|
options={options}
|
432
455
|
onChange={onTypeSelectionChange}
|
433
456
|
value={newConnectionDriver.typeOption}
|
434
|
-
darkMode={
|
457
|
+
darkMode={
|
458
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
459
|
+
}
|
435
460
|
/>
|
436
461
|
</div>
|
437
462
|
);
|
@@ -552,7 +577,10 @@ export const CreateNewLocalConnectionModal = observer(() => {
|
|
552
577
|
onChange={handleTypeChange}
|
553
578
|
value={selectedTypeOption}
|
554
579
|
isClearable={false}
|
555
|
-
darkMode={
|
580
|
+
darkMode={
|
581
|
+
!applicationStore.layoutService
|
582
|
+
.TEMPORARY__isLightColorThemeEnabled
|
583
|
+
}
|
556
584
|
/>
|
557
585
|
)}
|
558
586
|
<input
|
@@ -662,7 +690,10 @@ export const CreateNewElementModal = observer(() => {
|
|
662
690
|
onChange={handleTypeChange}
|
663
691
|
value={selectedTypeOption}
|
664
692
|
isClearable={false}
|
665
|
-
darkMode={
|
693
|
+
darkMode={
|
694
|
+
!applicationStore.layoutService
|
695
|
+
.TEMPORARY__isLightColorThemeEnabled
|
696
|
+
}
|
666
697
|
/>
|
667
698
|
)}
|
668
699
|
<input
|
@@ -303,6 +303,7 @@ const getMockDataEditorLanguage = (
|
|
303
303
|
|
304
304
|
const SampleDataGenerator = observer(() => {
|
305
305
|
const editorStore = useEditorStore();
|
306
|
+
const applicationStore = editorStore.applicationStore;
|
306
307
|
const explorerTreeState = editorStore.explorerTreeState;
|
307
308
|
const selectedClass = explorerTreeState.classToGenerateSampleData;
|
308
309
|
const [format, setFormat] = useState(GENERATION_DEFAULT_FORMAT);
|
@@ -387,10 +388,15 @@ const SampleDataGenerator = observer(() => {
|
|
387
388
|
options={classOptions}
|
388
389
|
onChange={changeClass}
|
389
390
|
value={selectedClassOption}
|
390
|
-
darkMode={
|
391
|
+
darkMode={
|
392
|
+
!applicationStore.layoutService
|
393
|
+
.TEMPORARY__isLightColorThemeEnabled
|
394
|
+
}
|
391
395
|
filterOption={elementFilterOption}
|
392
396
|
formatOptionLabel={getPackageableElementOptionFormatter({
|
393
|
-
darkMode:
|
397
|
+
darkMode:
|
398
|
+
!applicationStore.layoutService
|
399
|
+
.TEMPORARY__isLightColorThemeEnabled,
|
394
400
|
})}
|
395
401
|
/>
|
396
402
|
<div
|
@@ -35,6 +35,7 @@ import {
|
|
35
35
|
ModalBody,
|
36
36
|
ModalFooter,
|
37
37
|
ModalHeader,
|
38
|
+
ModalFooterButton,
|
38
39
|
} from '@finos/legend-art';
|
39
40
|
import { EntityDiffViewState } from '../../../stores/editor/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
|
40
41
|
import { EntityDiffSideBarItem } from '../editor-group/diff-editor/EntityDiffView.js';
|
@@ -56,6 +57,7 @@ import { GRAPH_EDITOR_MODE } from '../../../stores/editor/EditorConfig.js';
|
|
56
57
|
|
57
58
|
const PatchLoader = observer(() => {
|
58
59
|
const editorStore = useEditorStore();
|
60
|
+
const applicationStore = editorStore.applicationStore;
|
59
61
|
const localChangesState = editorStore.localChangesState;
|
60
62
|
const patchState = localChangesState.patchLoaderState;
|
61
63
|
const onClose = (): void => patchState.closeModal();
|
@@ -72,7 +74,12 @@ const PatchLoader = observer(() => {
|
|
72
74
|
patchState.deleteChange(change);
|
73
75
|
return (
|
74
76
|
<Dialog onClose={onClose} open={patchState.showModal}>
|
75
|
-
<Modal
|
77
|
+
<Modal
|
78
|
+
darkMode={
|
79
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
80
|
+
}
|
81
|
+
className="modal--scrollable patch-loader"
|
82
|
+
>
|
76
83
|
<ModalHeader title="Patch Loader" />
|
77
84
|
<ModalBody>
|
78
85
|
<PanelLoadingIndicator isLoading={patchState.isLoadingChanges} />
|
@@ -115,13 +122,12 @@ const PatchLoader = observer(() => {
|
|
115
122
|
)}
|
116
123
|
</ModalBody>
|
117
124
|
<ModalFooter>
|
118
|
-
<
|
119
|
-
className="
|
125
|
+
<ModalFooterButton
|
126
|
+
className="blocking-alert__action--standard"
|
127
|
+
text="Apply Patch"
|
120
128
|
onClick={upload}
|
121
129
|
disabled={!patchState.changes?.length || !patchState.isValidPatch}
|
122
|
-
|
123
|
-
Apply Patch
|
124
|
-
</button>
|
130
|
+
/>
|
125
131
|
</ModalFooter>
|
126
132
|
</Modal>
|
127
133
|
</Dialog>
|
@@ -34,6 +34,7 @@ import {
|
|
34
34
|
Modal,
|
35
35
|
ModalBody,
|
36
36
|
ModalFooter,
|
37
|
+
ModalFooterButton,
|
37
38
|
MenuContentItem,
|
38
39
|
MenuContent,
|
39
40
|
PanelFormBooleanField,
|
@@ -111,7 +112,12 @@ const ShareProjectModal = observer(
|
|
111
112
|
|
112
113
|
return (
|
113
114
|
<Dialog onClose={closeModal} open={open}>
|
114
|
-
<Modal
|
115
|
+
<Modal
|
116
|
+
darkMode={
|
117
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
118
|
+
}
|
119
|
+
className="modal--no-padding"
|
120
|
+
>
|
115
121
|
<PanelLoadingIndicator isLoading={isDispatchingAction} />
|
116
122
|
<ModalBody>
|
117
123
|
<div className="project-overview__share-project__modal__info-entry">
|
@@ -134,7 +140,10 @@ const ShareProjectModal = observer(
|
|
134
140
|
}
|
135
141
|
: null
|
136
142
|
}
|
137
|
-
darkMode={
|
143
|
+
darkMode={
|
144
|
+
!applicationStore.layoutService
|
145
|
+
.TEMPORARY__isLightColorThemeEnabled
|
146
|
+
}
|
138
147
|
/>
|
139
148
|
</div>
|
140
149
|
) : (
|
@@ -154,13 +163,12 @@ const ShareProjectModal = observer(
|
|
154
163
|
</div>
|
155
164
|
</ModalBody>
|
156
165
|
<ModalFooter>
|
157
|
-
<
|
158
|
-
className="btn--wide
|
166
|
+
<ModalFooterButton
|
167
|
+
className="btn--wide"
|
168
|
+
text="Copy Link"
|
159
169
|
disabled={isFetchingProject}
|
160
170
|
onClick={copyProjectElementLink}
|
161
|
-
|
162
|
-
Copy Link
|
163
|
-
</button>
|
171
|
+
/>
|
164
172
|
</ModalFooter>
|
165
173
|
</Modal>
|
166
174
|
</Dialog>
|
@@ -680,7 +688,10 @@ const PatchEditor = observer(() => {
|
|
680
688
|
placeholder={'Select source version'}
|
681
689
|
isClearable={true}
|
682
690
|
escapeClearsValue={true}
|
683
|
-
darkMode={
|
691
|
+
darkMode={
|
692
|
+
!applicationStore.layoutService
|
693
|
+
.TEMPORARY__isLightColorThemeEnabled
|
694
|
+
}
|
684
695
|
/>
|
685
696
|
</div>
|
686
697
|
</div>
|
@@ -747,7 +758,10 @@ const PatchEditor = observer(() => {
|
|
747
758
|
placeholder={'Select patch you want to release'}
|
748
759
|
isClearable={true}
|
749
760
|
escapeClearsValue={true}
|
750
|
-
darkMode={
|
761
|
+
darkMode={
|
762
|
+
!applicationStore.layoutService
|
763
|
+
.TEMPORARY__isLightColorThemeEnabled
|
764
|
+
}
|
751
765
|
/>
|
752
766
|
</div>
|
753
767
|
</div>
|
@@ -162,6 +162,8 @@ const ServiceFailViewer = observer(
|
|
162
162
|
failure: ServiceRegistrationResult | undefined;
|
163
163
|
}) => {
|
164
164
|
const { globalBulkServiceRegistrationState, failure } = props;
|
165
|
+
const applicationStore =
|
166
|
+
globalBulkServiceRegistrationState.editorStore.applicationStore;
|
165
167
|
const closeLogViewer = (): void =>
|
166
168
|
globalBulkServiceRegistrationState.setFailingView(undefined);
|
167
169
|
return (
|
@@ -174,7 +176,12 @@ const ServiceFailViewer = observer(
|
|
174
176
|
paper: 'editor-modal__content',
|
175
177
|
}}
|
176
178
|
>
|
177
|
-
<Modal
|
179
|
+
<Modal
|
180
|
+
darkMode={
|
181
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
182
|
+
}
|
183
|
+
className="editor-modal"
|
184
|
+
>
|
178
185
|
<ModalHeader title={guaranteeNonNullable(failure?.service).path} />
|
179
186
|
<ModalBody>
|
180
187
|
{failure instanceof ServiceRegistrationFail && (
|
@@ -186,7 +193,11 @@ const ServiceFailViewer = observer(
|
|
186
193
|
)}
|
187
194
|
</ModalBody>
|
188
195
|
<ModalFooter>
|
189
|
-
<ModalFooterButton
|
196
|
+
<ModalFooterButton
|
197
|
+
text="Close"
|
198
|
+
onClick={closeLogViewer}
|
199
|
+
type="secondary"
|
200
|
+
/>
|
190
201
|
</ModalFooter>
|
191
202
|
</Modal>
|
192
203
|
</Dialog>
|
@@ -199,6 +210,7 @@ export const RegisterService = observer(
|
|
199
210
|
globalBulkServiceRegistrationState: GlobalBulkServiceRegistrationState;
|
200
211
|
}) => {
|
201
212
|
const editorStore = useEditorStore();
|
213
|
+
const applicationStore = editorStore.applicationStore;
|
202
214
|
const services = editorStore.graphManagerState.graph.ownServices;
|
203
215
|
const toggleSelectAllServices = (): void => {
|
204
216
|
editorStore.globalBulkServiceRegistrationState.selectAllServices
|
@@ -334,7 +346,10 @@ export const RegisterService = observer(
|
|
334
346
|
}
|
335
347
|
>
|
336
348
|
<Modal
|
337
|
-
darkMode={
|
349
|
+
darkMode={
|
350
|
+
!applicationStore.layoutService
|
351
|
+
.TEMPORARY__isLightColorThemeEnabled
|
352
|
+
}
|
338
353
|
className={clsx(
|
339
354
|
'editor-modal bulk-service-registration__service__editor',
|
340
355
|
)}
|
@@ -198,6 +198,7 @@ const WorkflowJobLogsViewer = observer(
|
|
198
198
|
logState: WorkflowLogState;
|
199
199
|
}) => {
|
200
200
|
const { workflowState, logState } = props;
|
201
|
+
const applicationStore = workflowState.editorStore.applicationStore;
|
201
202
|
const job = guaranteeNonNullable(logState.job);
|
202
203
|
const jobIsInProgress = job.status === WorkflowJobStatus.IN_PROGRESS;
|
203
204
|
const closeLogViewer = (): void => {
|
@@ -220,7 +221,12 @@ const WorkflowJobLogsViewer = observer(
|
|
220
221
|
paper: 'editor-modal__content',
|
221
222
|
}}
|
222
223
|
>
|
223
|
-
<Modal
|
224
|
+
<Modal
|
225
|
+
darkMode={
|
226
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
227
|
+
}
|
228
|
+
className="editor-modal"
|
229
|
+
>
|
224
230
|
<PanelLoadingIndicator
|
225
231
|
isLoading={logState.fetchJobLogState.isInProgress}
|
226
232
|
/>
|
@@ -245,7 +251,11 @@ const WorkflowJobLogsViewer = observer(
|
|
245
251
|
/>
|
246
252
|
</ModalBody>
|
247
253
|
<ModalFooter>
|
248
|
-
<ModalFooterButton
|
254
|
+
<ModalFooterButton
|
255
|
+
text="Close"
|
256
|
+
onClick={closeLogViewer}
|
257
|
+
type="secondary"
|
258
|
+
/>
|
249
259
|
</ModalFooter>
|
250
260
|
</Modal>
|
251
261
|
</Dialog>
|
@@ -31,6 +31,7 @@ import {
|
|
31
31
|
ModalBody,
|
32
32
|
ModalFooter,
|
33
33
|
ModalHeader,
|
34
|
+
ModalFooterButton,
|
34
35
|
} from '@finos/legend-art';
|
35
36
|
import type {
|
36
37
|
EntityChangeConflict,
|
@@ -108,7 +109,12 @@ export const WorkspaceSyncConflictResolver = observer(() => {
|
|
108
109
|
classes={{ container: 'search-modal__container' }}
|
109
110
|
PaperProps={{ classes: { root: 'search-modal__inner-container' } }}
|
110
111
|
>
|
111
|
-
<Modal
|
112
|
+
<Modal
|
113
|
+
darkMode={
|
114
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
115
|
+
}
|
116
|
+
className="editor-modal query-builder__dialog"
|
117
|
+
>
|
112
118
|
<ModalHeader title="Resolve Merge Conflicts" />
|
113
119
|
<ModalBody>
|
114
120
|
<ResizablePanelGroup orientation="vertical">
|
@@ -255,17 +261,18 @@ export const WorkspaceSyncConflictResolver = observer(() => {
|
|
255
261
|
</ResizablePanelGroup>
|
256
262
|
</ModalBody>
|
257
263
|
<ModalFooter>
|
258
|
-
<
|
259
|
-
|
260
|
-
disabled={Boolean(conflicts.length)}
|
264
|
+
<ModalFooterButton
|
265
|
+
text="Apply Resolutions"
|
261
266
|
title="Apply Resolutions"
|
267
|
+
disabled={Boolean(conflicts.length)}
|
262
268
|
onClick={applyResolutions}
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
269
|
+
/>
|
270
|
+
<ModalFooterButton
|
271
|
+
text="Abort"
|
272
|
+
title="Aborts"
|
273
|
+
onClick={abort}
|
274
|
+
type="secondary"
|
275
|
+
/>
|
269
276
|
</ModalFooter>
|
270
277
|
</Modal>
|
271
278
|
</Dialog>
|
@@ -184,6 +184,7 @@ const TestFailViewer = observer(
|
|
184
184
|
failure: TestError | AssertFail;
|
185
185
|
}) => {
|
186
186
|
const { globalTestRunnerState, failure } = props;
|
187
|
+
const applicationStore = globalTestRunnerState.editorStore.applicationStore;
|
187
188
|
const id =
|
188
189
|
failure instanceof TestError
|
189
190
|
? failure.atomicTest.id
|
@@ -201,7 +202,12 @@ const TestFailViewer = observer(
|
|
201
202
|
paper: 'editor-modal__content',
|
202
203
|
}}
|
203
204
|
>
|
204
|
-
<Modal
|
205
|
+
<Modal
|
206
|
+
darkMode={
|
207
|
+
!applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled
|
208
|
+
}
|
209
|
+
className="editor-modal"
|
210
|
+
>
|
205
211
|
<PanelLoadingIndicator
|
206
212
|
isLoading={globalTestRunnerState.isDispatchingOwnProjectAction}
|
207
213
|
/>
|
@@ -231,7 +237,11 @@ const TestFailViewer = observer(
|
|
231
237
|
)}
|
232
238
|
</ModalBody>
|
233
239
|
<ModalFooter>
|
234
|
-
<ModalFooterButton
|
240
|
+
<ModalFooterButton
|
241
|
+
text="Close"
|
242
|
+
onClick={closeLogViewer}
|
243
|
+
type="secondary"
|
244
|
+
/>
|
235
245
|
</ModalFooter>
|
236
246
|
</Modal>
|
237
247
|
</Dialog>
|