@memberjunction/core-entities 6.2.0-edge.4 → 6.2.0-edge.6

package/dist/custom/MJQueryEntityExtended.js

@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { BaseEntity } from "@memberjunction/core";
-import { RegisterClass, UUIDsEqual } from "@memberjunction/global";
+import { BaseEntity, FieldSecuritySQLGate } from "@memberjunction/core";
+import { IndexByUUID, RegisterClass, UUIDsEqual } from "@memberjunction/global";
 import { MJQueryEntity } from "../generated/entity_subclasses.js";
 import { QueryEngine } from "../engines/QueryEngine.js";
 /**
@@ -131,6 +131,29 @@ let MJQueryEntityExtended = class MJQueryEntityExtended extends MJQueryEntity {
         if (!this.UserHasRunPermissions(user)) {
             return { canRun: false, deniedEntities: [] };
         }
+        const deniedEntities = [];
+        const queryEntities = this.QueryEntities;
+        const md = this.ProviderToUse;
+        // Step 1b: Any referenced AlternateBaseView that is disabled or missing cannot execute
+        // regardless of whether the query has explicit QueryPermissions (stored-procedure semantics
+        // do not re-enable a disabled SQL view whose SELECT grant was revoked).
+        if (queryEntities && queryEntities.length > 0) {
+            for (const qe of queryEntities) {
+                if (!qe.AlternateBaseViewID)
+                    continue;
+                const entityInfo = md.EntityByID(qe.EntityID);
+                if (!entityInfo)
+                    continue;
+                const abv = IndexByUUID(entityInfo.AlternateBaseViews ?? []).Get(qe.AlternateBaseViewID);
+                if (!abv || !abv.IsUsable) {
+                    const label = abv?.Name ?? qe.AlternateBaseView ?? qe.AlternateBaseViewID;
+                    deniedEntities.push(`${entityInfo.Name} (AlternateBaseView '${label}' is unavailable)`);
+                }
+            }
+            if (deniedEntities.length > 0) {
+                return { canRun: false, deniedEntities };
+            }
+        }
         // Step 2: Explicit Query Permissions override entity checks for this query
         // and all its dependencies (stored-procedure semantics)
         const permissions = this.QueryPermissions;
@@ -138,10 +161,7 @@ let MJQueryEntityExtended = class MJQueryEntityExtended extends MJQueryEntity {
             return { canRun: true, deniedEntities: [] };
         }
         // Step 3: No explicit permissions — check entity read access
-        const deniedEntities = [];
-        const queryEntities = this.QueryEntities;
         if (queryEntities && queryEntities.length > 0) {
-            const md = this.ProviderToUse;
             for (const qe of queryEntities) {
                 const entityInfo = md.EntityByID(qe.EntityID);
                 if (!entityInfo)
@@ -169,6 +189,73 @@ let MJQueryEntityExtended = class MJQueryEntityExtended extends MJQueryEntity {
         }
         return { canRun: deniedEntities.length === 0, deniedEntities };
     }
+    /**
+     * SECURITY — the run-time half of {@link UserCanRun}: the checks that need the SQL a run will
+     * actually execute, after composition and template rendering. Call it with that SQL in addition
+     * to {@link UserCanRun}, never instead of it.
+     *
+     * 1. A query with `MJ: Query Permissions` rows is authorized by its role list alone: a user who
+     *    holds one of those roles may run it whatever it reads (stored-procedure semantics), and one
+     *    who holds none may not.
+     * 2. Otherwise every entity whose base view or base table the SQL reads as a relation must be
+     *    readable by the user ({@link FieldSecuritySQLGate.RelationEntities}). These come from the
+     *    SQL, so a query whose `QueryEntities` rows are missing or stale is still checked. SQL that
+     *    cannot be read is refused for a user who cannot read every entity in the catalog.
+     * 3. The SQL must not reference a field the user is denied anywhere it could leak one: the
+     *    select list, WHERE, JOIN, GROUP BY, ORDER BY or HAVING, inside expressions and aggregates
+     *    included. A whole-row construct (`SELECT *`, `alias.*`) over an entity the user is denied a
+     *    field on, and SQL that cannot be read, are refused too ({@link FieldSecuritySQLGate.FindViolation}).
+     *    So is a relation that is not a CTE or a catalog entity's base view or base table (a custom
+     *    view, synonym, table-valued function, temp table or cross-database name), whose reads
+     *    cannot be checked. A user denied no field on any entity is not scanned.
+     *
+     * The result never names a denied field, so a refusal says only that the query cannot be run.
+     * `QueryFields` metadata plays no part: it is documentation, not a security source.
+     *
+     * @param user The user the query runs for
+     * @param renderedSQL The SQL the run will execute
+     * @param catalog Every entity the executing provider knows
+     * @param dialect The database dialect the SQL runs under
+     */
+    UserCanRunRenderedSQL(user, renderedSQL, catalog, dialect) {
+        const permissions = this.QueryPermissions;
+        if (permissions && permissions.length > 0) {
+            return { canRun: this.UserHasRunPermissions(user), deniedEntities: [] };
+        }
+        const read = FieldSecuritySQLGate.RelationEntities(renderedSQL, catalog, dialect);
+        if (read === null && catalog.some(e => !e.GetUserPermisions(user)?.CanRead)) {
+            const unreadable = { Kind: 'Unresolvable', Reference: 'the SQL could not be read', Entity: null };
+            return { canRun: false, deniedEntities: [], fieldSecurityViolation: unreadable };
+        }
+        const deniedEntities = (read ?? []).filter(e => !e.GetUserPermisions(user)?.CanRead).map(e => e.Name);
+        if (deniedEntities.length > 0) {
+            return { canRun: false, deniedEntities };
+        }
+        const violation = FieldSecuritySQLGate.FindViolation(renderedSQL, {
+            User: user,
+            Dialect: dialect,
+            Catalog: catalog,
+            ReadEntities: [...this.declaredEntities(catalog), ...(read ?? [])],
+            RefuseUnknownRelations: true,
+        });
+        return violation
+            ? { canRun: false, deniedEntities: [], fieldSecurityViolation: violation }
+            : { canRun: true, deniedEntities: [] };
+    }
+    /** The catalog entities this query's `QueryEntities` rows name; stale rows are left out. */
+    declaredEntities(catalog) {
+        const queryEntities = this.QueryEntities ?? [];
+        if (queryEntities.length === 0)
+            return [];
+        const byID = IndexByUUID(catalog);
+        const declared = [];
+        for (const qe of queryEntities) {
+            const entity = byID.Get(qe.EntityID);
+            if (entity)
+                declared.push(entity);
+        }
+        return declared;
+    }
     // ─── Status Checks ──────────────────────────────────────────────────────────
     /** Whether this query has been formally approved for production use */
     get IsApproved() {

package/dist/custom/MJQueryEntityExtended.js.map

@@ -1 +1 @@
-{"version":3,"file":"MJQueryEntityExtended.js","sourceRoot":"","sources":["../../src/custom/MJQueryEntityExtended.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAiD,MAAM,sBAAsB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EACH,aAAa,EAOhB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGrD;;;;;;;GAOG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,aAAa;IAAjD;QAEH,+EAA+E;;QAwCvE,kBAAa,GAAkB,IAAI,CAAC;QAuK5C,+EAA+E;QAEvE,iBAAY,GAA4B,IAAI,CAAC;IAqDzD,CAAC;IApQG,2CAA2C;IAC3C,IAAW,WAAW;QAClB,OAAO,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,+CAA+C;IAC/C,IAAW,eAAe;QACtB,OAAO,WAAW,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,6CAA6C;IAC7C,IAAW,aAAa;QACpB,OAAO,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1F,CAAC;IAED,4CAA4C;IAC5C,IAAW,gBAAgB;QACvB,OAAO,WAAW,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,oGAAoG;IACpG,IAAW,iBAAiB;QACxB,OAAO,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACzF,CAAC;IAED,+EAA+E;IAC/E,IAAW,eAAe;QACtB,OAAO,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAClG,CAAC;IAED,+EAA+E;IAE/E,6EAA6E;IAC7E,IAAW,cAAc;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU;YAAE,OAAO,SAAS,CAAC;QACvC,OAAO,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IACxF,CAAC;IAID;;;OAGG;IACH,IAAW,YAAY;QACnB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;YAC9B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAED;;OAEG;IACI,iBAAiB,CAAC,UAAkB;QACvC,IAAI,CAAC,UAAU;YAAE,OAAO,EAAE,CAAC;QAE3B,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC;QACnD,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,IAAI,SAAS,GAAkB,UAAU,CAAC;QAE1C,OAAO,SAAS,EAAE,CAAC;YACf,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,SAAU,CAAC,CAAC,CAAC;YAC/D,IAAI,CAAC,GAAG;gBAAE,MAAM;YAChB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3B,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC7B,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,+EAA+E;IAE/E;;;;;OAKG;IACI,qBAAqB,CAAC,IAAc;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAE1C,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3C,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACzB,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;oBAC5F,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,UAAU,CAAC,IAAc,EAAE,QAAsB;QACpD,cAAc;QACd,MAAM,OAAO,GAAG,QAAQ,IAAI,IAAI,GAAG,EAAU,CAAC;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;QAChD,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAErB,4CAA4C;QAC5C,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;QACjD,CAAC;QAED,2EAA2E;QAC3E,wDAAwD;QACxD,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC1C,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;QAChD,CAAC;QAED,6DAA6D;QAC7D,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACzC,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5C,MAAM,EAAE,GAAG,IAAI,CAAC,aAA6C,CAAC;YAC9D,KAAK,MAAM,EAAE,IAAI,aAAa,EAAE,CAAC;gBAC7B,MAAM,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,UAAU;oBAAE,SAAS,CAAE,yBAAyB;gBAErD,MAAM,KAAK,GAAG,UAAU,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;gBACjD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBAC3B,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACzC,CAAC;YACL,CAAC;QACL,CAAC;QAED,qDAAqD;QACrD,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC;QAC5C,IAAI,YAAY,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC;YAChD,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;gBAC9E,IAAI,CAAC,QAAQ;oBAAE,SAAS,CAAE,8BAA8B;gBAExD,MAAM,SAAS,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACrD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;oBACpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,GAAG,cAAc,EAAE,GAAG,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC/F,CAAC;gBACD,cAAc,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,cAAc,EAAE,CAAC;IACnE,CAAC;IAED,+EAA+E;IAE/E,uEAAuE;IACvE,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC;IACtC,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACnB,OAAO,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC;IAC5C,CAAC;IAED,+EAA+E;IAE/E;;;;;OAKG;IACI,cAAc,CAAC,QAA0B;QAC5C,MAAM,EAAE,GAAG,WAAW,CAAC,QAAQ,CAAC;QAEhC,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC;QACrE,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAC3B,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,CACnF,CAAC;YACF,IAAI,KAAK,EAAE,GAAG;gBAAE,OAAO,KAAK,CAAC,GAAG,CAAC;QACrC,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAMD;;;;OAIG;IACH,IAAW,WAAW;QAClB,IAAI,IAAI,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,IAAI,CAAC,YAAY,CAAC;QAC7B,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,IAAI,CAAC,YAAY,GAAG;gBAChB,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,IAAI,CAAC,eAAe,IAAI,EAAE;gBACtC,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,SAAS;gBAC5C,QAAQ,EAAE,OAAO;aACpB,CAAC;YACF,OAAO,IAAI,CAAC,YAAY,CAAC;QAC7B,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjD,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;YAC9B,OAAO,IAAI,CAAC,YAAY,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAEO,uBAAuB;QAC3B,MAAM,UAAU,GAAG,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC;QACnD,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;QAE5B,OAAO,KAAK,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,KAAM,CAAC,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG;gBAAE,MAAM;YAEhB,IAAI,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,uBAAuB,EAAE,CAAC;gBACzD,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,UAAU,EAAE,GAAG,CAAC,sBAAsB,IAAI,EAAE;oBAC5C,YAAY,EAAE,GAAG,CAAC,mBAAmB,IAAI,SAAS;oBAClD,QAAQ,EAAE,OAAO;oBACjB,mBAAmB,EAAE,IAAI;iBAC5B,CAAC;YACN,CAAC;YACD,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC;QACzB,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;AAxQY,qBAAqB;IADjC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC;GAC5B,qBAAqB,CAwQjC"}
+{"version":3,"file":"MJQueryEntityExtended.js","sourceRoot":"","sources":["../../src/custom/MJQueryEntityExtended.ts"],"names":[],"mappings":"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"}

package/dist/custom/MJThemeEntityExtended.d.ts

@@ -0,0 +1,13 @@
+import { type ValidationResult } from '@memberjunction/core';
+import { MJThemeEntity } from '../generated/entity_subclasses.js';
+/**
+ * `MJ: Themes`: refuses a sign-in page design (`LoginScreen`, `LoginScreenDraft`) the login screen cannot
+ * draw safely. Runs on both tiers, so Login Studio hears the reason before the request leaves the browser.
+ * Only a column this save changes is checked, so a theme whose stored design predates a stricter contract
+ * can still be renamed or recolored.
+ */
+export declare class MJThemeEntityExtended extends MJThemeEntity {
+    Validate(): ValidationResult;
+    private checkLoginDesign;
+}
+//# sourceMappingURL=MJThemeEntityExtended.d.ts.map

package/dist/custom/MJThemeEntityExtended.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MJThemeEntityExtended.d.ts","sourceRoot":"","sources":["../../src/custom/MJThemeEntityExtended.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwD,KAAK,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGnH,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;;;GAKG;AACH,qBACa,qBAAsB,SAAQ,aAAa;IACpC,QAAQ,IAAI,gBAAgB;IAQ5C,OAAO,CAAC,gBAAgB;CAM3B"}

package/dist/custom/MJThemeEntityExtended.js

@@ -0,0 +1,37 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { BaseEntity, ValidationErrorInfo, ValidationErrorType } from '@memberjunction/core';
+import { RegisterClass } from '@memberjunction/global';
+import { StoredLoginDesignProblems } from '@memberjunction/theme-engine';
+import { MJThemeEntity } from '../generated/entity_subclasses.js';
+/**
+ * `MJ: Themes`: refuses a sign-in page design (`LoginScreen`, `LoginScreenDraft`) the login screen cannot
+ * draw safely. Runs on both tiers, so Login Studio hears the reason before the request leaves the browser.
+ * Only a column this save changes is checked, so a theme whose stored design predates a stricter contract
+ * can still be renamed or recolored.
+ */
+let MJThemeEntityExtended = class MJThemeEntityExtended extends MJThemeEntity {
+    Validate() {
+        const result = super.Validate();
+        this.checkLoginDesign(result, 'LoginScreen', this.LoginScreen);
+        this.checkLoginDesign(result, 'LoginScreenDraft', this.LoginScreenDraft);
+        result.Success = result.Errors.every((e) => e.Type !== ValidationErrorType.Failure);
+        return result;
+    }
+    checkLoginDesign(result, field, value) {
+        if (!this.GetFieldByName(field)?.Dirty)
+            return;
+        for (const problem of StoredLoginDesignProblems(value)) {
+            result.Errors.push(new ValidationErrorInfo(field, problem, null, ValidationErrorType.Failure));
+        }
+    }
+};
+MJThemeEntityExtended = __decorate([
+    RegisterClass(BaseEntity, 'MJ: Themes')
+], MJThemeEntityExtended);
+export { MJThemeEntityExtended };
+//# sourceMappingURL=MJThemeEntityExtended.js.map

package/dist/custom/MJThemeEntityExtended.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MJThemeEntityExtended.js","sourceRoot":"","sources":["../../src/custom/MJThemeEntityExtended.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,mBAAmB,EAAyB,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D;;;;;GAKG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,aAAa;IACpC,QAAQ;QACpB,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAChC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACzE,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACpF,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,gBAAgB,CAAC,MAAwB,EAAE,KAAyC,EAAE,KAAoB;QAC9G,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,KAAK;YAAE,OAAO;QAC/C,KAAK,MAAM,OAAO,IAAI,yBAAyB,CAAC,KAAK,CAAC,EAAE,CAAC;YACrD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC;QACnG,CAAC;IACL,CAAC;CACJ,CAAA;AAfY,qBAAqB;IADjC,aAAa,CAAC,UAAU,EAAE,YAAY,CAAC;GAC3B,qBAAqB,CAejC"}

package/dist/custom/MJUserViewEntityExtended.d.ts

@@ -1,4 +1,4 @@
-import { BaseInfo, EntityInfo, EntityFieldInfo, UserInfo, EntitySaveOptions } from "@memberjunction/core";
+import { BaseInfo, EntityInfo, EntityFieldInfo, UserInfo, EntitySaveOptions, ValidationResult } from "@memberjunction/core";
 import { MJUserViewEntity, MJUserViewEntity_IColumnFormat as ColumnFormat, MJUserViewEntity_IGridSortSetting as ViewGridSortSetting, MJUserViewEntity_IGridColumnSetting as ViewGridColumnSetting, MJUserViewEntity_IGridAggregatesConfig as ViewGridAggregatesConfig, MJUserViewEntity_IGridAggregateDisplay as ViewGridAggregateDisplay, MJUserViewEntity_IDisplayState as ViewDisplayState, MJUserViewEntity_ITimelineState as ViewTimelineState } from "../generated/entity_subclasses.js";
 export declare class MJUserViewEntityExtended extends MJUserViewEntity {
     private _ViewEntityInfo;
@@ -57,6 +57,16 @@ export declare class MJUserViewEntityExtended extends MJUserViewEntity {
      * @param config The timeline configuration to set
      */
     setTimelineConfig(config: ViewTimelineState): void;
+    /**
+     * Semantic `Name` of the alternate base view (`MJ: Entity Alternate Base Views.Name`)
+     * pinned in `DisplayState.alternateBaseView`, or `null` when this view reads from the
+     * entity's canonical `BaseView`.
+     */
+    get AlternateBaseView(): string | null;
+    /**
+     * Updates or clears the pinned `alternateBaseView` in `DisplayState`.
+     */
+    set AlternateBaseView(value: string | null);
     /**
      * Check if a specific view mode is enabled.
      * By default, all modes are enabled unless explicitly disabled.
@@ -114,6 +124,13 @@ export declare class MJUserViewEntityExtended extends MJUserViewEntity {
     Load(ID: string, EntityRelationshipsToLoad?: string[]): Promise<boolean>;
     Delete(): Promise<boolean>;
     Save(options?: EntitySaveOptions): Promise<boolean>;
+    /**
+     * Adds the checks on the view's declared `Properties`: unique, non-empty names; a known type; a
+     * target field of the view's entity with an operator that suits the type; and each default valid
+     * for the type. A view with no properties validates exactly as before.
+     */
+    Validate(): ValidationResult;
+    private validateProperties;
     SetDefaultsFromEntity(e: EntityInfo): Promise<void>;
     NewRecord(): boolean;
     /**
@@ -140,6 +157,23 @@ export declare class MJUserViewEntityExtended extends MJUserViewEntity {
      * infrastructure will be enabled from the UpdateWhereClause() method.
      */
     protected get SmartFilterImplemented(): boolean;
+    /**
+     * True when no Smart Filter WHERE clause has been generated. Null and blank are the same state: the
+     * server's generator can return '' (or a model's whitespace), and `WhereClause = SmartFilterWhereClause`
+     * then makes the view return EVERY row.
+     */
+    private get smartFilterWhereClauseBlank();
+    /**
+     * True when the view has a Smart Filter to apply (enabled, with a prompt) but no clause. A re-save of the same
+     * prompt leaves no field dirty, so without this Save() would never retry, and the view would return every row
+     * until someone edited the prompt. With it, the view's next save regenerates the clause.
+     */
+    private get smartFilterPending();
+    /**
+     * True when `DisplayState.alternateBaseView` changed compared to the persisted `DisplayState` OldValue.
+     * Used to re-evaluate SmartFilterWhereClause against the new base view context on Save.
+     */
+    private get alternateBaseViewDirty();
     Set(FieldName: string, Value: any): void;
     /**
      * Create a where clause for SQL from the structured filter state JSON information
@@ -188,10 +222,11 @@ export declare class MJUserViewEntityExtended extends MJUserViewEntity {
           }]
         }`;
      */
+    static GenerateWhereClauseFromFilterState(FilterState: string | Record<string, unknown>, entityInfo: EntityInfo): string;
     protected GenerateWhereClause(FilterState: string, entityInfo: EntityInfo): string;
-    private wrapQuotes;
-    private convertFilterToSQL;
-    private processFilterGroup;
+    private static wrapQuotesStatic;
+    private static convertFilterToSQLStatic;
+    private static processFilterGroupStatic;
 }
 export declare class ViewInfo {
     /**

package/dist/custom/MJUserViewEntityExtended.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MJUserViewEntityExtended.d.ts","sourceRoot":"","sources":["../../src/custom/MJUserViewEntityExtended.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MJUserViewEntityExtended.d.ts","sourceRoot":"","sources":["../../src/custom/MJUserViewEntityExtended.ts"],"names":[],"mappings":"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"}

package/dist/custom/MJUserViewEntityExtended.js

@@ -4,11 +4,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var MJUserViewEntityExtended_1;
 import { RegisterClass, UUIDsEqual } from "@memberjunction/global";
-import { Metadata, BaseEntity, BaseInfo, RunView, EntityFieldTSType, EntityPermissionType, BaseEntityResult, ParseFilterField } from "@memberjunction/core";
+import { Metadata, BaseEntity, BaseInfo, RunView, EntityFieldTSType, EntityPermissionType, BaseEntityResult, ParseFilterField, ExtractAlternateBaseViewFromDisplayState, ValidationErrorInfo, ValidationErrorType, ValidateUserViewProperties } from "@memberjunction/core";
 import { MJUserViewEntity, } from "../generated/entity_subclasses.js";
 import { ResourcePermissionEngine } from "./ResourcePermissions/ResourcePermissionEngine.js";
-let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserViewEntity {
+let MJUserViewEntityExtended = MJUserViewEntityExtended_1 = class MJUserViewEntityExtended extends MJUserViewEntity {
     constructor() {
         super(...arguments);
         this._ViewEntityInfo = null; // case-violation-ok-legacy-back-compat: reached by bracket access outside the declaring class, where a same-named key on an unrelated object is indistinguishable
@@ -173,6 +174,32 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
         current.timeline = config;
         this.setDisplayState(current);
     }
+    /**
+     * Semantic `Name` of the alternate base view (`MJ: Entity Alternate Base Views.Name`)
+     * pinned in `DisplayState.alternateBaseView`, or `null` when this view reads from the
+     * entity's canonical `BaseView`.
+     */
+    get AlternateBaseView() {
+        const parsed = this.ParsedDisplayState;
+        const raw = parsed?.alternateBaseView ?? parsed?.AlternateBaseView;
+        const val = typeof raw === 'string' ? raw.trim() : undefined;
+        return val && val.length > 0 ? val : null;
+    }
+    /**
+     * Updates or clears the pinned `alternateBaseView` in `DisplayState`.
+     */
+    set AlternateBaseView(value) {
+        const trimmed = value?.trim() || undefined;
+        const current = this.ParsedDisplayState || { defaultMode: 'grid' };
+        delete current.AlternateBaseView;
+        if (trimmed) {
+            current.alternateBaseView = trimmed;
+        }
+        else {
+            delete current.alternateBaseView;
+        }
+        this.setDisplayState(current);
+    }
     /**
      * Check if a specific view mode is enabled.
      * By default, all modes are enabled unless explicitly disabled.
@@ -399,6 +426,8 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
             const smartFilterPromptField = this.Fields.find(c => c.Name.toLowerCase() == 'smartfilterprompt');
             if (!this.IsSaved ||
                 options?.IgnoreDirtyState ||
+                this.smartFilterPending ||
+                (Boolean(this.SmartFilterEnabled) && this.alternateBaseViewDirty) ||
                 filterStateField?.Dirty ||
                 smartFilterEnabledField?.Dirty ||
                 smartFilterPromptField?.Dirty) {
@@ -424,6 +453,33 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
             return false;
         }
     }
+    /**
+     * Adds the checks on the view's declared `Properties`: unique, non-empty names; a known type; a
+     * target field of the view's entity with an operator that suits the type; and each default valid
+     * for the type. A view with no properties validates exactly as before.
+     */
+    Validate() {
+        const result = super.Validate();
+        this.validateProperties(result);
+        result.Success = result.Success && result.Errors.length === 0;
+        return result;
+    }
+    validateProperties(result) {
+        if (this.Properties == null || this.Properties.trim().length === 0) {
+            return;
+        }
+        let problems;
+        try {
+            const fieldNames = this.ViewEntityInfo?.Fields.map(f => f.Name) ?? [];
+            problems = ValidateUserViewProperties(JSON.parse(this.Properties), fieldNames);
+        }
+        catch {
+            problems = ['Properties must be valid JSON.'];
+        }
+        for (const problem of problems) {
+            result.Errors.push(new ValidationErrorInfo('Properties', problem, this.Properties, ValidationErrorType.Failure));
+        }
+    }
     async SetDefaultsFromEntity(e) {
         this.EntityID = e.ID;
         const newGridState = new ViewGridState();
@@ -482,7 +538,7 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
             return;
         // if we get here, we need to update the WhereClause, first check to see if we have a Smart Filter or not
         if (this.SmartFilterEnabled && (this.SmartFilterEnabled === true || this.SmartFilterEnabled === 1) &&
-            this.SmartFilterPrompt && this.SmartFilterPrompt.length > 0) {
+            this.SmartFilterPrompt && this.SmartFilterPrompt.trim().length > 0) {
             if (this.SmartFilterImplemented) {
                 // The following block of code is only intended to execute when we're in an execution context where the 
                 // lowest level sub-class supports SmartFilter WHere Clause generation, which is determined by the class
@@ -492,9 +548,9 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
                 // if the SmartFilterPrompt has changed, then we need to update the SmartFilterWhereClause using AI
                 // otherwise, we don't need to do anything other than just use the SmartFilterWhereClause as it is.
                 // A new record (IsSaved === false — see the note in Save() on why the ID can't be used for this) or a
-                // record that has never had its SmartFilterWhereClause generated also needs the AI pass.
+                // record whose SmartFilterWhereClause is missing or blank (see smartFilterWhereClauseBlank) also needs the AI pass.
                 const smartFilterPromptDirty = this.Fields.find(c => c.Name.toLowerCase() == 'smartfilterprompt')?.Dirty === true;
-                if (!this.IsSaved || ignoreDirtyState || smartFilterPromptDirty || this.SmartFilterWhereClause == null) {
+                if (!this.IsSaved || ignoreDirtyState || smartFilterPromptDirty || this.alternateBaseViewDirty || this.smartFilterWhereClauseBlank) {
                     // the prompt has changed (or is newly populated, either way it is dirty) so use the AI to figure this out
                     const result = await this.GenerateSmartFilterWhereClause(this.SmartFilterPrompt, this.ViewEntityInfo);
                     this.SmartFilterWhereClause = result.whereClause;
@@ -510,6 +566,10 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
             }
         }
         else {
+            if (this.IsSaved && (!this.SmartFilterPrompt || this.SmartFilterPrompt.trim().length === 0)) {
+                this.SmartFilterWhereClause = '';
+                this.SmartFilterExplanation = '';
+            }
             const compiled = this.GenerateWhereClause(this.FilterState, this.ViewEntityInfo);
             // On a brand-new record an empty FilterState is just the NewRecord() seed. Callers that build a view
             // programmatically (view.NewRecord(); view.WhereClause = '...'; await view.Save()) rely on that clause
@@ -535,6 +595,35 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
     get SmartFilterImplemented() {
         return false; // stub function returns false. Sub-Class will do this.
     }
+    /**
+     * True when no Smart Filter WHERE clause has been generated. Null and blank are the same state: the
+     * server's generator can return '' (or a model's whitespace), and `WhereClause = SmartFilterWhereClause`
+     * then makes the view return EVERY row.
+     */
+    get smartFilterWhereClauseBlank() {
+        return (this.SmartFilterWhereClause ?? '').trim().length === 0;
+    }
+    /**
+     * True when the view has a Smart Filter to apply (enabled, with a prompt) but no clause. A re-save of the same
+     * prompt leaves no field dirty, so without this Save() would never retry, and the view would return every row
+     * until someone edited the prompt. With it, the view's next save regenerates the clause.
+     */
+    get smartFilterPending() {
+        const hasPrompt = (this.SmartFilterPrompt ?? '').trim().length > 0;
+        return !!this.SmartFilterEnabled && hasPrompt && this.smartFilterWhereClauseBlank;
+    }
+    /**
+     * True when `DisplayState.alternateBaseView` changed compared to the persisted `DisplayState` OldValue.
+     * Used to re-evaluate SmartFilterWhereClause against the new base view context on Save.
+     */
+    get alternateBaseViewDirty() {
+        const displayStateField = this.Fields.find(c => c.Name.toLowerCase() === 'displaystate');
+        if (!displayStateField?.Dirty) {
+            return false;
+        }
+        const oldVal = ExtractAlternateBaseViewFromDisplayState(typeof displayStateField.OldValue === 'string' ? displayStateField.OldValue : null);
+        return (oldVal ?? null) !== (this.AlternateBaseView ?? null);
+    }
     Set(FieldName, Value) {
         // call the superclass first and set the value internally there
         super.Set(FieldName, Value);
@@ -595,13 +684,17 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
           }]
         }`;
      */
+    static GenerateWhereClauseFromFilterState(FilterState, entityInfo) {
+        const parsed = typeof FilterState === 'string' ? JSON.parse(FilterState) : FilterState;
+        return MJUserViewEntityExtended_1.processFilterGroupStatic(parsed, entityInfo);
+    }
     GenerateWhereClause(FilterState, entityInfo) {
-        return this.processFilterGroup(JSON.parse(FilterState), entityInfo);
+        return MJUserViewEntityExtended_1.GenerateWhereClauseFromFilterState(FilterState, entityInfo);
     }
-    wrapQuotes(value, needQuotes) {
+    static wrapQuotesStatic(value, needQuotes) {
         return needQuotes ? `'${value}'` : value;
     }
-    convertFilterToSQL(field, operator, value, entity) {
+    static convertFilterToSQLStatic(field, operator, value, entity) {
         let op = '';
         const f = entity.Fields.find((f) => f.Name.trim().toLowerCase() === field.trim().toLowerCase());
         if (!f)
@@ -621,22 +714,22 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
         }
         switch (operator) {
             case 'eq':
-                op = '= ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '= ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'neq':
-                op = '<> ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '<> ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'gt':
-                op = '> ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '> ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'gte':
-                op = '>= ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '>= ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'lt':
-                op = '< ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '< ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'lte':
-                op = '<= ' + this.wrapQuotes(newValue, f.NeedsQuotes);
+                op = '<= ' + MJUserViewEntityExtended_1.wrapQuotesStatic(newValue, f.NeedsQuotes);
                 break;
             case 'startswith':
                 op = `LIKE '${newValue}%'`;
@@ -661,7 +754,7 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
         }
         return `[${field}] ${op}`;
     }
-    processFilterGroup(filterGroup, entity) {
+    static processFilterGroupStatic(filterGroup, entity) {
         // each filter has two properties, logic and filters
         // logic is either 'and' or 'or' and is what we use to determine the SQL logic operator
         // filters is an array of filters, each filter has a field, operator, and value,
@@ -676,20 +769,20 @@ let MJUserViewEntityExtended = class MJUserViewEntityExtended extends MJUserView
             // if an individual filter has a "logic" property, it's a group and we need to process it with parenthesis and recurisely
             if (filter.logic && filter.logic.length > 0) {
                 // this is a group, we process it with parenthesis
-                whereClause += `(${this.processFilterGroup(filter, entity)})`;
+                whereClause += `(${MJUserViewEntityExtended_1.processFilterGroupStatic(filter, entity)})`;
             }
             else {
                 // Dotted names (`Organizations.Type`) are the multi-entity encoding.
                 // Views are one table — use the field part. Bare names stay as they are.
                 const stored = String(filter.field ?? '');
                 const column = ParseFilterField(stored).Name;
-                whereClause += `(${this.convertFilterToSQL(column, filter.operator, filter.value, entity)})`;
+                whereClause += `(${MJUserViewEntityExtended_1.convertFilterToSQLStatic(column, filter.operator, filter.value, entity)})`;
             }
         }
         return whereClause;
     }
 };
-MJUserViewEntityExtended = __decorate([
+MJUserViewEntityExtended = MJUserViewEntityExtended_1 = __decorate([
     RegisterClass(BaseEntity, 'MJ: User Views')
 ], MJUserViewEntityExtended);
 export { MJUserViewEntityExtended };