@webiny/app-admin 6.3.0 → 6.4.0-beta.1

package/index.js

@@ -1,5 +1,12 @@
+import "./features/formModel/fieldTypes/FileFieldType.js";
+import "./features/formModel/fieldTypes/DateTimeFieldType.js";
+import "./features/formModel/fieldTypes/BooleanFieldType.js";
+import "./features/formModel/fieldTypes/NumberFieldType.js";
+import "./features/formModel/fieldTypes/TextFieldType.js";
+import "./features/formModel/renderers.js";
+import "./features/formModel/fieldTypes/ObjectFieldType.js";
+import "./features/formModel/fieldTypes/FileUrlFieldType.js";
 export * from "@webiny/app";
-// UI components
 export * from "./base/ui/Tags.js";
 export * from "./base/ui/Layout.js";
 export * from "./base/ui/TenantSelector.js";
@@ -11,52 +18,29 @@ export * from "./base/ui/LoginScreen.js";
 export * from "./base/ui/CenteredView.js";
 export * from "./base/ui/Dashboard.js";
 export * from "./base/ui/NotFound.js";
-
-// Base admin app
-export { Admin } from "./base/Admin.js";
 export * from "./config/AdminConfig.js";
-// Plugins
 export * from "./base/plugins/AddGraphQLQuerySelection.js";
-
-// Permissions
 export * from "./permissions/index.js";
-
-// Components
 export * from "./components/index.js";
+export * from "./hooks/index.js";
+export * from "@webiny/app/renderApp.js";
+export { Admin } from "./base/Admin.js";
 export { HasPermission } from "./presentation/security/components/HasPermission.js";
 export { SecureRoute } from "./presentation/security/components/SecureRoute.js";
 export { FileManager, FileManagerRenderer } from "./base/ui/FileManager.js";
 export { SystemInstallerProvider } from "./presentation/installation/components/SystemInstaller/index.js";
-
-// Feature types
-
 export { BuildParamsFeature } from "./features/buildParams/feature.js";
 export { ToolsFeature } from "./features/tools/feature.js";
-export { Tool, ToolRegistry, ToolPipelineRunner } from "./features/tools/abstractions.js";
-// Hooks
-export * from "./hooks/index.js";
+export { Tool, ToolPipelineRunner, ToolRegistry } from "./features/tools/abstractions.js";
 export { useWcp } from "./presentation/wcp/useWcp.js";
 export { useTenantContext } from "./presentation/tenancy/useTenantContext.js";
 export { useIdentity } from "./presentation/security/hooks/useIdentity.js";
 export { useAuthentication } from "./presentation/security/hooks/useAuthentication.js";
 export { useBuildParams } from "./presentation/buildParams/useBuildParams.js";
-
-// Legacy hook for easier migration
 export { useSecurity } from "./presentation/security/hooks/useSecurity.js";
-export * from "@webiny/app/renderApp.js";
-
-// FormModel
-import "./features/formModel/renderers.js";
-import "./features/formModel/fieldTypes/TextFieldType.js";
-import "./features/formModel/fieldTypes/NumberFieldType.js";
-import "./features/formModel/fieldTypes/BooleanFieldType.js";
-import "./features/formModel/fieldTypes/DateTimeFieldType.js";
-import "./features/formModel/fieldTypes/FileFieldType.js";
-import "./features/formModel/fieldTypes/FileUrlFieldType.js";
-import "./features/formModel/fieldTypes/ObjectFieldType.js";
-export { FormModelFactory, FormModel } from "./features/formModel/abstractions.js";
+export { FormModelFactory } from "./features/formModel/abstractions.js";
 export { FormView, LayoutNodeRenderer, useFormViewRenderers } from "./features/formModel/FormView.js";
+export { FormErrors } from "./features/formModel/FormErrors.js";
+export { PresenterErrors } from "./features/formModel/PresenterErrors.js";
 export { useFieldRenderers } from "./features/formModel/useFieldRenderers.js";
 export { useLayoutRenderers } from "./features/formModel/useLayoutRenderers.js";
