@shamar/adonis 0.1.2 → 0.1.3

package/assets/shamar-ui.js

@@ -818,9 +818,12 @@
 
       openRecord() {
         if (!this.value || !this.detailUrlBase) return;
+        const url = this.readonly
+          ? `${this.detailUrlBase}/${this.value}`
+          : `${this.detailUrlBase}/${this.value}/edit`;
         window.ShamarUI.openDialog({
-          url: `${this.detailUrlBase}/${this.value}/edit`,
-          title: this.label || 'Edit record',
+          url,
+          title: this.label || (this.readonly ? 'View record' : 'Edit record'),
           slug: this.relatedResource,
         });
       },
@@ -1119,9 +1122,12 @@
 
       openRecord(item) {
         if (!item?.id || !this.detailUrlBase) return;
+        const url = this.readonly
+          ? `${this.detailUrlBase}/${item.id}`
+          : `${this.detailUrlBase}/${item.id}/edit`;
         window.ShamarUI.openDialog({
-          url: `${this.detailUrlBase}/${item.id}/edit`,
-          title: item.label || 'Edit record',
+          url,
+          title: item.label || (this.readonly ? 'View record' : 'Edit record'),
           slug: this.relatedResource,
         });
       },
@@ -1453,10 +1459,30 @@
   function createShamarM2mTable(cfg) {
     const self = createShamarM2m(cfg);
     self.addOpen = false;
+    self.listUrl = cfg.listUrl || null;
+    self.columns = Array.isArray(cfg.columns) ? cfg.columns : [];
+    self.listHeaders = Array.isArray(cfg.listHeaders) ? cfg.listHeaders : [];
+    self.rows = [];
+    self.total = 0;
+    self.page = 1;
+    self.pageCount = 1;
+    self.perPage = String(cfg.perPage || 10);
+    self.listSearch = '';
+    self.listFilters = [];
+    self.listSort = cfg.defaultSort || '';
+    self.listDirection = cfg.defaultDirection || 'asc';
+    self.listLoading = false;
+    self.filterPanelOpen = false;
+    self._listAbort = null;
+
     const prevInit = self.init;
     const prevDestroy = self.destroy;
     const prevPick = self.pick;
     const prevCreateAndEdit = self.createAndEdit;
+    const prevAttach = self.attachHasMany;
+    const prevDetach = self.detachHasMany;
+    const prevOpenRecord = self.openRecord;
+
     self.init = function initTable() {
       prevInit.call(this);
       this._tablePickHandler = (event) => {
@@ -1467,13 +1493,190 @@
         }
       };
       window.addEventListener('shamar-m2m-pick', this._tablePickHandler);
+      if (this.listUrl) {
+        this.loadList();
+      }
     };
