@mongoosejs/studio 0.3.8 → 0.3.10

package/backend/actions/Dashboard/createDashboard.js

@@ -17,9 +17,9 @@ const CreateDashboardParams = new Archetype({
   }
 }).compile('CreateDashboardParams');
 
-module.exports = ({ db }) => async function createDashboard(params) {
+module.exports = ({ studioConnection }) => async function createDashboard(params) {
   const { title, code, roles } = new CreateDashboardParams(params);
-  const Dashboard = db.model('__Studio_Dashboard');
+  const Dashboard = studioConnection.model('__Studio_Dashboard');
 
   await authorize('Dashboard.createDashboard', roles);
 

package/backend/actions/Dashboard/deleteDashboard.js

@@ -13,12 +13,14 @@ const DeleteDashboardParams = new Archetype({
   }
 }).compile('DeleteDashboardParams');
 
-module.exports = ({ db }) => async function deleteDashboard(params) {
+module.exports = ({ studioConnection }) => async function deleteDashboard(params) {
   const { dashboardId, roles } = new DeleteDashboardParams(params);
-  const Dashboard = db.model('__Studio_Dashboard');
+  const Dashboard = studioConnection.model('__Studio_Dashboard');
+  const DashboardResult = studioConnection.model('__Studio_DashboardResult');
 
   await authorize('Dashboard.deleteDashboard', roles);
 
   const result = await Dashboard.deleteOne({ _id: dashboardId }).orFail();
+  await DashboardResult.deleteMany({ dashboardId });
   return { result };
 };

package/backend/actions/Dashboard/getDashboard.js

@@ -1,13 +1,13 @@
 'use strict';
 
 const Archetype = require('archetype');
-const vm = require('vm');
 const authorize = require('../../authorize');
+const mongoose = require('mongoose');
 const { defaultMothershipURL } = require('../../../constants');
 
 const GetDashboardParams = new Archetype({
   dashboardId: {
-    $type: 'string',
+    $type: mongoose.Types.ObjectId,
     $required: true
   },
   evaluate: {
@@ -17,16 +17,20 @@ const GetDashboardParams = new Archetype({
     $type: 'string'
   },
   $workspaceId: {
-    $type: 'string'
+    $type: mongoose.Types.ObjectId
+  },
+  userId: {
+    $type: mongoose.Types.ObjectId
   },
   roles: {
     $type: ['string']
   }
 }).compile('GetDashboardParams');
 
-module.exports = ({ db, options }) => async function getDashboard(params) {
-  const { $workspaceId, authorization, dashboardId, evaluate, roles } = new GetDashboardParams(params);
-  const Dashboard = db.model('__Studio_Dashboard');
+module.exports = ({ studioConnection, options }) => async function getDashboard(params) {
+  const { $workspaceId, authorization, userId, dashboardId, evaluate, roles } = new GetDashboardParams(params);
+  const Dashboard = studioConnection.model('__Studio_Dashboard');
+  const DashboardResult = studioConnection.model('__Studio_DashboardResult');
   const mothershipUrl = options?._mothershipUrl ?? defaultMothershipURL;
 
   await authorize('Dashboard.getDashboard', roles);
@@ -34,9 +38,8 @@ module.exports = ({ db, options }) => async function getDashboard(params) {
   const dashboard = await Dashboard.findOne({ _id: dashboardId });
   if (evaluate) {
     let result = null;
-    const startExec = startDashboardEvaluate(dashboardId, $workspaceId, authorization, mothershipUrl);
-    // Avoid unhandled promise rejection since we handle the promise later.
-    startExec.catch(() => {});
+    const startExec = startDashboardEvaluate(DashboardResult, dashboardId, $workspaceId, userId);
+    startExec.catch(() => {}); // Avoid unhandled promise rejections - we will handle this error later.
     try {
       result = await dashboard.evaluate();
     } catch (error) {
@@ -45,12 +48,11 @@ module.exports = ({ db, options }) => async function getDashboard(params) {
           return {};
         }
         return completeDashboardEvaluate(
+          DashboardResult,
           dashboardResult._id,
-          $workspaceId,
-          authorization,
           null,
           { message: error.message },
-          mothershipUrl
+          'failed'
         );
       });
       return { dashboard, dashboardResult, error: { message: error.message } };
@@ -62,12 +64,11 @@ module.exports = ({ db, options }) => async function getDashboard(params) {
           return {};
         }
         return completeDashboardEvaluate(
+          DashboardResult,
           dashboardResult._id,
-          $workspaceId,
-          authorization,
           result,
           undefined,
-          mothershipUrl
+          'completed'
         );
       });
 
@@ -76,77 +77,70 @@ module.exports = ({ db, options }) => async function getDashboard(params) {
       return { dashboard, error: { message: error.message } };
     }
   } else {
-    const { dashboardResults } = await getDashboardResults(dashboardId, $workspaceId, authorization, mothershipUrl);
+    const { dashboardResults } = await getDashboardResults(
+      DashboardResult,
+      dashboardId,
+      $workspaceId,
+      authorization,
+      mothershipUrl
+    );
     return { dashboard, dashboardResults };
   }
 };
 
-async function completeDashboardEvaluate(dashboardResultId, workspaceId, authorization, result, error, mothershipUrl) {
-  if (!workspaceId) {
-    return {};
-  }
-  const headers = { 'Content-Type': 'application/json' };
-  if (authorization) {
-    headers.Authorization = authorization;
-  }
-  const response = await fetch(`${mothershipUrl}/completeDashboardEvaluate`, {
-    method: 'POST',
-    headers,
-    body: JSON.stringify({
-      dashboardResultId,
-      workspaceId,
-      finishedEvaluatingAt: new Date(),
-      result,
-      error
-    })
-  }).then(response => {
-    if (response.status < 200 || response.status >= 400) {
-      return response.json().then(data => {
-        throw new Error(`completeDashboardEvaluate error: ${data.message}`);
-      });
-    }
-    return response;
+async function completeDashboardEvaluate(DashboardResult, dashboardResultId, result, error, status) {
+  const dashboardResult = await DashboardResult.findById(dashboardResultId).orFail();
+  dashboardResult.finishedEvaluatingAt = new Date();
+  dashboardResult.result = result;
+  dashboardResult.error = error;
+  dashboardResult.status = status;
+  await dashboardResult.save();
+  return { dashboardResult };
+}
+
+async function startDashboardEvaluate(DashboardResult, dashboardId, workspaceId, userId) {
+  const dashboardResult = await DashboardResult.create({
+    dashboardId,
+    workspaceId,
+    userId,
+    startedEvaluatingAt: new Date(),
+    status: 'in_progress'
   });
 
-  return await response.json();
+  return { dashboardResult };
 }
 
-async function startDashboardEvaluate(dashboardId, workspaceId, authorization, _mothershipUrl) {
-  if (!workspaceId) {
-    return {};
-  }
-  const headers = { 'Content-Type': 'application/json' };
-  if (authorization) {
-    headers.Authorization = authorization;
+async function getDashboardResults(DashboardResult, dashboardId, workspaceId, authorization, mothershipUrl) {
+  const filter = { dashboardId };
+  if (workspaceId != null) {
+    filter.workspaceId = workspaceId;
   }
-  const response = await fetch(`${_mothershipUrl}/startDashboardEvaluate`, {
-    method: 'POST',
-    headers,
-    body: JSON.stringify({
-      dashboardId,
-      workspaceId,
-      startedEvaluatingAt: new Date()
-    })
-  }).then(response => {
-    if (response.status < 200 || response.status >= 400) {
-      return response.json().then(data => {
-        throw new Error(`startDashboardEvaluate error: ${data.message}`);
-      });
-    }
-    return response;
-  });
 
-  return await response.json();
+  const [localResultsRes, remoteResultsRes] = await Promise.allSettled([
+    DashboardResult.find(filter).sort({ _id: -1 }).limit(10),
+    getMothershipDashboardResults(dashboardId, workspaceId, authorization, mothershipUrl)
+  ]);
+
+  const localResults = localResultsRes.status === 'fulfilled' ? localResultsRes.value : [];
+  const remoteResults = remoteResultsRes.status === 'fulfilled' ? remoteResultsRes.value : [];
+
+  const dashboardResults = localResults.concat(remoteResults)
+    .sort((a, b) => getSortTime(b) - getSortTime(a))
+    .slice(0, 10);
+
+  return { dashboardResults };
 }
 
-async function getDashboardResults(dashboardId, workspaceId, authorization, mothershipUrl) {
+async function getMothershipDashboardResults(dashboardId, workspaceId, authorization, mothershipUrl) {
   if (!workspaceId) {
-    return {};
+    return [];
   }
+
   const headers = { 'Content-Type': 'application/json' };
   if (authorization) {
     headers.Authorization = authorization;
   }
+
   const response = await fetch(`${mothershipUrl}/getDashboardResults`, {
     method: 'POST',
     headers,
@@ -154,14 +148,25 @@ async function getDashboardResults(dashboardId, workspaceId, authorization, moth
       dashboardId,
       workspaceId
     })
-  }).then(response => {
-    if (response.status < 200 || response.status >= 400) {
-      return response.json().then(data => {
-        throw new Error(`getDashboardResults error: ${data.message}`);
-      });
-    }
-    return response;
   });
 
-  return await response.json();
+  if (response.status < 200 || response.status >= 400) {
+    let message = `getDashboardResults error: ${response.status}`;
+    try {
+      const data = await response.json();
+      message = `getDashboardResults error: ${data.message}`;
+    } catch {
+      // Ignore parse errors and keep the generic status-based message.
+    }
+    throw new Error(message);
+  }
+
+  const data = await response.json();
+  return Array.isArray(data.dashboardResults) ? data.dashboardResults : [];
+}
+
+function getSortTime(result) {
+  const candidate = result?.finishedEvaluatingAt ?? result?.startedEvaluatingAt ?? result?.createdAt ?? result?._id;
+  const time = new Date(candidate).getTime();
+  return Number.isNaN(time) ? 0 : time;
 }

package/backend/actions/Dashboard/getDashboards.js

@@ -9,8 +9,8 @@ const GetDashboardParams = new Archetype({
   }
 }).compile('GetDashboardParams');
 
-module.exports = ({ db }) => async function getDashboards(params) {
-  const Dashboard = db.model('__Studio_Dashboard');
+module.exports = ({ studioConnection }) => async function getDashboards(params) {
+  const Dashboard = studioConnection.model('__Studio_Dashboard');
   const { roles } = new GetDashboardParams(params);
 
   await authorize('Dashboard.getDashboards', roles);

package/backend/actions/Dashboard/updateDashboard.js

@@ -23,10 +23,10 @@ const UpdateDashboardParams = new Archetype({
   }
 }).compile('UpdateDashboardParams');
 
-module.exports = ({ db }) => async function updateDashboard(params) {
+module.exports = ({ studioConnection }) => async function updateDashboard(params) {
   const { dashboardId, code, title, description, roles, evaluate } = new UpdateDashboardParams(params);
 
-  const Dashboard = db.models['__Studio_Dashboard'];
+  const Dashboard = studioConnection.models['__Studio_Dashboard'];
 
   await authorize('Dashboard.updateDashboard', roles);
 

package/backend/db/dashboardResultSchema.js

@@ -0,0 +1,37 @@
+'use strict';
+
+const mongoose = require('mongoose');
+
+const dashboardResultSchema = new mongoose.Schema({
+  dashboardId: {
+    type: mongoose.Schema.Types.ObjectId,
+    ref: '__Studio_Dashboard',
+    required: true
+  },
+  workspaceId: {
+    type: mongoose.Schema.Types.ObjectId
+  },
+  userId: {
+    type: mongoose.Schema.Types.ObjectId
+  },
+  startedEvaluatingAt: {
+    type: Date
+  },
+  finishedEvaluatingAt: {
+    type: Date
+  },
+  status: {
+    type: String,
+    enum: ['in_progress', 'completed', 'failed'],
+    required: true
+  },
+  error: new mongoose.Schema({
+    message: String,
+    extra: String
+  }, { _id: false }),
+  result: mongoose.Schema.Types.Mixed
+}, { timestamps: true });
+
+dashboardResultSchema.index({ dashboardId: 1 });
+
+module.exports = dashboardResultSchema;

package/backend/index.js

@@ -7,12 +7,14 @@ const mongoose = require('mongoose');
 const chatMessageSchema = require('./db/chatMessageSchema');
 const chatThreadSchema = require('./db/chatThreadSchema');
 const dashboardSchema = require('./db/dashboardSchema');
+const dashboardResultSchema = require('./db/dashboardResultSchema');
 
 module.exports = function backend(db, studioConnection, options) {
   db = db || mongoose.connection;
 
   studioConnection = studioConnection ?? db;
   const Dashboard = studioConnection.model('__Studio_Dashboard', dashboardSchema, 'studio__dashboards');
+  const DashboardResult = studioConnection.model('__Studio_DashboardResult', dashboardResultSchema, 'studio__dashboardResults');
   const ChatMessage = studioConnection.model('__Studio_ChatMessage', chatMessageSchema, 'studio__chatMessages');
   const ChatThread = studioConnection.model('__Studio_ChatThread', chatThreadSchema, 'studio__chatThreads');
 

package/frontend/public/app.js

@@ -62835,7 +62835,7 @@ var src_default = VueToastificationPlugin;
 (module) {
 
 "use strict";
-module.exports = /*#__PURE__*/JSON.parse('{"name":"@mongoosejs/studio","version":"0.3.8","description":"A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.","homepage":"https://mongoosestudio.app/","repository":{"type":"git","url":"https://github.com/mongoosejs/studio"},"license":"Apache-2.0","dependencies":{"@ai-sdk/anthropic":"2.x","@ai-sdk/google":"2.x","@ai-sdk/openai":"2.x","ace-builds":"^1.43.6","ai":"5.x","archetype":"0.13.1","csv-stringify":"6.3.0","ejson":"^2.2.3","extrovert":"^0.2.0","marked":"15.0.12","node-inspect-extracted":"3.x","regexp.escape":"^2.0.1","tailwindcss":"3.4.0","vue":"3.x","vue-toastification":"^2.0.0-rc.5","webpack":"5.x","time-commando":"1.0.1","xss":"^1.0.15"},"peerDependencies":{"mongoose":"7.x || 8.x || ^9.0.0"},"optionalPeerDependencies":{"@mongoosejs/task":"0.5.x || 0.6.x"},"devDependencies":{"@masteringjs/eslint-config":"0.1.1","axios":"1.2.2","dedent":"^1.6.0","eslint":"9.30.0","express":"4.x","mocha":"10.2.0","mongodb-memory-server":"^11.0.1","mongoose":"9.x","sinon":"^21.0.1"},"scripts":{"lint":"eslint .","seed":"node seed/index.js","start":"node ./local.js","tailwind":"tailwindcss -o ./frontend/public/tw.css","tailwind:watch":"tailwindcss -o ./frontend/public/tw.css --watch","test":"mocha test/*.test.js","test:frontend":"mocha test/frontend/*.test.js"}}');
+module.exports = /*#__PURE__*/JSON.parse('{"name":"@mongoosejs/studio","version":"0.3.10","description":"A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.","homepage":"https://mongoosestudio.app/","repository":{"type":"git","url":"https://github.com/mongoosejs/studio"},"license":"Apache-2.0","dependencies":{"@ai-sdk/anthropic":"2.x","@ai-sdk/google":"2.x","@ai-sdk/openai":"2.x","ace-builds":"^1.43.6","ai":"5.x","archetype":"0.13.1","csv-stringify":"6.3.0","ejson":"^2.2.3","extrovert":"^0.2.0","marked":"15.0.12","node-inspect-extracted":"3.x","regexp.escape":"^2.0.1","tailwindcss":"3.4.0","vue":"3.x","vue-toastification":"^2.0.0-rc.5","webpack":"5.x","time-commando":"1.0.1","xss":"^1.0.15"},"peerDependencies":{"mongoose":"7.x || 8.x || ^9.0.0"},"optionalPeerDependencies":{"@mongoosejs/task":"0.5.x || 0.6.x"},"devDependencies":{"@masteringjs/eslint-config":"0.1.1","axios":"1.2.2","dedent":"^1.6.0","eslint":"9.30.0","express":"4.x","mocha":"10.2.0","mongodb-memory-server":"^11.0.1","mongoose":"9.x","sinon":"^21.0.1"},"scripts":{"lint":"eslint .","seed":"node seed/index.js","start":"node ./local.js","tailwind":"tailwindcss -o ./frontend/public/tw.css","tailwind:watch":"tailwindcss -o ./frontend/public/tw.css --watch","test":"mocha test/*.test.js","test:frontend":"mocha test/frontend/*.test.js"}}');
 
 /***/ }
 

package/index.d.ts

@@ -1,7 +1,12 @@
 declare module '@mongoosejs/studio' {
   import { RequestHandler } from 'express';
+  import { Connection, Mongoose } from 'mongoose';
 
-  const express: (path: string) => RequestHandler;
+  const express: (
+    path: string,
+    connOrMongoose?: Connection | Mongoose,
+    options?: { apiKey?: string }
+  ) => RequestHandler;
 
   const studio: {
     express: typeof express;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongoosejs/studio",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "description": "A Mongoose-native MongoDB UI with schema-aware autocomplete, AI-assisted queries, and dashboards that understand your models - not just your data.",
   "homepage": "https://mongoosestudio.app/",
   "repository": {