@nocobase/plugin-user-data-sync 2.2.0-beta.9 → 2.2.0

package/dist/externalVersion.js

@@ -10,18 +10,18 @@
 module.exports = {
   "react": "18.2.0",
   "@formily/react": "2.3.7",
-  "@nocobase/client": "2.2.0-beta.9",
+  "@nocobase/client": "2.2.0",
   "@ant-design/icons": "5.6.1",
   "@formily/core": "2.3.7",
   "antd": "5.24.2",
-  "@nocobase/utils": "2.2.0-beta.9",
-  "@nocobase/flow-engine": "2.2.0-beta.9",
+  "@nocobase/utils": "2.2.0",
+  "@nocobase/flow-engine": "2.2.0",
   "react-i18next": "11.18.6",
-  "@nocobase/client-v2": "2.2.0-beta.9",
-  "@nocobase/server": "2.2.0-beta.9",
-  "@nocobase/logger": "2.2.0-beta.9",
-  "@nocobase/actions": "2.2.0-beta.9",
+  "@nocobase/client-v2": "2.2.0",
+  "@nocobase/server": "2.2.0",
+  "@nocobase/logger": "2.2.0",
+  "@nocobase/actions": "2.2.0",
   "dayjs": "1.11.13",
-  "@nocobase/database": "2.2.0-beta.9",
+  "@nocobase/database": "2.2.0",
   "ahooks": "3.7.8"
 };

package/dist/server/user-data-resource-manager.d.ts

@@ -89,10 +89,10 @@ export declare class UserDataResourceManager {
     registerResource(resource: UserDataResource, options?: ToposortOptions): void;
     set db(value: Database);
     saveOriginRecords(data: UserData): Promise<void>;
-    findOriginRecords({ sourceName, dataType, sourceUks }: {
-        sourceName: any;
-        dataType: any;
-        sourceUks: any;
+    findOriginRecords({ sourceName, dataType, sourceUks, }: {
+        sourceName: string;
+        dataType: SyncDataType;
+        sourceUks: string[];
     }): Promise<OriginRecord[]>;
     addResourceToOriginRecord({ recordId, resource, resourcePk }: {
         recordId: any;

package/dist/server/user-data-resource-manager.js

@@ -93,11 +93,24 @@ class UserDataResourceManager {
       }
     }
   }
-  async findOriginRecords({ sourceName, dataType, sourceUks }) {
-    return await this.syncRecordRepo.find({
+  async findOriginRecords({
+    sourceName,
+    dataType,
+    sourceUks
+  }) {
+    const originRecords = await this.syncRecordRepo.find({
       appends: ["resources"],
       filter: { sourceName, dataType, sourceUk: { $in: sourceUks } }
     });
+    const sourceUkOrder = /* @__PURE__ */ new Map();
+    sourceUks.forEach((sourceUk, index) => {
+      if (!sourceUkOrder.has(sourceUk)) {
+        sourceUkOrder.set(sourceUk, index);
+      }
+    });
+    return originRecords.sort((a, b) => {
+      return (sourceUkOrder.get(a.sourceUk) ?? Number.MAX_SAFE_INTEGER) - (sourceUkOrder.get(b.sourceUk) ?? Number.MAX_SAFE_INTEGER);
+    });
   }
   async addResourceToOriginRecord({ recordId, resource, resourcePk }) {
     const syncRecord = await this.syncRecordRepo.findOne({

package/package.json

@@ -6,7 +6,7 @@
   "description": "Reigster and manage extensible user data synchronization sources, with HTTP API provided by default. Support for synchronizing data to resources such as users and departments.",
   "description.ru-RU": "Регистрация и управление расширяемыми источниками синхронизации данных пользователей, по умолчанию предоставляется HTTP API. Поддержка синхронизации данных для таких ресурсов, как пользователи и департаменты.",
   "description.zh-CN": "注册和管理可扩展的用户数据同步来源，默认提供 HTTP API。支持向用户和部门等资源同步数据。",
-  "version": "2.2.0-beta.9",
+  "version": "2.2.0",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -18,5 +18,5 @@
     "Users & permissions"
   ],
   "license": "Apache-2.0",
-  "gitHead": "60e3d7abbaa0c7cead76f71a4f3d5eedb6b8acdb"
+  "gitHead": "d5052cae37177054c236f1bf7bba3aed6ef029d0"
 }