+
     self.destroy = function destroyTable() {
       prevDestroy.call(this);
       if (this._tablePickHandler) {
         window.removeEventListener('shamar-m2m-pick', this._tablePickHandler);
       }
+      if (this._listAbort) this._listAbort.abort();
+    };
+
+    Object.defineProperty(self, 'filterableHeaders', {
+      get() {
+        return (this.listHeaders || []).filter(
+          (header) =>
+            header.filter_kind === 'boolean' ||
+            (header.filter_kind === 'select' && Array.isArray(header.options)),
+        );
+      },
+    });
+
+    Object.defineProperty(self, 'availableResults', {
+      get() {
+        const linked = new Set([
+          ...(this.selected || []).map((item) => String(item.id)),
+          ...(this.rows || []).map((row) => String(row.id)),
+        ]);
+        return (this.results || []).filter((item) => !linked.has(String(item.id)));
+      },
+    });
+
+    self.cellAlignment = function cellAlignment(columnName) {
+      const column = (this.columns || []).find((entry) => entry.name === columnName);
+      return column?.alignmentClass || '';
+    };
+
+    self.buildListUrl = function buildListUrl() {
+      const url = new URL(this.listUrl, window.location.origin);
+      if (this.listSearch) url.searchParams.set('search', this.listSearch);
+      if (this.listSort) {
+        url.searchParams.set('sort', this.listSort);
+        if (this.listDirection === 'asc' || this.listDirection === 'desc') {
+          url.searchParams.set('direction', this.listDirection);
+        }
+      }
+      url.searchParams.set('page', String(this.page || 1));
+      url.searchParams.set('perPage', String(this.perPage || 10));
+      if (this.listFilters?.length) {
+        url.searchParams.set('filters', JSON.stringify(this.listFilters));
+      }
+      return `${url.pathname}${url.search}`;
+    };
+
+    self.loadList = async function loadList() {
+      if (!this.listUrl) return;
+      if (this._listAbort) this._listAbort.abort();
+      const ctl = new AbortController();
+      this._listAbort = ctl;
+      this.listLoading = true;
+      try {
+        const response = await fetch(this.buildListUrl(), {
+          signal: ctl.signal,
+          credentials: 'same-origin',
+          headers: { Accept: 'application/json' },
+        });
+        if (!response.ok) throw new Error('list failed');
+        const data = await response.json();
+        this.rows = Array.isArray(data.rows) ? data.rows : [];
+        this.total = Number(data.total) || 0;
+        this.page = Number(data.page) || 1;
+        this.pageCount = Math.max(1, Number(data.pageCount) || 1);
+        this.perPage = String(data.perPage || this.perPage || 10);
+        if (Array.isArray(data.columns) && data.columns.length) {
+          this.columns = data.columns;
+        }
+        if (Array.isArray(data.listHeaders)) {
+          this.listHeaders = data.listHeaders;
+        }
+        if (data.sort) this.listSort = data.sort;
+        if (data.direction) this.listDirection = data.direction;
+      } catch (error) {
+        if (error.name !== 'AbortError') {
+          this.rows = [];
+          this.total = 0;
+          showToast('error', {
+            title: 'Error',
+            message: 'Unable to load related records.',
+          });
+        }
+      } finally {
+        this.listLoading = false;
+      }
     };
+
+    self.applyListSearch = function applyListSearch() {
+      this.page = 1;
+      this.loadList();
+    };
+
+    self.setListPage = function setListPage(page) {
+      const next = Math.max(1, Number(page) || 1);
+      this.page = next;
+      this.loadList();
+    };
+
+    self.toggleListSort = function toggleListSort(field) {
+      if (!field) return;
+      if (this.listSort === field) {
+        this.listDirection = this.listDirection === 'asc' ? 'desc' : 'asc';
+      } else {
+        this.listSort = field;
+        this.listDirection = 'asc';
+      }
+      this.page = 1;
+      this.loadList();
+    };
+
+    self.hasFilter = function hasFilter(header, value) {
+      const field = header.filterField || header.name;
+      return this.listFilters.some(
+        (chip) => chip.field === field && String(chip.value) === String(value),
+      );
+    };
+
+    self.toggleBooleanFilter = function toggleBooleanFilter(header, value) {
+      const field = header.filterField || header.name;
+      const existing = this.listFilters.find((chip) => chip.field === field);
+      if (existing && String(existing.value) === String(value)) {
+        this.listFilters = this.listFilters.filter((chip) => chip.field !== field);
+      } else {
+        this.listFilters = [
+          ...this.listFilters.filter((chip) => chip.field !== field),
+          {
+            field,
+            op: '=',
+            value,
+            label: `${header.label}: ${value ? 'Yes' : 'No'}`,
+          },
+        ];
+      }
+      this.page = 1;
+      this.loadList();
+    };
+
+    self.toggleSelectFilter = function toggleSelectFilter(header, opt) {
+      const field = header.filterField || header.name;
+      const value = opt.value;
+      if (this.hasFilter(header, value)) {
+        this.listFilters = this.listFilters.filter(
+          (chip) => !(chip.field === field && String(chip.value) === String(value)),
+        );
+      } else {
+        this.listFilters = [
+          ...this.listFilters.filter((chip) => chip.field !== field),
+          {
+            field,
+            op: '=',
+            value,
+            label: `${header.label}: ${opt.label}`,
+          },
+        ];
+      }
+      this.page = 1;
+      this.loadList();
+    };
+
+    self.removeListFilter = function removeListFilter(chip) {
+      this.listFilters = this.listFilters.filter(
+        (entry) =>
+          !(entry.field === chip.field && String(entry.value) === String(chip.value)),
+      );
+      this.page = 1;
+      this.loadList();
+    };
+
+    self.clearListFilters = function clearListFilters() {
+      this.listFilters = [];
+      this.filterPanelOpen = false;
+      this.page = 1;
+      this.loadList();
+    };
+
     self.toggleAdd = function toggleAdd() {
       this.addOpen = !this.addOpen;
       if (this.addOpen) {
@@ -1482,18 +1685,76 @@
         this.$nextTick?.(() => this.$refs.addInput?.focus());
       }
     };
