@steedos/service-ui 3.0.0-beta.2 → 3.0.0-beta.9

package/main/default/routes/apps.router.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const core_1 = require("@steedos/core");
+const auth_1 = require("@steedos/auth");
 const objectql_1 = require("@steedos/objectql");
 const express = require('express');
 const router = express.Router();
-router.get('/service/api/apps/menus', core_1.requireAuthentication, function (req, res) {
+router.get('/service/api/apps/menus', auth_1.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         const mobile = req.query && req.query.mobile;

package/main/default/routes/objects.router.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const objectql_1 = require("@steedos/objectql");
 const express = require('express');
 const router = express.Router();
-const core = require('@steedos/core');
+const auth = require('@steedos/auth');
 const callObjectServiceAction = function (actionName, userSession, data) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const broker = (0, objectql_1.getSteedosSchema)().broker;
@@ -14,7 +14,7 @@ const callObjectServiceAction = function (actionName, userSession, data) {
 const getObjectName = function (objectServiceName) {
     return objectServiceName.substring(1);
 };
-router.get('/service/api/:objectServiceName/fields', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/fields', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
@@ -27,7 +27,7 @@ router.get('/service/api/:objectServiceName/fields', core.requireAuthentication,
         }
     });
 });
-router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/getUserObjectPermission', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
@@ -40,7 +40,7 @@ router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requi
         }
     });
 });
-router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/recordPermissions/:recordId', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
@@ -56,19 +56,15 @@ router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.r
         }
     });
 });
-router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/uiSchema', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
             const { objectServiceName } = req.params;
             const objectName = objectServiceName.substring(1);
-            const [result, hasImportTemplates] = yield Promise.all([
+            const [result] = yield Promise.all([
                 callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName }),
-                callObjectServiceAction(`@steedos/data-import.hasImportTemplates`, userSession, {
-                    objectName: objectName
-                })
             ]);
-            result.hasImportTemplates = hasImportTemplates;
             res.status(200).send(result);
         }
         catch (error) {
@@ -76,7 +72,7 @@ router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthenticatio
         }
     });
 });
-router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentication, function (req, res) {
+router.post('/service/api/:objectServiceName/defUiSchema', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
@@ -89,7 +85,7 @@ router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentic
         }
     });
 });
-router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/uiSchemaTemplate', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {
@@ -102,7 +98,7 @@ router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthe
         }
     });
 });
