@uxf/cms 11.0.0-beta.9 → 11.1.0

package/api/index.d.ts

@@ -154,6 +154,10 @@ export declare function saveFormValues<T extends Record<string, any>>(ctx: any,
     entityAlias: string;
     id?: number | null;
 }, body: T): Promise<import("axios").AxiosResponse<T, any>>;
+export declare function removeEntity(ctx: any, path: {
+    entityAlias: string;
+    id: number;
+}): Promise<import("axios").AxiosResponse<undefined, any>>;
 export declare function userConfigSave(name: string, data: any): Promise<import("axios").AxiosResponse<UserConfigBagResponse, any>>;
 export declare function userConfigGetAll(ctx: any): Promise<import("axios").AxiosResponse<UserConfigBagResponse, any>>;
 export declare function userConfigGet<T>(ctx: any, name: string, defaultValue?: T): Promise<T | undefined>;

package/api/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uploadFile = exports.userConfigGet = exports.userConfigGetAll = exports.userConfigSave = exports.saveFormValues = exports.autocomplete = exports.login = exports.getFormValues = exports.getFormSchema = exports.getEntityMetaSchemas = exports.getLoggedUser = exports.forgottenPassword = exports.dataGridAutocompleteGet = exports.dataGridSchemaGet = exports.contentUpdate = exports.contentCreate = exports.contentGet = void 0;
+exports.uploadFile = exports.userConfigGet = exports.userConfigGetAll = exports.userConfigSave = exports.removeEntity = exports.saveFormValues = exports.autocomplete = exports.login = exports.getFormValues = exports.getFormSchema = exports.getEntityMetaSchemas = exports.getLoggedUser = exports.forgottenPassword = exports.dataGridAutocompleteGet = exports.dataGridSchemaGet = exports.contentUpdate = exports.contentCreate = exports.contentGet = void 0;
 // eslint-disable-next-line import/no-cycle
 const api_1 = require("../lib/api");
 const { axiosRequest, axiosInstance } = (0, api_1.createAxiosInstance)();
@@ -58,6 +58,10 @@ function saveFormValues(ctx, path, body) {
         : axiosRequest(ctx, `/api/cms/form/${path.entityAlias}`, "post", body, null);
 }
 exports.saveFormValues = saveFormValues;