+
     self.closeAdd = function closeAdd() {
       this.addOpen = false;
       this.query = '';
     };
+
     self.pick = function pickTable(item) {
+      if (
+        this.listUrl &&
+        item?.id != null &&
+        this.rows.some((row) => String(row.id) === String(item.id))
+      ) {
+        this.closeAdd();
+        return;
+      }
       prevPick.call(this, item);
       this.closeAdd();
     };
+
+    self.attachHasMany = async function attachHasManyTable(item) {
+      await prevAttach.call(this, item);
+      if (this.listUrl) {
+        this.page = 1;
+        await this.loadList();
+      }
+    };
+
+    self.detachHasMany = async function detachHasManyTable(relatedId) {
+      await prevDetach.call(this, relatedId);
+      if (this.listUrl) {
+        await this.loadList();
+      }
+    };
+
+    self.openRecord = function openRecordTable(item) {
+      if (!item?.id || !this.detailUrlBase) return;
+      const url = this.readonly
+        ? `${this.detailUrlBase}/${item.id}`
+        : `${this.detailUrlBase}/${item.id}/edit`;
+      window.ShamarUI.openDialog({
+        url,
+        title: item.label || (this.readonly ? 'View record' : 'Edit record'),
+        slug: this.relatedResource,
+        onResult: () => {
+          if (this.listUrl) this.loadList();
+        },
+      });
+    };
+
     self.createAndEdit = function createAndEditTable() {
       this.closeAdd();
-      prevCreateAndEdit.call(this);
+      if (!this.createUrl) return;
+      const q = (this.query || '').trim();
+      const url = q
+        ? `${this.createUrl}${this.createUrl.includes('?') ? '&' : '?'}name=${encodeURIComponent(q)}`
+        : this.createUrl;
+      const title = q ? `New ${this.singularLabel}` : `Create ${this.singularLabel}`;
+      window.ShamarUI.openDialog({
+        url,
+        title,
+        slug: this.relatedResource,
+        onResult: (detail) => {
+          if (detail?.id) {
+            prevPick.call(this, { id: detail.id, label: detail.label });
+          }
+          if (this.listUrl) this.loadList();
+        },
+      });
     };
+
     return self;
   }
 
@@ -3134,12 +3395,36 @@
     applyListHrefs();
     bindListViewSwitcher();
     bindListRefresh();
+    bindListRowNavigation();
     bindMediaUploads();
     bindFormSaveShortcut();
     bindFormAutosave();
     bindRecordPagerNav();
   });
 
