@uxf/cms 11.46.0 → 11.47.1

package/api/swr.d.ts

@@ -0,0 +1,75 @@
+import { Schema } from "@uxf/data-grid";
+import { SWRConfiguration } from "swr";
+import { SWRMutationConfiguration, SWRMutationResponse } from "swr/mutation";
+export declare class ApiError extends Error {
+    readonly code: string;
+    readonly statusCode: number;
+    readonly info: {
+        error: {
+            code: string;
+            message: string;
+        };
+        validationErrors: {
+            field: string;
+            message: string;
+        }[];
+    };
+    constructor(message: string, code: string, statusCode: number, info: {
+        error: {
+            code: string;
+            message: string;
+        };
+        validationErrors: {
+            field: string;
+            message: string;
+        }[];
+    });
+}
+export declare const _fetch: (url: string, method?: string, body?: any) => Promise<any>;
+type Mixed = any;
+type XString = string;
+type Int = number;
+type Email = string;
+export interface CMSSaveUserConfigRequestBody {
+    name: XString;
+    data: Array<Mixed>;
+}
+export interface CMSUserResponse {
+    id: Int;
+    email: Email;
+    name: XString;
+    roles: Array<XString>;
+}
+export interface Metadata {
+    title: XString;
+    entityAlias: XString;
+    actions: Array<XString>;
+}
+export declare const useCmsUserConfigQuery: <T extends SWRConfiguration<Mixed, ApiError>>(config: {
+    path: {
+        name: XString;
+    };
+} & {
+    skip?: boolean;
+}, options?: T) => import("swr").SWRResponse<any, ApiError, T>;
+export declare const useCmsUserConfigUpdateMutation: (config: {
+    path: {
+        name: XString;
+    };
+}, options?: SWRMutationConfiguration<Mixed, ApiError, string, Mixed> | undefined) => SWRMutationResponse<Mixed, ApiError, string, Mixed>;
+export declare const useCmsMeQuery: <T extends SWRConfiguration<CMSUserResponse, ApiError>>(config?: {
+    skip?: boolean;
+}, options?: T) => import("swr").SWRResponse<CMSUserResponse, ApiError, T>;
+/** @deprecated will be removed - schemas are generated */
+export declare const useCmsTablesQuery: <T extends SWRConfiguration<Record<string, Metadata>, ApiError>>(config?: {
+    skip?: boolean;
+}, options?: T) => import("swr").SWRResponse<Record<string, Metadata>, ApiError, T>;
+/** @deprecated will be removed - schemas are generated */
+export declare const useDatagridGetSchemaQuery: <T extends SWRConfiguration<Schema<any>, ApiError>>(config: {
+    path: {
+        name: XString;
+    };
+} & {
+    skip?: boolean;
+}, options?: T) => import("swr").SWRResponse<Schema<any>, ApiError, T>;
+export {};

package/api/swr.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useDatagridGetSchemaQuery = exports.useCmsTablesQuery = exports.useCmsMeQuery = exports.useCmsUserConfigUpdateMutation = exports.useCmsUserConfigQuery = exports._fetch = exports.ApiError = void 0;
+const swr_1 = __importDefault(require("swr"));
+const mutation_1 = __importDefault(require("swr/mutation"));
+class ApiError extends Error {
+    constructor(message, code, statusCode, info) {
+        super(message);
+        this.code = code;
+        this.statusCode = statusCode;
+        this.info = info;
+    }
+}
+exports.ApiError = ApiError;
+const _fetch = (url, method = "GET", body = undefined) => {
+    var _a;
+    return fetch(((_a = process.env.API_URL) !== null && _a !== void 0 ? _a : "") + url, {
+        method,
+        body: typeof body !== "undefined" ? JSON.stringify(body) : undefined,
+    }).then(async (res) => {
+        const data = await res.json();
+        if (!res.ok) {
+            throw new ApiError(data.error.message, data.error.code, res.status, data);
+        }
+        return data;
+    });
+};
+exports._fetch = _fetch;
+const useCmsUserConfigQuery = (config, options = {}) => (0, swr_1.default)(config.skip !== true ? `/api/cms/user-config/${config.path.name}` : null, options);
+exports.useCmsUserConfigQuery = useCmsUserConfigQuery;
+const useCmsUserConfigUpdateMutation = (config, options = undefined) => (0, mutation_1.default)(`/api/cms/user-config/${config.path.name}`, (url, { arg: body }) => (0, exports._fetch)(url, "PUT", body), options);
+exports.useCmsUserConfigUpdateMutation = useCmsUserConfigUpdateMutation;
+const useCmsMeQuery = (config = {}, options = {}) => (0, swr_1.default)(config.skip !== true ? `/api/cms/me` : null, options);
+exports.useCmsMeQuery = useCmsMeQuery;
+/** @deprecated will be removed - schemas are generated */
+const useCmsTablesQuery = (config = {}, options = {}) => (0, swr_1.default)(config.skip !== true ? `/api/cms/tables` : null, options);
+exports.useCmsTablesQuery = useCmsTablesQuery;
+/** @deprecated will be removed - schemas are generated */
+const useDatagridGetSchemaQuery = (config, options = {}) => (0, swr_1.default)(config.skip !== true ? `/api/cms/datagrid/schema/${config.path.name}` : null, options);
+exports.useDatagridGetSchemaQuery = useDatagridGetSchemaQuery;

