forms-angular 0.12.0-beta.210 → 0.12.0-beta.211

package/dist/client/index.d.ts

@@ -473,6 +473,7 @@ declare module fng {
     onSchemaFetch?: (description: string, source: IFieldViewInfo[]) => void;
     onSchemaProcessed?: (description: string, formSchema: IFormInstruction[]) => void;
     updateQueryForTab?: (tab: string) => void;
+    showLoading? : boolean;
     tabDeselect?: ($event: any, $selectedIndex: number) => void;
     setUpCustomLookupOptions?: (
       schemaElement: IFormInstruction,

package/dist/server/data_form.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FormsAngular = void 0;
+const mongoose_1 = require("mongoose");
 // This part of forms-angular borrows _very_ heavily from https://github.com/Alexandre-Strzelewicz/angular-bridge
 // (now https://github.com/Unitech/angular-bridge
 const _ = require('lodash');
@@ -851,7 +852,7 @@ class FormsAngular {
                     else {
                         const objectIdTest = /^([0-9a-fA-F]{24})$/.exec(obj[prop]);
                         if (objectIdTest) {
-                            obj[prop] = new this.mongoose.Types.ObjectId(objectIdTest[1]);
+                            obj[prop] = new mongoose_1.Types.ObjectId(objectIdTest[1]);
                         }
                     }
                 }
@@ -1534,76 +1535,86 @@ class FormsAngular {
         }, this);
     }
     ;