+  function bindListRowNavigation() {
+    document.addEventListener('click', (event) => {
+      if (!(event instanceof MouseEvent) || event.button !== 0) return;
+      if (event.defaultPrevented) return;
+      if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) return;
+      const target = event.target;
+      if (!(target instanceof Element)) return;
+      if (
+        target.closest(
+          'a, button, input, select, textarea, label, [data-shamar-stop-row-nav]',
+        )
+      ) {
+        return;
+      }
+      const row = target.closest('tr[data-shamar-row-href]');
+      if (!row) return;
+      const href = row.getAttribute('data-shamar-row-href');
+      if (!href) return;
+      event.preventDefault();
+      window.location.assign(href);
+    });
+  }
+
   function relationConfigsFromForm(form) {
     const configs = [];
     if (!(form instanceof HTMLFormElement)) return configs;

package/dist/config.d.ts

@@ -71,6 +71,33 @@ export interface ShamarConfig {
     };
     /** Default branding inherited by panels without their own. */
     branding?: PanelConfig['branding'];
+    /**
+     * Optional REST / OpenAPI docs settings (consumed by `@shamar/rest`).
+     * Prefer nesting here or use a separate `config/shamar_rest.ts`.
+     */
+    rest?: {
+        enabled?: boolean;
+        openapiPath?: string;
+        docs?: {
+            enabled?: boolean;
+            path?: string;
+            ui?: 'scalar';
+        };
+        openapi?: {
+            title?: string;
+            version?: string;
+            description?: string;
+            servers?: Array<{
+                url: string;
+                description?: string;
+            }>;
+        };
+        security?: boolean;
+        discover?: false | {
+            prefixes?: string[];
+            exclude?: string[];
+        };
+    };
 }
 export declare function defineConfig(config: ShamarConfig): ShamarConfig & {
     panels: PanelConfig[];

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,QAAQ,EAET,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,UAAU,CAAC;AAE7C,MAAM,WAAW,YAAY;IAC3B,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IAC5C;;;OAGG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,OAAO,QAAQ,CAAC,CAAC;IACnC,+CAA+C;IAC/C,MAAM,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC;YAAE,OAAO,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC5C,2EAA2E;QAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,oEAAoE;QACpE,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,8CAA8C;QAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;WAGG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,wDAAwD;QACxD,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,qEAAqE;QACrE,SAAS,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAC3C,4CAA4C;QAC5C,YAAY,CAAC,EAAE,YAAY,CAAC;QAC5B,sEAAsE;QACtE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QACvC;;;;;;;;WAQG;QACH,OAAO,CAAC,EAAE;YACR,OAAO,EAAE,CACP,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,iBAAiB,KACnB,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;YACxD;;;;eAIG;YACH,UAAU,CAAC,EAAE,OAAO,CAAC;YACrB;;;eAGG;YACH,yBAAyB,CAAC,EAAE,OAAO,CAAC;SACrC,CAAC;QACF,iEAAiE;QACjE,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC;KAC9F,CAAC;IACF,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;CACpC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,WAAW,EAAE,CAAA;CAAE,CAU3F;AAED,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAqB,MAAM,cAAc,CAAC;AA2EvE,MAAM,UAAU,YAAY,CAAC,MAAoB;IAC/C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,QAAQ;QACjC,SAAS,EAAE,aAAa;QACxB,GAAG,EAAE,OAAO;QACZ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,IAAI,EAAE;QACrC,GAAG,MAAM;QACT,MAAM;KACP,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,CAAC;AAEhC,SAAS,eAAe,CAAC,MAAoB;IAC3C,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,MAAM,KAAK,GAAG,OAAQ,KAAsB,CAAC,KAAK,KAAK,UAAU;gBAC/D,CAAC,CAAE,KAAsB,CAAC,KAAK,EAAE;gBACjC,CAAC,CAAE,KAAqB,CAAC;YAC3B,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;gBAC3C,SAAS,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;aACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,QAAQ;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;SACzC;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,IAAI,WAAW,EAAqB,MAAM,cAAc,CAAC;AAqGvE,MAAM,UAAU,YAAY,CAAC,MAAoB;IAC/C,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACvC,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,QAAQ;QACjC,SAAS,EAAE,aAAa;QACxB,GAAG,EAAE,OAAO;QACZ,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,IAAI,EAAE;QACrC,GAAG,MAAM;QACT,MAAM;KACP,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,CAAC;AAEhC,SAAS,eAAe,CAAC,MAAoB;IAC3C,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,MAAM,KAAK,GAAG,OAAQ,KAAsB,CAAC,KAAK,KAAK,UAAU;gBAC/D,CAAC,CAAE,KAAsB,CAAC,KAAK,EAAE;gBACjC,CAAC,CAAE,KAAqB,CAAC;YAC3B,OAAO;gBACL,GAAG,KAAK;gBACR,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ;gBAC3C,SAAS,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;aACxC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL;YACE,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,QAAQ;YAC7B,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,SAAS,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;SACzC;KACF,CAAC;AACJ,CAAC"}

package/dist/controllers/admin_controller.d.ts

@@ -36,6 +36,7 @@ export declare class AdminController {
     formState(ctx: ShamarHttpContext): Promise<unknown>;
     summary(ctx: ShamarHttpContext): Promise<unknown>;
     relationSearch(ctx: ShamarHttpContext): Promise<unknown>;
+    relationTable(ctx: ShamarHttpContext): Promise<unknown>;
     relationQuickCreate(ctx: ShamarHttpContext): Promise<unknown>;
     relationAttach(ctx: ShamarHttpContext): Promise<unknown>;
     relationDetach(ctx: ShamarHttpContext): Promise<unknown>;

package/dist/controllers/admin_controller.d.ts.map

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

package/dist/controllers/admin_controller.js

@@ -1,4 +1,4 @@
-import { resolveGridItemStyle, isValidationException } from '@shamar/core';
+import { resolveGridItemStyle, isValidationException, relationUsesListTable } from '@shamar/core';
 import { Authorizer as AuthorizerClass } from '@shamar/cherubim';
 import { ResourceController } from '../controller.js';
 import { authRequired, assertResourceAccess, buildAuthContext, ForbiddenError, resourcePolicyFlags, respondForbidden, respondUnauthorized, UnauthorizedError, } from '../shamar/auth.js';
@@ -9,6 +9,7 @@ import { formSections, formSchemaTree, detailSections, detailSchemaTree, normali
 import { evaluateFormState, formClientFields } from '../form-state.js';
 import { buildRelationUiConfig, collectRelationIds, isRelationField, recordSummaryLabel, resolveRelatedMeta, relationTitleAttribute, } from '../shamar/relation-fields.js';
 import { hydrateRecordsForDisplay } from '../shamar/display-relations.js';
+import { buildRelationTableRows, relationTableListMeta, } from '../shamar/relation-table.js';
 export class AdminController {
     panel;
     config;
@@ -277,6 +278,7 @@ export class AdminController {
         if (this.wantsJson(ctx, options?.asJson)) {
             return ctx.response.json(record);
         }
+        const embed = this.isEmbed(ctx);
         const title = recordTitle(meta, record);
         const policy = resourcePolicyFlags(this.authorizer, authCtx, this.registry, meta, record);
         const shell = this.shellOpts(ctx, authCtx, {
@@ -298,11 +300,14 @@ export class AdminController {
             resource: meta,
             record,
             id: record.id,
+            embed,
             detailSchema: detailSchemaTree(meta),
             detailSections: detailSections(meta),
             relationUi,
             formErrors: {},
-            recordPager: await this.resolveRecordPager(ctx, meta, String(record.id), 'show'),
+            recordPager: embed
+                ? null
+                : await this.resolveRecordPager(ctx, meta, String(record.id), 'show'),
             resolveGridItemStyle,
             recordActions: visibleRowActions(meta, policy, record),
         });
@@ -434,6 +439,66 @@ export class AdminController {
         });
         return ctx.response.json({ results });
     }
+    async relationTable(ctx) {
+        const meta = this.requireResource(ctx);
+        const authResult = await this.ensureResourceAction(ctx, meta, 'viewAny', undefined, true);
+        if (!this.isAuthContext(authResult))
+            return authResult;
+        const authCtx = authResult;
+        const fieldName = String(ctx.request.input('field') ?? '');
+        const field = meta.fields.find((entry) => entry.name === fieldName);
+        if (!field?.relation || field.relation.kind !== 'hasMany' || !field.relation.foreignKey) {
+            return ctx.response.badRequest({ message: 'Relation table requires a hasMany field' });
+        }
+        const parentId = ctx.request.input('parentId');
+        if (!parentId) {
+            return ctx.response.badRequest({ message: 'parentId is required' });
+        }
+        const related = resolveRelatedMeta(this.registry, field.relation);
+        const relatedAuth = await this.ensureResourceAction(ctx, related, 'viewAny', undefined, true);
+        if (!this.isAuthContext(relatedAuth))
+            return relatedAuth;
+        const { columnConfigs, columns, listHeaders } = relationTableListMeta(related, field.relation.foreignKey);
+        const rawQuery = this.listQuery(ctx);
+        const hasFiltersParam = ctx.request.input('filters') !== undefined && ctx.request.input('filters') !== null;
+        const normalized = normalizeListQuery(rawQuery, { perPage: 10 });
+        if (!hasFiltersParam && related.defaultFilters?.length) {
+            normalized.filters = resolveDefaultFilters(related, listHeaders);
+        }
+        else if (normalized.filters?.length) {
+            normalized.filters = labelListFilters(normalized.filters, listHeaders);
+        }
+        if (!normalized.sort && related.defaultSort) {
+            normalized.sort = related.defaultSort.field;
+            normalized.direction = related.defaultSort.direction;
+        }
+        const query = this.withPolicyScope(authCtx, related, {
+            ...normalized,
+            scope: {
+                ...(normalized.scope ?? {}),
+                [field.relation.foreignKey]: String(parentId),
+            },
+        });
+        const result = await this.resources.index(related, query);
+        await hydrateRecordsForDisplay(related, result.items, this.registry, this.panel.adapter);
+        decorateRevokedStatus(result.items);
+        const titleAttribute = relationTitleAttribute(field.relation);
+        const rows = buildRelationTableRows(related, columnConfigs, result.items, this.basePath, (record) => recordSummaryLabel(related, record, titleAttribute));
+        return ctx.response.json({
+            items: result.items,
+            rows,
+            total: result.total,
+            page: result.page,
+            perPage: result.perPage,
+            pageCount: result.pageCount,
+            columns,
+            listHeaders,
+            filters: normalized.filters ?? [],
+            sort: normalized.sort ?? null,
+            direction: normalized.direction ?? null,
+            search: normalized.search ?? '',
+        });
+    }
     async relationQuickCreate(ctx) {
         const meta = this.requireResource(ctx);
         const authResult = await this.ensureResourceAction(ctx, meta, 'create', undefined, true);
@@ -973,7 +1038,16 @@ export class AdminController {
             const titleAttribute = relationTitleAttribute(field.relation);
             const widget = field.relation.widget ?? 'combobox';
             let initialItems = [];
-            if (field.relation.kind === 'hasMany' && record?.id != null && field.relation.foreignKey) {
+            const skipPreload = field.relation.kind === 'hasMany' &&
+                widget === 'table' &&
+                record?.id != null &&
+                !!field.relation.foreignKey &&
+                relationUsesListTable(field.relation);
+            if (skipPreload) {
+                // RelationTable loads linked rows via GET relation-table (search/page/filters).
+                initialItems = [];
+            }
+            else if (field.relation.kind === 'hasMany' && record?.id != null && field.relation.foreignKey) {
                 initialItems = await this.panel.adapter.search(related, {
                     titleAttribute,
                     limit: field.relation.preloadLimit ?? 100,