@memberjunction/ng-core-entity-forms 5.36.0 → 5.38.0

package/dist/lib/custom/Queries/query-category-dialog.component.d.ts

@@ -19,8 +19,8 @@ export declare class QueryCategoryDialogComponent extends BaseAngularComponent i
     categoryTree: CategoryNode[];
     flattenedCategories: CategoryNode[];
     isCreating: boolean;
-    ngOnInit(): Promise<void>;
-    loadCategories(): Promise<void>;
+    ngOnInit(): void;
+    loadCategories(): void;
     private buildCategoryTree;
     private flattenCategories;
     createCategory(): Promise<void>;

package/dist/lib/custom/Queries/query-category-dialog.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-category-dialog.component.d.ts","sourceRoot":"","sources":["../../../../src/lib/custom/Queries/query-category-dialog.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,YAAY,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAItE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;;AACrE,UAAU,YAAY;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAMa,4BAA6B,SAAQ,oBAAqB,YAAW,MAAM;IAC3E,SAAS,UAAS;IACjB,eAAe,wBAA+B;IAC9C,iBAAiB,sCAA6C;IAEjE,YAAY,SAAM;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,UAAU,EAAE,qBAAqB,EAAE,CAAM;IACzC,YAAY,EAAE,YAAY,EAAE,CAAM;IAClC,mBAAmB,EAAE,YAAY,EAAE,CAAM;IACzC,UAAU,UAAS;IAEpB,QAAQ;IAIR,cAAc;IAmBpB,OAAO,CAAC,iBAAiB;IAqCzB,OAAO,CAAC,iBAAiB;IAYnB,cAAc;IA4CpB,KAAK;IAOL,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAIjD,WAAW,IAAI,MAAM;yCA3IZ,4BAA4B;2CAA5B,4BAA4B;CAgJxC"}
+{"version":3,"file":"query-category-dialog.component.d.ts","sourceRoot":"","sources":["../../../../src/lib/custom/Queries/query-category-dialog.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,YAAY,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAe,MAAM,+BAA+B,CAAC;AAGnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;;AACrE,UAAU,YAAY;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,YAAY,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,qBAMa,4BAA6B,SAAQ,oBAAqB,YAAW,MAAM;IAC3E,SAAS,UAAS;IACjB,eAAe,wBAA+B;IAC9C,iBAAiB,sCAA6C;IAEjE,YAAY,SAAM;IAClB,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,UAAU,EAAE,qBAAqB,EAAE,CAAM;IACzC,YAAY,EAAE,YAAY,EAAE,CAAM;IAClC,mBAAmB,EAAE,YAAY,EAAE,CAAM;IACzC,UAAU,UAAS;IAE1B,QAAQ;IAIR,cAAc;IAMd,OAAO,CAAC,iBAAiB;IAqCzB,OAAO,CAAC,iBAAiB;IAYnB,cAAc;IA4CpB,KAAK;IAOL,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAIjD,WAAW,IAAI,MAAM;yCA9HZ,4BAA4B;2CAA5B,4BAA4B;CAmIxC"}

package/dist/lib/custom/Queries/query-category-dialog.component.js

@@ -1,5 +1,5 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
-import { RunView } from '@memberjunction/core';
+import { QueryEngine } from '@memberjunction/core-entities';
 import { MJNotificationService } from '@memberjunction/ng-notifications';
 import { BaseAngularComponent } from '@memberjunction/ng-base-types';
 import * as i0 from "@angular/core";
@@ -86,26 +86,13 @@ export class QueryCategoryDialogComponent extends BaseAngularComponent {
         this.flattenedCategories = [];
         this.isCreating = false;
     }
-    async ngOnInit() {
-        await this.loadCategories();
+    ngOnInit() {
+        this.loadCategories();
     }
-    async loadCategories() {
-        try {
-            const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-            const result = await rv.RunView({
-                EntityName: 'MJ: Query Categories',
-                OrderBy: 'Name',
-                ResultType: 'entity_object'
-            });
-            if (result.Success && result.Results) {
-                this.categories = result.Results;
-                this.categoryTree = this.buildCategoryTree(this.categories);
-                this.flattenedCategories = this.flattenCategories(this.categoryTree, 0);
-            }
-        }
-        catch (error) {
-            console.error('Error loading categories:', error);
-        }
+    loadCategories() {
+        this.categories = QueryEngine.Instance.Categories;
+        this.categoryTree = this.buildCategoryTree(this.categories);
+        this.flattenedCategories = this.flattenCategories(this.categoryTree, 0);
     }
     buildCategoryTree(categories) {
         const categoryMap = new Map();
@@ -212,5 +199,5 @@ export class QueryCategoryDialogComponent extends BaseAngularComponent {
         }], onCategoryCreated: [{
             type: Output
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCategoryDialogComponent, { className: "QueryCategoryDialogComponent", filePath: "src/lib/custom/Queries/query-category-dialog.component.ts", lineNumber: 21 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(QueryCategoryDialogComponent, { className: "QueryCategoryDialogComponent", filePath: "src/lib/custom/Queries/query-category-dialog.component.ts", lineNumber: 20 }); })();
 //# sourceMappingURL=query-category-dialog.component.js.map

package/dist/lib/custom/Queries/query-category-dialog.component.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-category-dialog.component.js","sourceRoot":"","sources":["../../../../src/lib/custom/Queries/query-category-dialog.component.ts","../../../../src/lib/custom/Queries/query-category-dialog.component.html"],"names":[],"mappings":"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","sourcesContent":["import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';\nimport { MJQueryCategoryEntity } from '@memberjunction/core-entities';\nimport { Metadata, RunView } from '@memberjunction/core';\nimport { MJNotificationService } from '@memberjunction/ng-notifications';\n\nimport { BaseAngularComponent } from '@memberjunction/ng-base-types';\ninterface CategoryNode {\n    id: string;\n    name: string;\n    fullPath: string;\n    children: CategoryNode[];\n    level: number;\n}\n\n@Component({\n  standalone: false,\n    selector: 'mj-query-category-dialog',\n    templateUrl: './query-category-dialog.component.html',\n    styleUrls: ['./query-category-dialog.component.css']\n})\nexport class QueryCategoryDialogComponent extends BaseAngularComponent implements OnInit {\n    @Input() isVisible = false;\n    @Output() isVisibleChange = new EventEmitter<boolean>();\n    @Output() onCategoryCreated = new EventEmitter<MJQueryCategoryEntity>();\n    \n    public categoryName = '';\n    public selectedParentId: string | null = null;\n    public categories: MJQueryCategoryEntity[] = [];\n    public categoryTree: CategoryNode[] = [];\n    public flattenedCategories: CategoryNode[] = [];\n    public isCreating = false;\n    \n    async ngOnInit() {\n        await this.loadCategories();\n    }\n    \n    async loadCategories() {\n        try {\n            const rv = RunView.FromMetadataProvider(this.ProviderToUse);\n            const result = await rv.RunView<MJQueryCategoryEntity>({\n                EntityName: 'MJ: Query Categories',\n                OrderBy: 'Name',\n                ResultType: 'entity_object'\n            });\n            \n            if (result.Success && result.Results) {\n                this.categories = result.Results;\n                this.categoryTree = this.buildCategoryTree(this.categories);\n                this.flattenedCategories = this.flattenCategories(this.categoryTree, 0);\n            }\n        } catch (error) {\n            console.error('Error loading categories:', error);\n        }\n    }\n    \n    private buildCategoryTree(categories: MJQueryCategoryEntity[]): CategoryNode[] {\n        const categoryMap = new Map<string, CategoryNode>();\n        const rootCategories: CategoryNode[] = [];\n        \n        // Create nodes for all categories\n        categories.forEach(cat => {\n            categoryMap.set(cat.ID, {\n                id: cat.ID,\n                name: cat.Name,\n                fullPath: cat.Name,\n                children: [],\n                level: 0\n            });\n        });\n        \n        // Build the tree structure\n        categories.forEach(cat => {\n            const node = categoryMap.get(cat.ID)!;\n            if (cat.ParentID && categoryMap.has(cat.ParentID)) {\n                const parent = categoryMap.get(cat.ParentID)!;\n                parent.children.push(node);\n                node.fullPath = `${parent.fullPath} / ${node.name}`;\n            } else {\n                rootCategories.push(node);\n            }\n        });\n        \n        // Sort children alphabetically\n        const sortNodes = (nodes: CategoryNode[]) => {\n            nodes.sort((a, b) => a.name.localeCompare(b.name));\n            nodes.forEach(node => sortNodes(node.children));\n        };\n        sortNodes(rootCategories);\n        \n        return rootCategories;\n    }\n    \n    private flattenCategories(nodes: CategoryNode[], level: number): CategoryNode[] {\n        const result: CategoryNode[] = [];\n        nodes.forEach(node => {\n            node.level = level;\n            result.push(node);\n            if (node.children.length > 0) {\n                result.push(...this.flattenCategories(node.children, level + 1));\n            }\n        });\n        return result;\n    }\n    \n    async createCategory() {\n        if (!this.categoryName.trim()) {\n            MJNotificationService.Instance.CreateSimpleNotification(\n                'Please enter a category name',\n                'warning'\n            );\n            return;\n        }\n        \n        this.isCreating = true;\n        \n        try {\n            const md = this.ProviderToUse;\n            const newCategory = await md.GetEntityObject<MJQueryCategoryEntity>('MJ: Query Categories');\n            newCategory.Name = this.categoryName.trim();\n            newCategory.ParentID = this.selectedParentId;\n            newCategory.UserID = md.CurrentUser.ID;\n            \n            const saved = await newCategory.Save();\n            \n            if (saved) {\n                MJNotificationService.Instance.CreateSimpleNotification(\n                    'Category created successfully',\n                    'success'\n                );\n                this.onCategoryCreated.emit(newCategory);\n                this.close();\n            } else {\n                MJNotificationService.Instance.CreateSimpleNotification(\n                    `Failed to create category: ${newCategory.LatestResult?.Message || 'Unknown error'}`,\n                    'error'\n                );\n            }\n        } catch (error) {\n            console.error('Error creating category:', error);\n            MJNotificationService.Instance.CreateSimpleNotification(\n                'Error creating category',\n                'error'\n            );\n        } finally {\n            this.isCreating = false;\n        }\n    }\n    \n    close() {\n        this.categoryName = '';\n        this.selectedParentId = null;\n        this.isVisible = false;\n        this.isVisibleChange.emit(false);\n    }\n    \n    getCategoryIndent(category: CategoryNode): string {\n        return `${category.level * 20}px`;\n    }\n    \n    getFullPath(): string {\n        const parent = this.flattenedCategories.find(c => c.id === this.selectedParentId);\n        const name = this.categoryName || 'New Category';\n        return parent ? `${parent.fullPath} / ${name}` : name;\n    }\n}","@if (isVisible) {\n  <mj-dialog\n    [Visible]=\"true\"\n    [Width]=\"500\"\n    (Close)=\"close()\">\n    <mj-dialog-titlebar>\n      <div style=\"display: flex; align-items: center; gap: 8px;\">\n        <i class=\"fa-solid fa-folder-plus\" style=\"color: #28a745;\"></i>\n        Create New Query Category\n      </div>\n    </mj-dialog-titlebar>\n    <div style=\"padding: 20px;\">\n      <div class=\"form-group\" style=\"margin-bottom: 20px;\">\n        <label for=\"categoryName\" style=\"display: block; margin-bottom: 8px; font-weight: 600; color: var(--mj-text-secondary);\">\n          <i class=\"fa-solid fa-tag\"></i> Category Name <span style=\"color: #dc3545;\">*</span>\n        </label>\n        <input class=\"mj-input\"\n          [(ngModel)]=\"categoryName\"\n          name=\"categoryName\"\n          placeholder=\"Enter category name...\"\n          style=\"width: 100%;\" />\n      </div>\n      <div class=\"form-group\">\n        <label for=\"parentCategory\" style=\"display: block; margin-bottom: 8px; font-weight: 600; color: var(--mj-text-secondary);\">\n          <i class=\"fa-solid fa-folder-tree\"></i> Parent Category (Optional)\n        </label>\n        <mj-dropdown\n          [(ngModel)]=\"selectedParentId\"\n          name=\"parentCategory\"\n          [Data]=\"flattenedCategories\"\n          TextField=\"name\"\n          ValueField=\"id\"\n          [ValuePrimitive]=\"true\"\n          Placeholder=\"-- No Parent (Top Level) --\"\n          style=\"width: 100%;\">\n        </mj-dropdown>\n        @if (selectedParentId) {\n          <div style=\"margin-top: 8px; padding: 8px; background: var(--mj-bg-surface-sunken); border-radius: 4px; font-size: 0.85em; color: var(--mj-text-muted);\">\n            <i class=\"fa-solid fa-info-circle\"></i>\n            Full path: {{ getFullPath() }}\n          </div>\n        }\n      </div>\n    </div>\n    <mj-dialog-actions>\n      <button mjButton (click)=\"close()\">\n        <i class=\"fa-solid fa-times\"></i> Cancel\n      </button>\n      <button mjButton\n        variant=\"primary\"\n        [disabled]=\"!categoryName.trim() || isCreating\"\n        (click)=\"createCategory()\">\n        @if (isCreating) {\n          <i class=\"fa-solid fa-spinner fa-spin\"></i> Creating...\n        } @else {\n          <i class=\"fa-solid fa-check\"></i> Create Category\n        }\n      </button>\n    </mj-dialog-actions>\n  </mj-dialog>\n}\n"]}
+{"version":3,"file":"query-category-dialog.component.js","sourceRoot":"","sources":["../../../../src/lib/custom/Queries/query-category-dialog.component.ts","../../../../src/lib/custom/Queries/query-category-dialog.component.html"],"names":[],"mappings":"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","sourcesContent":["import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';\nimport { MJQueryCategoryEntity, QueryEngine } from '@memberjunction/core-entities';\nimport { MJNotificationService } from '@memberjunction/ng-notifications';\n\nimport { BaseAngularComponent } from '@memberjunction/ng-base-types';\ninterface CategoryNode {\n    id: string;\n    name: string;\n    fullPath: string;\n    children: CategoryNode[];\n    level: number;\n}\n\n@Component({\n  standalone: false,\n    selector: 'mj-query-category-dialog',\n    templateUrl: './query-category-dialog.component.html',\n    styleUrls: ['./query-category-dialog.component.css']\n})\nexport class QueryCategoryDialogComponent extends BaseAngularComponent implements OnInit {\n    @Input() isVisible = false;\n    @Output() isVisibleChange = new EventEmitter<boolean>();\n    @Output() onCategoryCreated = new EventEmitter<MJQueryCategoryEntity>();\n    \n    public categoryName = '';\n    public selectedParentId: string | null = null;\n    public categories: MJQueryCategoryEntity[] = [];\n    public categoryTree: CategoryNode[] = [];\n    public flattenedCategories: CategoryNode[] = [];\n    public isCreating = false;\n    \n    ngOnInit() {\n        this.loadCategories();\n    }\n    \n    loadCategories() {\n        this.categories = QueryEngine.Instance.Categories;\n        this.categoryTree = this.buildCategoryTree(this.categories);\n        this.flattenedCategories = this.flattenCategories(this.categoryTree, 0);\n    }\n    \n    private buildCategoryTree(categories: MJQueryCategoryEntity[]): CategoryNode[] {\n        const categoryMap = new Map<string, CategoryNode>();\n        const rootCategories: CategoryNode[] = [];\n        \n        // Create nodes for all categories\n        categories.forEach(cat => {\n            categoryMap.set(cat.ID, {\n                id: cat.ID,\n                name: cat.Name,\n                fullPath: cat.Name,\n                children: [],\n                level: 0\n            });\n        });\n        \n        // Build the tree structure\n        categories.forEach(cat => {\n            const node = categoryMap.get(cat.ID)!;\n            if (cat.ParentID && categoryMap.has(cat.ParentID)) {\n                const parent = categoryMap.get(cat.ParentID)!;\n                parent.children.push(node);\n                node.fullPath = `${parent.fullPath} / ${node.name}`;\n            } else {\n                rootCategories.push(node);\n            }\n        });\n        \n        // Sort children alphabetically\n        const sortNodes = (nodes: CategoryNode[]) => {\n            nodes.sort((a, b) => a.name.localeCompare(b.name));\n            nodes.forEach(node => sortNodes(node.children));\n        };\n        sortNodes(rootCategories);\n        \n        return rootCategories;\n    }\n    \n    private flattenCategories(nodes: CategoryNode[], level: number): CategoryNode[] {\n        const result: CategoryNode[] = [];\n        nodes.forEach(node => {\n            node.level = level;\n            result.push(node);\n            if (node.children.length > 0) {\n                result.push(...this.flattenCategories(node.children, level + 1));\n            }\n        });\n        return result;\n    }\n    \n    async createCategory() {\n        if (!this.categoryName.trim()) {\n            MJNotificationService.Instance.CreateSimpleNotification(\n                'Please enter a category name',\n                'warning'\n            );\n            return;\n        }\n        \n        this.isCreating = true;\n        \n        try {\n            const md = this.ProviderToUse;\n            const newCategory = await md.GetEntityObject<MJQueryCategoryEntity>('MJ: Query Categories');\n            newCategory.Name = this.categoryName.trim();\n            newCategory.ParentID = this.selectedParentId;\n            newCategory.UserID = md.CurrentUser.ID;\n            \n            const saved = await newCategory.Save();\n            \n            if (saved) {\n                MJNotificationService.Instance.CreateSimpleNotification(\n                    'Category created successfully',\n                    'success'\n                );\n                this.onCategoryCreated.emit(newCategory);\n                this.close();\n            } else {\n                MJNotificationService.Instance.CreateSimpleNotification(\n                    `Failed to create category: ${newCategory.LatestResult?.Message || 'Unknown error'}`,\n                    'error'\n                );\n            }\n        } catch (error) {\n            console.error('Error creating category:', error);\n            MJNotificationService.Instance.CreateSimpleNotification(\n                'Error creating category',\n                'error'\n            );\n        } finally {\n            this.isCreating = false;\n        }\n    }\n    \n    close() {\n        this.categoryName = '';\n        this.selectedParentId = null;\n        this.isVisible = false;\n        this.isVisibleChange.emit(false);\n    }\n    \n    getCategoryIndent(category: CategoryNode): string {\n        return `${category.level * 20}px`;\n    }\n    \n    getFullPath(): string {\n        const parent = this.flattenedCategories.find(c => c.id === this.selectedParentId);\n        const name = this.categoryName || 'New Category';\n        return parent ? `${parent.fullPath} / ${name}` : name;\n    }\n}","@if (isVisible) {\n  <mj-dialog\n    [Visible]=\"true\"\n    [Width]=\"500\"\n    (Close)=\"close()\">\n    <mj-dialog-titlebar>\n      <div style=\"display: flex; align-items: center; gap: 8px;\">\n        <i class=\"fa-solid fa-folder-plus\" style=\"color: #28a745;\"></i>\n        Create New Query Category\n      </div>\n    </mj-dialog-titlebar>\n    <div style=\"padding: 20px;\">\n      <div class=\"form-group\" style=\"margin-bottom: 20px;\">\n        <label for=\"categoryName\" style=\"display: block; margin-bottom: 8px; font-weight: 600; color: var(--mj-text-secondary);\">\n          <i class=\"fa-solid fa-tag\"></i> Category Name <span style=\"color: #dc3545;\">*</span>\n        </label>\n        <input class=\"mj-input\"\n          [(ngModel)]=\"categoryName\"\n          name=\"categoryName\"\n          placeholder=\"Enter category name...\"\n          style=\"width: 100%;\" />\n      </div>\n      <div class=\"form-group\">\n        <label for=\"parentCategory\" style=\"display: block; margin-bottom: 8px; font-weight: 600; color: var(--mj-text-secondary);\">\n          <i class=\"fa-solid fa-folder-tree\"></i> Parent Category (Optional)\n        </label>\n        <mj-dropdown\n          [(ngModel)]=\"selectedParentId\"\n          name=\"parentCategory\"\n          [Data]=\"flattenedCategories\"\n          TextField=\"name\"\n          ValueField=\"id\"\n          [ValuePrimitive]=\"true\"\n          Placeholder=\"-- No Parent (Top Level) --\"\n          style=\"width: 100%;\">\n        </mj-dropdown>\n        @if (selectedParentId) {\n          <div style=\"margin-top: 8px; padding: 8px; background: var(--mj-bg-surface-sunken); border-radius: 4px; font-size: 0.85em; color: var(--mj-text-muted);\">\n            <i class=\"fa-solid fa-info-circle\"></i>\n            Full path: {{ getFullPath() }}\n          </div>\n        }\n      </div>\n    </div>\n    <mj-dialog-actions>\n      <button mjButton (click)=\"close()\">\n        <i class=\"fa-solid fa-times\"></i> Cancel\n      </button>\n      <button mjButton\n        variant=\"primary\"\n        [disabled]=\"!categoryName.trim() || isCreating\"\n        (click)=\"createCategory()\">\n        @if (isCreating) {\n          <i class=\"fa-solid fa-spinner fa-spin\"></i> Creating...\n        } @else {\n          <i class=\"fa-solid fa-check\"></i> Create Category\n        }\n      </button>\n    </mj-dialog-actions>\n  </mj-dialog>\n}\n"]}

package/dist/lib/custom/Queries/query-form.component.d.ts

@@ -1,8 +1,8 @@
 import { OnInit, OnDestroy, AfterViewInit } from '@angular/core';
-import { MJQueryEntity, MJQueryParameterEntity, MJQueryCategoryEntity, MJQueryFieldEntity, MJQueryEntityEntity, MJQueryPermissionEntity } from '@memberjunction/core-entities';
+import { MJQueryEntityExtended, MJQueryParameterEntity, MJQueryCategoryEntity, MJQueryFieldEntity, MJQueryEntityEntity, MJQueryPermissionEntity, MJQueryDependencyEntity } from '@memberjunction/core-entities';
 import { FormToolbarConfig } from '@memberjunction/ng-base-forms';
 import { MJQueryFormComponent } from '../../generated/Entities/MJQuery/mjquery.form.component';
-import { CompositeKey, QueryInfo, QueryDependencyInfo } from '@memberjunction/core';
+import { CompositeKey } from '@memberjunction/core';
 import { TreeBranchConfig } from '@memberjunction/ng-trees';
 import { CodeEditorComponent, CompositionTokenClickEvent } from '@memberjunction/ng-code-editor';
 import * as i0 from "@angular/core";
@@ -12,7 +12,7 @@ interface CategoryTreeNode {
     items?: CategoryTreeNode[];
 }
 export declare class MJQueryFormComponentExtended extends MJQueryFormComponent implements OnInit, OnDestroy, AfterViewInit {
-    record: MJQueryEntity;
+    record: MJQueryEntityExtended;
     queryParameters: MJQueryParameterEntity[];
     queryFields: MJQueryFieldEntity[];
     queryEntities: MJQueryEntityEntity[];
@@ -58,14 +58,10 @@ export declare class MJQueryFormComponentExtended extends MJQueryFormComponent i
     sqlFilters: import("@memberjunction/core").RunQuerySQLFilter[];
     private navigationService;
     private destroy$;
-    /**
-     * Gets the QueryInfo metadata object for the current record, used to access Dependents.
-     */
-    get CurrentQueryInfo(): QueryInfo | undefined;
     /**
      * Gets queries that depend on (reference) this query via composition.
      */
-    get DependentQueries(): QueryDependencyInfo[];
+    get DependentQueries(): MJQueryDependencyEntity[];
     private isUpdatingEditorValue;
     private isInitialLoad;
     ngOnInit(): Promise<void>;
@@ -76,11 +72,11 @@ export declare class MJQueryFormComponentExtended extends MJQueryFormComponent i
     CancelEdit(): void;
     private updateEditorValue;
     isFormReadOnly(): boolean;
-    loadQueryParameters(): Promise<void>;
-    loadQueryFields(): Promise<void>;
-    loadQueryEntities(): Promise<void>;
-    loadQueryPermissions(): Promise<void>;
-    loadCategories(): Promise<void>;
+    loadQueryParameters(): void;
+    loadQueryFields(): void;
+    loadQueryEntities(): void;
+    loadQueryPermissions(): void;
+    loadCategories(): void;
     private buildCategoryTree;
     getCategoryPath(): string;
     private updateCategoryPathDisplay;
@@ -115,7 +111,7 @@ export declare class MJQueryFormComponentExtended extends MJQueryFormComponent i
     /**
      * Handle category creation from dialog
      */
-    onCategoryCreated(newCategory: MJQueryCategoryEntity): Promise<void>;
+    onCategoryCreated(newCategory: MJQueryCategoryEntity): void;
     /**
      * Format date for display
      */
@@ -132,7 +128,7 @@ export declare class MJQueryFormComponentExtended extends MJQueryFormComponent i
     /**
      * Navigate to a dependent query's record
      */
-    onDependentQueryClick(dep: QueryDependencyInfo): void;
+    onDependentQueryClick(dep: MJQueryDependencyEntity): void;
     /**
      * Handle SQL value changes from the code editor
      */

package/dist/lib/custom/Queries/query-form.component.d.ts.map

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

package/dist/lib/custom/Queries/query-form.component.js

@@ -5,10 +5,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { Component, ViewChild, inject } from '@angular/core';
+import { QueryEngine } from '@memberjunction/core-entities';
 import { RegisterClass, UUIDsEqual } from '@memberjunction/global';
 import { BaseFormComponent, CUSTOM_LAYOUT_TOOLBAR_CONFIG } from '@memberjunction/ng-base-forms';
 import { MJQueryFormComponent } from '../../generated/Entities/MJQuery/mjquery.form.component';
-import { RunView, RUN_QUERY_SQL_FILTERS, CompositeKey } from '@memberjunction/core';
+import { RUN_QUERY_SQL_FILTERS, CompositeKey } from '@memberjunction/core';
 import { MJNotificationService } from '@memberjunction/ng-notifications';
 import { NavigationService } from '@memberjunction/ng-shared';
 import { Subject } from 'rxjs';
@@ -1314,34 +1315,23 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
     }
     /** Custom-layout Query form looks best full-width on first open. */
     getDefaultFormWidthMode() { return 'full-width'; }
-    /**
-     * Gets the QueryInfo metadata object for the current record, used to access Dependents.
-     */
-    get CurrentQueryInfo() {
-        if (!this.record?.ID)
-            return undefined;
-        return this.ProviderToUse.Queries.find(q => UUIDsEqual(q.ID, this.record.ID));
-    }
     /**
      * Gets queries that depend on (reference) this query via composition.
      */
     get DependentQueries() {
-        return this.CurrentQueryInfo?.Dependents ?? [];
+        return this.record?.QueryDependents ?? [];
     }
     async ngOnInit() {
         await super.ngOnInit();
         // During init, suppress per-method detectChanges to avoid NG0100.
         // We do one unified detectChanges after everything completes.
         this.isInitialLoad = true;
-        // Load categories first to ensure they're available for the dropdown
-        await this.loadCategories();
-        // Then load other data in parallel
-        await Promise.all([
-            this.loadQueryParameters(),
-            this.loadQueryFields(),
-            this.loadQueryEntities(),
-            this.loadQueryPermissions()
-        ]);
+        // Load all data synchronously from QueryEngine cache
+        this.loadCategories();
+        this.loadQueryParameters();
+        this.loadQueryFields();
+        this.loadQueryEntities();
+        this.loadQueryPermissions();
         this.isInitialLoad = false;
         this.cdr.detectChanges();
     }
@@ -1392,139 +1382,51 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
     isFormReadOnly() {
         return !this.EditMode;
     }
-    async loadQueryParameters() {
+    loadQueryParameters() {
         if (this.record && this.record.ID) {
-            this.isLoadingParameters = true;
-            try {
-                const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-                const results = await rv.RunView({
-                    EntityName: 'MJ: Query Parameters',
-                    ExtraFilter: `QueryID='${this.record.ID}'`,
-                    OrderBy: 'Name ASC',
-                    ResultType: 'entity_object'
-                });
-                if (results.Success) {
-                    this.queryParameters = results.Results || [];
-                }
-            }
-            catch (error) {
-                console.error('Error loading query parameters:', error);
-            }
-            finally {
-                this.isLoadingParameters = false;
-                if (!this.isInitialLoad)
-                    this.cdr.detectChanges();
-            }
+            this.queryParameters = this.record.QueryParameters;
+            if (!this.isInitialLoad)
+                this.cdr.detectChanges();
         }
     }
-    async loadQueryFields() {
+    loadQueryFields() {
         if (this.record && this.record.ID) {
-            this.isLoadingFields = true;
-            try {
-                const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-                const results = await rv.RunView({
-                    EntityName: 'MJ: Query Fields',
-                    ExtraFilter: `QueryID='${this.record.ID}'`,
-                    OrderBy: 'Sequence ASC, Name ASC',
-                    ResultType: 'entity_object'
-                });
-                if (results.Success) {
-                    this.queryFields = results.Results || [];
-                }
-            }
-            catch (error) {
-                console.error('Error loading query fields:', error);
-            }
-            finally {
-                this.isLoadingFields = false;
-                if (!this.isInitialLoad)
-                    this.cdr.detectChanges();
-            }
+            this.queryFields = this.record.QueryFields;
+            if (!this.isInitialLoad)
+                this.cdr.detectChanges();
         }
     }
-    async loadQueryEntities() {
+    loadQueryEntities() {
         if (this.record && this.record.ID) {
-            this.isLoadingEntities = true;
-            try {
-                const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-                const results = await rv.RunView({
-                    EntityName: 'MJ: Query Entities',
-                    ExtraFilter: `QueryID='${this.record.ID}'`,
-                    OrderBy: 'Entity ASC',
-                    ResultType: 'entity_object'
-                });
-                if (results.Success) {
-                    this.queryEntities = results.Results || [];
-                    console.log('Loaded query entities:', this.queryEntities);
-                }
-            }
-            catch (error) {
-                console.error('Error loading query entities:', error);
-            }
-            finally {
-                this.isLoadingEntities = false;
-                if (!this.isInitialLoad)
-                    this.cdr.detectChanges();
-            }
+            this.queryEntities = this.record.QueryEntities;
+            if (!this.isInitialLoad)
+                this.cdr.detectChanges();
         }
     }
-    async loadQueryPermissions() {
+    loadQueryPermissions() {
         if (this.record && this.record.ID) {
-            this.isLoadingPermissions = true;
-            try {
-                const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-                const results = await rv.RunView({
-                    EntityName: 'MJ: Query Permissions',
-                    ExtraFilter: `QueryID='${this.record.ID}'`,
-                    OrderBy: 'Role ASC',
-                    ResultType: 'entity_object'
-                });
-                if (results.Success) {
-                    this.queryPermissions = results.Results || [];
-                }
-            }
-            catch (error) {
-                console.error('Error loading query permissions:', error);
-            }
-            finally {
-                this.isLoadingPermissions = false;
-                if (!this.isInitialLoad)
-                    this.cdr.detectChanges();
-            }
+            this.queryPermissions = this.record.QueryPermissions;
+            if (!this.isInitialLoad)
+                this.cdr.detectChanges();
         }
     }
-    async loadCategories() {
-        try {
-            const rv = RunView.FromMetadataProvider(this.ProviderToUse);
-            const results = await rv.RunView({
-                EntityName: 'MJ: Query Categories',
-                OrderBy: 'Name',
-                ResultType: 'entity_object'
-            });
-            if (results.Success && results.Results) {
-                this.categories = results.Results;
-                // Build flat options for legacy compatibility
-                this.categoryOptions = [
-                    { text: 'Select Category...', value: '' },
-                    ...this.categories.map(cat => ({
-                        text: cat.Name,
-                        value: cat.ID
-                    }))
-                ];
-                // Build tree data after options are set
-                this.categoryTreeData = this.buildCategoryTree(this.categories);
-                // Update cached category path display
-                this.updateCategoryPathDisplay();
-                // Trigger change detection to update the view (skip during init)
-                if (!this.isInitialLoad)
-                    this.cdr.detectChanges();
-            }
-        }
-        catch (error) {
-            console.error('Error loading categories:', error);
-            this.categoryOptions = [{ text: 'Select Category...', value: '' }];
-            this.categoryTreeData = [];
-        }
+    loadCategories() {
+        this.categories = QueryEngine.Instance.Categories;
+        // Build flat options for legacy compatibility
+        this.categoryOptions = [
+            { text: 'Select Category...', value: '' },
+            ...this.categories.map(cat => ({
+                text: cat.Name,
+                value: cat.ID
+            }))
+        ];
+        // Build tree data after options are set
+        this.categoryTreeData = this.buildCategoryTree(this.categories);
+        // Update cached category path display
+        this.updateCategoryPathDisplay();
+        // Trigger change detection to update the view (skip during init)
+        if (!this.isInitialLoad)
+            this.cdr.detectChanges();
     }
     buildCategoryTree(categories) {
         const categoryMap = new Map();
@@ -1652,7 +1554,7 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
             console.warn(`Executing query '${this.record.Name}' with status '${this.record.Status}'. Query has not been approved.`);
         }
         // Reload parameters in case they were updated
-        await this.loadQueryParameters();
+        this.loadQueryParameters();
         // Show the run dialog — set before detectChanges to avoid NG0100
         this.showRunDialog = true;
         this.cdr.detectChanges();
@@ -1741,9 +1643,9 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
     /**
      * Handle category creation from dialog
      */
-    async onCategoryCreated(newCategory) {
+    onCategoryCreated(newCategory) {
         // Reload categories to include the new one
-        await this.loadCategories();
+        this.loadCategories();
         // Set the new category as selected
         this.record.CategoryID = newCategory.ID;
         // Trigger change detection
@@ -1825,11 +1727,9 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
             this.updateUnsavedChangesFlag();
             // Reload related data after successful save as server-side processes may have updated them
             if (this.record && this.record.ID) {
-                await Promise.all([
-                    this.loadQueryParameters(),
-                    this.loadQueryFields(),
-                    this.loadQueryEntities()
-                ]);
+                this.loadQueryParameters();
+                this.loadQueryFields();
+                this.loadQueryEntities();
                 this.updateCategoryPathDisplay();
                 this.cdr.detectChanges();
             }
@@ -1865,24 +1765,24 @@ let MJQueryFormComponentExtended = class MJQueryFormComponentExtended extends MJ
      * Handle composition token click — navigate to the referenced query
      */
     onCompositionTokenClick(event) {
-        const md = this.ProviderToUse;
+        const allQueries = QueryEngine.Instance.Queries;
         const segments = event.FullPath.split('/').map(s => s.trim()).filter(s => s.length > 0);
         if (segments.length === 0)
             return;
         const queryName = segments[segments.length - 1];
         const categorySegments = segments.slice(0, -1);
         // First try: exact match on Name + CategoryPath
-        let targetQuery = md.Queries.find(q => {
+        let targetQuery = allQueries.find(q => {
             if (q.Name !== queryName)
                 return false;
             if (categorySegments.length === 0)
                 return true;
-            const expectedPath = '/' + categorySegments.join('/') + '/';
+            const expectedPath = categorySegments.join('/');
             return q.CategoryPath === expectedPath;
         });
         // Fallback: match on Name alone
         if (!targetQuery) {
-            targetQuery = md.Queries.find(q => q.Name === queryName);
+            targetQuery = allQueries.find(q => q.Name === queryName);
         }
         if (targetQuery) {
             const compositeKey = CompositeKey.FromID(targetQuery.ID);