@duke333/builder-ui 0.2.2 → 0.2.3

package/dist/index.js

@@ -420,11 +420,13 @@ function createBuilderClient({ transport, apiBasePath }) {
   return createBuilderApiClient(transport, { apiBasePath });
 }
 var BuilderContext = createContext(null);
+var defaultComponents = {};
 function BuilderProvider({
   children,
   client: configuredClient,
   transport,
   apiBasePath,
+  components = defaultComponents,
   queryClient,
   onNotify
 }) {
@@ -446,8 +448,8 @@ function BuilderProvider({
   const internalQueryClient = useRef(null);
   if (!internalQueryClient.current) internalQueryClient.current = queryClient ?? new QueryClient();
   const value = useMemo(
-    () => ({ client: internalClient, hooks, notify }),
-    [hooks, internalClient, notify]
+    () => ({ client: internalClient, components, hooks, notify }),
+    [components, hooks, internalClient, notify]
   );
   return /* @__PURE__ */ jsx(QueryClientProvider, { client: internalQueryClient.current, children: /* @__PURE__ */ jsxs(BuilderContext.Provider, { value, children: [
     children,
@@ -827,7 +829,7 @@ function ReadyDataGrid({
   ] });
 }
 function readyColumns(columns) {
-  return columns.map((column) => ({ ...column }));
+  return columns.filter((column) => !column.hidden).map((column) => ({ ...column }));
 }
 
 // src/ready/ReadySubform.tsx
@@ -884,6 +886,7 @@ function ReadySubform({ subform, parentEntry, rows, onRowsChange }) {
       key: "_actions",
       label: "\u04AE\u0439\u043B\u0434\u044D\u043B",
       sortable: false,
+      hidden: false,
       align: "right",
       render: (row) => /* @__PURE__ */ jsx5("button", { type: "button", className: "builder-link builder-link--danger", onClick: (event) => {
         event.stopPropagation();
@@ -948,7 +951,7 @@ function ReadySubform({ subform, parentEntry, rows, onRowsChange }) {
       /* @__PURE__ */ jsx5(ReadyFields, { formId: view.form.id, viewId: view.id, schema: view.form.schema }),
       /* @__PURE__ */ jsxs5("div", { className: "builder-actions", children: [
         /* @__PURE__ */ jsx5("button", { type: "button", className: "builder-button builder-button--ghost", onClick: close, children: "\u0411\u043E\u043B\u0438\u0445" }),
-        /* @__PURE__ */ jsx5("button", { type: "submit", className: "builder-button builder-button--primary", children: "\u0425\u0430\u0434\u0433\u0430\u043B\u0430\u0445" })
+        /* @__PURE__ */ jsx5("button", { type: "submit", className: "builder-button builder-button--primary", children: editing ? "\u0428\u0438\u043D\u044D\u0447\u043B\u044D\u0445" : "\u041D\u044D\u043C\u044D\u0445" })
       ] })
     ] }) }) }) : null
   ] });
@@ -956,7 +959,7 @@ function ReadySubform({ subform, parentEntry, rows, onRowsChange }) {
 
 // src/ready/BuilderRuntimeComponents.tsx
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
-function BuilderForm({ formId }) {
+function DefaultBuilderForm({ formId }) {
   const { hooks, notify } = useBuilderRuntime();
   const query = hooks.useRuntimeBuilderForm(formId);
   const save = hooks.useSaveRuntimeBuilderFormEntry(formId);
@@ -982,7 +985,7 @@ function BuilderForm({ formId }) {
     ] }) })
   ] });
 }
-function BuilderGrid({ listId }) {
+function DefaultBuilderGrid({ listId }) {
   const { hooks } = useBuilderRuntime();
   const listQuery = hooks.useRuntimeBuilderList(listId);
   const state = useReadyTableState();
@@ -1049,7 +1052,7 @@ function BuilderEntryEditor({ view, editing, open, onClose }) {
     ] })
   ] }) }) : /* @__PURE__ */ jsx6(ReadyErrorState, { title: "Form \u0445\u043E\u043B\u0431\u043E\u043E\u0433\u04AF\u0439", description: "\u042D\u043D\u044D view-\u0434 form \u0442\u043E\u0445\u0438\u0440\u0443\u0443\u043B\u0430\u0430\u0433\u04AF\u0439 \u0431\u0430\u0439\u043D\u0430." }) });
 }
