@tachybase/client 1.3.24 → 1.4.0

package/lib/schema-component/hooks/useDesignable.js

@@ -308,17 +308,17 @@ class Designable {
         if (this.model) update(this.model);
         if (this.query) this.query.take(update);
     }
-    insertAdjacent(position, schema) {
+    async insertAdjacent(position, schema) {
         let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
         switch(position){
             case 'beforeBegin':
-                return this.insertBeforeBegin(schema, options);
+                return await this.insertBeforeBegin(schema, options);
             case 'afterBegin':
-                return this.insertAfterBegin(schema, options);
+                return await this.insertAfterBegin(schema, options);
             case 'beforeEnd':
-                return this.insertBeforeEnd(schema, options);
+                return await this.insertBeforeEnd(schema, options);
             case 'afterEnd':
-                return this.insertAfterEnd(schema, options);
+                return await this.insertAfterEnd(schema, options);
         }
     }
     recursiveRemoveIfNoChildren(schema, options) {
@@ -337,7 +337,7 @@ class Designable {
         }
         return removed;
     }
-    remove(schema) {
+    async remove(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         const { breakRemoveOn, removeParentsIfNoChildren } = options;
         const s = schema || this.current;
@@ -348,7 +348,7 @@ class Designable {
             });
             if (parent) removed = parent;
         }
-        return this.emit('remove', {
+        return await this.emit('remove', {
             removed
         });
     }
@@ -365,7 +365,7 @@ class Designable {
         }
         return removed;
     }
-    insertBeforeBeginOrAfterEnd(schema) {
+    async insertBeforeBeginOrAfterEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         if (!schema_namespaceObject.Schema.isSchemaInstance(schema)) return;
@@ -376,9 +376,9 @@ class Designable {
             if (this.current.name === key) toIndex = index;
             if (schema.name === key) fromIndex = index;
         });
-        return fromIndex > toIndex ? this.insertBeforeBegin(schema, options) : this.insertAfterEnd(schema, options);
+        return fromIndex > toIndex ? await this.insertBeforeBegin(schema, options) : await this.insertAfterEnd(schema, options);
     }
-    insertBeforeBegin(schema) {
+    async insertBeforeBegin(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -419,7 +419,7 @@ class Designable {
         s.parent = this.current.parent;
         this.current.parent.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'beforeBegin',
             schema: schema2,
             wrapped,
@@ -427,7 +427,7 @@ class Designable {
             ...opts
         });
     }
-    insertAfterBegin(schema) {
+    async insertAfterBegin(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -459,7 +459,7 @@ class Designable {
         s.parent = this.current;
         this.current.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'afterBegin',
             schema: schema2,
             wrap: schema1,
@@ -467,7 +467,7 @@ class Designable {
             ...opts
         });
     }
-    insertBeforeEnd(schema) {
+    async insertBeforeEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         delete schema['x-index'];
@@ -476,7 +476,7 @@ class Designable {
         };
         const { wrap = defaultWrap, breakRemoveOn, removeParentsIfNoChildren } = options;
         if (schema_namespaceObject.Schema.isSchemaInstance(schema)) {
-            if (this.parentsIn(schema)) return void this.emit('error', {
+            if (this.parentsIn(schema)) return void await this.emit('error', {
                 code: 'parent_is_not_allowed',
                 schema
             });
@@ -490,7 +490,7 @@ class Designable {
         const s = this.current.addProperty(wrapped.name || (0, schema_namespaceObject.uid)(), wrapped);
         s.parent = this.current;
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        return this.emit('insertAdjacent', {
+        return await this.emit('insertAdjacent', {
             position: 'beforeEnd',
             schema: schema2,
             wrap: schema1,
@@ -498,7 +498,7 @@ class Designable {
             ...opts
         });
     }
-    insertAfterEnd(schema) {
+    async insertAfterEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -540,7 +540,7 @@ class Designable {
         s['x-index'] = newOrder;
         this.current.parent.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'afterEnd',
             schema: schema2,
             wrap: schema1,

package/lib/user/CurrentUser.js

@@ -30,8 +30,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const icons_namespaceObject = require("@ant-design/icons");
 const client_namespaceObject = require("@tego/client");
+const icons_namespaceObject = require("@ant-design/icons");
 const external_antd_namespaceObject = require("antd");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -187,8 +187,16 @@ const SettingsMenu = (props)=>{
                 key: 'signout',
                 label: t('Sign out'),
                 onClick: async ()=>{
-                    await api.auth.signOut();
-                    navigate("/signin?redirect=".concat(encodeURIComponent(redirectUrl)));
+                    try {
+                        var _loginMethods_data;
+                        const loginMethods = await api.resource('authenticators').publicList();
+                        const methods = (null == loginMethods ? void 0 : null == (_loginMethods_data = loginMethods.data) ? void 0 : _loginMethods_data.data) || [];
+                        await api.auth.signOut();
+                        if (1 === methods.length && 'mainApp' === methods[0].authType) window.location.href = '/';
+                        else navigate("/signin?redirect=".concat(encodeURIComponent(redirectUrl)));
+                    } catch (err) {
+                        console.error('Sign out error:', err);
+                    }
                 }
             }
         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.3.24",
+  "version": "1.4.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -11,7 +11,7 @@
     "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "2.8.9",
     "@ant-design/pro-layout": "^7.21.2",
-    "@ctrl/tinycolor": "^3.6.1",
+    "@ctrl/tinycolor": "^4.2.0",
     "@dnd-kit/accessibility": "^3.1.1",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -21,16 +21,16 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "^1.3.49",
-    "@tego/client": "^1.3.49",
+    "@tachybase/schema": "*",
+    "@tego/client": "*",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",
-    "axios": "1.7.7",
+    "axios": "1.13.0",
     "axios-mock-adapter": "^1.22.0",
     "classnames": "^2.5.1",
     "click-to-react-component": "1.1.2",
-    "cronstrue": "^2.52.0",
+    "cronstrue": "^3.2.0",
     "d3-format": "^3.1.0",
     "dayjs": "1.11.13",
     "deepmerge": "^4.3.1",
@@ -50,7 +50,7 @@
     "react-error-boundary": "^6.0.0",
     "react-helmet": "^6.1.0",
     "react-hotkeys-hook": "^5.1.0",
-    "react-i18next": "15.2.0",
+    "react-i18next": "16.2.1",
     "react-intersection-observer": "^9.14.0",
     "react-js-cron": "^3.2.0",
     "react-pdf": "^10.0.1",