@duke333/builder-ui 0.2.2 → 0.2.3

package/dist/integration/index.d.ts

@@ -1,5 +1,5 @@
 import { BuilderApiContracts, BuilderApiClient, BuilderApiTransport } from '../api/index.js';
-import { P as createBuilderAdminPages, b as BuilderAdminPagesOptions, a as BuilderAdminPageContracts } from '../BuilderAdminPages-C-jaMLOa.js';
+import { Q as createBuilderAdminPages, b as BuilderAdminPagesOptions, a as BuilderAdminPageContracts } from '../BuilderAdminPages-DrOrFyIX.js';
 import { BuilderHooks } from '../hooks/index.js';
 import 'react';
 import 'react-hook-form';

package/dist/integration/index.js

@@ -251,16 +251,19 @@ function builderFormEditorValuesFromEntity(form, emptyValues) {
 function builderListEditorValuesFromEntity(list, emptyValues) {
   if (!list) return emptyValues;
   const source = list.source;
+  const orderBy = list.schema.orderBy ? Array.isArray(list.schema.orderBy) ? list.schema.orderBy : [list.schema.orderBy] : [];
   return {
     title: list.title,
     description: list.description ?? "",
     sourceType: source?.type ?? "none",
     sourceTable: source?.type === "dbTable" ? source.tableName : BUILDER_EDITOR_NONE_VALUE,
     apiBasePath: source?.type === "apiEndpoint" ? source.basePath : "",
+    orderBy,
     columns: list.schema.columns.map((column) => ({
       key: column.key,
       label: column.label,
       sortable: column.sortable,
+      hidden: column.hidden ?? false,
       align: column.align
     })),
     triggers: valuesFromTriggers(list.triggers),
@@ -305,6 +308,7 @@ function builderListEditorColumnsFromTable(table) {
     key: column.name,
     label: column.label,
     sortable: column.sortable,
+    hidden: false,
     align: column.fieldType === "number" || column.fieldType === "money" ? "right" : "left"
   }));
 }