package/lib/menu/active-item-resolver.js

@@ -1,12 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActiveItemResolver = void 0;
+const is_nil_1 = require("@uxf/core/utils/is-nil");
 const exactMatch = () => (menuItem) => (_, activeRoute) => {
     return activeRoute === menuItem.route;
 };
 const exactMatchWithParams = () => (menuItem) => (router, activeRoute) => {
-    const isQueryEqual = JSON.stringify(router.query) === JSON.stringify(menuItem.routeParams);
-    return activeRoute === menuItem.route && isQueryEqual;
+    const isQueryEqual = (menuQuery, itemQuery) => {
+        // match when both undefined or empty
+        if ((0, is_nil_1.isNil)(itemQuery)) {
+            return Object.keys(menuQuery).length === 0;
+        }
+        const keysMenu = Object.keys(menuQuery);
+        const keysItem = Object.keys(itemQuery);
+        if (keysMenu.length !== keysItem.length) {
+            return false;
+        }
+        return keysMenu.every((key) => key in itemQuery && String(menuQuery[key]) === String(itemQuery[key]));
+    };
+    return activeRoute === menuItem.route && isQueryEqual(router.query, menuItem.routeParams);
 };
 const anyOf = (routeNames) => (menuItem) => (_, activeRoute) => {
     if (activeRoute === menuItem.route) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@uxf/cms",
-    "version": "11.46.0",
+    "version": "11.47.1",
     "description": "UXF Cms",
     "author": "UXFans <dev@uxf.cz>",
     "homepage": "https://gitlab.com/uxf-npm/cms#readme",
@@ -30,13 +30,13 @@
         "@dnd-kit/utilities": "3.2.2",
         "@floating-ui/react": "0.26.28",
         "@redux-devtools/extension": "3.3.0",
-        "@uxf/core": "11.46.0",
-        "@uxf/core-react": "11.46.0",
-        "@uxf/data-grid": "11.46.0",
-        "@uxf/form": "11.46.0",
+        "@uxf/core": "11.47.0",
+        "@uxf/core-react": "11.47.0",
+        "@uxf/data-grid": "11.47.1",
+        "@uxf/form": "11.47.1",
         "@uxf/router": "11.46.0",
-        "@uxf/ui": "11.46.0",
-        "@uxf/wysiwyg": "11.46.0",
+        "@uxf/ui": "11.47.1",
+        "@uxf/wysiwyg": "11.47.1",
         "axios": "1.7.5",
         "axios-hooks": "5.0.2",
         "es6-error": "4.1.1",

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

@@ -1,4 +1,6 @@
 import { Request, Response } from "@uxf/data-grid";
+import React from "react";
 import { GridPageConfig } from "./types";
 export declare const dataGridLoader: (gridName: string, request: Request) => Promise<Response>;
-export declare const GridPage: (config: GridPageConfig) => import("next").NextComponentType<import("../../deprecated/types/app").IAppContext, object, object>;
+/** @deprecated - use custom DataGrid on project */
+export declare const GridPage: (config: GridPageConfig) => (props: any) => React.JSX.Element;

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

@@ -29,30 +29,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GridPage = exports.dataGridLoader = void 0;
 const empty_array_1 = require("@uxf/core/constants/empty-array");
 const buildArray_1 = require("@uxf/core/utils/buildArray");
+const is_nil_1 = require("@uxf/core/utils/is-nil");
 const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
+const isServer_1 = require("@uxf/core/utils/isServer");
 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 icon_1 = require("@uxf/ui/icon");
+const loader_1 = require("@uxf/ui/loader");
 const link_1 = __importDefault(require("next/link"));
-const router_2 = __importDefault(require("next/router"));
+const router_2 = __importStar(require("next/router"));
 const qs_1 = require("qs");
 const react_1 = __importStar(require("react"));
 const url_1 = require("url");
-const api_1 = require("../../api");
-const config_1 = require("../../config");
-const with_authenticate_1 = require("../../deprecated/hoc/with-authenticate");
-const api_2 = require("../../lib/api");
-const get_initial_props_helper_1 = require("./get-initial-props-helper");
-const { axiosRequest } = (0, api_2.createAxiosInstance)();
+const swr_1 = require("../../api/swr");
+const api_1 = require("../../lib/api");
+const restricted_page_1 = require("../../security/restricted-page");
+const { axiosRequest } = (0, api_1.createAxiosInstance)();
 const dataGridLoader = (gridName, request) => {
     return axiosRequest(null, `/api/cms/datagrid/${gridName}`, "get", null, request).then((r) => r.data);
 };
 exports.dataGridLoader = dataGridLoader;
 const DefaultLayout = (props) => react_1.default.createElement("div", { ...props });
-const GridPageComponent = (props) => {
+function GridPageComponent(props) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     // eslint-disable-next-line react/destructuring-assignment
     const { query, AddIcon = react_1.default.createElement(icon_1.Icon, { name: "plus" }), onAddTitle = "Přidat záznam" } = props;
@@ -71,14 +72,14 @@ const GridPageComponent = (props) => {
         router_2.default.replace(`${(0, url_1.parse)(((_a = window.history.state) === null || _a === void 0 ? void 0 : _a.url) || "").pathname}?${(0, qs_1.stringify)(newQuery)}`, `${(0, url_1.parse)(((_b = window.history.state) === null || _b === void 0 ? void 0 : _b.as) || "").pathname}?${(0, qs_1.stringify)(newQuery)}`, { shallow: true });
         return response;
     }, [query]);
-    const { data, isLoading, error, onReload } = (0, use_data_grid_fetching_1.useDataGridFetching)({
+    const { data, isLoading, error, reload } = (0, use_data_grid_fetching_1.useDataGridFetching)({
         loader: (_c = props.loader) !== null && _c !== void 0 ? _c : universalLoader,
         schema: props.gridSchema,
         state,
     });
     const actionsBag = (0, react_1.useMemo)(() => ({
-        reload: onReload,
-    }), [onReload]);
+        reload,
+    }), [reload]);
     const hasOnAdd = props.onAdd && (!props.metaSchema || props.metaSchema.actions.includes("add"));
     const cActions = [
         ...((_d = props.customActions) !== null && _d !== void 0 ? _d : empty_array_1.EMPTY_ARRAY),
@@ -129,26 +130,29 @@ const GridPageComponent = (props) => {
         : 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, { NoRowsFallback: (_k = props.ui) === null || _k === void 0 ? void 0 : _k.NoRowsFallback, SelectedRowsToolbarActions: (_l = props.ui) === null || _l === void 0 ? void 0 : _l.SelectedRowsToolbarActions, actionCell: actionCell, actions: actions, bodyCells: (_m = props.ui) === null || _m === void 0 ? void 0 : _m.BodyCells, customActions: cActions, data: data, error: error, filterHandlers: (_o = props.ui) === null || _o === void 0 ? void 0 : _o.FilterHandlers, gridName: props.entityAlias, isLoading: isLoading, isRowSelectable: props.selectable, onCsvDownload: (r) => window.open(`/api/cms/datagrid/export/${props.entityAlias}?${(0, qs_1.stringify)(r)}`), onReload: onReload, rowHeight: props.rowHeight, schema: props.gridSchema, state: state }))));