+function removeEntity(ctx, path) {
+    return axiosRequest(ctx, `/api/cms/form/${path.entityAlias}/${path.id}`, "delete", null, null);
+}
+exports.removeEntity = removeEntity;
 async function userConfigSave(name, data) {
     return axiosRequest(null, "/api/cms/user-config", "post", { name, data }, null);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/cms",
-  "version": "11.0.0-beta.9",
+  "version": "11.1.0",
   "description": "UXF Cms",
   "author": "UXFans <dev@uxf.cz>",
   "homepage": "https://gitlab.com/uxf-npm/cms#readme",
@@ -30,12 +30,12 @@
     "@dnd-kit/utilities": "3.2.1",
     "@floating-ui/react": "0.26.0",
     "@redux-devtools/extension": "3.2.5",
-    "@uxf/core": "10.0.0",
-    "@uxf/data-grid": "11.0.0-beta.9",
-    "@uxf/form": "10.0.9",
+    "@uxf/core": "10.10.1",
+    "@uxf/data-grid": "11.1.0",
+    "@uxf/form": "11.1.0",
     "@uxf/router": "10.0.0",
-    "@uxf/ui": "10.0.7",
-    "@uxf/wysiwyg": "10.0.10",
+    "@uxf/ui": "11.1.0",
+    "@uxf/wysiwyg": "11.1.0",
     "axios": "1.5.1",
     "axios-hooks": "5.0.0",
     "es6-error": "4.1.1",
@@ -45,13 +45,11 @@
     "redux": "4.2.1"
   },
   "peerDependencies": {
-    "@next/font": ">=12",
-    "next": ">=12",
+    "next": ">=13.2.0",
     "react": ">=18.2.0",
     "react-dom": ">=18.2.0"
   },
   "devDependencies": {
-    "@next/font": "13.5.4",
     "@types/node": "18.18.4",
     "@types/qs": "6.9.8",
     "@types/react": "18.2.27",

package/pages/grid-page/grid-page.js

@@ -27,11 +27,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridPage = exports.dataGridLoader = void 0;
+const buildArray_1 = require("@uxf/core/utils/buildArray");
+const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
 const data_grid_1 = require("@uxf/data-grid");
+const table_1 = require("@uxf/data-grid/table");
 const use_data_grid_control_1 = require("@uxf/data-grid/use-data-grid-control");
 const use_data_grid_fetching_1 = require("@uxf/data-grid/use-data-grid-fetching");
 const router_1 = require("@uxf/router");
-const context_1 = require("@uxf/ui/context");
 const icon_1 = require("@uxf/ui/icon");
 const router_2 = __importDefault(require("next/router"));
 const qs_1 = require("qs");
@@ -49,9 +51,9 @@ const dataGridLoader = (gridName, request) => {
 exports.dataGridLoader = dataGridLoader;
 const DefaultLayout = (props) => react_1.default.createElement("div", { ...props });
 const GridPageComponent = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     // eslint-disable-next-line react/destructuring-assignment
-    const { metaSchema, entityAlias, gridSchema, getOpenUrl, getEditUrl, onOpen, onAdd, onEdit, onRemove, query, rowHeight, AddIcon = react_1.default.createElement(icon_1.Icon, { name: "plus" }), onAddTitle = "Přidat záznam", customActions = [], } = props;
+    const { query, AddIcon = react_1.default.createElement(icon_1.Icon, { name: "plus" }), onAddTitle = "Přidat záznam" } = props;
     const Layout = (_b = (_a = props.ui) === null || _a === void 0 ? void 0 : _a.Layout) !== null && _b !== void 0 ? _b : DefaultLayout;
     const { state, actions } = (0, use_data_grid_control_1.useDataGridControl)({
         schema: props.gridSchema,
@@ -72,26 +74,58 @@ const GridPageComponent = (props) => {
         gridName: (_e = (_d = props.metaSchema) === null || _d === void 0 ? void 0 : _d.entityAlias) !== null && _e !== void 0 ? _e : "",
         state,
     });
-    const uiContextValues = (0, react_1.useContext)(context_1.UiContext);
     const actionsBag = (0, react_1.useMemo)(() => ({
         reload: onReload,
     }), [onReload]);
-    const hasOnAdd = onAdd && (!metaSchema || metaSchema.actions.includes("add"));
+    const hasOnAdd = props.onAdd && (!props.metaSchema || props.metaSchema.actions.includes("add"));
     const cActions = [
-        ...customActions,
+        ...((_f = props.customActions) !== null && _f !== void 0 ? _f : []),
         hasOnAdd
             ? {
                 label: (react_1.default.createElement(react_1.default.Fragment, null,
                     AddIcon,
                     "\u00A0",
                     onAddTitle)),
-                onClick: () => onAdd(entityAlias, actionsBag),
+                onClick: () => { var _a; return (_a = props.onAdd) === null || _a === void 0 ? void 0 : _a.call(props, props.entityAlias, actionsBag); },
             }
             : undefined,
     ].filter(Boolean);
-    return (react_1.default.createElement(Layout, { key: entityAlias, title: (_g = (_f = props.title) !== null && _f !== void 0 ? _f : metaSchema === null || metaSchema === void 0 ? void 0 : metaSchema.title) !== null && _g !== void 0 ? _g : "" },
+    const actionColumnButtonsCount = (props.onEdit || props.getEditUrl ? 1 : 0) +
+        (props.onOpen || props.getOpenUrl ? 1 : 0) +
+        (props.onRemove ? 1 : 0);
+    const actionCell = actionColumnButtonsCount > 0
+        ? {
+            width: actionColumnButtonsCount * 40,
+            Component: (actionCellProps) => {
+                var _a, _b, _c, _d, _e, _f;
+                const buttons = (0, buildArray_1.buildArray)()
+                    .when((0, is_not_nil_1.isNotNil)((_a = props.onOpen) !== null && _a !== void 0 ? _a : props.getOpenUrl), {
+                    icon: "circle-info",
+                    onClick: () => { var _a; return (_a = props.onOpen) === null || _a === void 0 ? void 0 : _a.call(props, props.entityAlias, actionCellProps.row, actionsBag); },
+                    href: (_c = (_b = props.getOpenUrl) === null || _b === void 0 ? void 0 : _b.call(props, props.entityAlias, actionCellProps.row)) !== null && _c !== void 0 ? _c : undefined,
+                    isIconButton: true,
+                    title: "Detail",
+                })
+                    .when((0, is_not_nil_1.isNotNil)((_d = props.onEdit) !== null && _d !== void 0 ? _d : props.getEditUrl), {
+                    icon: "pen",
+                    onClick: () => { var _a; return (_a = props.onEdit) === null || _a === void 0 ? void 0 : _a.call(props, props.entityAlias, actionCellProps.row, actionsBag); },
+                    href: (_f = (_e = props.getEditUrl) === null || _e === void 0 ? void 0 : _e.call(props, props.entityAlias, actionCellProps.row)) !== null && _f !== void 0 ? _f : undefined,
+                    isIconButton: true,
+                    title: "Upravit",
+                })
+                    .when((0, is_not_nil_1.isNotNil)(props.onRemove), {
+                    icon: "trash",
+                    onClick: () => { var _a; return (_a = props.onRemove) === null || _a === void 0 ? void 0 : _a.call(props, props.entityAlias, actionCellProps.row, actionsBag); },
+                    isIconButton: true,
+                    title: "Smazat",
+                });
+                return react_1.default.createElement(table_1.ActionCell, { buttons: buttons, visibleButtonsCount: 3 });
+            },
+        }
+        : undefined;
+    return (react_1.default.createElement(Layout, { key: props.entityAlias, title: (_j = (_g = props.title) !== null && _g !== void 0 ? _g : (_h = props.metaSchema) === null || _h === void 0 ? void 0 : _h.title) !== null && _j !== void 0 ? _j : "" },
         react_1.default.createElement("div", { className: "mb-10" },
-            react_1.default.createElement(data_grid_1.DataGrid, { state: state, actions: actions, data: data, isLoading: isLoading, error: error, onReload: onReload, noBorder: true, schema: gridSchema, gridName: entityAlias, onOpen: onOpen && ((row) => onOpen(entityAlias, row, actionsBag)), getOpenUrl: getOpenUrl && ((row) => getOpenUrl(entityAlias, row)), onEdit: onEdit && ((row) => onEdit(entityAlias, row, actionsBag)), getEditUrl: getEditUrl && ((row) => getEditUrl(entityAlias, row)), onRemove: onRemove && ((row) => onRemove(entityAlias, row, actionsBag)), rowHeight: rowHeight, ui: props.ui, customActions: cActions, mode: (_h = uiContextValues === null || uiContextValues === void 0 ? void 0 : uiContextValues.colorScheme.getUserSettings()) !== null && _h !== void 0 ? _h : "light", onCsvDownload: (r) => window.open(`/api/cms/datagrid/export/${entityAlias}?${(0, qs_1.stringify)(r)}`), isRowSelectable: props.selectable }))));
+            react_1.default.createElement(data_grid_1.DataGrid, { state: state, actions: actions, data: data, isLoading: isLoading, error: error, onReload: onReload, noBorder: true, actionCell: actionCell, schema: props.gridSchema, gridName: props.entityAlias, rowHeight: props.rowHeight, customActions: cActions, onCsvDownload: (r) => window.open(`/api/cms/datagrid/export/${props.entityAlias}?${(0, qs_1.stringify)(r)}`), isRowSelectable: props.selectable }))));
 };
 GridPageComponent.displayName = "GridPageComponent";
 const GridPage = (config) => {

package/pages/grid-page/types.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DataGridProps, UIComponents as DataGridUIComponents, Loader, Schema } from "@uxf/data-grid";
+import { DataGridProps, Loader, Schema } from "@uxf/data-grid";
 import { NextPageContext } from "next";
 import { ParsedUrlQuery } from "querystring";
 import { FC, ReactElement } from "react";
@@ -31,7 +31,11 @@ export type GridPageComponentProps = {
     customActions?: DataGridProps<any, any>["customActions"];
 };
 export type EntityAliasExtractor = (ctx: NextPageContext) => string;
-type UIComponents = Partial<DataGridUIComponents<any, any>> & {
+type UIComponents = {
+    BodyCells?: DataGridProps<any, any>["bodyCells"];
+    FilterHandlers?: DataGridProps<any, any>["filterHandlers"];
+    NoRowsFallback?: DataGridProps<any, any>["NoRowsFallback"];
+    SelectedRowsToolbarActions?: DataGridProps<any, any>["SelectedRowsToolbarActions"];
     Layout?: LayoutComponent;
 };
 export type GridPageConfig<T extends object = any> = {

package/utils/icons.config.js

@@ -1,3 +1,4 @@
+"use strict";
 /** @type {import('@uxf/icons-generator/types').Config['icons']} */
 module.exports = {
     ...require("@uxf/ui/utils/icons-config"),