@uxf/cms 11.47.1 → 11.48.0

package/api/index.js

@@ -19,9 +19,10 @@ exports.userConfigGetAll = userConfigGetAll;
 exports.userConfigGet = userConfigGet;
 exports.uploadFile = uploadFile;
 const is_not_nil_1 = require("@uxf/core/utils/is-not-nil");
-// eslint-disable-next-line import/no-cycle
+const env_variables_1 = require("@uxf/example/src/config/env-variables");
 const api_1 = require("../lib/api");
-const { axiosRequest, axiosInstance } = (0, api_1.createAxiosInstance)();
+// TODO @vejvis - doufám, že tohle bude fungovat
+const { axiosRequest, axiosInstance } = (0, api_1.createAxiosInstance)(env_variables_1.envVariables.NEXT_PUBLIC_FRONTEND_URL);
 function contentGet(ctx, contentId) {
     return axiosRequest(ctx, `/api/cms/content/${contentId}`, "get", null, null);
 }

package/config/index.d.ts

@@ -1,4 +1,2 @@
-import { Config } from "./config";
 import { Container } from "./container";
-export declare const config: Config;
 export declare const container: Container;

package/config/index.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.container = exports.config = void 0;
-const config_1 = require("./config");
+exports.container = void 0;
 // eslint-disable-next-line import/no-cycle
 const container_1 = require("./container");
-exports.config = new config_1.Config();
 exports.container = new container_1.Container();

package/lib/api/create-axios-instance.d.ts

@@ -1,5 +1,5 @@
 import { AxiosRequestConfig } from "axios";