-
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/app-admin",
-	"version": "6.3.0",
+	"version": "6.4.0-beta.1",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -21,56 +21,56 @@
 		"@emotion/styled": "11.14.1",
 		"@fortawesome/fontawesome-svg-core": "7.2.0",
 		"@fortawesome/react-fontawesome": "3.3.1",
-		"@iconify/json": "2.2.469",
+		"@iconify/json": "2.2.474",
 		"@svgr/webpack": "8.1.0",
 		"@types/react": "18.3.28",
-		"@webiny/admin-ui": "6.3.0",
-		"@webiny/app": "6.3.0",
-		"@webiny/di": "0.2.3",
-		"@webiny/feature": "6.3.0",
-		"@webiny/form": "6.3.0",
-		"@webiny/icons": "6.3.0",
-		"@webiny/lexical-converter": "6.3.0",
-		"@webiny/lexical-editor": "6.3.0",
-		"@webiny/lexical-theme": "6.3.0",
-		"@webiny/plugins": "6.3.0",
-		"@webiny/react-composition": "6.3.0",
-		"@webiny/react-properties": "6.3.0",
-		"@webiny/sdk": "6.3.0",
-		"@webiny/telemetry": "6.3.0",
-		"@webiny/ui": "6.3.0",
-		"@webiny/utils": "6.3.0",
-		"@webiny/validation": "6.3.0",
-		"@webiny/wcp": "6.3.0",
+		"@webiny/admin-ui": "6.4.0-beta.1",
+		"@webiny/app": "6.4.0-beta.1",
+		"@webiny/di": "1.0.0",
+		"@webiny/feature": "6.4.0-beta.1",
+		"@webiny/form": "6.4.0-beta.1",
+		"@webiny/icons": "6.4.0-beta.1",
+		"@webiny/lexical-converter": "6.4.0-beta.1",
+		"@webiny/lexical-editor": "6.4.0-beta.1",
+		"@webiny/lexical-theme": "6.4.0-beta.1",
+		"@webiny/plugins": "6.4.0-beta.1",
+		"@webiny/react-composition": "6.4.0-beta.1",
+		"@webiny/react-properties": "6.4.0-beta.1",
+		"@webiny/sdk": "6.4.0-beta.1",
+		"@webiny/telemetry": "6.4.0-beta.1",
+		"@webiny/utils": "6.4.0-beta.1",
+		"@webiny/validation": "6.4.0-beta.1",
+		"@webiny/wcp": "6.4.0-beta.1",
 		"apollo-cache": "1.3.5",
 		"apollo-client": "2.6.10",
 		"apollo-link": "1.2.14",
 		"apollo-link-context": "1.0.20",
 		"apollo-utilities": "1.3.4",
+		"bytes": "3.1.2",
 		"classnames": "2.5.1",
-		"graphql": "16.13.2",
+		"graphql": "16.14.0",
 		"graphql-tag": "2.12.6",
 		"history": "5.3.0",
 		"is-hotkey": "0.2.0",
 		"lexical": "0.44.0",
 		"lodash": "4.18.1",
-		"markdown-to-jsx": "9.7.16",
+		"markdown-to-jsx": "9.8.0",
+		"mime": "4.1.0",
 		"minimatch": "10.2.5",
-		"mobx": "6.15.1",
+		"mobx": "6.15.3",
 		"mobx-react-lite": "4.1.1",
 		"monaco-editor": "0.53.0",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
-		"react-resizable-panels": "4.11.0",
+		"react-resizable-panels": "4.11.1",
 		"react-transition-group": "4.4.5",
 		"react-virtualized": "9.22.6",
 		"reset-css": "5.0.2",
 		"tinycolor2": "1.6.0",
 		"unicode-emoji-json": "0.9.0",
