@mongoosejs/studio 0.0.3 → 0.0.5

package/backend/actions/Model/getDocument.js

@@ -31,7 +31,7 @@ module.exports = ({ db }) => async function getDocument(params) {
     schemaPaths[path] = {
       instance: Model.schema.paths[path].instance,
       path,
-      options: Model.schema.paths[path].options
+      ref: Model.schema.paths[path].options?.ref
     };
   }
   removeSpecifiedPaths(schemaPaths, '.$*');

package/backend/actions/Model/getDocuments.js

@@ -44,18 +44,19 @@ module.exports = ({ db }) => async function getDocuments(params) {
     filter = { '$**': filter };
   }
 
+  const hasSort = typeof sort === 'object' && sort != null && Object.keys(sort).length > 0;
   const docs = await Model.
     find(filter == null ? {} : filter).
     limit(limit).
     skip(skip).
-    sort(sort == null ? { _id: -1 } : sort );
+    sort(hasSort ? sort : { _id: -1 });
 
   let schemaPaths = {};
   for (const path of Object.keys(Model.schema.paths)) {
     schemaPaths[path] = {
       instance: Model.schema.paths[path].instance,
       path,
-      options: Model.schema.paths[path].options
+      ref: Model.schema.paths[path].options?.ref
     };
   }
   removeSpecifiedPaths(schemaPaths, '.$*');

package/frontend/src/models/models.html

@@ -39,7 +39,7 @@
             <td v-for="schemaPath in schemaPaths">
               <component
                 :is="getComponentForPath(schemaPath)"
-                :value="document[schemaPath.path]"
+                :value="getValueForPath(document, schemaPath.path)"
                 :allude="getReferenceModel(schemaPath)">
               </component>
             </td>

package/frontend/src/models/models.js

@@ -3,6 +3,7 @@
 const api = require('../api');
 const template = require('./models.html');
 const EJSON = require('ejson');
+const mpath = require('mpath');
 
 const appendCSS = require('../appendCSS');
 
@@ -24,7 +25,8 @@ module.exports = app => app.component('models', {
     searchText: '',
     shouldShowExportModal: false,
     shouldExport: {},
-    sortBy: {}
+    sortBy: {},
+    query: {}
   }),
   created() {
     this.currentModel = this.model;
@@ -34,11 +36,18 @@ module.exports = app => app.component('models', {
     if (this.currentModel == null && this.models.length > 0) {
       this.currentModel = this.models[0];
     }
+    this.query = Object.assign({}, this.$route.query); // important that this is here before the if statements
     if (this.$route.query?.search) {
       this.searchText = this.$route.query.search;
       this.filter = eval(`(${this.$route.query.search})`);
       this.filter = EJSON.stringify(this.filter);
     }
+    if (this.$route.query?.sort) {
+      const sort = eval(`(${this.$route.query.sort})`);
+      const path = Object.keys(sort)[0];
+      const num = Object.values(sort)[0];
+      this.sortDocs(num, path);
+    }
 
     if (this.currentModel != null) {
       await this.getDocuments();
@@ -51,12 +60,16 @@ module.exports = app => app.component('models', {
       let sorted = false;
       if (this.sortBy[path] == num) {
         sorted = true;
+        delete this.query.sort;
+        this.$router.push({ query: this.query });
       }
       for (const key in this.sortBy) {
         delete this.sortBy[key];
       }
       if (!sorted) {
         this.sortBy[path] = num;
+        this.query.sort = `{${path}:${num}}`
+        this.$router.push({ query: this.query });
       }
       await this.getDocuments();
     },
@@ -64,10 +77,12 @@ module.exports = app => app.component('models', {
       if (this.searchText && Object.keys(this.searchText).length) {
         this.filter = eval(`(${this.searchText})`);
         this.filter = EJSON.stringify(this.filter);
-        this.$router.push({ path: this.$route.path, query: { search: this.searchText }})
+        this.query.search = this.searchText;
+        this.$router.push({ path: this.$route.path, query: this.query })
       } else {
         this.filter = {};
-        this.$router.push({ path: this.$route.path });
+        delete this.query.search;
+        this.$router.push({ path: this.$route.path, query: this.query });
       }
       await this.getDocuments();
     },
@@ -107,7 +122,10 @@ module.exports = app => app.component('models', {
       return 'list-default';
     },
     getReferenceModel(schemaPath) {
-      return schemaPath.options?.ref;
+      return schemaPath.ref;
+    },
+    getValueForPath(doc, path) {
+      return mpath.get(path, doc);
     },
     async saveDocEdits() {
       const res = await api.Model.updateDocument({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mongoosejs/studio",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "dependencies": {
     "archetype": "0.13.0",
     "csv-stringify": "6.3.0",

package/mongoose.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const db = require('../backend/src/db');
-const express = require('express');
-const studio = require('./express');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  const app = express();
-  const conn = await db();
-
-  app.use('/studio', studio('/studio/api', conn));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}

package/scripts/stratos.js

@@ -1,22 +0,0 @@
-'use strict';
-
-// env MONGODB\_CONNECTION\_STRING="mongodb://localhost:27017/stratos_local" node ./stratos.js
-
-const db = require('../../BirbAI/backend/db'); // user dependent
-const express = require('express');
-const studio = require('../express');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  const app = express();
-  const conn = await db();
-
-  app.use('/studio', studio('/studio/api', conn));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}

package/stargate.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const express = require('express');
-const studio = require('./express');
-
-const mongoose = require('../stargate-mongoose-sample-apps/netlify-functions-ecommerce/node_modules/mongoose');
-const { driver } =require('../stargate-mongoose-sample-apps/netlify-functions-ecommerce/node_modules/stargate-mongoose');
-mongoose.setDriver(driver);
-
-require('../stargate-mongoose-sample-apps/netlify-functions-ecommerce/models');
-const connect = require('../stargate-mongoose-sample-apps/netlify-functions-ecommerce/connect');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  await connect();
-  const app = express();
-
-  app.use('/studio', studio('/studio/api', mongoose.connection));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}

package/stratos.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const db = require('../stratos-ai/backend/db');
-const express = require('express');
-const studio = require('./express');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  const app = express();
-  const conn = await db();
-
-  app.use('/studio', studio('/studio/api', conn));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}

package/tv.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const db = require('../terravera.com/backend/connect');
-const express = require('express');
-const studio = require('./express');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  const app = express();
-  const conn = await db();
-
-  app.use('/studio', studio('/studio/api', conn));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}

package/zevo.js

@@ -1,20 +0,0 @@
-'use strict';
-
-const db = require('../../voltmobile/core-api/backend/db');
-const express = require('express');
-const studio = require('./express');
-
-run().catch(err => {
-  console.error(err);
-  process.exit(-1);
-});
-
-async function run() {
-  const app = express();
-  const conn = await db();
-
-  app.use('/studio', studio('/studio/api', conn));
-
-  await app.listen(3002);
-  console.log('Listening on port 3002');
-}