@steedos/service-ui 2.4.8-beta.2 → 2.4.8-beta.3

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.
Files changed (3) hide show
  1. package/main/default/routes/objects.router.js +10 -6
  2. package/package.json +5 -5
  3. package/src/routes/objects.router.ts +11 -7
package/main/default/routes/objects.router.js CHANGED
@@ -11,12 +11,15 @@ const callObjectServiceAction = function (actionName, userSession, data) {
11
11
  return broker.call(actionName, data, { meta: { user: userSession } });
12
12
  });
13
13
  };
14
+ const getObjectName = function (objectServiceName) {
15
+ return objectServiceName.substring(1);
16
+ };
14
17
  router.get('/service/api/:objectServiceName/fields', core.requireAuthentication, function (req, res) {
15
18
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
16
19
  const userSession = req.user;
17
20
  try {
18
21
  const { objectServiceName } = req.params;
19
- const result = yield callObjectServiceAction(`${objectServiceName}.getFields`, userSession);
22
+ const result = yield callObjectServiceAction(`objectql.getFields`, userSession, { objectName: getObjectName(objectServiceName) });
20
23
  res.status(200).send(result);
21
24
  }
22
25
  catch (error) {
@@ -29,7 +32,7 @@ router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requi
29
32
  const userSession = req.user;
30
33
  try {
31
34
  const { objectServiceName } = req.params;
32
- const result = yield callObjectServiceAction(`${objectServiceName}.getUserObjectPermission`, userSession);
35
+ const result = yield callObjectServiceAction(`objectql.getUserObjectPermission`, userSession, { objectName: getObjectName(objectServiceName) });
33
36
  res.status(200).send(result);
34
37
  }
35
38
  catch (error) {
@@ -42,7 +45,8 @@ router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.r
42
45
  const userSession = req.user;
43
46
  try {
44
47
  const { objectServiceName, recordId } = req.params;
45
- const result = yield callObjectServiceAction(`${objectServiceName}.getRecordPermissionsById`, userSession, {
48
+ const result = yield callObjectServiceAction(`objectql.getRecordPermissionsById`, userSession, {
49
+ objectName: getObjectName(objectServiceName),
46
50
  recordId: recordId
47
51
  });
48
52
  res.status(200).send(result);
@@ -77,7 +81,7 @@ router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentic
77
81
  const userSession = req.user;
78
82
  try {
79
83
  const { objectServiceName } = req.params;
80
- const result = yield callObjectServiceAction(`${objectServiceName}.createDefaultRecordView`, userSession);
84
+ const result = yield callObjectServiceAction(`objectql.createDefaultRecordView`, userSession, { objectName: getObjectName(objectServiceName) });
81
85
  res.status(200).send(result);
82
86
  }
83
87
  catch (error) {
@@ -90,7 +94,7 @@ router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthe
90
94
  const userSession = req.user;
91
95
  try {
92
96
  const { objectServiceName } = req.params;
93
- const result = yield callObjectServiceAction(`${objectServiceName}.getDefaultRecordView`, userSession);
97
+ const result = yield callObjectServiceAction(`objectql.getDefaultRecordView`, userSession, { objectName: getObjectName(objectServiceName) });
94
98
  res.status(200).send(result);
95
99
  }
96
100
  catch (error) {
@@ -103,7 +107,7 @@ router.get('/service/api/:objectServiceName/relateds', core.requireAuthenticatio
103
107
  const userSession = req.user;
104
108
  try {
105
109
  const { objectServiceName } = req.params;
106
- const result = yield callObjectServiceAction(`${objectServiceName}.getRelateds`, userSession);
110
+ const result = yield callObjectServiceAction(`objectql.getRelateds`, userSession, { objectName: getObjectName(objectServiceName) });
107
111
  res.status(200).send(result);
108
112
  }
109
113
  catch (error) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-ui",
3
- "version": "2.4.8-beta.2",
3
+ "version": "2.4.8-beta.3",
4
4
  "main": "package.service.js",
5
5
  "keywords": [
6
6
  "steedos"
@@ -11,9 +11,9 @@
11
11
  "description": "steedos package",
12
12
  "repository": {},
13
13
  "dependencies": {
14
- "@steedos/core": "2.4.8-beta.2",
15
- "@steedos/i18n": "2.4.8-beta.2",
16
- "@steedos/objectql": "2.4.8-beta.2",
14
+ "@steedos/core": "2.4.8-beta.3",
15
+ "@steedos/i18n": "2.4.8-beta.3",
16
+ "@steedos/objectql": "2.4.8-beta.3",
17
17
  "express": "4.18.1"
18
18
  },
19
19
  "license": "MIT",
@@ -21,5 +21,5 @@
21
21
  "publishConfig": {
22
22
  "access": "public"
23
23
  },
24
- "gitHead": "75409cde3a71561adfff93fbb36a7dc1ce5252d5"
24
+ "gitHead": "f748fc92a115543edaca48cf99f68dc57863db69"
25
25
  }
package/src/routes/objects.router.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: baozhoutao@steedos.com
3
3
  * @Date: 2022-06-09 10:19:47
4
4
  * @LastEditors: sunhaolin@hotoa.com
5
- * @LastEditTime: 2023-03-27 17:19:57
5
+ * @LastEditTime: 2023-03-28 20:59:08
6
6
  * @Description:
7
7
  */
8
8
  import { getSteedosSchema } from "@steedos/objectql";
@@ -16,12 +16,15 @@ const callObjectServiceAction = async function(actionName, userSession, data?){
16
16
  return broker.call(actionName, data, { meta: { user: userSession}})
17
17
  }
18
18
 
19
+ const getObjectName = function(objectServiceName){
20
+ return objectServiceName.substring(1);
21
+ }
19
22
 
20
23
  router.get('/service/api/:objectServiceName/fields', core.requireAuthentication, async function (req, res) {
21
24
  const userSession = req.user;
22
25
  try {
23
26
  const { objectServiceName } = req.params;
24
- const result = await callObjectServiceAction(`${objectServiceName}.getFields`, userSession);
27
+ const result = await callObjectServiceAction(`objectql.getFields`, userSession, { objectName: getObjectName(objectServiceName) });
25
28
  res.status(200).send(result);
26
29
  } catch (error) {
27
30
  res.status(500).send(error.message);
@@ -32,7 +35,7 @@ router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requi
32
35
  const userSession = req.user;
33
36
  try {
34
37
  const { objectServiceName } = req.params;
35
- const result = await callObjectServiceAction(`${objectServiceName}.getUserObjectPermission`, userSession);
38
+ const result = await callObjectServiceAction(`objectql.getUserObjectPermission`, userSession, { objectName: getObjectName(objectServiceName) });
36
39
  res.status(200).send(result);
37
40
  } catch (error) {
38
41
  res.status(500).send(error.message);
@@ -43,7 +46,8 @@ router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.r
43
46
  const userSession = req.user;
44
47
  try {
45
48
  const { objectServiceName, recordId } = req.params;
46
- const result = await callObjectServiceAction(`${objectServiceName}.getRecordPermissionsById`, userSession, {
49
+ const result = await callObjectServiceAction(`objectql.getRecordPermissionsById`, userSession, {
50
+ objectName: getObjectName(objectServiceName),
47
51
  recordId: recordId
48
52
  });
49
53
  res.status(200).send(result);
@@ -74,7 +78,7 @@ router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentic
74
78
  const userSession = req.user;
75
79
  try {
76
80
  const { objectServiceName } = req.params;
77
- const result = await callObjectServiceAction(`${objectServiceName}.createDefaultRecordView`, userSession);
81
+ const result = await callObjectServiceAction(`objectql.createDefaultRecordView`, userSession, { objectName: getObjectName(objectServiceName) });
78
82
  res.status(200).send(result);
79
83
  } catch (error) {
80
84
  res.status(500).send(error.message);
@@ -85,7 +89,7 @@ router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthe
85
89
  const userSession = req.user;
86
90
  try {
87
91
  const { objectServiceName } = req.params;
88
- const result = await callObjectServiceAction(`${objectServiceName}.getDefaultRecordView`, userSession);
92
+ const result = await callObjectServiceAction(`objectql.getDefaultRecordView`, userSession, { objectName: getObjectName(objectServiceName) });
89
93
  res.status(200).send(result);
90
94
  } catch (error) {
91
95
  res.status(500).send(error.message);
@@ -96,7 +100,7 @@ router.get('/service/api/:objectServiceName/relateds', core.requireAuthenticatio
96
100
  const userSession = req.user;
97
101
  try {
98
102
  const { objectServiceName } = req.params;
99
- const result = await callObjectServiceAction(`${objectServiceName}.getRelateds`, userSession);
103
+ const result = await callObjectServiceAction(`objectql.getRelateds`, userSession, { objectName: getObjectName(objectServiceName) });
100
104
  res.status(200).send(result);
101
105
  } catch (error) {
102
106
  res.status(500).send(error.message);