-		"zod": "4.3.6"
+		"zod": "4.4.3"
 	},
 	"devDependencies": {
-		"@emotion/babel-plugin": "11.13.5",
 		"@testing-library/react": "16.3.2",
 		"@types/bytes": "3.1.5",
 		"@types/graphlib": "2.1.12",
@@ -79,10 +79,10 @@
 		"@types/react-transition-group": "4.4.12",
 		"@types/store": "2.0.5",
 		"@types/tinycolor2": "1.4.6",
-		"@webiny/build-tools": "6.3.0",
+		"@webiny/build-tools": "6.4.0-beta.1",
 		"rimraf": "6.1.3",
 		"typescript": "6.0.3",
-		"vitest": "4.1.5"
+		"vitest": "4.1.6"
 	},
 	"publishConfig": {
 		"access": "public",
@@ -105,5 +105,5 @@
 			]
 		}
 	},
-	"gitHead": "7cefe15431dbd65504e1f58147dc9e55bcbfa693"
+	"gitHead": "73237b8243693038c072bae1c0b783387448cbbe"
 }

package/permissions/PermissionRenderer.js

@@ -1,4 +1,4 @@
-import React, { Fragment, useCallback, useMemo } from "react";
+import react, { Fragment, useCallback, useMemo } from "react";
 import { CheckboxGroup, Grid, Select } from "@webiny/admin-ui";
 import { Form } from "@webiny/form";
 import { CannotUseAaclAlert, PermissionInfo, PermissionsGroup } from "../components/Permissions/index.js";
@@ -9,211 +9,197 @@ const NO_ACCESS = "no";
 const FULL_ACCESS = "full";
 const READ_ONLY_ACCESS = "read-only";
 const CUSTOM_ACCESS = "custom";