-};
+            react_1.default.createElement(data_grid_1.DataGrid, { NoRowsFallback: (_k = props.ui) === null || _k === void 0 ? void 0 : _k.NoRowsFallback, SelectedRowsToolbarActions: (_l = props.ui) === null || _l === void 0 ? void 0 : _l.SelectedRowsToolbarActions, actionCell: actionCell, actions: actions, bodyCells: (_m = props.ui) === null || _m === void 0 ? void 0 : _m.BodyCells, customActions: cActions, data: data, error: error, filterHandlers: (_o = props.ui) === null || _o === void 0 ? void 0 : _o.FilterHandlers, gridName: props.entityAlias, isLoading: isLoading, isRowSelectable: props.selectable, onCsvDownload: (r) => window.open(`/api/cms/datagrid/export/${props.entityAlias}?${(0, qs_1.stringify)(r)}`), reload: reload, rowHeight: props.rowHeight, schema: props.gridSchema, state: state }))));
+}
 GridPageComponent.displayName = "GridPageComponent";
+/** @deprecated - use custom DataGrid on project */
 const GridPage = (config) => {
-    const Component = (props) => {
-        return (react_1.default.createElement(GridPageComponent, { ...props, AddIcon: config.AddIcon, customActions: config.customActions, getEditUrl: config.getEditUrl, getOpenUrl: config.getOpenUrl, initialUserConfig: config.initialUserConfig, loader: config.loader, onAdd: config.onAdd, onAddTitle: config.onAddTitle, onEdit: config.onEdit, onOpen: config.onOpen, onRemove: config.onRemove, rowHeight: config.rowHeight, selectable: config.selectable, title: config.title, ui: config.ui }));
-    };
-    Component.getInitialProps = async (ctx) => {
-        const entityAlias = typeof config.entityAlias === "function" ? config.entityAlias(ctx) : config.entityAlias;
-        const initialHiddenColumns = config_1.container.has("api.getUserConfig")
-            ? await config_1.container.get("api.getUserConfig")(ctx, `v1--hidden-columns--${entityAlias}`, [])
-            : await (0, api_1.userConfigGet)(ctx, `v1--hidden-columns--${entityAlias}`, []);
-        return {
-            entityAlias,
-            initialHiddenColumns,
-            query: ctx.query,
-            metaSchema: await (0, get_initial_props_helper_1.loadEntityMetaSchema)(ctx, entityAlias),
-            gridSchema: await (0, get_initial_props_helper_1.loadEntityGridSchema)(ctx, entityAlias),
-        };
-    };
-    return (0, with_authenticate_1.withAuthenticate)({ allowedRoles: config.allowedRoles || ["ROLE_ROOT"] })(Component);
+    var _a;
+    function Component() {
+        var _a, _b;
+        const router = (0, router_2.useRouter)();
+        const userConfigQuery = (0, swr_1.useCmsUserConfigQuery)({ path: { name: `v1--hidden-columns--${config.entityAlias}` } });
+        const cmsTablesQuery = (0, swr_1.useCmsTablesQuery)();
+        const dataGridSchemaQuery = (0, swr_1.useDatagridGetSchemaQuery)({ path: { name: config.entityAlias } });
+        if (cmsTablesQuery.isLoading || dataGridSchemaQuery.isLoading || isServer_1.isServer) {
+            return (react_1.default.createElement("div", { className: "flex min-h-screen w-full items-center justify-center" },
+                react_1.default.createElement(loader_1.Loader, null)));
+        }
+        const metadata = (_a = cmsTablesQuery.data) === null || _a === void 0 ? void 0 : _a[config.entityAlias];
+        const schema = dataGridSchemaQuery.data;
+        if ((0, is_nil_1.isNil)(schema) || (0, is_nil_1.isNil)(metadata)) {
+            return react_1.default.createElement("div", null, "Omlouv\u00E1me se, n\u011Bco se pokazilo.");
+        }
+        return (react_1.default.createElement(GridPageComponent, { AddIcon: config.AddIcon, customActions: config.customActions, entityAlias: config.entityAlias, getEditUrl: config.getEditUrl, getOpenUrl: config.getOpenUrl, gridSchema: schema, initialHiddenColumns: (_b = userConfigQuery.data) !== null && _b !== void 0 ? _b : [], initialUserConfig: config.initialUserConfig, loader: config.loader, metaSchema: metadata, onAdd: config.onAdd, onAddTitle: config.onAddTitle, onEdit: config.onEdit, onOpen: config.onOpen, onRemove: config.onRemove, query: router.query, rowHeight: config.rowHeight, selectable: config.selectable, title: config.title, ui: config.ui }));
+    }
+    return (0, restricted_page_1.restrictedPage)(Component, { allowedRole: (_a = config.allowedRoles) !== null && _a !== void 0 ? _a : ["ROLE_ROOT"] });
 };
 exports.GridPage = GridPage;

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

