@finos/legend-extension-dsl-service 1.0.39 → 1.0.41
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/query/ServiceRegisterModal.d.ts +2 -0
- package/lib/components/query/ServiceRegisterModal.d.ts.map +1 -1
- package/lib/components/query/ServiceRegisterModal.js +10 -2
- package/lib/components/query/ServiceRegisterModal.js.map +1 -1
- package/lib/index.css +1 -1
- package/lib/package.json +2 -2
- package/package.json +11 -11
- package/src/components/query/ServiceRegisterModal.tsx +23 -1
|
@@ -13,8 +13,10 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
+
import { type VariableExpression } from '@finos/legend-graph';
|
|
16
17
|
import { type QueryEditorStore } from '@finos/legend-application-query';
|
|
17
18
|
import type { QueryBuilderState } from '@finos/legend-query-builder';
|
|
19
|
+
export declare const generateServiceURL: (urlPrefix: string | undefined, params: VariableExpression[] | undefined) => string;
|
|
18
20
|
export declare const ServiceRegisterAction: ((props: {
|
|
19
21
|
editorStore: QueryEditorStore;
|
|
20
22
|
queryBuilderState: QueryBuilderState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceRegisterModal.d.ts","sourceRoot":"","sources":["../../../src/components/query/ServiceRegisterModal.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"ServiceRegisterModal.d.ts","sourceRoot":"","sources":["../../../src/components/query/ServiceRegisterModal.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAkCH,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAKrE,eAAO,MAAM,kBAAkB,cAClB,MAAM,GAAG,SAAS,UACrB,kBAAkB,EAAE,GAAG,SAAS,KACvC,MAMF,CAAC;AA8QF,eAAO,MAAM,qBAAqB,WACxB;IACN,WAAW,EAAE,gBAAgB,CAAC;IAC9B,iBAAiB,EAAE,iBAAiB,CAAC;CACtC;;CAgCF,CAAC"}
|
|
@@ -21,15 +21,23 @@ import { generateServiceManagementUrl, LEGEND_STUDIO_APP_EVENT, } from '@finos/l
|
|
|
21
21
|
import { createServiceElement } from '../../stores/studio/QueryProductionizerStore.js';
|
|
22
22
|
import { CheckSquareIcon, clsx, CustomSelectorInput, Dialog, Modal, ModalTitle, Panel, PanelFullContent, PanelLoadingIndicator, RocketIcon, SquareIcon, } from '@finos/legend-art';
|
|
23
23
|
import { ActionAlertType, ActionAlertActionType, } from '@finos/legend-application';
|
|
24
|
-
import { RuntimePointer, ServiceExecutionMode, validate_ServicePattern, } from '@finos/legend-graph';
|
|
24
|
+
import { Multiplicity, RuntimePointer, ServiceExecutionMode, validate_ServicePattern, } from '@finos/legend-graph';
|
|
25
25
|
import {} from '@finos/legend-application-query';
|
|
26
26
|
import { resolveVersion } from '@finos/legend-server-depot';
|
|
27
|
+
const validURLParamMultiplicityList = [Multiplicity.ONE, Multiplicity.ZERO_ONE];
|
|
28
|
+
export const generateServiceURL = (urlPrefix, params) => {
|
|
29
|
+
const paramNames = params
|
|
30
|
+
?.filter((p) => validURLParamMultiplicityList.includes(p.multiplicity))
|
|
31
|
+
.map((e) => `{${e.name}}`);
|
|
32
|
+
const paramSuffix = paramNames?.length ? `/${paramNames.join('/')}` : '';
|
|
33
|
+
return `${urlPrefix ?? `/${uuid()}`}${paramSuffix}`;
|
|
34
|
+
};
|
|
27
35
|
const ServiceRegisterModal = observer((props) => {
|
|
28
36
|
const { editorStore, onClose, queryBuilderState } = props;
|
|
29
37
|
const [registrationState] = useState(ActionState.create());
|
|
30
38
|
const [text, setText] = useState('');
|
|
31
39
|
const [activateService, setActivateService] = useState(true);
|
|
32
|
-
const [servicePattern, setServicePattern] = useState(
|
|
40
|
+
const [servicePattern, setServicePattern] = useState(generateServiceURL(undefined, queryBuilderState.parametersState.parameterStates.map((p) => p.parameter)));
|
|
33
41
|
const [owners, setOwners] = useState([]);
|
|
34
42
|
const [isServiceUrlPatternValid, setIsServiceUrlPatternValid] = useState(true);
|
|
35
43
|
const onTextChange = (value) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceRegisterModal.js","sourceRoot":"","sources":["../../../src/components/query/ServiceRegisterModal.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,oBAAoB,EACpB,oBAAoB,EACpB,QAAQ,EACR,IAAI,GACL,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AACvF,OAAO,EACL,eAAe,EACf,IAAI,EACJ,mBAAmB,EACnB,MAAM,EACN,KAAK,EACL,UAAU,EACV,KAAK,EACL,gBAAgB,EAChB,qBAAqB,EACrB,UAAU,EACV,UAAU,GACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,qBAAqB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,
|
|
1
|
+
{"version":3,"file":"ServiceRegisterModal.js","sourceRoot":"","sources":["../../../src/components/query/ServiceRegisterModal.tsx"],"names":[],"mappings":"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"}
|
package/lib/index.css
CHANGED
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-service",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.41",
|
|
4
4
|
"description": "Legend extension for Service DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"jest": "29.5.0",
|
|
69
69
|
"npm-run-all": "4.1.5",
|
|
70
70
|
"rimraf": "5.0.1",
|
|
71
|
-
"sass": "1.63.
|
|
71
|
+
"sass": "1.63.6",
|
|
72
72
|
"typescript": "5.1.3"
|
|
73
73
|
},
|
|
74
74
|
"peerDependencies": {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@finos/legend-extension-dsl-service",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.41",
|
|
4
4
|
"description": "Legend extension for Service DSL",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"legend",
|
|
@@ -42,15 +42,15 @@
|
|
|
42
42
|
"test:watch": "jest --watch"
|
|
43
43
|
},
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"@finos/legend-application": "15.0.
|
|
46
|
-
"@finos/legend-application-query": "13.0.
|
|
47
|
-
"@finos/legend-application-studio": "27.1.
|
|
48
|
-
"@finos/legend-art": "7.0.
|
|
49
|
-
"@finos/legend-graph": "30.0.
|
|
50
|
-
"@finos/legend-lego": "1.1.
|
|
51
|
-
"@finos/legend-query-builder": "4.1.
|
|
45
|
+
"@finos/legend-application": "15.0.27",
|
|
46
|
+
"@finos/legend-application-query": "13.0.30",
|
|
47
|
+
"@finos/legend-application-studio": "27.1.3",
|
|
48
|
+
"@finos/legend-art": "7.0.27",
|
|
49
|
+
"@finos/legend-graph": "30.0.12",
|
|
50
|
+
"@finos/legend-lego": "1.1.4",
|
|
51
|
+
"@finos/legend-query-builder": "4.1.3",
|
|
52
52
|
"@finos/legend-server-depot": "6.0.16",
|
|
53
|
-
"@finos/legend-server-sdlc": "5.0.
|
|
53
|
+
"@finos/legend-server-sdlc": "5.0.18",
|
|
54
54
|
"@finos/legend-shared": "10.0.15",
|
|
55
55
|
"@finos/legend-storage": "3.0.65",
|
|
56
56
|
"@types/react": "18.2.13",
|
|
@@ -61,14 +61,14 @@
|
|
|
61
61
|
"serializr": "3.0.2"
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
-
"@finos/legend-dev-utils": "2.0.
|
|
64
|
+
"@finos/legend-dev-utils": "2.0.70",
|
|
65
65
|
"@jest/globals": "29.5.0",
|
|
66
66
|
"cross-env": "7.0.3",
|
|
67
67
|
"eslint": "8.43.0",
|
|
68
68
|
"jest": "29.5.0",
|
|
69
69
|
"npm-run-all": "4.1.5",
|
|
70
70
|
"rimraf": "5.0.1",
|
|
71
|
-
"sass": "1.63.
|
|
71
|
+
"sass": "1.63.6",
|
|
72
72
|
"typescript": "5.1.3"
|
|
73
73
|
},
|
|
74
74
|
"peerDependencies": {
|
|
@@ -47,6 +47,8 @@ import {
|
|
|
47
47
|
ActionAlertActionType,
|
|
48
48
|
} from '@finos/legend-application';
|
|
49
49
|
import {
|
|
50
|
+
type VariableExpression,
|
|
51
|
+
Multiplicity,
|
|
50
52
|
RuntimePointer,
|
|
51
53
|
ServiceExecutionMode,
|
|
52
54
|
validate_ServicePattern,
|
|
@@ -56,6 +58,19 @@ import type { UserOption } from '../studio/QueryProductionizer.js';
|
|
|
56
58
|
import type { QueryBuilderState } from '@finos/legend-query-builder';
|
|
57
59
|
import { resolveVersion } from '@finos/legend-server-depot';
|
|
58
60
|
|
|
61
|
+
const validURLParamMultiplicityList = [Multiplicity.ONE, Multiplicity.ZERO_ONE];
|
|
62
|
+
|
|
63
|
+
export const generateServiceURL = (
|
|
64
|
+
urlPrefix: string | undefined,
|
|
65
|
+
params: VariableExpression[] | undefined,
|
|
66
|
+
): string => {
|
|
67
|
+
const paramNames = params
|
|
68
|
+
?.filter((p) => validURLParamMultiplicityList.includes(p.multiplicity))
|
|
69
|
+
.map((e) => `{${e.name}}`);
|
|
70
|
+
const paramSuffix = paramNames?.length ? `/${paramNames.join('/')}` : '';
|
|
71
|
+
return `${urlPrefix ?? `/${uuid()}`}${paramSuffix}`;
|
|
72
|
+
};
|
|
73
|
+
|
|
59
74
|
const ServiceRegisterModal = observer(
|
|
60
75
|
(props: {
|
|
61
76
|
editorStore: QueryEditorStore;
|
|
@@ -66,7 +81,14 @@ const ServiceRegisterModal = observer(
|
|
|
66
81
|
const [registrationState] = useState(ActionState.create());
|
|
67
82
|
const [text, setText] = useState('');
|
|
68
83
|
const [activateService, setActivateService] = useState(true);
|
|
69
|
-
const [servicePattern, setServicePattern] = useState(
|
|
84
|
+
const [servicePattern, setServicePattern] = useState(
|
|
85
|
+
generateServiceURL(
|
|
86
|
+
undefined,
|
|
87
|
+
queryBuilderState.parametersState.parameterStates.map(
|
|
88
|
+
(p) => p.parameter,
|
|
89
|
+
),
|
|
90
|
+
),
|
|
91
|
+
);
|
|
70
92
|
const [owners, setOwners] = useState<UserOption[]>([]);
|
|
71
93
|
const [isServiceUrlPatternValid, setIsServiceUrlPatternValid] =
|
|
72
94
|
useState(true);
|