-router.get('/service/api/:objectServiceName/relateds', core.requireAuthentication, function (req, res) {
+router.get('/service/api/:objectServiceName/relateds', auth.requireAuthentication, function (req, res) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const userSession = req.user;
         try {

package/main/default/routes/objects.router.todo.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 const express = require("express");
 const router =require('@steedos/router').staticRouter()
-const core = require('@steedos/core');
-router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthentication, function (req, res) {
+const auth = require('@steedos/auth');
+router.get('/service/api/:objectServiceName/uiSchema', auth.requireAuthentication, function (req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         // const userSession = req.user;
         // const spaceId = userSession.spaceId;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos/service-ui",
-    "version": "3.0.0-beta.2",
+    "version": "3.0.0-beta.9",
     "main": "package.service.js",
     "keywords": [
         "steedos"
@@ -11,9 +11,9 @@
     "description": "steedos package",
     "repository": {},
     "dependencies": {
-        "@steedos/core": "3.0.0-beta.2",
-        "@steedos/i18n": "3.0.0-beta.2",
-        "@steedos/objectql": "3.0.0-beta.2",
+        "@steedos/auth": "3.0.0-beta.9",
+        "@steedos/i18n": "3.0.0-beta.9",
+        "@steedos/objectql": "3.0.0-beta.9",
         "express": "4.18.1"
     },
     "license": "MIT",
@@ -21,5 +21,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74"
+    "gitHead": "9111ae9e9ce7c57c67c6bd670706f4344c28d69d"
 }

package/src/routes/apps.router.ts

@@ -2,10 +2,10 @@
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-08 23:28:39
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2023-05-30 15:00:25
+ * @LastEditTime: 2025-01-21 17:24:29
  * @Description: 
  */
-import { requireAuthentication } from '@steedos/core';
+import { requireAuthentication } from '@steedos/auth';
 import { getSteedosSchema } from '@steedos/objectql';
 const express = require('express');
 const router =express.Router();

package/src/routes/objects.router.ts

@@ -1,15 +1,14 @@
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-06-09 10:19:47
- * @LastEditors: 孙浩林 sunhaolin@steedos.com
- * @LastEditTime: 2023-11-14 11:11:06
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-02-18 11:47:54
  * @Description: 
  */
 import { getSteedosSchema } from "@steedos/objectql";
 const express = require('express');
 const router =express.Router();
-const core = require('@steedos/core');
-
+const auth = require('@steedos/auth');
 
 const callObjectServiceAction = async function(actionName, userSession, data?){
     const broker = getSteedosSchema().broker;
@@ -20,7 +19,7 @@ const getObjectName = function(objectServiceName){
     return objectServiceName.substring(1);
 }
 
-router.get('/service/api/:objectServiceName/fields', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/fields', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
@@ -31,7 +30,7 @@ router.get('/service/api/:objectServiceName/fields', core.requireAuthentication,
     }
 });
 
-router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/getUserObjectPermission', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
@@ -42,7 +41,7 @@ router.get('/service/api/:objectServiceName/getUserObjectPermission', core.requi
     }
 });
 
-router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/recordPermissions/:recordId', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName, recordId } = req.params;
@@ -56,25 +55,28 @@ router.get('/service/api/:objectServiceName/recordPermissions/:recordId', core.r
     }
 });
 
-router.get('/service/api/:objectServiceName/uiSchema', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/uiSchema', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
         const objectName = objectServiceName.substring(1);
-        const [ result, hasImportTemplates ] = await Promise.all([
+        // const [ result, hasImportTemplates ] = await Promise.all([
+        //     callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName }),
+        //     callObjectServiceAction(`@steedos/data-import.hasImportTemplates`, userSession, {
+        //         objectName: objectName
+        //     })
+        // ])
+        // result.hasImportTemplates = hasImportTemplates  //TODO  这段查的有点多
+        const [ result ] = await Promise.all([
             callObjectServiceAction(`objectql.getRecordView`, userSession, { objectName }),
-            callObjectServiceAction(`@steedos/data-import.hasImportTemplates`, userSession, {
-                objectName: objectName
-            })
         ])
-        result.hasImportTemplates = hasImportTemplates 
         res.status(200).send(result);
     } catch (error) {
         res.status(500).send(error.message);
     }
 });
 
-router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentication, async function (req, res) {
+router.post('/service/api/:objectServiceName/defUiSchema', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
@@ -85,7 +87,7 @@ router.post('/service/api/:objectServiceName/defUiSchema', core.requireAuthentic
     }
 });
 
-router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/uiSchemaTemplate', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;
@@ -96,7 +98,7 @@ router.get('/service/api/:objectServiceName/uiSchemaTemplate', core.requireAuthe
     }
 });
 
-router.get('/service/api/:objectServiceName/relateds', core.requireAuthentication, async function (req, res) {
+router.get('/service/api/:objectServiceName/relateds', auth.requireAuthentication, async function (req, res) {
     const userSession = req.user;
     try {
         const { objectServiceName } = req.params;

package/main/default/client/cordova.push.client.js

@@ -1,112 +0,0 @@
-if (Meteor.isCordova) {
-  Meteor.startup(function () {
-    const hasRegister = function () {
-      let has = false;
-      if (Push.push.handlers.notification && Push.push.handlers.notification.length > 0) {
-        Push.push.handlers.notification.forEach(function (handler) {
-          if (handler.toString().indexOf('push.setApplicationIconBadgeNumber') > 0) {
-            has = true
-          }
-        })
-      }
-      return has;
-    }
-    document.addEventListener("deviceready", function () {
-      return window.setTimeout(function () {
-        var ref, ref1;
-
-        if (hasRegister() == true) {
-          return;
-        }
-        console.log('app注册push失败, 由client js注册push')
-        Push.push.on("notification", function (data) {
-          var host, path;
-          if (data.additionalData.foreground === true) {
-            if (data.count > -1) {
-              push.setApplicationIconBadgeNumber(
-                function () { },
-                function () { },
-                data.count
-              );
-            }
-            return;
-          }
-          if (typeof data.additionalData.ejson === "string") {
-            data.additionalData.ejson = JSON.parse(data.additionalData.ejson);
-          }
-          host = data.additionalData.ejson.host;
-          if (host == null) {
-            return;
-          }
-          host = host.replace(/\/$/, "");
-          if (Servers.serverExists(host) !== true) {
-            return;
-          }
-          window.AUTOLOAD = false;
-          if (data.additionalData.ejson.url) {
-            return FlowRouter.go(data.additionalData.ejson.url);
-          } else {
-            path = "";
-            if (
-              data.additionalData.ejson.space &&
-              data.additionalData.ejson.instance
-            ) {
-              path =
-                "workflow/space/" +
-                data.additionalData.ejson.space +
-                "/inbox/" +
-                data.additionalData.ejson.instance;
-            }
-            navigator.splashscreen.hide();
-            if (window.Session && window.Session.get("spaceId")) {
-              return FlowRouter.go("/" + path);
-            } else {
-              return Servers.startServer(host, path, function (err, url) {
-                if (err != null) {
-                  return console.log(err);
-                }
-              });
-            }
-          }
-        });
-        if (
-          ((ref = device.manufacturer) != null ? ref.toLowerCase() : void 0) ===
-          "huawei" &&
-          cordova.plugins.huaweipush
-        ) {
-          cordova.plugins.huaweipush.init();
-          return document.addEventListener(
-            "huaweipush.receiveRegisterResult",
-            function (event) {
-              var registrationId;
-              console.log(event);
-              registrationId = "huawei:" + event.token;
-              Push.push.emit("registration", {
-                registrationId: registrationId,
-              });
-            }.bind(this),
-            false
-          );
-        } else if (
-          ((ref1 = device.manufacturer) != null ? ref1.toLowerCase() : void 0) ===
-          "xiaomi" &&
-          window.plugins.MiPushPlugin
-        ) {
-          window.plugins.MiPushPlugin.init();
-          return document.addEventListener(
-            "mipush.receiveRegisterResult",
-            function (data) {
-              var registrationId;
-              console.log(data);
-              registrationId = "mi:" + data.regId;
-              Push.push.emit("registration", {
-                registrationId: registrationId,
-              });
-            },
-            false
-          );
-        }
-      }, 1000);
-    });
-  })
-}

package/public/steedos-init.js

@@ -1,181 +0,0 @@
-/*
- * @Author: baozhoutao@steedos.com
- * @Date: 2023-02-26 15:22:12
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-01-04 16:44:08
- * @Description:
- */
-try {
-  Steedos.authRequest = function (url, options) {
-    var userSession = Creator.USER_CONTEXT;
-    var spaceId = userSession.spaceId;
-    var authToken = userSession.authToken
-      ? userSession.authToken
-      : userSession.user.authToken;
-    var result = null;
-    url = Steedos.absoluteUrl(url);
-    try {
-      var authorization = "Bearer " + spaceId + "," + authToken;
-      var headers = [
-        {
-          name: "Content-Type",
-          value: "application/json",
-        },
-        {
-          name: "Authorization",
-          value: authorization,
-        },
-      ];
-
-      var defOptions = {
-        type: "get",
-        url: url,
-        dataType: "json",
-        contentType: "application/json",
-        beforeSend: function (XHR) {
-          if (headers && headers.length) {
-            return headers.forEach(function (header) {
-              return XHR.setRequestHeader(header.name, header.value);
-            });
-          }
-        },
-        success: function (data) {
-          result = data;
-        },
-        error: function (XMLHttpRequest, textStatus, errorThrown) {
-          console.error(XMLHttpRequest.responseJSON);
-          if (
-            XMLHttpRequest.responseJSON &&
-            XMLHttpRequest.responseJSON.error
-          ) {
-            const errorInfo = XMLHttpRequest.responseJSON.error;
-            result = { error: errorInfo };
-            let errorMsg;
-            if (errorInfo.reason) {
-              errorMsg = errorInfo.reason;
-            } else if (errorInfo.message) {
-              errorMsg = errorInfo.message;
-            } else {
-              errorMsg = errorInfo;
-            }
-            toastr.error(t(errorMsg.replace(/:/g, "：")));
-          } else {
-            toastr.error(XMLHttpRequest.responseJSON);
-          }
-        },
-      };
-      $.ajax(Object.assign({}, defOptions, options));
-      return result;
-    } catch (err) {
-      console.error(err);
-      toastr.error(err);
-    }
-  };
-
-  window.UI_SCHEMA_CACHE = {};
-
-  const setUISchemaCache = (key, value) => {
-    UI_SCHEMA_CACHE[key] = value;
-  };
-
-  const getUISchemaCache = (key) => {
-    return _.cloneDeep(UI_SCHEMA_CACHE[key]);
-  };
-
-  const hasUISchemaCache = (key) => {
-    return _.has(UI_SCHEMA_CACHE, key);
-  };
-
-  function formatUISchemaCache(objectName, uiSchema) {
-    setUISchemaCache(objectName, uiSchema);
-    _.each(uiSchema.fields, (field) => {
-      try {
-        if (
-          field.type === "lookup" &&
-          field._reference_to &&
-          _.isString(field._reference_to)
-        ) {
-          field.reference_to = eval(`(${field._reference_to})`)();
-        }
-      } catch (exception) {
-        field.reference_to = undefined;
-        console.error(exception);
-      }
-    });
-    _.each(uiSchema.list_views, (v, k) => {
-      v.name = k;
-      if (!_.has(v, "columns")) {
-        v.columns = uiSchema.list_views.all.columns;
-      }
-    });
-  }
-
-  window.getUISchemaSync = (objectName, force) => {
-    if (!objectName) {
-      return;
-    }
-    if (hasUISchemaCache(objectName) && !force) {
-      return getUISchemaCache(objectName);
-    }
-    let uiSchema = null;
-    try {
-      const url = `/service/api/@${objectName.replace(/\./g, "_")}/uiSchema`;
-      uiSchema = Steedos.authRequest(url, {
-        type: "GET",
-        async: false,
-      });
-
-      if (!uiSchema) {
-        return;
-      }
-      formatUISchemaCache(objectName, uiSchema);
-    } catch (error) {
-      console.error(`getUISchema`, objectName, error);
-      setUISchemaCache(objectName, null);
-    }
-    return getUISchemaCache(objectName);
-  };
-
-  window.getFirstListView = (objectName) => {
-    const uiSchema = window.getUISchemaSync(objectName);
-    const disabled_list_views = uiSchema.permissions.disabled_list_views;
-    return _.first(_.sortBy(_.values(
-      _.filter(uiSchema.list_views, function (o, k) {
-        return disabled_list_views.indexOf(o._id) < 0 && k !== "lookup";
-      })
-    ), "sort_no"));
-  };
-
-  window.getAppsSync = () => {
-    const isMobile = Steedos.isMobile()
-    let data = { };
-    if(isMobile){
-      data.mobile = isMobile
-    }
-    const url = "/service/api/apps/menus";
-    const apps = Steedos.authRequest(url, {
-      type: "GET",
-      async: false,
-      data
-    });
-    return apps;
-  };
-
-  window.Steedos.getFirstApp = ()=>{
-    const apps = window.getAppsSync();
-    return _.first(apps);
-  }
-
-  window.Creator.getObjectRecord = (objectName, recordId, select_fields, expand)=>{
-    return Creator.odata.get(objectName, recordId, select_fields, expand)
-  }
-
-  window.Creator.isSpaceAdmin = ()=>{
-    return Creator.USER_CONTEXT.user.is_space_admin;
-  }
-
-
-  Creator.steedosInit.set(true);
-} catch (error) {
-  console.error(error);
-}