@@ -376,11 +380,19 @@ function builderFormEditorInputFromValues(values) {
 }
 function builderListEditorInputFromValues(values) {
   const source = values.sourceType === "dbTable" && values.sourceTable !== BUILDER_EDITOR_NONE_VALUE ? { type: "dbTable", tableName: values.sourceTable } : values.sourceType === "apiEndpoint" && values.apiBasePath ? { type: "apiEndpoint", basePath: values.apiBasePath } : null;
+  const orderBy = Array.from(
+    new Map(
+      values.orderBy.filter((rule) => rule.field && rule.field !== BUILDER_EDITOR_NONE_VALUE).map((rule) => [rule.field, rule])
+    ).values()
+  );
   return {
     title: values.title,
     description: values.description || null,
     source,
-    schema: { columns: values.columns },
+    schema: {
+      columns: values.columns,
+      ...source && orderBy.length > 0 ? { orderBy } : {}
+    },
     triggers: values.triggers.map((trigger) => ({
       event: trigger.event,
       action: "callApi",
@@ -583,10 +595,18 @@ function createBuilderDefaultFormEditorBody(options) {
           ] }),
           sourceType === "dbTable" ? /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx("span", { style: styles.label, children: "Table" }),
-            /* @__PURE__ */ jsxs("select", { style: styles.input, ...form.register("sourceTable"), children: [
-              /* @__PURE__ */ jsx("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
-              tables.map((table) => /* @__PURE__ */ jsx("option", { value: table.name, children: table.label ?? table.name }, table.name))
-            ] })
+            /* @__PURE__ */ jsxs(
+              "select",
+              {
+                style: styles.input,
+                value: sourceTable,
+                ...form.register("sourceTable"),
+                children: [
+                  /* @__PURE__ */ jsx("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
+                  tables.map((table) => /* @__PURE__ */ jsx("option", { value: table.name, children: table.label ?? table.name }, table.name))
+                ]
+              }
+            )
           ] }) : null,
           sourceType === "apiEndpoint" ? /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx("span", { style: styles.label, children: "API base path" }),
@@ -844,6 +864,7 @@ function createBuilderDefaultListEditorBody(options) {
     listId,
     form,
     columnArray,
+    orderByArray,
     triggerArray,
     sourceType,
     sourceTable,
@@ -853,6 +874,8 @@ function createBuilderDefaultListEditorBody(options) {
     isSaving,
     importColumnsFromTable
   }) {
+    const selectedTable = tables.find((table) => table.name === sourceTable);
+    const orderByColumns = selectedTable?.columns.filter((column) => column.sortable) ?? [];
     return /* @__PURE__ */ jsxs("div", { style: styles.page, children: [
       /* @__PURE__ */ jsxs("div", { style: styles.header, children: [
         /* @__PURE__ */ jsxs("div", { children: [
@@ -885,10 +908,18 @@ function createBuilderDefaultListEditorBody(options) {
           ] }),
           sourceType === "dbTable" ? /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx("span", { style: styles.label, children: "Table" }),
-            /* @__PURE__ */ jsxs("select", { style: styles.input, ...form.register("sourceTable"), children: [
-              /* @__PURE__ */ jsx("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
-              tables.map((table) => /* @__PURE__ */ jsx("option", { value: table.name, children: table.label ?? table.name }, table.name))
-            ] })
+            /* @__PURE__ */ jsxs(
+              "select",
+              {
+                style: styles.input,
+                value: sourceTable,
+                ...form.register("sourceTable"),
+                children: [
+                  /* @__PURE__ */ jsx("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
+                  tables.map((table) => /* @__PURE__ */ jsx("option", { value: table.name, children: table.label ?? table.name }, table.name))
+                ]
+              }
+            )
           ] }) : null,
           sourceType === "apiEndpoint" ? /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx("span", { style: styles.label, children: "API base path" }),
@@ -906,6 +937,85 @@ function createBuilderDefaultListEditorBody(options) {
           ) }) : null
         ] })
       ] }),
+      /* @__PURE__ */ jsxs("section", { style: styles.section, children: [
+        /* @__PURE__ */ jsxs("div", { style: styles.sectionHeader, children: [
+          /* @__PURE__ */ jsxs("div", { children: [
+            /* @__PURE__ */ jsx("h2", { style: styles.sectionTitle, children: "Default ordering" }),
+            /* @__PURE__ */ jsx("p", { style: styles.description, children: "Rules are applied from top to bottom." })
+          ] }),
+          /* @__PURE__ */ jsx(
+            "button",
+            {
+              type: "button",
+              style: styles.button,
+              disabled: sourceType === "none" || orderByArray.fields.length >= 8,
+              onClick: () => orderByArray.append({
+                field: sourceType === "dbTable" ? orderByColumns[0]?.name ?? BUILDER_EDITOR_NONE_VALUE : "",
+                direction: "desc"
+              }),
+              children: "Add ordering"
+            }
+          )
+        ] }),
+        orderByArray.fields.length === 0 ? /* @__PURE__ */ jsx("div", { style: styles.grid, children: /* @__PURE__ */ jsx("p", { style: styles.description, children: "Automatic ordering is used." }) }) : null,
+        orderByArray.fields.map((rule, index) => /* @__PURE__ */ jsxs("div", { style: styles.row, children: [
+          sourceType === "dbTable" ? /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx("span", { style: styles.label, children: "Order by field" }),
+            /* @__PURE__ */ jsxs("select", { style: styles.input, ...form.register(`orderBy.${index}.field`), children: [
+              /* @__PURE__ */ jsx("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select field" }),
+              orderByColumns.map((column) => /* @__PURE__ */ jsx("option", { value: column.name, children: column.label }, column.name))
+            ] })
+          ] }) : /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx("span", { style: styles.label, children: "Order by field" }),
+            /* @__PURE__ */ jsx(
+              "input",
+              {
+                style: styles.input,
+                placeholder: "createdAt",
+                ...form.register(`orderBy.${index}.field`)
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxs("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx("span", { style: styles.label, children: "Direction" }),
+            /* @__PURE__ */ jsxs("select", { style: styles.input, ...form.register(`orderBy.${index}.direction`), children: [
+              /* @__PURE__ */ jsx("option", { value: "asc", children: "Ascending" }),
+              /* @__PURE__ */ jsx("option", { value: "desc", children: "Descending" })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxs("div", { style: styles.actions, children: [
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                disabled: index === 0,
+                onClick: () => orderByArray.move(index, index - 1),
+                children: "Move up"
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                disabled: index === orderByArray.fields.length - 1,
+                onClick: () => orderByArray.move(index, index + 1),
+                children: "Move down"
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                onClick: () => orderByArray.remove(index),
+                children: "Remove"
+              }
+            )
+          ] })
+        ] }, rule.id))
+      ] }),
       /* @__PURE__ */ jsxs("section", { style: styles.section, children: [
         /* @__PURE__ */ jsxs("div", { style: styles.sectionHeader, children: [
           /* @__PURE__ */ jsxs("div", { children: [
@@ -946,16 +1056,10 @@ function createBuilderDefaultListEditorBody(options) {
             /* @__PURE__ */ jsx("input", { type: "checkbox", ...form.register(`columns.${index}.sortable`) }),
             "Sortable"
           ] }),
-          /* @__PURE__ */ jsx(
-            "button",
-            {
-              type: "button",
-              style: styles.button,
-              onClick: () => columnArray.remove(index),
-              disabled: columnArray.fields.length <= 1,
-              children: "Remove"
-            }
-          )
+          /* @__PURE__ */ jsxs("label", { style: styles.checkboxField, children: [
+            /* @__PURE__ */ jsx("input", { type: "checkbox", ...form.register(`columns.${index}.hidden`) }),
+            "Hidden"
+          ] })
         ] }, column.id))
       ] }),
       /* @__PURE__ */ jsxs("section", { style: styles.section, children: [
@@ -1484,6 +1588,7 @@ function createBuilderListEditorPageComponent(deps) {
       defaultValues: deps.emptyValues
     });
     const columnArray = useFieldArray({ control: form.control, name: "columns" });
+    const orderByArray = useFieldArray({ control: form.control, name: "orderBy" });
     const triggerArray = useFieldArray({ control: form.control, name: "triggers" });
     const sourceType = useWatch({ control: form.control, name: "sourceType" });
     const sourceTable = useWatch({ control: form.control, name: "sourceTable" });
@@ -1517,6 +1622,7 @@ function createBuilderListEditorPageComponent(deps) {
         listId,
         form,
         columnArray,
+        orderByArray,
         triggerArray,
         sourceType,
         sourceTable,
@@ -1679,6 +1785,7 @@ function createBuilderAdminPages({
     key: "name",
     label: "Name",
     sortable: true,
+    hidden: false,
     align: "left"
   };
   const emptyListValues = {
@@ -1687,6 +1794,7 @@ function createBuilderAdminPages({
     sourceType: "none",
     sourceTable: BUILDER_EDITOR_NONE_VALUE,
     apiBasePath: "",
+    orderBy: [],
     columns: [emptyColumn],
     triggers: [],
     version: 0