@finos/legend-application-studio 28.19.115 → 28.19.117
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/__lib__/LegendStudioEvent.d.ts +1 -0
- package/lib/__lib__/LegendStudioEvent.d.ts.map +1 -1
- package/lib/__lib__/LegendStudioEvent.js +1 -0
- package/lib/__lib__/LegendStudioEvent.js.map +1 -1
- package/lib/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.js +3 -3
- package/lib/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.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 +12 -3
- package/lib/components/editor/editor-group/service-editor/ServiceRegistrationEditor.js.map +1 -1
- package/lib/index.css +2 -2
- package/lib/index.css.map +1 -1
- package/lib/package.json +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.js +2 -2
- package/lib/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.js.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.d.ts +4 -0
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.d.ts.map +1 -1
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.js +29 -0
- package/lib/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.js.map +1 -1
- package/package.json +16 -16
- package/src/__lib__/LegendStudioEvent.ts +1 -0
- package/src/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.ts +4 -4
- package/src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx +67 -1
- package/src/stores/editor/editor-state/element-editor-state/dataProduct/DataProductEditorState.ts +5 -4
- package/src/stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.ts +39 -0
|
@@ -27,6 +27,7 @@ export declare enum LEGEND_STUDIO_APP_EVENT {
|
|
|
27
27
|
DATABASE_BUILDER_FAILURE = "editor.database-builder.failure",
|
|
28
28
|
DATABASE_MODEL_BUILDER_FAILURE = "editor.database-model-builder.failure",
|
|
29
29
|
SERVICE_REGISTRATION_FAILURE = "editor.service-editor.registration.failure",
|
|
30
|
+
SERVICE_REGISTRATION_CHECK_FAILURE = "editor.service-editor.registration-check.failure",
|
|
30
31
|
SERVICE_TEST_RUNNER_FAILURE = "editor.service-editor.test-runner.failure",
|
|
31
32
|
SERVICE_TEST_SETUP_FAILURE = "editor.service-editor.test-setup.failure",
|
|
32
33
|
GENERATION_FAILURE = "editor.generation.failure",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LegendStudioEvent.d.ts","sourceRoot":"","sources":["../../src/__lib__/LegendStudioEvent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,oBAAY,uBAAuB;IACjC,qBAAqB,4CAA4C;IACjE,oBAAoB,2CAA2C;IAC/D,4BAA4B,4CAA4C;IAExE,8BAA8B,yCAAyC;IACvE,8BAA8B,yCAAyC;IACvE,6BAA6B,6CAA6C;IAI1E,eAAe,gCAAgC;IAC/C,uBAAuB,4BAA4B;IACnD,4BAA4B,sCAAsC;IAClE,oBAAoB,gCAAgC;IACpD,wBAAwB,oCAAoC;IAC5D,8BAA8B,0CAA0C;IACxE,4BAA4B,+CAA+C;IAC3E,2BAA2B,8CAA8C;IACzE,0BAA0B,6CAA6C;IACvE,kBAAkB,8BAA8B;IAChD,uBAAuB,mCAAmC;IAC1D,oBAAoB,8CAA8C;IAElE,sBAAsB,2BAA2B;IAGjD,oBAAoB,yBAAyB;IAE7C,wBAAwB,6BAA6B;IAErD,uBAAuB,4BAA4B;IACnD,wCAAwC,6CAA6C;IACrF,kCAAkC,sCAAsC;IACxE,sBAAsB,2BAA2B;IAEjD,yBAAyB,kCAAkC;IAC3D,2BAA2B,oCAAoC;IAI/D,qBAAqB,0BAA0B;IAG/C,yBAAyB,6BAA6B;IAEtD,iCAAiC,qCAAqC;IAEtE,yCAAyC,iDAAiD;IAC1F,+DAA+D,mDAAmD;IAElH,kDAAkD,iDAAiD;IACnG,kDAAkD,iDAAiD;IACnG,sDAAsD,qDAAqD;IAC3G,2DAA2D,0DAA0D;IACrH,4DAA4D,4DAA4D;IAExH,iDAAiD,4CAA4C;IAC7F,uCAAuC,+CAA+C;IAGtF,2DAA2D,mEAAmE;IAC9H,0DAA0D,kEAAkE;IAC5H,4DAA4D,oEAAoE;IAGhI,4BAA4B,4CAA4C;IACxE,wBAAwB,wCAAwC;IAGhE,2BAA2B,2CAA2C;IACtE,2BAA2B,2CAA2C;IAGtE,yBAAyB,qCAAqC;CAC/D"}
|
|
1
|
+
{"version":3,"file":"LegendStudioEvent.d.ts","sourceRoot":"","sources":["../../src/__lib__/LegendStudioEvent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,oBAAY,uBAAuB;IACjC,qBAAqB,4CAA4C;IACjE,oBAAoB,2CAA2C;IAC/D,4BAA4B,4CAA4C;IAExE,8BAA8B,yCAAyC;IACvE,8BAA8B,yCAAyC;IACvE,6BAA6B,6CAA6C;IAI1E,eAAe,gCAAgC;IAC/C,uBAAuB,4BAA4B;IACnD,4BAA4B,sCAAsC;IAClE,oBAAoB,gCAAgC;IACpD,wBAAwB,oCAAoC;IAC5D,8BAA8B,0CAA0C;IACxE,4BAA4B,+CAA+C;IAC3E,kCAAkC,qDAAqD;IACvF,2BAA2B,8CAA8C;IACzE,0BAA0B,6CAA6C;IACvE,kBAAkB,8BAA8B;IAChD,uBAAuB,mCAAmC;IAC1D,oBAAoB,8CAA8C;IAElE,sBAAsB,2BAA2B;IAGjD,oBAAoB,yBAAyB;IAE7C,wBAAwB,6BAA6B;IAErD,uBAAuB,4BAA4B;IACnD,wCAAwC,6CAA6C;IACrF,kCAAkC,sCAAsC;IACxE,sBAAsB,2BAA2B;IAEjD,yBAAyB,kCAAkC;IAC3D,2BAA2B,oCAAoC;IAI/D,qBAAqB,0BAA0B;IAG/C,yBAAyB,6BAA6B;IAEtD,iCAAiC,qCAAqC;IAEtE,yCAAyC,iDAAiD;IAC1F,+DAA+D,mDAAmD;IAElH,kDAAkD,iDAAiD;IACnG,kDAAkD,iDAAiD;IACnG,sDAAsD,qDAAqD;IAC3G,2DAA2D,0DAA0D;IACrH,4DAA4D,4DAA4D;IAExH,iDAAiD,4CAA4C;IAC7F,uCAAuC,+CAA+C;IAGtF,2DAA2D,mEAAmE;IAC9H,0DAA0D,kEAAkE;IAC5H,4DAA4D,oEAAoE;IAGhI,4BAA4B,4CAA4C;IACxE,wBAAwB,wCAAwC;IAGhE,2BAA2B,2CAA2C;IACtE,2BAA2B,2CAA2C;IAGtE,yBAAyB,qCAAqC;CAC/D"}
|
|
@@ -30,6 +30,7 @@ export var LEGEND_STUDIO_APP_EVENT;
|
|
|
30
30
|
LEGEND_STUDIO_APP_EVENT["DATABASE_BUILDER_FAILURE"] = "editor.database-builder.failure";
|
|
31
31
|
LEGEND_STUDIO_APP_EVENT["DATABASE_MODEL_BUILDER_FAILURE"] = "editor.database-model-builder.failure";
|
|
32
32
|
LEGEND_STUDIO_APP_EVENT["SERVICE_REGISTRATION_FAILURE"] = "editor.service-editor.registration.failure";
|
|
33
|
+
LEGEND_STUDIO_APP_EVENT["SERVICE_REGISTRATION_CHECK_FAILURE"] = "editor.service-editor.registration-check.failure";
|
|
33
34
|
LEGEND_STUDIO_APP_EVENT["SERVICE_TEST_RUNNER_FAILURE"] = "editor.service-editor.test-runner.failure";
|
|
34
35
|
LEGEND_STUDIO_APP_EVENT["SERVICE_TEST_SETUP_FAILURE"] = "editor.service-editor.test-setup.failure";
|
|
35
36
|
LEGEND_STUDIO_APP_EVENT["GENERATION_FAILURE"] = "editor.generation.failure";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LegendStudioEvent.js","sourceRoot":"","sources":["../../src/__lib__/LegendStudioEvent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"LegendStudioEvent.js","sourceRoot":"","sources":["../../src/__lib__/LegendStudioEvent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAN,IAAY,uBA4EX;AA5ED,WAAY,uBAAuB;IACjC,4FAAiE,CAAA;IACjE,0FAA+D,CAAA;IAC/D,mGAAwE,CAAA;IAExE,kGAAuE,CAAA;IACvE,kGAAuE,CAAA;IACvE,qGAA0E,CAAA;IAE1E,UAAU;IACV,mFAAmF;IACnF,0EAA+C,CAAA;IAC/C,8EAAmD,CAAA;IACnD,6FAAkE,CAAA;IAClE,+EAAoD,CAAA;IACpD,uFAA4D,CAAA;IAC5D,mGAAwE,CAAA;IACxE,sGAA2E,CAAA;IAC3E,kHAAuF,CAAA;IACvF,oGAAyE,CAAA;IACzE,kGAAuE,CAAA;IACvE,2EAAgD,CAAA;IAChD,qFAA0D,CAAA;IAC1D,6FAAkE,CAAA;IAElE,4EAAiD,CAAA;IACjD,OAAO;IACP,wEAAwE;IACxE,wEAA6C,CAAA;IAE7C,gFAAqD,CAAA;IACrD,mBAAmB;IACnB,8EAAmD,CAAA;IACnD,gHAAqF,CAAA;IACrF,mGAAwE,CAAA;IACxE,4EAAiD,CAAA;IAEjD,sFAA2D,CAAA;IAC3D,0FAA+D,CAAA;IAE/D,QAAQ;IACR,wEAAwE;IACxE,0EAA+C,CAAA;IAE/C,wCAAwC;IACxC,iFAAsD,CAAA;IAEtD,iGAAsE,CAAA;IAEtE,qHAA0F,CAAA;IAC1F,6IAAkH,CAAA;IAElH,8HAAmG,CAAA;IACnG,8HAAmG,CAAA;IACnG,sIAA2G,CAAA;IAC3G,gJAAqH,CAAA;IACrH,mJAAwH,CAAA;IAExH,wHAA6F,CAAA;IAC7F,iHAAsF,CAAA;IAEtF,cAAc;IACd,yJAA8H,CAAA;IAC9H,uJAA4H,CAAA;IAC5H,2JAAgI,CAAA;IAEhI,YAAY;IACZ,mGAAwE,CAAA;IACxE,2FAAgE,CAAA;IAEhE,eAAe;IACf,iGAAsE,CAAA;IACtE,iGAAsE,CAAA;IAEtE,cAAc;IACd,yFAA8D,CAAA;AAChE,CAAC,EA5EW,uBAAuB,KAAvB,uBAAuB,QA4ElC"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { LakehouseAccessPoint, ModelAccessPointGroup, } from '@finos/legend-graph';
|
|
17
17
|
import { flowResult } from 'mobx';
|
|
18
|
-
import { DataProductQueryBuilderState, QueryBuilderActionConfig, QueryBuilderAdvancedWorkflowState,
|
|
18
|
+
import { DataProductQueryBuilderState, QueryBuilderActionConfig, QueryBuilderAdvancedWorkflowState, resolveDataProductAccessor, } from '@finos/legend-query-builder';
|
|
19
19
|
import { assertErrorThrown, assertTrue, filterByType, guaranteeNonNullable, } from '@finos/legend-shared';
|
|
20
20
|
const isQueryableDataProduct = (dataProduct) => {
|
|
21
21
|
return (Boolean(dataProduct.nativeModelAccess?.nativeModelExecutionContexts.length) ||
|
|
@@ -43,14 +43,14 @@ export const queryDataProduct = async (dataProduct, editorStore) => {
|
|
|
43
43
|
let accessor;
|
|
44
44
|
if (defaultExecutionContext instanceof LakehouseAccessPoint) {
|
|
45
45
|
const relationMetadata = await editorStore.graphManagerState.graphManager.getLambdaRelationType(defaultExecutionContext.func, editorStore.graphManagerState.graph);
|
|
46
|
-
accessor =
|
|
46
|
+
accessor = resolveDataProductAccessor(dataProduct, defaultExecutionContext, editorStore.graphManagerState.graph, undefined, relationMetadata);
|
|
47
47
|
}
|
|
48
48
|
await flowResult(embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
|
|
49
49
|
setupQueryBuilderState: async () => {
|
|
50
50
|
const sourceInfo = Object.assign({}, editorStore.editorMode.getSourceInfo(), {
|
|
51
51
|
dataProduct: dataProduct.path,
|
|
52
52
|
});
|
|
53
|
-
const queryBuilderState = new DataProductQueryBuilderState(editorStore.applicationStore, editorStore.graphManagerState, QueryBuilderAdvancedWorkflowState.INSTANCE, dataProduct, undefined, QueryBuilderActionConfig.INSTANCE, defaultExecutionContext, undefined, async (val) => { }, undefined,
|
|
53
|
+
const queryBuilderState = new DataProductQueryBuilderState(editorStore.applicationStore, editorStore.graphManagerState, QueryBuilderAdvancedWorkflowState.INSTANCE, dataProduct, undefined, QueryBuilderActionConfig.INSTANCE, defaultExecutionContext, undefined, async (val) => { }, undefined, editorStore.applicationStore.config.options.queryBuilderConfig, sourceInfo);
|
|
54
54
|
queryBuilderState.initWithDataProduct(dataProduct, accessor, defaultExecutionContext);
|
|
55
55
|
return queryBuilderState;
|
|
56
56
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataProductQueryBuilderHelper.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAIL,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,iCAAiC,EACjC,
|
|
1
|
+
{"version":3,"file":"DataProductQueryBuilderHelper.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/dataProduct/DataProductQueryBuilderHelper.ts"],"names":[],"mappings":"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"}
|
package/lib/components/editor/editor-group/service-editor/ServiceRegistrationEditor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceRegistrationEditor.d.ts","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"ServiceRegistrationEditor.d.ts","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA0BH,eAAO,MAAM,yBAAyB;;CA6XpC,CAAC"}
|
|
@@ -15,8 +15,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { observer } from 'mobx-react-lite';
|
|
18
|
+
import { useEffect } from 'react';
|
|
18
19
|
import { ServiceEditorState } from '../../../../stores/editor/editor-state/element-editor-state/service/ServiceEditorState.js';
|
|
19
|
-
import { clsx, PanelLoadingIndicator, CustomSelectorInput, CheckSquareIcon, SquareIcon, } from '@finos/legend-art';
|
|
20
|
+
import { clsx, PanelLoadingIndicator, CustomSelectorInput, CheckSquareIcon, SquareIcon, ExternalLinkSquareIcon, CircleNotchIcon, } from '@finos/legend-art';
|
|
20
21
|
import { prettyCONSTName } from '@finos/legend-shared';
|
|
21
22
|
import { LEGEND_STUDIO_TEST_ID } from '../../../../__lib__/LegendStudioTesting.js';
|
|
22
23
|
import { ServiceExecutionMode } from '@finos/legend-graph';
|
|
@@ -24,7 +25,7 @@ import { flowResult } from 'mobx';
|
|
|
24
25
|
import { useEditorStore } from '../../EditorStoreProvider.js';
|
|
25
26
|
import { useApplicationStore } from '@finos/legend-application';
|
|
26
27
|
import { MASTER_SNAPSHOT_ALIAS } from '@finos/legend-server-depot';
|
|
27
|
-
import { LATEST_PROJECT_REVISION } from '../../../../stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.js';
|
|
28
|
+
import { LATEST_PROJECT_REVISION, generateServiceManagementUrl, } from '../../../../stores/editor/editor-state/element-editor-state/service/ServiceRegistrationState.js';
|
|
28
29
|
export const ServiceRegistrationEditor = observer(() => {
|
|
29
30
|
const editorStore = useEditorStore();
|
|
30
31
|
const applicationStore = useApplicationStore();
|
|
@@ -98,7 +99,15 @@ export const ServiceRegistrationEditor = observer(() => {
|
|
|
98
99
|
const disableRegistration = !selectedEnvOption ||
|
|
99
100
|
!selectedServiceType ||
|
|
100
101
|
registrationState.registrationState.isInProgress;
|
|
101
|
-
|
|
102
|
+
useEffect(() => {
|
|
103
|
+
flowResult(registrationState.checkServiceRegistration()).catch(applicationStore.alertUnhandledError);
|
|
104
|
+
}, [registrationState, applicationStore]);
|
|
105
|
+
return (_jsxs("div", { "data-testid": LEGEND_STUDIO_TEST_ID.SERVICE_REGISTRATION_EDITOR, className: "service-registration-editor", children: [_jsxs("div", { className: "panel__header", children: [_jsx("div", { className: "panel__header__title", children: _jsx("div", { className: "panel__header__title__label", children: "Register Service" }) }), _jsx("div", { className: "panel__header__actions", children: _jsx("div", { className: "panel__header__action", children: _jsx("button", { className: "btn--dark model-loader__header__load-btn", onClick: registerService, disabled: disableRegistration, tabIndex: -1, title: "Register Service", children: "Register" }) }) })] }), _jsx(PanelLoadingIndicator, { isLoading: registrationState.registrationState.isInProgress }), _jsx("div", { className: "panel__content", children: _jsxs("div", { className: "panel__content__form", children: [registrationState.registrationState.message && (_jsx("div", { className: "service-registration-editor__progress-msg", children: `${registrationState.registrationState.message}...` })), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Deployment Status" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "Environments where this service is currently deployed" }), _jsxs("div", { className: "service-registration-editor__deployment-status", children: [registrationState.deploymentCheckState.isInProgress && (_jsxs("div", { className: "service-registration-editor__deployment-status__loading", children: [_jsx(CircleNotchIcon, { className: "service-registration-editor__deployment-status__loading-icon" }), _jsx("span", { children: "Fetching deployment status..." })] })), registrationState.deploymentCheckState.hasCompleted &&
|
|
106
|
+
registrationState.registeredEnvs.length === 0 && (_jsx("div", { className: "service-registration-editor__deployment-status__empty", children: "Service is not deployed to any environment" })), registrationState.deploymentCheckState.hasCompleted &&
|
|
107
|
+
registrationState.registeredEnvs.length > 0 && (_jsxs("div", { className: "service-registration-editor__deployment-status__envs", children: [_jsx("span", { className: "service-registration-editor__deployment-status__label", children: "Service is deployed to" }), registrationState.registeredEnvs.map((env) => {
|
|
108
|
+
const envConfig = registrationState.registrationOptions.find((e) => e.env === env);
|
|
109
|
+
return envConfig ? (_jsxs("a", { className: "service-editor__deployment-link", href: generateServiceManagementUrl(envConfig.managementUrl, serviceState.service.pattern), target: "_blank", rel: "noopener noreferrer", title: `Open in ${env}`, children: [_jsx("span", { className: "service-editor__deployment-link__env", children: env.toUpperCase() }), _jsx(ExternalLinkSquareIcon, {})] }, env)) : null;
|
|
110
|
+
})] }))] })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Activate Service" }), _jsxs("div", { className: "panel__content__form__section__toggler", onClick: toggleActivatePostRegistration, children: [_jsx("button", { className: clsx('panel__content__form__section__toggler__btn', {
|
|
102
111
|
'panel__content__form__section__toggler__btn--toggled': registrationState.activatePostRegistration,
|
|
103
112
|
}), tabIndex: -1, children: registrationState.activatePostRegistration ? (_jsx(CheckSquareIcon, {})) : (_jsx(SquareIcon, {})) }), _jsx("div", { className: "panel__content__form__section__toggler__prompt", children: "Activates service after registration" })] })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Execution Server" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "The execution server where your service will be registered" }), _jsx(CustomSelectorInput, { options: envOptions, onChange: onServerEnvChange, value: selectedEnvOption, darkMode: !applicationStore.layoutService
|
|
104
113
|
.TEMPORARY__isLightColorThemeEnabled })] }), _jsxs("div", { className: "panel__content__form__section", children: [_jsx("div", { className: "panel__content__form__section__header__label", children: "Service Type" }), _jsx("div", { className: "panel__content__form__section__header__prompt", children: "The kind of service you want to register. Used to determine how the metadata will be fetched" }), _jsx(CustomSelectorInput, { options: serviceTypesOptions, onChange: onServiceTypeSelectionChange, value: selectedServiceType, darkMode: !applicationStore.layoutService
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceRegistrationEditor.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2FAA2F,CAAC;AAC/H,OAAO,EACL,IAAI,EACJ,qBAAqB,EACrB,mBAAmB,EACnB,eAAe,EACf,UAAU,
|
|
1
|
+
{"version":3,"file":"ServiceRegistrationEditor.js","sourceRoot":"","sources":["../../../../../src/components/editor/editor-group/service-editor/ServiceRegistrationEditor.tsx"],"names":[],"mappings":"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"}
|