@finos/legend-application-studio 14.0.0 → 15.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/editor/StatusBar.d.ts.map +1 -1
- package/lib/components/editor/StatusBar.js +5 -3
- package/lib/components/editor/StatusBar.js.map +1 -1
- package/lib/components/editor/edit-panel/ModelImporter.d.ts.map +1 -1
- package/lib/components/editor/edit-panel/ModelImporter.js +2 -7
- package/lib/components/editor/edit-panel/ModelImporter.js.map +1 -1
- package/lib/components/editor/edit-panel/mapping-editor/NewMappingElementModal.d.ts.map +1 -1
- package/lib/components/editor/edit-panel/mapping-editor/NewMappingElementModal.js +1 -2
- package/lib/components/editor/edit-panel/mapping-editor/NewMappingElementModal.js.map +1 -1
- package/lib/components/editor/edit-panel/service-editor/ServiceRegistrationEditor.d.ts.map +1 -1
- package/lib/components/editor/edit-panel/service-editor/ServiceRegistrationEditor.js +8 -1
- package/lib/components/editor/edit-panel/service-editor/ServiceRegistrationEditor.js.map +1 -1
- package/lib/components/shared/StudioLambdaEditor.d.ts.map +1 -1
- package/lib/components/shared/StudioLambdaEditor.js +3 -1
- package/lib/components/shared/StudioLambdaEditor.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/index.d.ts +2 -0
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +2 -0
- package/lib/index.js.map +1 -1
- package/lib/package.json +10 -10
- package/lib/stores/EditorGraphState.d.ts +11 -3
- package/lib/stores/EditorGraphState.d.ts.map +1 -1
- package/lib/stores/EditorGraphState.js +17 -3
- package/lib/stores/EditorGraphState.js.map +1 -1
- package/lib/stores/LegendStudioApplicationPlugin.d.ts +4 -2
- package/lib/stores/LegendStudioApplicationPlugin.d.ts.map +1 -1
- package/lib/stores/LegendStudioApplicationPlugin.js.map +1 -1
- package/lib/stores/editor-state/ModelImporterState.d.ts +7 -2
- package/lib/stores/editor-state/ModelImporterState.d.ts.map +1 -1
- package/lib/stores/editor-state/ModelImporterState.js +18 -18
- package/lib/stores/editor-state/ModelImporterState.js.map +1 -1
- package/lib/stores/editor-state/element-editor-state/service/ServiceEditorState.d.ts.map +1 -1
- package/lib/stores/editor-state/element-editor-state/service/ServiceEditorState.js +1 -1
- package/lib/stores/editor-state/element-editor-state/service/ServiceEditorState.js.map +1 -1
- package/lib/stores/editor-state/element-editor-state/service/ServiceRegistrationState.d.ts +8 -5
- package/lib/stores/editor-state/element-editor-state/service/ServiceRegistrationState.d.ts.map +1 -1
- package/lib/stores/editor-state/element-editor-state/service/ServiceRegistrationState.js +25 -16
- package/lib/stores/editor-state/element-editor-state/service/ServiceRegistrationState.js.map +1 -1
- package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js +1 -1
- package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js.map +1 -1
- package/package.json +18 -18
- package/src/components/editor/StatusBar.tsx +5 -3
- package/src/components/editor/edit-panel/ModelImporter.tsx +3 -7
- package/src/components/editor/edit-panel/mapping-editor/NewMappingElementModal.tsx +1 -2
- package/src/components/editor/edit-panel/service-editor/ServiceRegistrationEditor.tsx +36 -0
- package/src/components/shared/StudioLambdaEditor.tsx +5 -2
- package/src/index.ts +2 -0
- package/src/stores/EditorGraphState.ts +25 -6
- package/src/stores/LegendStudioApplicationPlugin.ts +13 -4
- package/src/stores/editor-state/ModelImporterState.ts +24 -16
- package/src/stores/editor-state/element-editor-state/service/ServiceEditorState.ts +6 -1
- package/src/stores/editor-state/element-editor-state/service/ServiceRegistrationState.ts +30 -25
- package/src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts +1 -1
- package/tsconfig.json +1 -1
package/lib/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntityChangeConflictEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EntityChangeConflictEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-application-studio",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "15.1.0",
|
|
4
4
|
"description": "Legend Studio application core",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -44,20 +44,20 @@
|
|
|
44
44
|
"test:watch": "jest --watch"
|
|
45
45
|
},
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@finos/legend-application": "7.1.
|
|
48
|
-
"@finos/legend-art": "3.0.
|
|
49
|
-
"@finos/legend-graph": "14.0.
|
|
50
|
-
"@finos/legend-server-depot": "3.0.
|
|
51
|
-
"@finos/legend-server-sdlc": "4.0.
|
|
52
|
-
"@finos/legend-shared": "6.0.
|
|
53
|
-
"@finos/legend-storage": "3.0.
|
|
54
|
-
"@testing-library/react": "13.
|
|
55
|
-
"@types/react": "18.0.
|
|
47
|
+
"@finos/legend-application": "7.1.6",
|
|
48
|
+
"@finos/legend-art": "3.0.4",
|
|
49
|
+
"@finos/legend-graph": "14.0.6",
|
|
50
|
+
"@finos/legend-server-depot": "3.0.9",
|
|
51
|
+
"@finos/legend-server-sdlc": "4.0.12",
|
|
52
|
+
"@finos/legend-shared": "6.0.4",
|
|
53
|
+
"@finos/legend-storage": "3.0.8",
|
|
54
|
+
"@testing-library/react": "13.4.0",
|
|
55
|
+
"@types/react": "18.0.18",
|
|
56
56
|
"@types/react-dom": "18.0.6",
|
|
57
57
|
"@types/react-router-dom": "5.3.3",
|
|
58
|
-
"date-fns": "2.29.
|
|
58
|
+
"date-fns": "2.29.2",
|
|
59
59
|
"history": "5.3.0",
|
|
60
|
-
"mobx": "6.6.
|
|
60
|
+
"mobx": "6.6.2",
|
|
61
61
|
"mobx-react-lite": "3.4.0",
|
|
62
62
|
"mobx-utils": "6.0.5",
|
|
63
63
|
"monaco-editor": "0.34.0",
|
|
@@ -73,15 +73,15 @@
|
|
|
73
73
|
"serializr": "2.0.5"
|
|
74
74
|
},
|
|
75
75
|
"devDependencies": {
|
|
76
|
-
"@finos/legend-dev-utils": "2.0.
|
|
77
|
-
"@jest/globals": "
|
|
76
|
+
"@finos/legend-dev-utils": "2.0.14",
|
|
77
|
+
"@jest/globals": "29.0.2",
|
|
78
78
|
"cross-env": "7.0.3",
|
|
79
|
-
"eslint": "8.
|
|
80
|
-
"jest": "
|
|
79
|
+
"eslint": "8.23.0",
|
|
80
|
+
"jest": "29.0.2",
|
|
81
81
|
"npm-run-all": "4.1.5",
|
|
82
82
|
"rimraf": "3.0.2",
|
|
83
|
-
"sass": "1.54.
|
|
84
|
-
"typescript": "4.
|
|
83
|
+
"sass": "1.54.8",
|
|
84
|
+
"typescript": "4.8.2"
|
|
85
85
|
},
|
|
86
86
|
"peerDependencies": {
|
|
87
87
|
"react": "^18.0.0"
|
|
@@ -123,10 +123,12 @@ export const StatusBar = observer((props: { actionsDisabled: boolean }) => {
|
|
|
123
123
|
const handleTextModeClick = applicationStore.guardUnhandledError(() =>
|
|
124
124
|
flowResult(editorStore.toggleTextMode()),
|
|
125
125
|
);
|
|
126
|
-
const compile = applicationStore.guardUnhandledError(
|
|
126
|
+
const compile = applicationStore.guardUnhandledError(
|
|
127
127
|
editorStore.isInGrammarTextMode
|
|
128
|
-
? flowResult(editorStore.graphState.globalCompileInTextMode())
|
|
129
|
-
:
|
|
128
|
+
? () => flowResult(editorStore.graphState.globalCompileInTextMode())
|
|
129
|
+
: async () => {
|
|
130
|
+
await flowResult(editorStore.graphState.globalCompileInFormMode());
|
|
131
|
+
},
|
|
130
132
|
);
|
|
131
133
|
const generate = applicationStore.guardUnhandledError(() =>
|
|
132
134
|
flowResult(editorStore.graphState.graphGenerationState.globalGenerate()),
|
|
@@ -151,11 +151,7 @@ export const ModelImporter = observer(() => {
|
|
|
151
151
|
const label = modelImporterState.modelImportEditorState.label;
|
|
152
152
|
const modelImportEditorState = modelImporterState.modelImportEditorState;
|
|
153
153
|
const loadModel = (): void => {
|
|
154
|
-
if (
|
|
155
|
-
modelImportEditorState.extensionConfiguration
|
|
156
|
-
.load(editorStore)
|
|
157
|
-
.catch(applicationStore.alertUnhandledError);
|
|
158
|
-
} else if (editorStore.hasUnpushedChanges) {
|
|
154
|
+
if (editorStore.hasUnpushedChanges) {
|
|
159
155
|
editorStore.setActionAlertInfo({
|
|
160
156
|
message: 'You have unpushed changes',
|
|
161
157
|
prompt:
|
|
@@ -211,8 +207,8 @@ export const ModelImporter = observer(() => {
|
|
|
211
207
|
};
|
|
212
208
|
const renderModelImporterEditor = (): React.ReactNode => {
|
|
213
209
|
if (modelImportEditorState instanceof ExtensionModelImporterEditorState) {
|
|
214
|
-
return modelImportEditorState.
|
|
215
|
-
|
|
210
|
+
return modelImportEditorState.config.renderer(
|
|
211
|
+
modelImportEditorState.rendererState,
|
|
216
212
|
);
|
|
217
213
|
} else if (
|
|
218
214
|
modelImportEditorState instanceof NativeModelImporterEditorState
|
|
@@ -145,8 +145,7 @@ export const NewMappingElementModal = observer(() => {
|
|
|
145
145
|
|
|
146
146
|
// Submit button
|
|
147
147
|
const disableCreateButton =
|
|
148
|
-
!spec ||
|
|
149
|
-
!spec.target ||
|
|
148
|
+
!spec?.target ||
|
|
150
149
|
!isMappingIdUnique ||
|
|
151
150
|
!id ||
|
|
152
151
|
(spec.target instanceof Class && !classMappingType);
|
|
@@ -97,6 +97,12 @@ export const ServiceRegistrationEditor = observer(() => {
|
|
|
97
97
|
!registrationState.activatePostRegistration,
|
|
98
98
|
);
|
|
99
99
|
};
|
|
100
|
+
// store model for full interactive
|
|
101
|
+
const toggleUseStoreModel = (): void => {
|
|
102
|
+
registrationState.setUseStoreModelWithFullInteractive(
|
|
103
|
+
!registrationState.TEMPORARY__useStoreModel,
|
|
104
|
+
);
|
|
105
|
+
};
|
|
100
106
|
// actions
|
|
101
107
|
const registerService = (): void => {
|
|
102
108
|
if (selectedEnvOption && selectedServiceType) {
|
|
@@ -197,6 +203,36 @@ export const ServiceRegistrationEditor = observer(() => {
|
|
|
197
203
|
darkMode={true}
|
|
198
204
|
/>
|
|
199
205
|
</div>
|
|
206
|
+
{registrationState.serviceExecutionMode ===
|
|
207
|
+
ServiceExecutionMode.FULL_INTERACTIVE && (
|
|
208
|
+
<div className="panel__content__form__section">
|
|
209
|
+
<div className="panel__content__form__section__header__label">
|
|
210
|
+
Store Model
|
|
211
|
+
</div>
|
|
212
|
+
<div
|
|
213
|
+
className="panel__content__form__section__toggler"
|
|
214
|
+
onClick={toggleUseStoreModel}
|
|
215
|
+
>
|
|
216
|
+
<button
|
|
217
|
+
type="button"
|
|
218
|
+
className={clsx('panel__content__form__section__toggler__btn', {
|
|
219
|
+
'panel__content__form__section__toggler__btn--toggled':
|
|
220
|
+
registrationState.TEMPORARY__useStoreModel,
|
|
221
|
+
})}
|
|
222
|
+
tabIndex={-1}
|
|
223
|
+
>
|
|
224
|
+
{registrationState.TEMPORARY__useStoreModel ? (
|
|
225
|
+
<CheckSquareIcon />
|
|
226
|
+
) : (
|
|
227
|
+
<SquareIcon />
|
|
228
|
+
)}
|
|
229
|
+
</button>
|
|
230
|
+
<div className="panel__content__form__section__toggler__prompt">
|
|
231
|
+
Use Store Model (slower)
|
|
232
|
+
</div>
|
|
233
|
+
</div>
|
|
234
|
+
</div>
|
|
235
|
+
)}
|
|
200
236
|
<div className="panel__content__form__section">
|
|
201
237
|
<div className="panel__content__form__section__header__label">
|
|
202
238
|
Project Version
|
|
@@ -93,8 +93,11 @@ export const StudioLambdaEditor = observer(
|
|
|
93
93
|
editorStore.graphState.checkLambdaParsingError(
|
|
94
94
|
lambdaEditorState,
|
|
95
95
|
!disabled,
|
|
96
|
-
() =>
|
|
97
|
-
flowResult(
|
|
96
|
+
async () => {
|
|
97
|
+
await flowResult(
|
|
98
|
+
editorStore.graphState.globalCompileInFormMode(),
|
|
99
|
+
);
|
|
100
|
+
},
|
|
98
101
|
),
|
|
99
102
|
).catch(applicationStore.alertUnhandledError);
|
|
100
103
|
},
|
package/src/index.ts
CHANGED
|
@@ -23,9 +23,11 @@ export * from './application/LegendStudioPluginManager.js';
|
|
|
23
23
|
export * from './stores/LegendStudioAppEvent.js';
|
|
24
24
|
|
|
25
25
|
// stores
|
|
26
|
+
export { FormModeCompilationOutcome } from './stores/EditorGraphState.js';
|
|
26
27
|
export * from './stores/LegendStudioApplicationPlugin.js';
|
|
27
28
|
export * from './stores/EditorStore.js';
|
|
28
29
|
export * from './stores/EditorConfig.js';
|
|
30
|
+
export * from './stores/editor-state/ModelImporterState.js';
|
|
29
31
|
export { ClassEditorState } from './stores/editor-state/element-editor-state/ClassEditorState.js';
|
|
30
32
|
export { ElementEditorState } from './stores/editor-state/element-editor-state/ElementEditorState.js';
|
|
31
33
|
export { UnsupportedElementEditorState } from './stores/editor-state/UnsupportedElementEditorState.js';
|
|
@@ -110,6 +110,14 @@ export enum GraphBuilderStatus {
|
|
|
110
110
|
REDIRECTED_TO_TEXT_MODE = 'REDIRECTED_TO_TEXT_MODE',
|
|
111
111
|
}
|
|
112
112
|
|
|
113
|
+
export enum FormModeCompilationOutcome {
|
|
114
|
+
SKIPPED = 'SKIPPED',
|
|
115
|
+
SUCCEEDED = 'SUCCEEDED',
|
|
116
|
+
FAILED = 'FAILED',
|
|
117
|
+
FAILED_WITH_ERROR_REVEALED = 'FAILED_WITH_ERROR_REVEALED',
|
|
118
|
+
FAILED_AND_FALLBACK_TO_TEXT_MODE = 'FAILED_AND_FALLBACK_TO_TEXTMODE',
|
|
119
|
+
}
|
|
120
|
+
|
|
113
121
|
export interface GraphBuilderResult {
|
|
114
122
|
status: GraphBuilderStatus;
|
|
115
123
|
error?: Error;
|
|
@@ -461,13 +469,13 @@ export class EditorGraphState {
|
|
|
461
469
|
message?: string;
|
|
462
470
|
disableNotificationOnSuccess?: boolean;
|
|
463
471
|
openConsole?: boolean;
|
|
464
|
-
}): GeneratorFn<
|
|
472
|
+
}): GeneratorFn<FormModeCompilationOutcome> {
|
|
465
473
|
assertTrue(
|
|
466
474
|
this.editorStore.isInFormMode,
|
|
467
475
|
'Editor must be in form mode to call this method',
|
|
468
476
|
);
|
|
469
477
|
if (this.checkIfApplicationUpdateOperationIsRunning()) {
|
|
470
|
-
return;
|
|
478
|
+
return FormModeCompilationOutcome.SKIPPED;
|
|
471
479
|
}
|
|
472
480
|
this.isRunningGlobalCompile = true;
|
|
473
481
|
try {
|
|
@@ -490,6 +498,7 @@ export class EditorGraphState {
|
|
|
490
498
|
'Compiled successfully',
|
|
491
499
|
);
|
|
492
500
|
}
|
|
501
|
+
return FormModeCompilationOutcome.SUCCEEDED;
|
|
493
502
|
} catch (error) {
|
|
494
503
|
assertErrorThrown(error);
|
|
495
504
|
// TODO: we probably should make this pattern of error the handling for all other exceptions in the codebase
|
|
@@ -548,19 +557,22 @@ export class EditorGraphState {
|
|
|
548
557
|
this.editorStore.applicationStore.notifyWarning(
|
|
549
558
|
`Can't enter text mode. Transformation to grammar text failed: ${error2.message}`,
|
|
550
559
|
);
|
|
551
|
-
return;
|
|
560
|
+
return FormModeCompilationOutcome.FAILED;
|
|
552
561
|
}
|
|
553
562
|
this.editorStore.setGraphEditMode(GRAPH_EDITOR_MODE.GRAMMAR_TEXT);
|
|
554
563
|
yield flowResult(
|
|
555
564
|
this.globalCompileInTextMode({
|
|
556
565
|
ignoreBlocking: true,
|
|
557
566
|
suppressCompilationFailureMessage: true,
|
|
567
|
+
disableNotificationOnSuccess: options?.disableNotificationOnSuccess,
|
|
558
568
|
}),
|
|
559
569
|
);
|
|
570
|
+
return FormModeCompilationOutcome.FAILED_AND_FALLBACK_TO_TEXT_MODE;
|
|
560
571
|
} else {
|
|
561
572
|
this.editorStore.applicationStore.notifyWarning(
|
|
562
573
|
`Compilation failed: ${error.message}`,
|
|
563
574
|
);
|
|
575
|
+
return FormModeCompilationOutcome.FAILED_WITH_ERROR_REVEALED;
|
|
564
576
|
}
|
|
565
577
|
} finally {
|
|
566
578
|
this.isRunningGlobalCompile = false;
|
|
@@ -570,8 +582,9 @@ export class EditorGraphState {
|
|
|
570
582
|
// TODO: when we support showing multiple notifications, we can take this `suppressCompilationFailureMessage` out as
|
|
571
583
|
// we can show the transition between form mode and text mode warning and the compilation failure warning at the same time
|
|
572
584
|
*globalCompileInTextMode(options?: {
|
|
573
|
-
ignoreBlocking?: boolean;
|
|
574
|
-
suppressCompilationFailureMessage?: boolean;
|
|
585
|
+
ignoreBlocking?: boolean | undefined;
|
|
586
|
+
suppressCompilationFailureMessage?: boolean | undefined;
|
|
587
|
+
disableNotificationOnSuccess?: boolean | undefined;
|
|
575
588
|
openConsole?: boolean;
|
|
576
589
|
}): GeneratorFn<void> {
|
|
577
590
|
assertTrue(
|
|
@@ -595,7 +608,13 @@ export class EditorGraphState {
|
|
|
595
608
|
this.editorStore.grammarTextEditorState.graphGrammarText,
|
|
596
609
|
this.editorStore.graphManagerState.graph,
|
|
597
610
|
)) as Entity[];
|
|
598
|
-
|
|
611
|
+
|
|
612
|
+
if (!options?.disableNotificationOnSuccess) {
|
|
613
|
+
this.editorStore.applicationStore.notifySuccess(
|
|
614
|
+
'Compiled successfully',
|
|
615
|
+
);
|
|
616
|
+
}
|
|
617
|
+
|
|
599
618
|
yield flowResult(this.updateGraphAndApplication(entities));
|
|
600
619
|
} catch (error) {
|
|
601
620
|
assertErrorThrown(error);
|
|
@@ -27,6 +27,10 @@ import {
|
|
|
27
27
|
LegendApplicationPlugin,
|
|
28
28
|
} from '@finos/legend-application';
|
|
29
29
|
import type { TestableMetadata } from './sidebar-state/testable/GlobalTestRunnerState.js';
|
|
30
|
+
import type {
|
|
31
|
+
ExtensionModelImportRendererState,
|
|
32
|
+
ModelImporterState,
|
|
33
|
+
} from './editor-state/ModelImporterState.js';
|
|
30
34
|
|
|
31
35
|
export type ExplorerContextMenuItemRendererConfiguration = {
|
|
32
36
|
key: string;
|
|
@@ -53,10 +57,15 @@ export type ModelImporterExtensionConfiguration = {
|
|
|
53
57
|
key: string;
|
|
54
58
|
label?: string | undefined;
|
|
55
59
|
allowHardReplace?: boolean;
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
renderer: (
|
|
60
|
+
getExtensionModelImportRendererStateCreator: (
|
|
61
|
+
modelImporterState: ModelImporterState,
|
|
62
|
+
) => ExtensionModelImportRendererState;
|
|
63
|
+
renderer: (
|
|
64
|
+
rendererState: ExtensionModelImportRendererState,
|
|
65
|
+
) => React.ReactNode | undefined;
|
|
66
|
+
loadModel: (
|
|
67
|
+
rendererState: ExtensionModelImportRendererState,
|
|
68
|
+
) => Promise<void>;
|
|
60
69
|
};
|
|
61
70
|
|
|
62
71
|
export type TestableMetadataGetter = (
|
|
@@ -269,19 +269,30 @@ export class NativeModelImporterEditorState extends ModelImporterEditorState {
|
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
271
|
|
|
272
|
+
export abstract class ExtensionModelImportRendererState {
|
|
273
|
+
importerState: ModelImporterState;
|
|
274
|
+
|
|
275
|
+
constructor(importerState: ModelImporterState) {
|
|
276
|
+
this.importerState = importerState;
|
|
277
|
+
}
|
|
278
|
+
}
|
|
272
279
|
export class ExtensionModelImporterEditorState extends ModelImporterEditorState {
|
|
273
|
-
|
|
280
|
+
config: ModelImporterExtensionConfiguration;
|
|
281
|
+
rendererState: ExtensionModelImportRendererState;
|
|
274
282
|
|
|
275
283
|
constructor(
|
|
276
|
-
|
|
284
|
+
config: ModelImporterExtensionConfiguration,
|
|
285
|
+
rendererState: ExtensionModelImportRendererState,
|
|
277
286
|
modelImporterState: ModelImporterState,
|
|
278
287
|
) {
|
|
279
288
|
super(modelImporterState);
|
|
280
|
-
this.
|
|
289
|
+
this.config = config;
|
|
290
|
+
this.rendererState = rendererState;
|
|
281
291
|
makeObservable(this, {
|
|
282
|
-
|
|
292
|
+
config: observable,
|
|
283
293
|
modelImporterState: observable,
|
|
284
294
|
loadModelActionState: observable,
|
|
295
|
+
rendererState: observable,
|
|
285
296
|
isLoadingDisabled: computed,
|
|
286
297
|
setExtension: action,
|
|
287
298
|
loadModel: flow,
|
|
@@ -289,11 +300,11 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
|
|
|
289
300
|
}
|
|
290
301
|
|
|
291
302
|
get label(): string {
|
|
292
|
-
return this.
|
|
303
|
+
return this.config.label ?? this.config.key;
|
|
293
304
|
}
|
|
294
305
|
|
|
295
306
|
get allowHardReplace(): boolean {
|
|
296
|
-
return Boolean(this.
|
|
307
|
+
return Boolean(this.config.allowHardReplace);
|
|
297
308
|
}
|
|
298
309
|
|
|
299
310
|
get isLoadingDisabled(): boolean {
|
|
@@ -303,18 +314,11 @@ export class ExtensionModelImporterEditorState extends ModelImporterEditorState
|
|
|
303
314
|
setExtension(
|
|
304
315
|
extensionConfiguration: ModelImporterExtensionConfiguration,
|
|
305
316
|
): void {
|
|
306
|
-
this.
|
|
317
|
+
this.config = extensionConfiguration;
|
|
307
318
|
}
|
|
308
319
|
|
|
309
320
|
*loadModel(): GeneratorFn<void> {
|
|
310
|
-
this.
|
|
311
|
-
try {
|
|
312
|
-
yield flowResult(this.extensionConfiguration.load(this.editorStore));
|
|
313
|
-
} catch (error) {
|
|
314
|
-
assertErrorThrown(error);
|
|
315
|
-
} finally {
|
|
316
|
-
this.loadModelActionState.complete();
|
|
317
|
-
}
|
|
321
|
+
flowResult(this.config.loadModel(this.rendererState));
|
|
318
322
|
}
|
|
319
323
|
}
|
|
320
324
|
|
|
@@ -498,7 +502,11 @@ export class ModelImporterState extends EditorState {
|
|
|
498
502
|
const externalEditorState =
|
|
499
503
|
this.modelImportEditorState instanceof ExtensionModelImporterEditorState
|
|
500
504
|
? this.modelImportEditorState
|
|
501
|
-
: new ExtensionModelImporterEditorState(
|
|
505
|
+
: new ExtensionModelImporterEditorState(
|
|
506
|
+
extension,
|
|
507
|
+
extension.getExtensionModelImportRendererStateCreator(this),
|
|
508
|
+
this,
|
|
509
|
+
);
|
|
502
510
|
externalEditorState.setExtension(extension);
|
|
503
511
|
this.setImportEditorState(externalEditorState);
|
|
504
512
|
return externalEditorState;
|
|
@@ -61,7 +61,12 @@ export class ServiceEditorState extends ElementEditorState {
|
|
|
61
61
|
});
|
|
62
62
|
|
|
63
63
|
this.executionState = this.buildExecutionState();
|
|
64
|
-
this.registrationState = new ServiceRegistrationState(
|
|
64
|
+
this.registrationState = new ServiceRegistrationState(
|
|
65
|
+
editorStore,
|
|
66
|
+
this.service,
|
|
67
|
+
editorStore.applicationStore.config.options.TEMPORARY__serviceRegistrationConfig,
|
|
68
|
+
editorStore.sdlcServerClient.features.canCreateVersion,
|
|
69
|
+
);
|
|
65
70
|
this.testableState = new ServiceTestableState(editorStore, this);
|
|
66
71
|
}
|
|
67
72
|
|
|
@@ -15,10 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
17
|
import { action, computed, makeAutoObservable } from 'mobx';
|
|
18
|
-
import {
|
|
19
|
-
type ServiceEditorState,
|
|
20
|
-
MINIMUM_SERVICE_OWNERS,
|
|
21
|
-
} from '../../../editor-state/element-editor-state/service/ServiceEditorState.js';
|
|
18
|
+
import { MINIMUM_SERVICE_OWNERS } from '../../../editor-state/element-editor-state/service/ServiceEditorState.js';
|
|
22
19
|
import type { EditorStore } from '../../../EditorStore.js';
|
|
23
20
|
import {
|
|
24
21
|
type GeneratorFn,
|
|
@@ -35,6 +32,7 @@ import {
|
|
|
35
32
|
import { LEGEND_STUDIO_APP_EVENT } from '../../../LegendStudioAppEvent.js';
|
|
36
33
|
import { Version } from '@finos/legend-server-sdlc';
|
|
37
34
|
import {
|
|
35
|
+
type Service,
|
|
38
36
|
type ServiceRegistrationResult,
|
|
39
37
|
ServiceExecutionMode,
|
|
40
38
|
} from '@finos/legend-graph';
|
|
@@ -74,23 +72,29 @@ export enum SERVICE_REGISTRATION_PHASE {
|
|
|
74
72
|
}
|
|
75
73
|
|
|
76
74
|
export class ServiceRegistrationState {
|
|
77
|
-
editorStore: EditorStore;
|
|
78
|
-
|
|
75
|
+
readonly editorStore: EditorStore;
|
|
76
|
+
readonly service: Service;
|
|
77
|
+
readonly registrationOptions: ServiceRegistrationEnvInfo[] = [];
|
|
79
78
|
registrationState = ActionState.create();
|
|
80
79
|
serviceEnv?: string | undefined;
|
|
81
80
|
serviceExecutionMode?: ServiceExecutionMode | undefined;
|
|
82
81
|
projectVersion?: Version | string | undefined;
|
|
83
82
|
activatePostRegistration = true;
|
|
83
|
+
enableModesWithVersioning: boolean;
|
|
84
|
+
TEMPORARY__useStoreModel = false;
|
|
84
85
|
|
|
85
86
|
constructor(
|
|
86
87
|
editorStore: EditorStore,
|
|
87
|
-
|
|
88
|
+
service: Service,
|
|
89
|
+
registrationOptions: ServiceRegistrationEnvInfo[],
|
|
90
|
+
enableModesWithVersioning: boolean,
|
|
88
91
|
) {
|
|
89
92
|
makeAutoObservable(this, {
|
|
90
93
|
editorStore: false,
|
|
91
94
|
executionModes: computed,
|
|
92
95
|
updateVersion: action,
|
|
93
96
|
setProjectVersion: action,
|
|
97
|
+
setUseStoreModelWithFullInteractive: action,
|
|
94
98
|
initialize: action,
|
|
95
99
|
updateType: action,
|
|
96
100
|
updateEnv: action,
|
|
@@ -98,7 +102,9 @@ export class ServiceRegistrationState {
|
|
|
98
102
|
});
|
|
99
103
|
|
|
100
104
|
this.editorStore = editorStore;
|
|
101
|
-
this.
|
|
105
|
+
this.service = service;
|
|
106
|
+
this.registrationOptions = registrationOptions;
|
|
107
|
+
this.enableModesWithVersioning = enableModesWithVersioning;
|
|
102
108
|
this.initialize();
|
|
103
109
|
this.registrationState.setMessageFormatter(prettyCONSTName);
|
|
104
110
|
}
|
|
@@ -112,16 +118,15 @@ export class ServiceRegistrationState {
|
|
|
112
118
|
setProjectVersion(val: Version | string | undefined): void {
|
|
113
119
|
this.projectVersion = val;
|
|
114
120
|
}
|
|
115
|
-
|
|
116
121
|
setActivatePostRegistration(val: boolean): void {
|
|
117
122
|
this.activatePostRegistration = val;
|
|
118
123
|
}
|
|
124
|
+
setUseStoreModelWithFullInteractive(val: boolean): void {
|
|
125
|
+
this.TEMPORARY__useStoreModel = val;
|
|
126
|
+
}
|
|
119
127
|
|
|
120
128
|
initialize(): void {
|
|
121
|
-
this.serviceEnv = getNullableFirstElement(
|
|
122
|
-
this.editorStore.applicationStore.config.options
|
|
123
|
-
.TEMPORARY__serviceRegistrationConfig,
|
|
124
|
-
)?.env;
|
|
129
|
+
this.serviceEnv = getNullableFirstElement(this.registrationOptions)?.env;
|
|
125
130
|
this.serviceExecutionMode = this.executionModes[0];
|
|
126
131
|
this.updateVersion();
|
|
127
132
|
}
|
|
@@ -147,12 +152,11 @@ export class ServiceRegistrationState {
|
|
|
147
152
|
}
|
|
148
153
|
|
|
149
154
|
get options(): ServiceRegistrationEnvInfo[] {
|
|
150
|
-
if (this.
|
|
151
|
-
return this.
|
|
152
|
-
.TEMPORARY__serviceRegistrationConfig;
|
|
155
|
+
if (this.enableModesWithVersioning) {
|
|
156
|
+
return this.registrationOptions;
|
|
153
157
|
}
|
|
154
|
-
return this.
|
|
155
|
-
(_envConfig) => {
|
|
158
|
+
return this.registrationOptions
|
|
159
|
+
.map((_envConfig) => {
|
|
156
160
|
const envConfig = new ServiceRegistrationEnvInfo();
|
|
157
161
|
envConfig.env = _envConfig.env;
|
|
158
162
|
envConfig.executionUrl = _envConfig.executionUrl;
|
|
@@ -162,8 +166,8 @@ export class ServiceRegistrationState {
|
|
|
162
166
|
(mode) => mode === ServiceExecutionMode.FULL_INTERACTIVE,
|
|
163
167
|
);
|
|
164
168
|
return envConfig;
|
|
165
|
-
}
|
|
166
|
-
|
|
169
|
+
})
|
|
170
|
+
.filter((envConfig) => envConfig.modes.length);
|
|
167
171
|
}
|
|
168
172
|
|
|
169
173
|
get executionModes(): ServiceExecutionMode[] {
|
|
@@ -174,8 +178,8 @@ export class ServiceRegistrationState {
|
|
|
174
178
|
|
|
175
179
|
get versionOptions(): ServiceVersionOption[] | undefined {
|
|
176
180
|
if (
|
|
177
|
-
this.
|
|
178
|
-
this.serviceExecutionMode
|
|
181
|
+
this.enableModesWithVersioning &&
|
|
182
|
+
!(this.serviceExecutionMode === ServiceExecutionMode.FULL_INTERACTIVE)
|
|
179
183
|
) {
|
|
180
184
|
const options: ServiceVersionOption[] =
|
|
181
185
|
this.editorStore.sdlcState.projectVersions.map((version) => ({
|
|
@@ -216,13 +220,14 @@ export class ServiceRegistrationState {
|
|
|
216
220
|
);
|
|
217
221
|
const serviceRegistrationResult =
|
|
218
222
|
(yield this.editorStore.graphManagerState.graphManager.registerService(
|
|
219
|
-
this.
|
|
223
|
+
this.service,
|
|
220
224
|
this.editorStore.graphManagerState.graph,
|
|
221
225
|
projectConfig.groupId,
|
|
222
226
|
projectConfig.artifactId,
|
|
223
227
|
versionInput,
|
|
224
228
|
serverUrl,
|
|
225
229
|
guaranteeNonNullable(this.serviceExecutionMode),
|
|
230
|
+
this.TEMPORARY__useStoreModel,
|
|
226
231
|
)) as ServiceRegistrationResult;
|
|
227
232
|
if (this.activatePostRegistration) {
|
|
228
233
|
this.registrationState.setMessage(
|
|
@@ -284,11 +289,11 @@ export class ServiceRegistrationState {
|
|
|
284
289
|
}
|
|
285
290
|
|
|
286
291
|
validateServiceForRegistration(): void {
|
|
287
|
-
this.
|
|
292
|
+
this.service.owners.forEach((owner) =>
|
|
288
293
|
assertNonEmptyString(owner, `Service can't have an empty owner name`),
|
|
289
294
|
);
|
|
290
295
|
assertTrue(
|
|
291
|
-
this.
|
|
296
|
+
this.service.owners.length >= MINIMUM_SERVICE_OWNERS,
|
|
292
297
|
`Service needs to have at least 2 owners in order to be registered`,
|
|
293
298
|
);
|
|
294
299
|
guaranteeNonNullable(
|
package/tsconfig.json
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"noImplicitOverride": true,
|
|
22
22
|
"noUncheckedIndexedAccess": true,
|
|
23
23
|
"exactOptionalPropertyTypes": true,
|
|
24
|
-
"forceConsistentCasingInFileNames":
|
|
24
|
+
"forceConsistentCasingInFileNames": false,
|
|
25
25
|
"outDir": "./lib",
|
|
26
26
|
"tsBuildInfoFile": "./build/prod.tsbuildinfo",
|
|
27
27
|
"rootDir": "./src",
|