medusa-contact-us 0.0.23 → 0.0.25

package/.medusa/server/src/admin/index.js

@@ -452,6 +452,8 @@ const ContactRequestDetailPage = () => {
     try {
       setIsLoadingAdmins(true);
       const params = new URLSearchParams();
+      params.set("limit", "100");
+      params.set("fields", "id,email,first_name,last_name");
       if (searchQuery) {
         params.set("q", searchQuery);
       }
@@ -462,7 +464,23 @@ const ContactRequestDetailPage = () => {
         throw new Error("Unable to load admin users");
       }
       const payload = await response.json();
-      setAdminUsers(payload.users || []);
+      const users = (payload.users || []).map((user) => {
+        if (typeof user === "object" && user !== null) {
+          const u = user;
+          const firstName = u.first_name || "";
+          const lastName = u.last_name || "";
+          const name = [firstName, lastName].filter(Boolean).join(" ") || u.email || "";
+          return {
+            id: u.id || "",
+            email: u.email || "",
+            first_name: u.first_name || null,
+            last_name: u.last_name || null,
+            name
+          };
+        }
+        return null;
+      }).filter(Boolean);
+      setAdminUsers(users);
     } catch (fetchError) {
       console.error("Error fetching admin users:", fetchError);
       setAdminUsers([]);

package/.medusa/server/src/admin/index.mjs

@@ -451,6 +451,8 @@ const ContactRequestDetailPage = () => {
     try {
       setIsLoadingAdmins(true);
       const params = new URLSearchParams();
+      params.set("limit", "100");
+      params.set("fields", "id,email,first_name,last_name");
       if (searchQuery) {
         params.set("q", searchQuery);
       }
@@ -461,7 +463,23 @@ const ContactRequestDetailPage = () => {
         throw new Error("Unable to load admin users");
       }
       const payload = await response.json();
-      setAdminUsers(payload.users || []);
+      const users = (payload.users || []).map((user) => {
+        if (typeof user === "object" && user !== null) {
+          const u = user;
+          const firstName = u.first_name || "";
+          const lastName = u.last_name || "";
+          const name = [firstName, lastName].filter(Boolean).join(" ") || u.email || "";
+          return {
+            id: u.id || "",
+            email: u.email || "",
+            first_name: u.first_name || null,
+            last_name: u.last_name || null,
+            name
+          };
+        }
+        return null;
+      }).filter(Boolean);
+      setAdminUsers(users);
     } catch (fetchError) {
       console.error("Error fetching admin users:", fetchError);
       setAdminUsers([]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medusa-contact-us",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "Manage storefront email subscriptions (opt-ins and opt-outs) in Medusa Admin.",
   "author": "Medusa (https://medusajs.com)",
   "license": "MIT",

package/.medusa/server/src/api/admin/users/route.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GET = void 0;
-const GET = async (req, res) => {
-    try {
-        const { q } = req.query;
-        const searchQuery = q ? String(q).toLowerCase() : "";
-        let users = [];
-        try {
-            // Resolve the EntityManager to query the database
-            const manager = req.scope.resolve("manager");
-            if (manager) {
-                const knex = manager.getKnex();
-                if (knex) {
-                    // Query auth_identity table for admin users
-                    // In Medusa v2, admin users are stored in auth_identity with entity_type = 'user'
-                    const result = await knex.raw(`
-            SELECT DISTINCT
-              ai.id,
-              ai.provider_metadata->>'email' as email,
-              ai.provider_metadata->>'first_name' as first_name,
-              ai.provider_metadata->>'last_name' as last_name
-            FROM auth_identity ai
-            WHERE ai.entity_type = 'user'
-            ORDER BY ai.created_at DESC
-          `);
-                    // Handle different result formats from knex.raw()
-                    const rows = result.rows || result[0] || [];
-                    users = rows.map((row) => {
-                        if (typeof row === "object" && row !== null) {
-                            const r = row;
-                            const firstName = r.first_name || "";
-                            const lastName = r.last_name || "";
-                            const name = [firstName, lastName].filter(Boolean).join(" ") || r.email || "";
-                            return {
-                                id: r.id || "",
-                                email: r.email || "",
-                                first_name: r.first_name || null,
-                                last_name: r.last_name || null,
-                                name,
-                            };
-                        }
-                        return null;
-                    }).filter(Boolean);
-                }
-            }
-        }
-        catch (serviceError) {
-            // If service resolution fails, return empty array
-            console.warn("Could not fetch admin users from database:", serviceError);
-        }
-        // Filter by search query if provided
-        if (searchQuery && users.length > 0) {
-            users = users.filter((user) => {
-                const nameMatch = user.name.toLowerCase().includes(searchQuery);
-                const emailMatch = user.email.toLowerCase().includes(searchQuery);
-                const idMatch = user.id.toLowerCase().includes(searchQuery);
-                return nameMatch || emailMatch || idMatch;
-            });
-        }
-        res.status(200).json({ users });
-    }
-    catch (error) {
-        // On error, return empty array so UI doesn't break
-        console.error("Error fetching admin users:", error);
-        res.status(200).json({ users: [] });
-    }
-};
-exports.GET = GET;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3VzZXJzL3JvdXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQVdPLE1BQU0sR0FBRyxHQUFHLEtBQUssRUFBRSxHQUFrQixFQUFFLEdBQW1CLEVBQUUsRUFBRTtJQUNuRSxJQUFJLENBQUM7UUFDSCxNQUFNLEVBQUUsQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQTtRQUN2QixNQUFNLFdBQVcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFBO1FBRXBELElBQUksS0FBSyxHQUFnQixFQUFFLENBQUE7UUFFM0IsSUFBSSxDQUFDO1lBQ0gsa0RBQWtEO1lBQ2xELE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFnQixTQUFTLENBQUMsQ0FBQTtZQUUzRCxJQUFJLE9BQU8sRUFBRSxDQUFDO2dCQUNaLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtnQkFFOUIsSUFBSSxJQUFJLEVBQUUsQ0FBQztvQkFDVCw0Q0FBNEM7b0JBQzVDLGtGQUFrRjtvQkFDbEYsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsR0FBRyxDQUFDOzs7Ozs7Ozs7V0FTN0IsQ0FBQyxDQUFBO29CQUVGLGtEQUFrRDtvQkFDbEQsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksSUFBSSxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFBO29CQUUzQyxLQUFLLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQVksRUFBRSxFQUFFO3dCQUNoQyxJQUFJLE9BQU8sR0FBRyxLQUFLLFFBQVEsSUFBSSxHQUFHLEtBQUssSUFBSSxFQUFFLENBQUM7NEJBQzVDLE1BQU0sQ0FBQyxHQUFHLEdBS1QsQ0FBQTs0QkFDRCxNQUFNLFNBQVMsR0FBRyxDQUFDLENBQUMsVUFBVSxJQUFJLEVBQUUsQ0FBQTs0QkFDcEMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUE7NEJBQ2xDLE1BQU0sSUFBSSxHQUFHLENBQUMsU0FBUyxFQUFFLFFBQVEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssSUFBSSxFQUFFLENBQUE7NEJBRTdFLE9BQU87Z0NBQ0wsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRTtnQ0FDZCxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssSUFBSSxFQUFFO2dDQUNwQixVQUFVLEVBQUUsQ0FBQyxDQUFDLFVBQVUsSUFBSSxJQUFJO2dDQUNoQyxTQUFTLEVBQUUsQ0FBQyxDQUFDLFNBQVMsSUFBSSxJQUFJO2dDQUM5QixJQUFJOzZCQUNMLENBQUE7d0JBQ0gsQ0FBQzt3QkFDRCxPQUFPLElBQUksQ0FBQTtvQkFDYixDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFnQixDQUFBO2dCQUNuQyxDQUFDO1lBQ0gsQ0FBQztRQUNILENBQUM7UUFBQyxPQUFPLFlBQVksRUFBRSxDQUFDO1lBQ3RCLGtEQUFrRDtZQUNsRCxPQUFPLENBQUMsSUFBSSxDQUFDLDRDQUE0QyxFQUFFLFlBQVksQ0FBQyxDQUFBO1FBQzFFLENBQUM7UUFFRCxxQ0FBcUM7UUFDckMsSUFBSSxXQUFXLElBQUksS0FBSyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNwQyxLQUFLLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO2dCQUM1QixNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtnQkFDL0QsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLEVBQUUsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7Z0JBQ2pFLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFBO2dCQUMzRCxPQUFPLFNBQVMsSUFBSSxVQUFVLElBQUksT0FBTyxDQUFBO1lBQzNDLENBQUMsQ0FBQyxDQUFBO1FBQ0osQ0FBQztRQUVELEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtJQUNqQyxDQUFDO0lBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztRQUNmLG1EQUFtRDtRQUNuRCxPQUFPLENBQUMsS0FBSyxDQUFDLDZCQUE2QixFQUFFLEtBQUssQ0FBQyxDQUFBO1FBQ25ELEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDckMsQ0FBQztBQUNILENBQUMsQ0FBQTtBQTVFWSxRQUFBLEdBQUcsT0E0RWYifQ==