@@ -1,6 +1,5 @@
 import { Nullish } from "@uxf/core/types";
 import { ActionCellComponent, DataGridProps, DataGridUserConfig, Loader, Schema } from "@uxf/data-grid";
-import { NextPageContext } from "next";
 import { ParsedUrlQuery } from "querystring";
 import { FC, ReactElement } from "react";
 import { EntityMetaSchema } from "../../api";
@@ -42,11 +41,10 @@ export type GridPageComponentProps = {
     customActions?: DataGridProps<any, any>["customActions"];
     initialUserConfig?: DataGridUserConfig<any> | Nullish;
 };
-export type EntityAliasExtractor = (ctx: NextPageContext) => string;
 export type GridPageConfig<T extends object = any> = {
     ui?: UIComponents;
     title?: string;
-    entityAlias: string | EntityAliasExtractor;
+    entityAlias: string;
     onOpen?: (entityAlias: string, row: T, actions: ActionsBag) => void;
     getOpenUrl?: (entityAlias: string, row: T) => string | undefined | null;
     onAdd?: (entityAlias: string, actions: ActionsBag) => void;

package/security/restricted-page.d.ts

@@ -0,0 +1,9 @@
+import React, { ReactNode } from "react";
+interface Config {
+    allowedRole: string[];
+}
+export declare function ErrorContent(props: {
+    error: any;
+}): React.JSX.Element;
+export declare function restrictedPage(Component: () => ReactNode, config: Config): (props: any) => React.JSX.Element;
+export {};

package/security/restricted-page.js

@@ -0,0 +1,38 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ErrorContent = ErrorContent;
+exports.restrictedPage = restrictedPage;
+const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
+const button_1 = require("@uxf/ui/button");
+const loader_1 = require("@uxf/ui/loader");
+const react_1 = __importDefault(require("react"));
+const swr_1 = require("../api/swr");
+function ErrorContent(props) {
+    if (props.error.code === "UNAUTHORIZED") {
+        return (react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement("div", null, "Mus\u00EDte se p\u0159\u00EDhl\u00E1sit"),
+            react_1.default.createElement(button_1.Button, { href: `/admin/login?redirect=${window.location.href}` }, "P\u0159ihl\u00E1sit")));
+    }
+    return react_1.default.createElement("div", null, "Vyskytla se chyba");
+}
+function restrictedPage(Component, config) {
+    return function Page(props) {
+        const meQuery = (0, swr_1.useCmsMeQuery)();
+        if (meQuery.isLoading || typeof window === "undefined") {
+            return (react_1.default.createElement("div", { className: "flex min-h-screen w-full items-center justify-center" },
+                react_1.default.createElement(loader_1.Loader, null)));
+        }
+        if ((0, is_not_nil_1.isNotNil)(meQuery.error)) {
+            return (react_1.default.createElement("div", { className: "flex min-h-screen w-full flex-col items-center justify-center gap-4" },
+                react_1.default.createElement(ErrorContent, { error: meQuery.error })));
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        if (!config.allowedRole.some((role) => { var _a, _b; return (_b = (_a = meQuery.data) === null || _a === void 0 ? void 0 : _a.roles) === null || _b === void 0 ? void 0 : _b.includes(role); })) {
+            return (react_1.default.createElement("div", { className: "flex min-h-screen w-full items-center justify-center" }, "Pro tuto str\u00E1nku nem\u00E1te opr\u00E1vn\u011Bn\u00ED."));
+        }
+        return react_1.default.createElement(Component, { ...props });
+    };
+}

package/utils/remove-confirm-handler.js

@@ -11,7 +11,7 @@ const react_1 = __importDefault(require("react"));
 function removeConfirmHandler() {
     return new Promise((resolve) => {
         (0, modal_1.openModal)({
-            disableBackdropClose: true,
+            isBackdropCloseDisabled: true,
             children: (react_1.default.createElement(modal_dialog_1.ModalDialog, { footer: react_1.default.createElement(react_1.default.Fragment, null,
                     react_1.default.createElement(button_1.Button, { onClick: () => {
                             resolve(false);