-export declare function createAxiosInstance(requestConfig?: AxiosRequestConfig): {
+export declare function createAxiosInstance(baseURL: string, requestConfig?: AxiosRequestConfig): {
     axiosInstance: import("axios").AxiosInstance;
     axiosRequest: <Response>(ctx: any, url: string, method: import("axios").Method, body: object | null, query: object | null) => Promise<import("axios").AxiosResponse<Response, any>>;
     useAxiosRequest: <Response extends Record<string, any> | boolean, RequestBody extends Record<string, any> | null, RequestQuery extends Record<string, any> | null, RequestPath extends Record<string, any> | null>(url: string, method: import("axios").Method, config: import("./types").RequestConfig<RequestBody, RequestQuery, RequestPath>) => [import("axios-hooks").ResponseValues<Response, any, any>, import("./types").Execute<Response, RequestBody, RequestQuery, RequestPath>];

package/lib/api/create-axios-instance.js

@@ -5,14 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAxiosInstance = createAxiosInstance;
 const axios_1 = __importDefault(require("axios"));
-// eslint-disable-next-line import/no-cycle
 const create_axios_request_1 = require("./create-axios-request");
 const create_use_axios_request_1 = require("./create-use-axios-request");
-function createAxiosInstance(requestConfig = {}) {
+function createAxiosInstance(baseURL, requestConfig = {}) {
     const instance = axios_1.default.create();
     return {
         axiosInstance: instance,
-        axiosRequest: (0, create_axios_request_1.createAxiosRequest)(instance, requestConfig),
-        useAxiosRequest: (0, create_use_axios_request_1.createUseAxiosRequest)(instance, requestConfig),
+        axiosRequest: (0, create_axios_request_1.createAxiosRequest)(baseURL, instance, requestConfig),
+        useAxiosRequest: (0, create_use_axios_request_1.createUseAxiosRequest)(baseURL, instance, requestConfig),
     };
 }

package/lib/api/create-axios-request.d.ts

@@ -1,2 +1,3 @@
 import { AxiosInstance, AxiosRequestConfig, Method } from "axios";
-export declare const createAxiosRequest: (axiosInstance: AxiosInstance, requestConfig: AxiosRequestConfig) => <Response>(ctx: any, url: string, method: Method, body: object | null, query: object | null) => Promise<import("axios").AxiosResponse<Response, any>>;
+/** @deprecated use swr */
+export declare const createAxiosRequest: (baseURL: string, axiosInstance: AxiosInstance, requestConfig: AxiosRequestConfig) => <Response>(ctx: any, url: string, method: Method, body: object | null, query: object | null) => Promise<import("axios").AxiosResponse<Response, any>>;

package/lib/api/create-axios-request.js

@@ -2,17 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAxiosRequest = void 0;
 const qs_1 = require("qs");
-// eslint-disable-next-line import/no-cycle
-const config_1 = require("../../config");
 const BadRequestError_1 = require("../../errors/BadRequestError");
 const ForbiddenError_1 = require("../../errors/ForbiddenError");
 const NetworkError_1 = require("../../errors/NetworkError");
 const UnauthorizedError_1 = require("../../errors/UnauthorizedError");
-const createAxiosRequest = (axiosInstance, requestConfig) => (ctx, url, method, body, query) => {
+/** @deprecated use swr */
+const createAxiosRequest = (baseURL, axiosInstance, requestConfig) => (ctx, url, method, body, query) => {
     var _a;
     return axiosInstance
         .request({
-        baseURL: config_1.config.get("api-url"),
+        baseURL,
         headers: ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.req) === null || _a === void 0 ? void 0 : _a.headers.cookie) ? { cookie: ctx.req.headers.cookie } : {},
         ...requestConfig,
         url: query && Object.keys(query).length > 0 ? `${url}?${(0, qs_1.stringify)(query)}` : url,

package/lib/api/create-use-axios-request.d.ts

@@ -1,4 +1,5 @@
 import { AxiosInstance, AxiosRequestConfig, Method } from "axios";
 import { ResponseValues } from "axios-hooks";
 import { Execute, RequestConfig } from "./types";
-export declare const createUseAxiosRequest: (axiosInstance: AxiosInstance, requestConfig: AxiosRequestConfig) => <Response extends Record<string, any> | boolean, RequestBody extends Record<string, any> | null, RequestQuery extends Record<string, any> | null, RequestPath extends Record<string, any> | null>(url: string, method: Method, config: RequestConfig<RequestBody, RequestQuery, RequestPath>) => [ResponseValues<Response, any, any>, Execute<Response, RequestBody, RequestQuery, RequestPath>];
+/** @deprecated use swr */
+export declare const createUseAxiosRequest: (baseURL: string, axiosInstance: AxiosInstance, requestConfig: AxiosRequestConfig) => <Response extends Record<string, any> | boolean, RequestBody extends Record<string, any> | null, RequestQuery extends Record<string, any> | null, RequestPath extends Record<string, any> | null>(url: string, method: Method, config: RequestConfig<RequestBody, RequestQuery, RequestPath>) => [ResponseValues<Response, any, any>, Execute<Response, RequestBody, RequestQuery, RequestPath>];

package/lib/api/create-use-axios-request.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUseAxiosRequest = void 0;
 const axios_hooks_1 = require("axios-hooks");
 const react_1 = require("react");
-// eslint-disable-next-line import/no-cycle
-const config_1 = require("../../config");
-const createUseAxiosRequest = (axiosInstance, requestConfig) => {
+/** @deprecated use swr */
+const createUseAxiosRequest = (baseURL, axiosInstance, requestConfig) => {
     const useAxios = (0, axios_hooks_1.makeUseAxios)({
         axios: axiosInstance,
         defaultOptions: {
@@ -16,7 +15,7 @@ const createUseAxiosRequest = (axiosInstance, requestConfig) => {
         // TODO Vejvis!!! nějaká demence s typem configu
         const { body, query, skip } = config;
         const [result, executeHandler] = useAxios({
-            baseURL: config_1.config.get("api-url"),
+            baseURL,
             ...requestConfig,
             url,
             method,

package/lib/layout/layout.js

@@ -9,7 +9,6 @@ const rem_1 = require("@uxf/styles/units/rem");
 const loader_1 = require("@uxf/ui/loader/loader");
 const head_1 = __importDefault(require("next/head"));
 const react_1 = __importDefault(require("react"));
-const config_1 = require("../../config");
 const breadcrumbs_1 = require("./breadcrumbs");
 const layout_container_1 = require("./layout-container");
 const sidebar_1 = require("./sidebar");
@@ -20,7 +19,7 @@ const Layout = (props) => {
         react_1.default.createElement(head_1.default, null,
             react_1.default.createElement("meta", { content: "width=device-width, initial-scale=1", name: "viewport" }),
             react_1.default.createElement("meta", { charSet: "utf-8" }),
-            react_1.default.createElement("title", null, `${props.title} | ${config_1.config.get("app-name") || ""}`)),
+            react_1.default.createElement("title", null, `${props.title} | ${props.appName}`)),
         react_1.default.createElement("div", { className: "uxf-cms-layout" },
             react_1.default.createElement("div", { className: "uxf-cms-layout__wrapper" },
                 react_1.default.createElement(sidebar_1.Sidebar, { Logo: props.Logo, menuConfiguration: props.menuConfiguration }),

package/lib/layout/types.d.ts

@@ -15,6 +15,7 @@ export interface SidebarProps {
     CustomSidebar?: ReactElement;
 }
 export type LayoutProps = SidebarProps & {
+    appName: string;
     Avatar?: ReactNode;
     children?: ReactNode;
     containerType?: LayoutContainerType;

package/package.json

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

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

@@ -47,14 +47,15 @@ const url_1 = require("url");
 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)();
+// TODO use swr
+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 });
 function GridPageComponent(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
     // 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;
     const Layout = (_b = (_a = props.ui) === null || _a === void 0 ? void 0 : _a.Layout) !== null && _b !== void 0 ? _b : DefaultLayout;
@@ -128,9 +129,9 @@ function 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 : "" },
+    return (react_1.default.createElement(Layout, { appName: (_g = props.appName) !== null && _g !== void 0 ? _g : "", key: props.entityAlias, title: (_k = (_h = props.title) !== null && _h !== void 0 ? _h : (_j = props.metaSchema) === null || _j === void 0 ? void 0 : _j.title) !== null && _k !== void 0 ? _k : "" },
         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)}`), reload: reload, rowHeight: props.rowHeight, schema: props.gridSchema, state: state }))));
+            react_1.default.createElement(data_grid_1.DataGrid, { NoRowsFallback: (_l = props.ui) === null || _l === void 0 ? void 0 : _l.NoRowsFallback, SelectedRowsToolbarActions: (_m = props.ui) === null || _m === void 0 ? void 0 : _m.SelectedRowsToolbarActions, actionCell: actionCell, actions: actions, bodyCells: (_o = props.ui) === null || _o === void 0 ? void 0 : _o.BodyCells, customActions: cActions, data: data, error: error, filterHandlers: (_p = props.ui) === null || _p === void 0 ? void 0 : _p.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 */
@@ -151,7 +152,7 @@ const GridPage = (config) => {
         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 (react_1.default.createElement(GridPageComponent, { AddIcon: config.AddIcon, appName: config.appName, 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"] });
 };

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

@@ -20,6 +20,7 @@ type UIComponents = {
     };
 };
 export type GridPageComponentProps = {
+    appName?: string;
     ui?: UIComponents;
     entityAlias: string;
     title?: string;
@@ -42,6 +43,7 @@ export type GridPageComponentProps = {
     initialUserConfig?: DataGridUserConfig<any> | Nullish;
 };
 export type GridPageConfig<T extends object = any> = {
+    appName?: string;
     ui?: UIComponents;
     title?: string;
     entityAlias: string;

package/config/config.d.ts

@@ -1,10 +0,0 @@
-type ConfigStore = {
-    "api-url": string;
-    "app-name": string;
-};
-export declare class Config {
-    private store;
-    set<T extends keyof ConfigStore>(key: T, value: ConfigStore[T]): Config;
-    get<T extends keyof ConfigStore>(key: T): ConfigStore[T];
-}
-export {};

package/config/config.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Config = void 0;
-class Config {
-    constructor() {
-        this.store = {
-            "app-name": "UXFans",
-        };
-    }
-    set(key, value) {
-        this.store[key] = value;
-        return this;
-    }
-    get(key) {
-        const value = this.store[key];
-        if (value === undefined) {
-            throw new Error(`Config attribute '${key}' is empty.`);
-        }
-        return value;
-    }
-}
-exports.Config = Config;