-function BuilderView({ viewId }) {
+function DefaultBuilderView({ viewId }) {
   const { hooks, notify } = useBuilderRuntime();
   const [editing, setEditing] = useState5(null);
   const [editorOpen, setEditorOpen] = useState5(false);
@@ -1066,6 +1069,7 @@ function BuilderView({ viewId }) {
       key: "_actions",
       label: "\u04AE\u0439\u043B\u0434\u044D\u043B",
       sortable: false,
+      hidden: false,
       align: "right",
       render: (entry) => /* @__PURE__ */ jsxs6("div", { className: "builder-row-actions", "data-builder-row-action": true, children: [
         /* @__PURE__ */ jsx6("button", { type: "button", className: "builder-button builder-button--ghost", onClick: (event) => {
@@ -1124,6 +1128,21 @@ function BuilderView({ viewId }) {
     )
   ] });
 }
+function BuilderForm(props) {
+  const { components } = useBuilderRuntime();
+  const Component = components.Form;
+  return Component ? /* @__PURE__ */ jsx6(Component, { ...props }) : /* @__PURE__ */ jsx6(DefaultBuilderForm, { ...props });
+}
+function BuilderGrid(props) {
+  const { components } = useBuilderRuntime();
+  const Component = components.Grid;
+  return Component ? /* @__PURE__ */ jsx6(Component, { ...props }) : /* @__PURE__ */ jsx6(DefaultBuilderGrid, { ...props });
+}
+function BuilderView(props) {
+  const { components } = useBuilderRuntime();
+  const Component = components.View;
+  return Component ? /* @__PURE__ */ jsx6(Component, { ...props }) : /* @__PURE__ */ jsx6(DefaultBuilderView, { ...props });
+}
 
 // src/admin/editorState.ts
 var BUILDER_EDITOR_NONE_VALUE = "__none";
@@ -1279,16 +1298,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),
@@ -1333,6 +1355,7 @@ function builderListEditorColumnsFromTable(table) {
     key: column.name,
     label: column.label,
     sortable: column.sortable,
+    hidden: false,
     align: column.fieldType === "number" || column.fieldType === "money" ? "right" : "left"
   }));
 }
@@ -1404,11 +1427,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",
@@ -1611,10 +1642,18 @@ function createBuilderDefaultFormEditorBody(options) {
           ] }),
           sourceType === "dbTable" ? /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx7("span", { style: styles.label, children: "Table" }),
-            /* @__PURE__ */ jsxs7("select", { style: styles.input, ...form.register("sourceTable"), children: [
-              /* @__PURE__ */ jsx7("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
-              tables.map((table) => /* @__PURE__ */ jsx7("option", { value: table.name, children: table.label ?? table.name }, table.name))
-            ] })
+            /* @__PURE__ */ jsxs7(
+              "select",
+              {
+                style: styles.input,
+                value: sourceTable,
+                ...form.register("sourceTable"),
+                children: [
+                  /* @__PURE__ */ jsx7("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
+                  tables.map((table) => /* @__PURE__ */ jsx7("option", { value: table.name, children: table.label ?? table.name }, table.name))
+                ]
+              }
+            )
           ] }) : null,
           sourceType === "apiEndpoint" ? /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx7("span", { style: styles.label, children: "API base path" }),
@@ -1872,6 +1911,7 @@ function createBuilderDefaultListEditorBody(options) {
     listId,
     form,
     columnArray,
+    orderByArray,
     triggerArray,
     sourceType,
     sourceTable,
@@ -1881,6 +1921,8 @@ function createBuilderDefaultListEditorBody(options) {
     isSaving,
     importColumnsFromTable
   }) {
+    const selectedTable = tables.find((table) => table.name === sourceTable);
+    const orderByColumns = selectedTable?.columns.filter((column) => column.sortable) ?? [];
     return /* @__PURE__ */ jsxs7("div", { style: styles.page, children: [
       /* @__PURE__ */ jsxs7("div", { style: styles.header, children: [
         /* @__PURE__ */ jsxs7("div", { children: [
@@ -1913,10 +1955,18 @@ function createBuilderDefaultListEditorBody(options) {
           ] }),
           sourceType === "dbTable" ? /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx7("span", { style: styles.label, children: "Table" }),
-            /* @__PURE__ */ jsxs7("select", { style: styles.input, ...form.register("sourceTable"), children: [
-              /* @__PURE__ */ jsx7("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
-              tables.map((table) => /* @__PURE__ */ jsx7("option", { value: table.name, children: table.label ?? table.name }, table.name))
-            ] })
+            /* @__PURE__ */ jsxs7(
+              "select",
+              {
+                style: styles.input,
+                value: sourceTable,
+                ...form.register("sourceTable"),
+                children: [
+                  /* @__PURE__ */ jsx7("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select table" }),
+                  tables.map((table) => /* @__PURE__ */ jsx7("option", { value: table.name, children: table.label ?? table.name }, table.name))
+                ]
+              }
+            )
           ] }) : null,
           sourceType === "apiEndpoint" ? /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
             /* @__PURE__ */ jsx7("span", { style: styles.label, children: "API base path" }),
@@ -1934,6 +1984,85 @@ function createBuilderDefaultListEditorBody(options) {
           ) }) : null
         ] })
       ] }),
