@xuda.io/account_module 1.2.2300 → 1.2.2301

package/index.mjs

@@ -55,6 +55,18 @@ const module_path = path.join(process.env.XUDA_HOME, 'cpi') + (!_conf.is_debug ?
 
 const db_module = await import(`${module_path}/db_module/index.mjs`);
 
+// Sort keys for the dashboard list tabs, per docType. Each entry is a fallback
+// chain (first defined value wins) because doc shapes differ. A profile keeps
+// its display name under profile_name, a contact under name. See
+// db_module.find_app_couch_sorted_page.
+const LIST_SORT_PATHS = {
+  contact: { created: ['date_created_ts', 'date_created', 'ts'], updated: ['ts', 'date_created_ts'], name: ['name', 'contact_name', 'email'] },
+  account_profile: { created: ['date_created_ts', 'date_created', 'ts'], updated: ['ts', 'date_created_ts'], name: ['profile_name', 'name'] },
+};
+
+// Dashboard list tabs whose sort preference is remembered per profile.
+const LIST_SORT_TABS = ['ai_chats', 'apps', 'contacts', 'ai_agents', 'account_profiles'];
+
 const ai_ms = await import(`${module_path}/ai_module/index_ms.mjs`);
 const drive_ms = await import(`${module_path}/drive_module/index_ms.mjs`);
 
@@ -370,7 +382,7 @@ export const update_account_info = async function (req, job_id, headers) {
   return save_ret;
 };
 export const update_account_preferences = async function (req) {
-  const { uid, hide_create_button, default_dashboard, sidebar_style, enable_thumbnail_avatar_generation, sidenav_mode, newsletter_opt_in } = req;
+  const { uid, hide_create_button, default_dashboard, sidebar_style, enable_thumbnail_avatar_generation, sidenav_mode, newsletter_opt_in, dashboard_sort } = req;
   try {
     let account_doc = await db_module.get_couch_doc_native('xuda_accounts', uid);
     account_doc.ts = Date.now();
@@ -386,6 +398,32 @@ export const update_account_preferences = async function (req) {
     // flag via router /newsletter/unsubscribe. Only touched when the caller sends it.
     if (newsletter_opt_in !== undefined) account_doc.preferences.newsletter_opt_in = !!newsletter_opt_in;
 
+    // Dashboard list sort, remembered per PROFILE and per tab so switching
+    // profiles brings back that profile's own order:
+    //   preferences.dashboard_sort[<account_profile_id>][<tab>] = { by, dir }
+    // Callers send one tab at a time ({ tab, sort_by, sort_dir, profile_id })
+    // and the merge below is surgical, so saving the Contacts order can never
+    // drop the one saved for AI Chats or for another profile. Sending
+    // sort_by:null clears that tab back to the default order.
+    if (dashboard_sort !== undefined) {
+      const { tab, sort_by, sort_dir } = dashboard_sort || {};
+      if (LIST_SORT_TABS.includes(tab)) {
+        const profile_info = await get_active_account_profile_info(uid, dashboard_sort?.profile_id);
+        const profile_key = profile_info?.account_profile_id || 'default';
+        const all = { ...(account_doc.preferences.dashboard_sort || {}) };
+        const for_profile = { ...(all[profile_key] || {}) };
+
+        if (['date', 'updated', 'name'].includes(sort_by)) {
+          for_profile[tab] = { by: sort_by, dir: sort_dir === 'asc' ? 'asc' : 'desc' };
+        } else {
+          delete for_profile[tab];
+        }
+
+        all[profile_key] = for_profile;
+        account_doc.preferences.dashboard_sort = all;
+      }
+    }
+
     const save_ret = await db_module.save_couch_doc('xuda_accounts', account_doc);
     if (save_ret.code < 0) {
       throw new Error(save_ret.data);
@@ -5466,17 +5504,25 @@ export const get_contacts = async function (req, job_id, headers) {
     let contacts = { docs: [], total_docs: 0 };
 
     if (filter_type !== 'pending') {
-      contacts = await find_contact_query(account_profile_info.uid, opt);
-      if (!limit || contact_id) {
-        contacts.total_docs = contacts.docs.length;
+      // User-picked order from the dashboard list controls, see
+      // db_module.find_app_couch_sorted_page. Null when none was asked for,
+      // which leaves the default newest-first path below untouched.
+      const sorted = contact_id ? null : await db_module.find_app_couch_sorted_page(account_profile_info.app_id, opt, req, LIST_SORT_PATHS.contact);
+      if (sorted) {
+        contacts = sorted;
       } else {
-        delete opt.sort;
-        delete opt.skip;
-        opt.limit = 9999;
-        opt.fields = ['_id'];
+        contacts = await find_contact_query(account_profile_info.uid, opt);
+        if (!limit || contact_id) {
+          contacts.total_docs = contacts.docs.length;
+        } else {
+          delete opt.sort;
+          delete opt.skip;
+          opt.limit = 9999;
+          opt.fields = ['_id'];
 
-        const counter = await find_contact_query(account_profile_info.uid, opt);
-        contacts.total_docs = counter.docs.length;
+          const counter = await find_contact_query(account_profile_info.uid, opt);
+          contacts.total_docs = counter.docs.length;
+        }
       }
     }
 
@@ -6157,17 +6203,26 @@ export const get_account_profiles = async function (req) {
   let profiles = { docs: [], total_docs: 0 };
 
   if (filter_type !== 'pending') {
-    profiles = await db_module.find_app_couch_query(app_id, opt);
-    if (!limit || profile_id) {
-      profiles.total_docs = profiles.docs.length;
+    // User-picked order from the dashboard list controls, see
+    // db_module.find_app_couch_sorted_page. Null when none was asked for,
+    // which leaves the default newest-first path below untouched. The main
+    // profile is still floated to the top of the page after enrichment.
+    const sorted = profile_id ? null : await db_module.find_app_couch_sorted_page(app_id, opt, req, LIST_SORT_PATHS.account_profile);
+    if (sorted) {
+      profiles = sorted;
     } else {
-      delete opt.sort;
-      delete opt.skip;
-      opt.limit = 9999;
-      opt.fields = ['_id'];
+      profiles = await db_module.find_app_couch_query(app_id, opt);
+      if (!limit || profile_id) {
+        profiles.total_docs = profiles.docs.length;
+      } else {
+        delete opt.sort;
+        delete opt.skip;
+        opt.limit = 9999;
+        opt.fields = ['_id'];
 
-      const counter = await db_module.find_app_couch_query(app_id, opt);
-      profiles.total_docs = counter.docs.length;
+        const counter = await db_module.find_app_couch_query(app_id, opt);
+        profiles.total_docs = counter.docs.length;
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.2300",
+  "version": "1.2.2301",
   "description": "Xuda Account Server Module",
   "main": "index.mjs",
   "dependencies": {