-    entityDelete() {
-        let that = this;
-        return _.bind(async function (req, res, next) {
-            function generateDependencyList(resource) {
-                if (resource.options.dependents === undefined) {
-                    resource.options.dependents = that.resources.reduce(function (acc, r) {
-                        function searchPaths(schema, prefix) {
-                            let fldList = [];
-                            for (let fld in schema.paths) {
-                                if (schema.paths.hasOwnProperty(fld)) {
-                                    const parts = fld.split('.');
-                                    let schemaType = schema.tree;
-                                    while (parts.length > 0) {
-                                        schemaType = schemaType[parts.shift()];
-                                    }
-                                    if (schemaType.type) {
-                                        if (schemaType.type.name === 'ObjectId' && schemaType.ref === resource.resourceName) {
-                                            fldList.push(prefix + fld);
-                                        }
-                                        else if (_.isArray(schemaType.type)) {
-                                            schemaType.type.forEach(function (t) {
-                                                searchPaths(t, prefix + fld + '.');
-                                            });
-                                        }
-                                    }
-                                }
+    generateDependencyList(resource) {
+        if (resource.options.dependents === undefined) {
+            let that = this;
+            resource.options.dependents = that.resources.reduce(function (acc, r) {
+                function searchPaths(schema, prefix) {
+                    let fldList = [];
+                    for (let fld in schema.paths) {
+                        if (schema.paths.hasOwnProperty(fld)) {
+                            const parts = fld.split('.');
+                            let schemaType = schema.tree;
+                            while (parts.length > 0) {
+                                schemaType = schemaType[parts.shift()];
                             }
-                            if (fldList.length > 0) {
-                                acc.push({ resource: r, keys: fldList });
+                            if (schemaType.type) {
+                                if (schemaType.type.name === 'ObjectId' && schemaType.ref === resource.resourceName) {
+                                    fldList.push(prefix + fld);
+                                }
+                                else if (_.isArray(schemaType.type)) {
+                                    schemaType.type.forEach(function (t) {
+                                        searchPaths(t, prefix + fld + '.');
+                                    });
+                                }
                             }
                         }
-                        searchPaths(r.model.schema, '');
-                        return acc;
-                    }, []);
-                    for (let pluginName in that.options.plugins) {
-                        let thisPlugin = that.options.plugins[pluginName];
-                        if (thisPlugin.dependencyChecks && thisPlugin.dependencyChecks[resource.resourceName]) {
-                            resource.options.dependents = resource.options.dependents.concat(thisPlugin.dependencyChecks[resource.resourceName]);
-                        }
                     }
+                    if (fldList.length > 0) {
+                        acc.push({ resource: r, keys: fldList });
+                    }
+                }
+                searchPaths(r.model.schema, '');
+                return acc;
+            }, []);
+            for (let pluginName in that.options.plugins) {
+                let thisPlugin = that.options.plugins[pluginName];
+                if (thisPlugin.dependencyChecks && thisPlugin.dependencyChecks[resource.resourceName]) {
+                    resource.options.dependents = resource.options.dependents.concat(thisPlugin.dependencyChecks[resource.resourceName]);
                 }
             }
+        }
+    }
+    async getDependencies(resource, id) {
+        this.generateDependencyList(resource);
+        let promises = [];
+        let foreignKeyList = [];
+        resource.options.dependents.forEach(collection => {
+            collection.keys.forEach(key => {
+                promises.push({
+                    p: collection.resource.model.find({ [key]: id }).limit(1).exec(),
+                    collection,
+                    key
+                });
+            });
+        });
+        return Promise.all(promises.map(p => p.p))
+            .then((results) => {
+            results.forEach((r, i) => {
+                if (r.length > 0) {
+                    foreignKeyList.push({ resourceName: promises[i].collection.resource.resourceName, key: promises[i].key, id: r[0]._id });
+                }
+            });
+            return foreignKeyList;
+        });
+    }
+    entityDelete() {
+        let that = this;
+        return _.bind(async function (req, res, next) {
             async function removeDoc(doc, resource) {
                 switch (resource.options.handleRemove) {
                     case 'allow':
                         // old behaviour - no attempt to maintain data integrity
                         return doc.remove();
                     case 'cascade':
-                        generateDependencyList(resource);
                         res.status(400).send('"cascade" option not yet supported');
                         break;
                     default:
-                        generateDependencyList(resource);
-                        let promises = [];
-                        resource.options.dependents.forEach(collection => {
-                            collection.keys.forEach(key => {
-                                promises.push({
-                                    p: collection.resource.model.find({ [key]: doc._id }).limit(1).exec(),
-                                    collection,
-                                    key
-                                });
-                            });
-                        });
-                        return Promise.all(promises.map(p => p.p))
-                            .then((results) => {
-                            results.forEach((r, i) => {
-                                if (r.length > 0) {
-                                    throw new ForeignKeyError(resource.resourceName, promises[i].collection.resource.resourceName, promises[i].key, r[0]._id);
-                                }
-                            });
+                        return that.getDependencies(resource, doc._id)
+                            .then((dependencies) => {
+                            if (dependencies.length > 0) {
+                                throw new ForeignKeyError(resource.resourceName, dependencies);
+                            }
                             return doc.remove();
                         });
                 }
@@ -1836,8 +1847,8 @@ class FormsAngular {
 }
 exports.FormsAngular = FormsAngular;
 class ForeignKeyError extends global.Error {
-    constructor(resourceName, foreignKeyOnResource, foreignItem, id) {
-        super(`Cannot delete this ${resourceName}, as it is the ${foreignItem} on ${foreignKeyOnResource} ${id}`);
+    constructor(resourceName, foreignKeys) {
+        super(`Cannot delete this ${resourceName}, as it is: ${foreignKeys.map(d => ` the ${d.key} on ${d.resourceName} ${d.id}`).join("; ")}`);
         this.name = "ForeignKeyError";
         this.stack = new global.Error('').stack;
     }

package/dist/server/index.d.ts

@@ -1,4 +1,4 @@
-import {Error, Model} from "mongoose";
+import { Error, Model, Types } from "mongoose";
 import {Express} from "express";
 
 declare module fngServer {
@@ -43,6 +43,9 @@ declare module fngServer {
 
     export type DependencyList = Dependency[];
 
+    export type ForeignKeys = { resourceName: string, key: string, id: Types.ObjectId};
+    export type ForeignKeyList = ForeignKeys[];
+
     export interface ResourceOptions {
         suppressDeprecatedMessage?: boolean;
         onRemove?: (doc, req, cb) => void;

package/package.json

@@ -3,7 +3,7 @@
   "author": "Mark Chapman <support@forms-angular.org>",
   "description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose.  Opinionated or what?",
   "homepage": "http://forms-angular.org",
-  "version": "0.12.0-beta.210",
+  "version": "0.12.0-beta.211",
   "engines": {
     "node": ">=8.x",
     "npm": ">=5.x"