-const RWD_OPTIONS = [{
-  value: "r",
-  label: "Read"
-}, {
-  value: "rw",
-  label: "Read, write"
-}, {
-  value: "rwd",
-  label: "Read, write, delete"
-}];
-const PW_OPTIONS = [{
-  value: "p",
-  label: "Publish"
-}, {
-  value: "u",
-  label: "Unpublish"
-}];
+const RWD_OPTIONS = [
+    {
+        value: "r",
+        label: "Read"
+    },
+    {
+        value: "rw",
+        label: "Read, write"
+    },
+    {
+        value: "rwd",
+        label: "Read, write, delete"
+    }
+];
+const PW_OPTIONS = [
+    {
+        value: "p",
+        label: "Publish"
+    },
+    {
+        value: "u",
+        label: "Unpublish"
+    }
+];
 function hasAction(entity, name) {
-  return entity.actions?.some(a => a.name === name) ?? false;
+    return entity.actions?.some((a)=>a.name === name) ?? false;
 }
 function buildScopeOptions(entity) {
-  const options = [{
-    value: NO_ACCESS,
-    label: "No access"
-  }];
-  if (entity.scopes.includes("full")) {
-    options.push({
-      value: FULL_ACCESS,
-      label: "Full access"
+    const options = [
+        {
+            value: NO_ACCESS,
+            label: "No access"
+        }
+    ];
+    if (entity.scopes.includes("full")) options.push({
+        value: FULL_ACCESS,
+        label: "Full access"
     });
-  }
-  if (entity.scopes.includes("own")) {
-    options.push({
-      value: "own",
-      label: "Only entries created by the user"
+    if (entity.scopes.includes("own")) options.push({
+        value: "own",
+        label: "Only entries created by the user"
     });
-  }
-  return options;
+    return options;
 }
-const BUILTIN_ACTIONS = new Set(["rwd", "pw"]);
+const BUILTIN_ACTIONS = new Set([
+    "rwd",
+    "pw"
+]);
 function getCustomActions(entity) {
-  return (entity.actions ?? []).filter(a => !BUILTIN_ACTIONS.has(a.name));
+    return (entity.actions ?? []).filter((a)=>!BUILTIN_ACTIONS.has(a.name));
 }
-function EntitySection({
-  entity,
-  data,
-  cannotUseAAcl,
-  Bind,
-  setValue
-}) {
-  const scopeField = `${entity.id}AccessScope`;
-  const currentScope = data[scopeField];
-  const scopeDisabled = cannotUseAAcl || !currentScope || currentScope === NO_ACCESS;
-  const customActions = useMemo(() => getCustomActions(entity), [entity]);
-
-  // Derive the selected values array from individual boolean form fields.
-  const customActionsValue = useMemo(() => {
-    return customActions.filter(a => data[`${entity.id}Action_${a.name}`]).map(a => a.name);
-  }, [data, customActions, entity.id]);
-  const onCustomActionsChange = useCallback(selected => {
-    const selectedSet = new Set(selected);
-    for (const action of customActions) {
-      setValue(`${entity.id}Action_${action.name}`, selectedSet.has(action.name));
-    }
-  }, [customActions, entity.id, setValue]);
-  const columns = [/*#__PURE__*/React.createElement(Grid.Column, {
-    span: 12,
-    key: "access"
-  }, /*#__PURE__*/React.createElement(Bind, {
-    name: scopeField,
-    beforeChange: (value, cb) => {
-      if (value === "own" && hasAction(entity, "rwd")) {
-        setValue(`${entity.id}RWD`, "rwd");
-      }
-      cb(value);
-    }
-  }, /*#__PURE__*/React.createElement(Select, {
-    label: "Access Scope",
-    disabled: cannotUseAAcl,
-    options: buildScopeOptions(entity)
-  })))];
-  if (hasAction(entity, "rwd")) {
-    columns.push(/*#__PURE__*/React.createElement(Grid.Column, {
-      span: 12,
-      key: "rwd"
-    }, /*#__PURE__*/React.createElement(Bind, {
-      name: `${entity.id}RWD`
-    }, /*#__PURE__*/React.createElement(Select, {
-      label: "Primary Actions",
-      disabled: scopeDisabled || currentScope === "own",
-      options: RWD_OPTIONS
+function EntitySection({ entity, data, cannotUseAAcl, Bind, setValue }) {
+    const scopeField = `${entity.id}AccessScope`;
+    const currentScope = data[scopeField];
+    const scopeDisabled = cannotUseAAcl || !currentScope || currentScope === NO_ACCESS;
+    const customActions = useMemo(()=>getCustomActions(entity), [
+        entity
+    ]);
+    const customActionsValue = useMemo(()=>customActions.filter((a)=>data[`${entity.id}Action_${a.name}`]).map((a)=>a.name), [
+        data,
+        customActions,
+        entity.id
+    ]);
+    const onCustomActionsChange = useCallback((selected)=>{
+        const selectedSet = new Set(selected);
+        for (const action of customActions)setValue(`${entity.id}Action_${action.name}`, selectedSet.has(action.name));
+    }, [
+        customActions,
+        entity.id,
+        setValue
+    ]);
+    const columns = [
+        /*#__PURE__*/ react.createElement(Grid.Column, {
+            span: 12,
+            key: "access"
+        }, /*#__PURE__*/ react.createElement(Bind, {
+            name: scopeField,
+            beforeChange: (value, cb)=>{
+                if ("own" === value && hasAction(entity, "rwd")) setValue(`${entity.id}RWD`, "rwd");
+                cb(value);
+            }
+        }, /*#__PURE__*/ react.createElement(Select, {
+            label: "Access Scope",
+            disabled: cannotUseAAcl,
+            options: buildScopeOptions(entity)
+        })))
+    ];
+    if (hasAction(entity, "rwd")) columns.push(/*#__PURE__*/ react.createElement(Grid.Column, {
+        span: 12,
+        key: "rwd"
+    }, /*#__PURE__*/ react.createElement(Bind, {
+        name: `${entity.id}RWD`
+    }, /*#__PURE__*/ react.createElement(Select, {
+        label: "Primary Actions",
+        disabled: scopeDisabled || "own" === currentScope,
+        options: RWD_OPTIONS
     }))));
-  }
-  if (hasAction(entity, "pw")) {
-    columns.push(/*#__PURE__*/React.createElement(Grid.Column, {
-      span: 12,
-      key: "pw"
-    }, /*#__PURE__*/React.createElement(Bind, {
-      name: `${entity.id}PW`
-    }, /*#__PURE__*/React.createElement(CheckboxGroup, {
-      label: "Publishing actions",
-      description: "Publishing-related actions that can be performed on entries.",
-      items: PW_OPTIONS.map(opt => ({
-        ...opt,
-        disabled: scopeDisabled
-      }))
+    if (hasAction(entity, "pw")) columns.push(/*#__PURE__*/ react.createElement(Grid.Column, {
+        span: 12,
+        key: "pw"
+    }, /*#__PURE__*/ react.createElement(Bind, {
+        name: `${entity.id}PW`
+    }, /*#__PURE__*/ react.createElement(CheckboxGroup, {
+        label: "Publishing actions",
+        description: "Publishing-related actions that can be performed on entries.",
+        items: PW_OPTIONS.map((opt)=>({
+                ...opt,
+                disabled: scopeDisabled
+            }))
     }))));
-  }
-  if (customActions.length > 0) {
-    columns.push(/*#__PURE__*/React.createElement(Grid.Column, {
-      span: 12,
-      key: "other"
-    }, /*#__PURE__*/React.createElement(CheckboxGroup, {
-      label: "Other Actions",
-      value: customActionsValue,
-      onChange: onCustomActionsChange,
-      items: customActions.map(action => ({
-        value: action.name,
-        label: action.label || action.name,
-        disabled: scopeDisabled
-      }))
+    if (customActions.length > 0) columns.push(/*#__PURE__*/ react.createElement(Grid.Column, {
+        span: 12,
+        key: "other"
+    }, /*#__PURE__*/ react.createElement(CheckboxGroup, {
+        label: "Other Actions",
+        value: customActionsValue,
+        onChange: onCustomActionsChange,
+        items: customActions.map((action)=>({
+                value: action.name,
+                label: action.label || action.name,
+                disabled: scopeDisabled
+            }))
     })));
-  }
-  return /*#__PURE__*/React.createElement(PermissionsGroup, {
-    title: entity.title || entity.id
-  }, /*#__PURE__*/React.createElement(Grid, null, columns));
+    return /*#__PURE__*/ react.createElement(PermissionsGroup, {
+        title: entity.title || entity.id
+    }, /*#__PURE__*/ react.createElement(Grid, null, columns));
 }
-export const PermissionRenderer = ({
-  schema
-}) => {
-  const {
-    value,
-    onChange
-  } = usePermissionValue();
-  const {
-    identity
-  } = useAuthentication();
-  const cannotUseAAcl = useMemo(() => {
-    return !identity.getPermission("aacl", true);
-  }, []);
-  const {
-    formData,
-    onFormChange
-  } = usePermissionForm(schema, {
-    value,
-    onChange
-  });
-  const entities = schema.entities || [];
-  const hasEntities = entities.length > 0;
-  const accessLevelOptions = useMemo(() => {
-    const options = [{
-      value: NO_ACCESS,
-      label: "No access"
-    }];
-    if (schema.readOnlyAccess) {
-      options.push({
-        value: READ_ONLY_ACCESS,
-        label: "Read-only access"
-      });
-    }
-    options.push({
-      value: FULL_ACCESS,
-      label: "Full access"
+const PermissionRenderer = ({ schema })=>{
+    const { value, onChange } = usePermissionValue();
+    const { identity } = useAuthentication();
+    const cannotUseAAcl = useMemo(()=>!identity.getPermission("aacl", true), []);
+    const { formData, onFormChange } = usePermissionForm(schema, {
+        value,
+        onChange
     });
-    if (hasEntities) {
-      options.push({
-        value: CUSTOM_ACCESS,
-        label: "Custom access"
-      });
-    }
-    return options;
-  }, [schema, hasEntities]);
-  return /*#__PURE__*/React.createElement(Form, {
-    data: formData,
-    onChange: onFormChange
-  }, ({
-    data,
-    Bind,
-    setValue
-  }) => /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Grid, {
-    className: "pt-md"
-  }, /*#__PURE__*/React.createElement(Grid.Column, {
-    span: 12
-  }, data.accessLevel === CUSTOM_ACCESS && cannotUseAAcl && /*#__PURE__*/React.createElement(CannotUseAaclAlert, null))), /*#__PURE__*/React.createElement(Grid, {
-    className: "pt-md"
-  }, /*#__PURE__*/React.createElement(Grid.Column, {
-    span: 6
-  }, /*#__PURE__*/React.createElement(PermissionInfo, {
-    title: "Access Level"
-  })), /*#__PURE__*/React.createElement(Grid.Column, {
-    span: 6
-  }, /*#__PURE__*/React.createElement(Bind, {
-    name: "accessLevel"
-  }, /*#__PURE__*/React.createElement(Select, {
-    options: accessLevelOptions
-  })))), data.accessLevel === CUSTOM_ACCESS && hasEntities && /*#__PURE__*/React.createElement("div", {
-    className: "mt-lg"
-  }, entities.map(entity => /*#__PURE__*/React.createElement(EntitySection, {
-    key: entity.id,
-    entity: entity,
-    data: data,
-    cannotUseAAcl: cannotUseAAcl,
-    Bind: Bind,
-    setValue: setValue
-  })))));
+    const entities = schema.entities || [];
+    const hasEntities = entities.length > 0;
+    const accessLevelOptions = useMemo(()=>{
+        const options = [
+            {
+                value: NO_ACCESS,
+                label: "No access"
+            }
+        ];
+        if (schema.readOnlyAccess) options.push({
+            value: READ_ONLY_ACCESS,
+            label: "Read-only access"
+        });
+        options.push({
+            value: FULL_ACCESS,
+            label: "Full access"
+        });
+        if (hasEntities) options.push({
+            value: CUSTOM_ACCESS,
+            label: "Custom access"
+        });
+        return options;
+    }, [
+        schema,
+        hasEntities
+    ]);
+    return /*#__PURE__*/ react.createElement(Form, {
+        data: formData,
+        onChange: onFormChange
+    }, ({ data, Bind, setValue })=>/*#__PURE__*/ react.createElement(Fragment, null, /*#__PURE__*/ react.createElement(Grid, {
+            className: "pt-md"
+        }, /*#__PURE__*/ react.createElement(Grid.Column, {
+            span: 12
+        }, data.accessLevel === CUSTOM_ACCESS && cannotUseAAcl && /*#__PURE__*/ react.createElement(CannotUseAaclAlert, null))), /*#__PURE__*/ react.createElement(Grid, {
+            className: "pt-md"
+        }, /*#__PURE__*/ react.createElement(Grid.Column, {
+            span: 6
+        }, /*#__PURE__*/ react.createElement(PermissionInfo, {
+            title: "Access Level"
+        })), /*#__PURE__*/ react.createElement(Grid.Column, {
+            span: 6
+        }, /*#__PURE__*/ react.createElement(Bind, {
+            name: "accessLevel"
+        }, /*#__PURE__*/ react.createElement(Select, {
+            options: accessLevelOptions
+        })))), data.accessLevel === CUSTOM_ACCESS && hasEntities && /*#__PURE__*/ react.createElement("div", {
+            className: "mt-lg"
+        }, entities.map((entity)=>/*#__PURE__*/ react.createElement(EntitySection, {
+                key: entity.id,
+                entity: entity,
+                data: data,
+                cannotUseAAcl: cannotUseAAcl,
+                Bind: Bind,
+                setValue: setValue
+            })))));
 };
+export { PermissionRenderer };
 
 //# sourceMappingURL=PermissionRenderer.js.map