+      /* @__PURE__ */ jsxs7("section", { style: styles.section, children: [
+        /* @__PURE__ */ jsxs7("div", { style: styles.sectionHeader, children: [
+          /* @__PURE__ */ jsxs7("div", { children: [
+            /* @__PURE__ */ jsx7("h2", { style: styles.sectionTitle, children: "Default ordering" }),
+            /* @__PURE__ */ jsx7("p", { style: styles.description, children: "Rules are applied from top to bottom." })
+          ] }),
+          /* @__PURE__ */ jsx7(
+            "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__ */ jsx7("div", { style: styles.grid, children: /* @__PURE__ */ jsx7("p", { style: styles.description, children: "Automatic ordering is used." }) }) : null,
+        orderByArray.fields.map((rule, index) => /* @__PURE__ */ jsxs7("div", { style: styles.row, children: [
+          sourceType === "dbTable" ? /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx7("span", { style: styles.label, children: "Order by field" }),
+            /* @__PURE__ */ jsxs7("select", { style: styles.input, ...form.register(`orderBy.${index}.field`), children: [
+              /* @__PURE__ */ jsx7("option", { value: BUILDER_EDITOR_NONE_VALUE, children: "Select field" }),
+              orderByColumns.map((column) => /* @__PURE__ */ jsx7("option", { value: column.name, children: column.label }, column.name))
+            ] })
+          ] }) : /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx7("span", { style: styles.label, children: "Order by field" }),
+            /* @__PURE__ */ jsx7(
+              "input",
+              {
+                style: styles.input,
+                placeholder: "createdAt",
+                ...form.register(`orderBy.${index}.field`)
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxs7("label", { style: styles.field, children: [
+            /* @__PURE__ */ jsx7("span", { style: styles.label, children: "Direction" }),
+            /* @__PURE__ */ jsxs7("select", { style: styles.input, ...form.register(`orderBy.${index}.direction`), children: [
+              /* @__PURE__ */ jsx7("option", { value: "asc", children: "Ascending" }),
+              /* @__PURE__ */ jsx7("option", { value: "desc", children: "Descending" })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsxs7("div", { style: styles.actions, children: [
+            /* @__PURE__ */ jsx7(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                disabled: index === 0,
+                onClick: () => orderByArray.move(index, index - 1),
+                children: "Move up"
+              }
+            ),
+            /* @__PURE__ */ jsx7(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                disabled: index === orderByArray.fields.length - 1,
+                onClick: () => orderByArray.move(index, index + 1),
+                children: "Move down"
+              }
+            ),
+            /* @__PURE__ */ jsx7(
+              "button",
+              {
+                type: "button",
+                style: styles.button,
+                onClick: () => orderByArray.remove(index),
+                children: "Remove"
+              }
+            )
+          ] })
+        ] }, rule.id))
+      ] }),
       /* @__PURE__ */ jsxs7("section", { style: styles.section, children: [
         /* @__PURE__ */ jsxs7("div", { style: styles.sectionHeader, children: [
           /* @__PURE__ */ jsxs7("div", { children: [
@@ -1974,16 +2103,10 @@ function createBuilderDefaultListEditorBody(options) {
             /* @__PURE__ */ jsx7("input", { type: "checkbox", ...form.register(`columns.${index}.sortable`) }),
             "Sortable"
           ] }),
-          /* @__PURE__ */ jsx7(
-            "button",
-            {
-              type: "button",
-              style: styles.button,
-              onClick: () => columnArray.remove(index),
-              disabled: columnArray.fields.length <= 1,
-              children: "Remove"
-            }
-          )
+          /* @__PURE__ */ jsxs7("label", { style: styles.checkboxField, children: [
+            /* @__PURE__ */ jsx7("input", { type: "checkbox", ...form.register(`columns.${index}.hidden`) }),
+            "Hidden"
+          ] })
         ] }, column.id))
       ] }),
       /* @__PURE__ */ jsxs7("section", { style: styles.section, children: [
@@ -2512,6 +2635,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 = useWatch2({ control: form.control, name: "sourceType" });
     const sourceTable = useWatch2({ control: form.control, name: "sourceTable" });
@@ -2545,6 +2669,7 @@ function createBuilderListEditorPageComponent(deps) {
         listId,
         form,
         columnArray,
+        orderByArray,
         triggerArray,
         sourceType,
         sourceTable,
@@ -2707,6 +2832,7 @@ function createBuilderAdminPages({
     key: "name",
     label: "Name",
     sortable: true,
+    hidden: false,
     align: "left"
   };
   const emptyListValues = {
@@ -2715,6 +2841,7 @@ function createBuilderAdminPages({
     sourceType: "none",
     sourceTable: BUILDER_EDITOR_NONE_VALUE,
     apiBasePath: "",
+    orderBy: [],
     columns: [emptyColumn],
     triggers: [],
     version: 0