From 7e8f4e09f65099eae5643c5455fd6d553c7ee243 Mon Sep 17 00:00:00 2001
From: adrians5j <adrian@webiny.com>
Date: Thu, 5 Dec 2024 06:32:17 +0100
Subject: [PATCH 01/28] fix: allow specifying dependency with exact version

---
 .../src/generateExtension.ts                  | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/packages/cli-plugin-extensions/src/generateExtension.ts b/packages/cli-plugin-extensions/src/generateExtension.ts
index 67af6b1741..b405ac5c26 100644
--- a/packages/cli-plugin-extensions/src/generateExtension.ts
+++ b/packages/cli-plugin-extensions/src/generateExtension.ts
@@ -93,9 +93,26 @@ export const generateExtension = async ({ input, ora, context }: GenerateExtensi
                 }
 
                 try {
-                    const { stdout } = await execa("npm", ["view", packageName, "version", "json"]);
-
-                    packageJsonUpdates[packageName] = `^${stdout}`;
+                    const parsedPackageName = (() => {
+                        const parts = packageName.split("@");
+                        if (packageName.startsWith("@")) {
+                            return { name: parts[0] + parts[1], version: parts[2] };
+                        }
+
+                        return { name: parts[0], version: parts[1] };
+                    })();
+
+                    if (parsedPackageName.version) {
+                        packageJsonUpdates[parsedPackageName.name] = parsedPackageName.version;
+                    } else {
+                        const { stdout } = await execa("npm", [
+                            "view",
+                            parsedPackageName.name,
+                            "version"
+                        ]);
+
+                        packageJsonUpdates[packageName] = `^${stdout}`;
+                    }
                 } catch (e) {
                     throw new Error(
                         `Could not find ${log.error.hl(

From 64f83d5f321c5b1b5562a45a9da2d327c884fda1 Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Tue, 3 Dec 2024 13:30:35 +0100
Subject: [PATCH 02/28] fix(plugins): improve types of plugins returned from
 the container

---
 packages/plugins/src/PluginsContainer.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/plugins/src/PluginsContainer.ts b/packages/plugins/src/PluginsContainer.ts
index 48ecdd719a..7407178beb 100644
--- a/packages/plugins/src/PluginsContainer.ts
+++ b/packages/plugins/src/PluginsContainer.ts
@@ -1,6 +1,8 @@
 import { Plugin, PluginCollection } from "./types";
 import uniqid from "uniqid";
 
+export type WithName<T extends Plugin> = T & { name: string };
+
 const isOptionsObject = (item?: any) => item && !Array.isArray(item) && !item.type && !item.name;
 const normalizeArgs = (args: any[]): [Plugin[], any] => {
     let options = {};
@@ -53,32 +55,32 @@ const assign = (
 
 export class PluginsContainer {
     private plugins: Record<string, Plugin> = {};
-    private _byTypeCache: Record<string, Plugin[]> = {};
+    private _byTypeCache: Record<string, WithName<Plugin>[]> = {};
 
     constructor(...args: PluginCollection) {
         this.register(...args);
     }
 
-    public byName<T extends Plugin>(name: T["name"]): T | null {
+    public byName<T extends Plugin>(name: T["name"]) {
         if (!name) {
             return null;
         }
         /**
          * We can safely cast name as string, we know it is so.
          */
-        return this.plugins[name as string] as T;
+        return this.plugins[name as string] as WithName<T>;
     }
 
-    public byType<T extends Plugin>(type: T["type"]): T[] {
+    public byType<T extends Plugin>(type: T["type"]) {
         if (this._byTypeCache[type]) {
-            return Array.from(this._byTypeCache[type]) as T[];
+            return Array.from(this._byTypeCache[type]) as WithName<T>[];
         }
         const plugins = this.findByType<T>(type);
         this._byTypeCache[type] = plugins;
         return Array.from(plugins);
     }
 
-    public atLeastOneByType<T extends Plugin>(type: T["type"]): T[] {
+    public atLeastOneByType<T extends Plugin>(type: T["type"]) {
         const list = this.byType<T>(type);
         if (list.length === 0) {
             throw new Error(`There are no plugins by type "${type}".`);
@@ -86,7 +88,7 @@ export class PluginsContainer {
         return list;
     }
 
-    public oneByType<T extends Plugin>(type: T["type"]): T {
+    public oneByType<T extends Plugin>(type: T["type"]) {
         const list = this.atLeastOneByType<T>(type);
         if (list.length > 1) {
             throw new Error(
@@ -125,7 +127,9 @@ export class PluginsContainer {
         delete this.plugins[name];
     }
 
-    private findByType<T extends Plugin>(type: T["type"]): T[] {
-        return Object.values(this.plugins).filter((pl): pl is T => pl.type === type) as T[];
+    private findByType<T extends Plugin>(type: T["type"]) {
+        return Object.values(this.plugins).filter(
+            (pl): pl is T => pl.type === type
+        ) as WithName<T>[];
     }
 }

From 122232cd6abf3e2f6765dfd3f45d62085ce2337c Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Tue, 3 Dec 2024 13:31:31 +0100
Subject: [PATCH 03/28] fix(app-page-builder): create plugin loader components

---
 .../admin/components/EditorPluginsLoader.tsx  | 138 ------------------
 .../PluginLoaders/EditorPluginsLoader.tsx     |   8 +
 .../PluginLoaders/RenderPluginsLoader.tsx     |   8 +
 .../PluginLoaders/createPluginsLoader.tsx     |  65 +++++++++
 .../src/admin/plugins/routes.tsx              | 128 +++++++---------
 packages/app-page-builder/src/types.ts        |   4 +-
 6 files changed, 139 insertions(+), 212 deletions(-)
 delete mode 100644 packages/app-page-builder/src/admin/components/EditorPluginsLoader.tsx
 create mode 100644 packages/app-page-builder/src/admin/components/PluginLoaders/EditorPluginsLoader.tsx
 create mode 100644 packages/app-page-builder/src/admin/components/PluginLoaders/RenderPluginsLoader.tsx
 create mode 100644 packages/app-page-builder/src/admin/components/PluginLoaders/createPluginsLoader.tsx

diff --git a/packages/app-page-builder/src/admin/components/EditorPluginsLoader.tsx b/packages/app-page-builder/src/admin/components/EditorPluginsLoader.tsx
deleted file mode 100644
index 0bb6d03f2b..0000000000
--- a/packages/app-page-builder/src/admin/components/EditorPluginsLoader.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import React, { useEffect, useReducer } from "react";
-import * as History from "history";
-import { plugins } from "@webiny/plugins";
-import { CircularProgress } from "@webiny/ui/Progress";
-import { PbPluginsLoader } from "~/types";
-
-const globalState: State = {
-    render: false,
-    editor: false
-};
-
-// Since these plugins are loaded asynchronously, and some overrides might've been registered
-// already by the developer (e.g. in the main App.tsx file), we only register new plugins.
-// In other words, if the plugin with a particular name already exists, we skip its registration.
-
-interface State {
-    render?: boolean;
-    editor?: boolean;
-}
-
-interface EditorPluginsLoaderProps {
-    location: History.Location;
-    children: React.ReactNode;
-}
-
-export const EditorPluginsLoader = ({ children, location }: EditorPluginsLoaderProps) => {
-    const [loaded, setLoaded] = useReducer(
-        (state: State, newState: Partial<State>) => ({ ...state, ...newState }),
-        globalState
-    );
-
-    const isEditorRoute = [
-        "/page-builder/editor",
-        "/page-builder/block-editor",
-        "/page-builder/template-editor"
-    ].some(path => location.pathname.startsWith(path));
-
-    const loadPlugins = async () => {
-        const pbPlugins = plugins.byType<PbPluginsLoader>("pb-plugins-loader");
-        // load all editor admin plugins
-        const loadEditorPlugins = async () =>
-            await Promise.all(
-                pbPlugins
-                    .map(plugin => plugin.loadEditorPlugins && plugin.loadEditorPlugins())
-                    .filter(Boolean)
-            );
-        // load all editor render plugins
-        const loadRenderPlugins = async () =>
-            await Promise.all(
-                pbPlugins
-                    .map(plugin => plugin.loadRenderPlugins && plugin.loadRenderPlugins())
-                    .filter(Boolean)
-            );
-
-        // If we are on pages list route, import plugins required to render the page content.
-        if (location.pathname.startsWith("/page-builder/pages") && !loaded.render) {
-            const renderPlugins = await loadRenderPlugins();
-
-            // "skipExisting" will ensure existing plugins (with the same name) are not overridden.
-            plugins.register(renderPlugins, { skipExisting: true });
-
-            globalState.render = true;
-            setLoaded({ render: true });
-        }
-
-        // If we are on pages list route, import plugins required to render the page content.
-        if (location.pathname.startsWith("/page-builder/page-blocks") && !loaded.render) {
-            const renderPlugins = await loadRenderPlugins();
-
-            // "skipExisting" will ensure existing plugins (with the same name) are not overridden.
-            plugins.register(renderPlugins, { skipExisting: true });
-
-            globalState.render = true;
-            setLoaded({ render: true });
-        }
-
-        // If we are on page templates list route, import plugins required to render the template content.
-        if (location.pathname.startsWith("/page-builder/page-templates") && !loaded.render) {
-            const renderPlugins = await loadRenderPlugins();
-
-            // "skipExisting" will ensure existing plugins (with the same name) are not overridden.
-            plugins.register(renderPlugins, { skipExisting: true });
-
-            globalState.render = true;
-            setLoaded({ render: true });
-        }
-
-        // If we are on the Editor route, import plugins required to render both editor and preview.
-        if (isEditorRoute && !loaded.editor) {
-            const renderPlugins = !loaded.render ? await loadRenderPlugins() : [];
-            const editorAdminPlugins = await loadEditorPlugins();
-            // merge both editor admin and render plugins
-            const editorRenderPlugins = [...editorAdminPlugins, ...renderPlugins].filter(Boolean);
-
-            // "skipExisting" will ensure existing plugins (with the same name) are not overridden.
-            plugins.register(editorRenderPlugins, { skipExisting: true });
-
-            globalState.editor = true;
-            globalState.render = true;
-
-            setLoaded({ editor: true, render: true });
-        }
-    };
-
-    useEffect(() => {
-        loadPlugins();
-    }, [location.pathname]);
-
-    /**
-     * This condition is for the list of pages.
-     * Page can be selected at this point.
-     */
-    if (location.pathname.startsWith("/page-builder/pages") && loaded.render) {
-        return children as unknown as React.ReactElement;
-    }
-    /**
-     * This condition is for the list of page blocks.
-     * Blocks can be selected at this point.
-     */
-    if (location.pathname.startsWith("/page-builder/page-blocks") && loaded.render) {
-        return children as unknown as React.ReactElement;
-    }
-    /**
-     * This condition is for the list of page templates.
-     * Page template can be selected at this point.
-     */
-    if (location.pathname.startsWith("/page-builder/page-templates") && loaded.render) {
-        return children as unknown as React.ReactElement;
-    }
-    /**
-     * This condition is for editing of the selected page/template.
-     */
-    if (isEditorRoute && loaded.editor) {
-        return children as unknown as React.ReactElement;
-    }
-
-    return <CircularProgress />;
-};
diff --git a/packages/app-page-builder/src/admin/components/PluginLoaders/EditorPluginsLoader.tsx b/packages/app-page-builder/src/admin/components/PluginLoaders/EditorPluginsLoader.tsx
new file mode 100644
index 0000000000..9a469d77e6
--- /dev/null
+++ b/packages/app-page-builder/src/admin/components/PluginLoaders/EditorPluginsLoader.tsx
@@ -0,0 +1,8 @@
+import { createPluginsLoader } from "~/admin/components/PluginLoaders/createPluginsLoader";
+
+export const EditorPluginsLoader = createPluginsLoader({
+    type: "pb-editor-page-element",
+    factory: plugin => {
+        return plugin.loadEditorPlugins ? plugin.loadEditorPlugins() : undefined;
+    }
+});
diff --git a/packages/app-page-builder/src/admin/components/PluginLoaders/RenderPluginsLoader.tsx b/packages/app-page-builder/src/admin/components/PluginLoaders/RenderPluginsLoader.tsx
new file mode 100644
index 0000000000..ce354e95df
--- /dev/null
+++ b/packages/app-page-builder/src/admin/components/PluginLoaders/RenderPluginsLoader.tsx
@@ -0,0 +1,8 @@
+import { createPluginsLoader } from "~/admin/components/PluginLoaders/createPluginsLoader";
+
+export const RenderPluginsLoader = createPluginsLoader({
+    type: "pb-render-page-element",
+    factory: plugin => {
+        return plugin.loadRenderPlugins ? plugin.loadRenderPlugins() : undefined;
+    }
+});
diff --git a/packages/app-page-builder/src/admin/components/PluginLoaders/createPluginsLoader.tsx b/packages/app-page-builder/src/admin/components/PluginLoaders/createPluginsLoader.tsx
new file mode 100644
index 0000000000..52c6bdb382
--- /dev/null
+++ b/packages/app-page-builder/src/admin/components/PluginLoaders/createPluginsLoader.tsx
@@ -0,0 +1,65 @@
+import React, { useEffect, useState } from "react";
+import type { Plugin } from "@webiny/plugins/types";
+import { GenericRecord } from "@webiny/app/types";
+import { plugins } from "@webiny/plugins";
+import { CircularProgress } from "@webiny/ui/Progress";
+import type { PbEditorPageElementPlugin, PbPluginsLoader, PbRenderElementPlugin } from "~/types";
+
+export interface CreatePluginsLoaderParams {
+    // Plugin type
+    type: PbRenderElementPlugin["type"] | PbEditorPageElementPlugin["type"];
+    // Plugin factory
+    factory: (plugin: PbPluginsLoader) => Promise<Plugin[]> | undefined;
+}
+
+const globalCache: GenericRecord<string, boolean> = {};
+
+export interface PluginsLoaderProps {
+    children: React.ReactNode;
+}
+
+export const createPluginsLoader = ({ type, factory }: CreatePluginsLoaderParams) => {
+    const PluginsLoader = ({ children }: PluginsLoaderProps) => {
+        const [loaded, setLoaded] = useState(false);
+
+        const loadPlugins = async () => {
+            const pluginsLoaders = plugins.byType<PbPluginsLoader>("pb-plugins-loader");
+
+            const lazyLoadedPlugins = await Promise.all(
+                pluginsLoaders.map(plugin => factory(plugin)).filter(Boolean)
+            );
+
+            // Here comes an awkward hack: there's a chance that a user registered some custom plugins through React,
+            // and they're already in the registry. But we want to make sure that user plugins are applied _after_ the lazy-loaded
+            // plugins, loaded via the `pb-plugins-loader`. To achieve that, we unregister existing plugins, and register them
+            // _after_ the lazy-loaded ones.
+
+            const existingPlugins = plugins.byType(type);
+
+            existingPlugins.forEach(plugin => {
+                plugins.unregister(plugin.name);
+            });
+
+            // Register lazy-loaded plugins first.
+            plugins.register(lazyLoadedPlugins);
+            plugins.register(existingPlugins);
+        };
+
+        useEffect(() => {
+            if (!globalCache[type]) {
+                loadPlugins().then(() => {
+                    globalCache[type] = true;
+                    setLoaded(true);
+                });
+            } else {
+                setLoaded(true);
+            }
+        }, []);
+
+        return loaded ? <>{children}</> : <CircularProgress />;
+    };
+
+    PluginsLoader.displayName = `PluginsLoader<${type}>`;
+
+    return PluginsLoader;
+};
diff --git a/packages/app-page-builder/src/admin/plugins/routes.tsx b/packages/app-page-builder/src/admin/plugins/routes.tsx
index ab702c5108..8cd18ad6eb 100644
--- a/packages/app-page-builder/src/admin/plugins/routes.tsx
+++ b/packages/app-page-builder/src/admin/plugins/routes.tsx
@@ -5,7 +5,6 @@ import { AdminLayout } from "@webiny/app-admin/components/AdminLayout";
 import { SecureRoute } from "@webiny/app-security/components";
 import { RoutePlugin } from "@webiny/app/types";
 import { CompositionScope } from "@webiny/react-composition";
-import { EditorPluginsLoader } from "../components/EditorPluginsLoader";
 
 import Categories from "../views/Categories/Categories";
 import Menus from "../views/Menus/Menus";
@@ -17,6 +16,8 @@ import PageTemplates from "~/admin/views/PageTemplates/PageTemplates";
 import { PageEditor } from "~/pageEditor/Editor";
 import { BlockEditor } from "~/blockEditor/Editor";
 import { TemplateEditor } from "~/templateEditor/Editor";
+import { RenderPluginsLoader } from "~/admin/components/PluginLoaders/RenderPluginsLoader";
+import { EditorPluginsLoader } from "~/admin/components/PluginLoaders/EditorPluginsLoader";
 
 const ROLE_PB_CATEGORY = "pb.category";
 const ROLE_PB_MENUS = "pb.menu";
@@ -30,16 +31,15 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/categories"
-                render={() => (
+                element={
                     <SecureRoute permission={ROLE_PB_CATEGORY}>
                         <AdminLayout>
                             <Helmet title={"Page Builder - Categories"} />
                             <Categories />
                         </AdminLayout>
                     </SecureRoute>
-                )}
+                }
             />
         )
     },
@@ -48,16 +48,15 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/menus"
-                render={() => (
+                element={
                     <SecureRoute permission={ROLE_PB_MENUS}>
                         <AdminLayout>
                             <Helmet title={"Page Builder - Menus"} />
                             <Menus />
                         </AdminLayout>
                     </SecureRoute>
-                )}
+                }
             />
         )
     },
@@ -66,20 +65,19 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/pages"
-                render={({ location }) => (
+                element={
                     <SecureRoute permission={ROLE_PB_PAGES}>
-                        <EditorPluginsLoader location={location}>
+                        <RenderPluginsLoader>
                             <AdminLayout>
                                 <Helmet title={"Page Builder - Pages"} />
                                 <CompositionScope name={"pb.page"}>
                                     <Pages />
                                 </CompositionScope>
                             </AdminLayout>
-                        </EditorPluginsLoader>
+                        </RenderPluginsLoader>
                     </SecureRoute>
-                )}
+                }
             />
         )
     },
@@ -88,20 +86,17 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/editor/:id"
-                render={({ location }) => {
-                    return (
-                        <SecureRoute permission={ROLE_PB_PAGES}>
-                            <EditorPluginsLoader location={location}>
-                                <Helmet title={"Page Builder - Edit page"} />
-                                <CompositionScope name={"pb.pageEditor"}>
-                                    <PageEditor />
-                                </CompositionScope>
-                            </EditorPluginsLoader>
-                        </SecureRoute>
-                    );
-                }}
+                element={
+                    <SecureRoute permission={ROLE_PB_PAGES}>
+                        <EditorPluginsLoader>
+                            <Helmet title={"Page Builder - Edit page"} />
+                            <CompositionScope name={"pb.pageEditor"}>
+                                <PageEditor />
+                            </CompositionScope>
+                        </EditorPluginsLoader>
+                    </SecureRoute>
+                }
             />
         )
     },
@@ -110,20 +105,17 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/page-templates"
-                render={({ location }) => {
-                    return (
-                        <SecureRoute permission={ROLE_PB_TEMPLATE}>
-                            <EditorPluginsLoader location={location}>
-                                <AdminLayout>
-                                    <Helmet title={"Page Builder - Page Templates"} />
-                                    <PageTemplates />
-                                </AdminLayout>
-                            </EditorPluginsLoader>
-                        </SecureRoute>
-                    );
-                }}
+                element={
+                    <SecureRoute permission={ROLE_PB_TEMPLATE}>
+                        <RenderPluginsLoader>
+                            <AdminLayout>
+                                <Helmet title={"Page Builder - Page Templates"} />
+                                <PageTemplates />
+                            </AdminLayout>
+                        </RenderPluginsLoader>
+                    </SecureRoute>
+                }
             />
         )
     },
@@ -132,20 +124,17 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/template-editor/:id"
-                render={({ location }) => {
-                    return (
-                        <SecureRoute permission={ROLE_PB_TEMPLATE}>
-                            <EditorPluginsLoader location={location}>
-                                <Helmet title={"Page Builder - Edit template"} />
-                                <CompositionScope name={"pb.templateEditor"}>
-                                    <TemplateEditor />
-                                </CompositionScope>
-                            </EditorPluginsLoader>
-                        </SecureRoute>
-                    );
-                }}
+                element={
+                    <SecureRoute permission={ROLE_PB_TEMPLATE}>
+                        <EditorPluginsLoader>
+                            <Helmet title={"Page Builder - Edit template"} />
+                            <CompositionScope name={"pb.templateEditor"}>
+                                <TemplateEditor />
+                            </CompositionScope>
+                        </EditorPluginsLoader>
+                    </SecureRoute>
+                }
             />
         )
     },
@@ -154,16 +143,15 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/block-categories"
-                render={() => (
+                element={
                     <SecureRoute permission={ROLE_PB_BLOCK}>
                         <AdminLayout>
                             <Helmet title={"Page Builder - Block Categories"} />
                             <BlockCategories />
                         </AdminLayout>
                     </SecureRoute>
-                )}
+                }
             />
         )
     },
@@ -172,18 +160,17 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/page-blocks"
-                render={({ location }) => (
+                element={
                     <SecureRoute permission={ROLE_PB_BLOCK}>
-                        <EditorPluginsLoader location={location}>
+                        <RenderPluginsLoader>
                             <AdminLayout>
                                 <Helmet title={"Page Builder - Blocks"} />
                                 <PageBlocks />
                             </AdminLayout>
-                        </EditorPluginsLoader>
+                        </RenderPluginsLoader>
                     </SecureRoute>
-                )}
+                }
             />
         )
     },
@@ -192,20 +179,17 @@ const plugins: RoutePlugin[] = [
         type: "route",
         route: (
             <Route
-                exact
                 path="/page-builder/block-editor/:id"
-                render={({ location }) => {
-                    return (
-                        <SecureRoute permission={ROLE_PB_PAGES}>
-                            <EditorPluginsLoader location={location}>
-                                <Helmet title={"Page Builder - Edit block"} />
-                                <CompositionScope name={"pb.blockEditor"}>
-                                    <BlockEditor />
-                                </CompositionScope>
-                            </EditorPluginsLoader>
-                        </SecureRoute>
-                    );
-                }}
+                element={
+                    <SecureRoute permission={ROLE_PB_PAGES}>
+                        <EditorPluginsLoader>
+                            <Helmet title={"Page Builder - Edit block"} />
+                            <CompositionScope name={"pb.blockEditor"}>
+                                <BlockEditor />
+                            </CompositionScope>
+                        </EditorPluginsLoader>
+                    </SecureRoute>
+                }
             />
         )
     }
diff --git a/packages/app-page-builder/src/types.ts b/packages/app-page-builder/src/types.ts
index 03eb871c8c..983a94fd73 100644
--- a/packages/app-page-builder/src/types.ts
+++ b/packages/app-page-builder/src/types.ts
@@ -312,8 +312,8 @@ export interface PbTheme {
 }
 
 export type PbPluginsLoader = Plugin & {
-    loadEditorPlugins?: () => Promise<any>;
-    loadRenderPlugins?: () => Promise<any>;
+    loadEditorPlugins?: () => Promise<Plugin[]> | undefined;
+    loadRenderPlugins?: () => Promise<Plugin[]> | undefined;
 };
 
 export type PbThemePlugin = Plugin & {

From 2cb9a8a7ba892755e603e6dfb215444bc41b1714 Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Tue, 3 Dec 2024 13:51:11 +0100
Subject: [PATCH 04/28] fix(app-page-builder): export loader components

---
 packages/app-page-builder/src/admin/index.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/app-page-builder/src/admin/index.ts b/packages/app-page-builder/src/admin/index.ts
index 03cfdd1476..e5467bb379 100644
--- a/packages/app-page-builder/src/admin/index.ts
+++ b/packages/app-page-builder/src/admin/index.ts
@@ -5,3 +5,6 @@ export * from "./hooks/usePageBuilderSettings";
 export * from "./hooks/useConfigureWebsiteUrl";
 export * from "./hooks/useSiteStatus";
 export * from "./hooks/useAdminPageBuilder";
+
+export * from "./components/PluginLoaders/EditorPluginsLoader";
+export * from "./components/PluginLoaders/RenderPluginsLoader";

From d2a02573dbddabfcfff99e1e8877bea1897fb55d Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Thu, 5 Dec 2024 05:44:32 +0100
Subject: [PATCH 05/28] fix: introduce `useLoader` hook (#4424)

---
 .github/workflows/pullRequests.yml            | 36 +++++-----
 .github/workflows/wac/pullRequests.wac.ts     |  5 +-
 .../extractPeLoaderDataFromHtml.test.ts       | 45 ++++++++++++
 .../api-prerendering-service/package.json     |  2 +
 .../src/render/extractPeLoaderDataFromHtml.ts | 69 +++++++++++++++++++
 .../src/render/renderUrl.ts                   | 31 +++++----
 .../src/render/types.ts                       | 16 ++++-
 .../src/contexts/PageElements.tsx             | 15 ++--
 .../src/hooks/useLoader.ts                    | 61 ++++++++++++++++
 .../src/hooks/useLoader/ILoaderCache.ts       |  6 ++
 .../src/hooks/useLoader/NullLoaderCache.ts    | 19 +++++
 .../src/hooks/useLoader/createObjectHash.ts   | 17 +++++
 .../app-page-builder-elements/src/index.ts    |  1 +
 .../app-page-builder-elements/src/types.ts    |  2 +
 packages/app-page-builder/src/PageBuilder.tsx |  9 ++-
 .../ResponsiveElementsProvider.tsx            |  9 ++-
 .../PageBuilder/PageBuilderContext.tsx        |  6 +-
 .../PageBuilder/PageElementsProvider.tsx      |  9 ++-
 .../contexts/EditorPageElementsProvider.tsx   |  6 ++
 .../elementSettings/save/SaveDialog.tsx       |  9 ++-
 packages/app-website/src/LinkPreload.tsx      | 33 ++++++---
 packages/app-website/src/Website.tsx          |  9 ++-
 .../src/utils/WebsiteLoaderCache.ts           | 37 ++++++++++
 .../WebsiteLoaderCache/PeLoaderHtmlCache.ts   | 26 +++++++
 .../ddbPutItemConditionalCheckFailed.js       | 12 ++++
 .../gracefulPulumiErrorHandlers/index.js      |  3 +-
 .../src/promptQuestions.ts                    |  5 +-
 27 files changed, 437 insertions(+), 61 deletions(-)
 create mode 100644 packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
 create mode 100644 packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
 create mode 100644 packages/app-page-builder-elements/src/hooks/useLoader.ts
 create mode 100644 packages/app-page-builder-elements/src/hooks/useLoader/ILoaderCache.ts
 create mode 100644 packages/app-page-builder-elements/src/hooks/useLoader/NullLoaderCache.ts
 create mode 100644 packages/app-page-builder-elements/src/hooks/useLoader/createObjectHash.ts
 create mode 100644 packages/app-website/src/utils/WebsiteLoaderCache.ts
 create mode 100644 packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
 create mode 100644 packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/ddbPutItemConditionalCheckFailed.js

diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml
index 7326019c8c..e4dfa42ee2 100644
--- a/.github/workflows/pullRequests.yml
+++ b/.github/workflows/pullRequests.yml
@@ -3,7 +3,7 @@
 # and run "github-actions-wac build" (or "ghawac build") to regenerate this file.
 # For more information, run "github-actions-wac --help".
 name: Pull Requests
-'on': pull_request
+"on": pull_request
 concurrency:
   group: pr-${{ github.event.pull_request.number }}
   cancel-in-progress: true
@@ -19,7 +19,7 @@ jobs:
       - uses: webiny/action-conventional-commits@v1.3.0
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   validateCommitsDev:
     name: Validate commit messages (dev branch, 'feat' commits not allowed)
@@ -34,7 +34,7 @@ jobs:
           allowed-commit-types: fix,docs,style,refactor,test,build,perf,ci,chore,revert,merge,wip
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   constants:
     name: Create constants
@@ -87,12 +87,14 @@ jobs:
           $GITHUB_OUTPUT
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   assignMilestone:
     name: Assign milestone
     needs: constants
-    if: needs.constants.outputs.is-fork-pr != 'true'
+    if: >-
+      needs.constants.outputs.is-fork-pr != 'true' &&
+      github.event.pull_request.milestone == null
     steps:
       - uses: actions/setup-node@v4
         with:
@@ -115,7 +117,7 @@ jobs:
           milestone: ${{ steps.get-milestone-to-assign.outputs.milestone }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   build:
     name: Build
@@ -147,7 +149,7 @@ jobs:
           path: ${{ github.base_ref }}/.webiny/cached-packages
           key: ${{ needs.constants.outputs.run-cache-key }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysis:
     needs:
@@ -188,7 +190,7 @@ jobs:
         working-directory: ${{ github.base_ref }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysisTs:
     name: Static code analysis (TypeScript)
@@ -214,7 +216,7 @@ jobs:
         run: yarn cy:ts
         working-directory: ${{ github.base_ref }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageConstants:
     needs:
@@ -242,7 +244,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageRun:
     needs:
@@ -263,7 +265,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsNoStorageConstants.outputs.packages-to-jest-test != '[]'
@@ -361,7 +363,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddbRun:
     needs:
@@ -381,7 +383,7 @@ jobs:
           fromJson(needs.jestTestsddbConstants.outputs.packages-to-jest-test) }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsddbConstants.outputs.packages-to-jest-test != '[]'
@@ -478,7 +480,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-esRun:
     needs:
@@ -499,7 +501,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_ELASTIC_SEARCH_DOMAIN_NAME }}
@@ -608,7 +610,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-osRun:
     needs:
@@ -629,7 +631,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: '--max_old_space_size=4096'
+      NODE_OPTIONS: "--max_old_space_size=4096"
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_OPEN_SEARCH_DOMAIN_NAME }}
diff --git a/.github/workflows/wac/pullRequests.wac.ts b/.github/workflows/wac/pullRequests.wac.ts
index 7cbab4bb82..6dea090644 100644
--- a/.github/workflows/wac/pullRequests.wac.ts
+++ b/.github/workflows/wac/pullRequests.wac.ts
@@ -210,7 +210,10 @@ export const pullRequests = createWorkflow({
         assignMilestone: createJob({
             name: "Assign milestone",
             needs: "constants",
-            if: "needs.constants.outputs.is-fork-pr != 'true'",
+            if: [
+                "needs.constants.outputs.is-fork-pr != 'true'",
+                "github.event.pull_request.milestone == null"
+            ].join(" && "),
             steps: [
                 {
                     name: "Print latest Webiny version",
diff --git a/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts b/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
new file mode 100644
index 0000000000..967a670437
--- /dev/null
+++ b/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
@@ -0,0 +1,45 @@
+import extractPeLoaderDataFromHtml from "../../src/render/extractPeLoaderDataFromHtml";
+
+describe("extractPeLoaderDataFromHtml Tests", () => {
+    it("must detect pe-loader-data-cache tags in given HTML", async () => {
+        const results = extractPeLoaderDataFromHtml(TEST_STRING);
+
+        expect(results).toEqual([
+            {
+                key: "GfT8AoRsYT-1238102521",
+                value: [
+                    {
+                        description:
+                            "The Falcon 1 was an expendable launch system privately developed and manufactured by SpaceX during 2006-2009. On 28 September 2008, Falcon 1 became the first privately-developed liquid-fuel launch vehicle to go into orbit around the Earth.",
+                        id: "5e9d0d95eda69955f709d1eb",
+                        name: "Falcon 1",
+                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_1"
+                    },
+                    {
+                        description:
+                            "Falcon 9 is a two-stage rocket designed and manufactured by SpaceX for the reliable and safe transport of satellites and the Dragon spacecraft into orbit.",
+                        id: "5e9d0d95eda69973a809d1ec",
+                        name: "Falcon 9",
+                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_9"
+                    },
+                    {
+                        description:
+                            "With the ability to lift into orbit over 54 metric tons (119,000 lb)--a mass equivalent to a 737 jetliner loaded with passengers, crew, luggage and fuel--Falcon Heavy can lift more than twice the payload of the next closest operational vehicle, the Delta IV Heavy, at one-third the cost.",
+                        id: "5e9d0d95eda69974db09d1ed",
+                        name: "Falcon Heavy",
+                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_Heavy"
+                    },
+                    {
+                        description:
+                            "Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.",
+                        id: "5e9d0d96eda699382d09d1ee",
+                        name: "Starship",
+                        wikipedia: "https://en.wikipedia.org/wiki/SpaceX_Starship"
+                    }
+                ]
+            }
+        ]);
+    });
+});
+
+const TEST_STRING = `...<li><h1>Starship</h1><div>Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.</div><br><div>More info at&nbsp;<a href="https://en.wikipedia.org/wiki/SpaceX_Starship" target="_blank" rel="noreferrer">https://en.wikipedia.org/wiki/SpaceX_Starship</a></div></li></ul></pb-spacex></pb-cell></pb-grid></pb-block></pb-document></main><footer data-testid="pb-footer" class="wby-1lh86qf"><div class="wby-xv6w56"><div class="logo wby-1i3ok2b"><a href="/"></a><div class="copy">DEVR © 2024</div></div></div></footer></div></div><pe-loader-data-cache data-key="GfT8AoRsYT-1238102521" data-value="[{&quot;id&quot;:&quot;5e9d0d95eda69955f709d1eb&quot;,&quot;name&quot;:&quot;Falcon 1&quot;,&quot;description&quot;:&quot;The Falcon 1 was an expendable launch system privately developed and manufactured by SpaceX during 2006-2009. On 28 September 2008, Falcon 1 became the first privately-developed liquid-fuel launch vehicle to go into orbit around the Earth.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_1&quot;},{&quot;id&quot;:&quot;5e9d0d95eda69973a809d1ec&quot;,&quot;name&quot;:&quot;Falcon 9&quot;,&quot;description&quot;:&quot;Falcon 9 is a two-stage rocket designed and manufactured by SpaceX for the reliable and safe transport of satellites and the Dragon spacecraft into orbit.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_9&quot;},{&quot;id&quot;:&quot;5e9d0d95eda69974db09d1ed&quot;,&quot;name&quot;:&quot;Falcon Heavy&quot;,&quot;description&quot;:&quot;With the ability to lift into orbit over 54 metric tons (119,000 lb)--a mass equivalent to a 737 jetliner loaded with passengers, crew, luggage and fuel--Falcon Heavy can lift more than twice the payload of the next closest operational vehicle, the Delta IV Heavy, at one-third the cost.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_Heavy&quot;},{&quot;id&quot;:&quot;5e9d0d96eda699382d09d1ee&quot;,&quot;name&quot;:&quot;Starship&quot;,&quot;description&quot;:&quot;Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/SpaceX_Starship&quot;}]"></pe-loader-data-cache></body></html>`;
diff --git a/packages/api-prerendering-service/package.json b/packages/api-prerendering-service/package.json
index 7ef4468742..dc3ba82289 100644
--- a/packages/api-prerendering-service/package.json
+++ b/packages/api-prerendering-service/package.json
@@ -24,6 +24,7 @@
     "@webiny/handler-client": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "@webiny/utils": "0.0.0",
+    "he": "^1.2.0",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",
     "pluralize": "^8.0.0",
@@ -34,6 +35,7 @@
     "srcset": "^4.0.0"
   },
   "devDependencies": {
+    "@types/he": "^1.2.3",
     "@types/object-hash": "^2.2.1",
     "@types/puppeteer-core": "7.0.4",
     "@webiny/cli": "0.0.0",
diff --git a/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts b/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
new file mode 100644
index 0000000000..1618e550a2
--- /dev/null
+++ b/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
@@ -0,0 +1,69 @@
+import { PeLoaderCacheEntry } from "./types";
+import he from "he";
+
+const parsePeLoaderDataCacheTag = (content: string): PeLoaderCacheEntry | null => {
+    const regex =
+        /<pe-loader-data-cache data-key="([a-zA-Z0-9-#]+)" data-value="(.*)"><\/pe-loader-data-cache>/gm;
+    let m;
+
+    while ((m = regex.exec(content)) !== null) {
+        // This is necessary to avoid infinite loops with zero-width matches
+        if (m.index === regex.lastIndex) {
+            regex.lastIndex++;
+        }
+
+        const [, key, value] = m;
+
+        // JSON in `data-value` is HTML Entities-encoded. So, we need to decode it here first.
+        const heParsedValue = he.decode(value);
+        const parsedValue = JSON.parse(heParsedValue);
+        return { key, value: parsedValue };
+    }
+
+    return null;
+};
+
+export default (content: string): PeLoaderCacheEntry[] => {
+    if (!content) {
+        return [];
+    }
+
+    const cachedData: PeLoaderCacheEntry[] = [];
+    const regex = /<pe-loader-data-cache .*><\/pe-loader-data-cache>/gm;
+    let m;
+
+    while ((m = regex.exec(content)) !== null) {
+        // This is necessary to avoid infinite loops with zero-width matches
+        if (m.index === regex.lastIndex) {
+            regex.lastIndex++;
+        }
+
+        const [matchedTag] = m;
+
+        if (!matchedTag) {
+            continue;
+        }
+
+        const parsedTag = parsePeLoaderDataCacheTag(matchedTag);
+        if (!parsedTag) {
+            continue;
+        }
+
+        cachedData.push(parsedTag);
+    }
+
+    if (cachedData.length > 0) {
+        const uniqueMap: Record<string, PeLoaderCacheEntry> = cachedData.reduce(
+            (collection, peLoaderDataCache) => {
+                collection[`${peLoaderDataCache.key || ""}${peLoaderDataCache.value || ""}`] =
+                    peLoaderDataCache;
+
+                return collection;
+            },
+            {} as Record<string, PeLoaderCacheEntry>
+        );
+
+        return Object.values(uniqueMap);
+    }
+    return cachedData;
+};
diff --git a/packages/api-prerendering-service/src/render/renderUrl.ts b/packages/api-prerendering-service/src/render/renderUrl.ts
index c880c185b6..de07395b8e 100644
--- a/packages/api-prerendering-service/src/render/renderUrl.ts
+++ b/packages/api-prerendering-service/src/render/renderUrl.ts
@@ -14,8 +14,11 @@ import injectRenderTs from "./injectRenderTs";
 import injectTenantLocale from "./injectTenantLocale";
 import injectNotFoundPageFlag from "./injectNotFoundPageFlag";
 import getPsTags from "./getPsTags";
+import extractPeLoaderDataFromHtml from "./extractPeLoaderDataFromHtml";
 import { generateAlphaNumericId } from "@webiny/utils/generateId";
 import {
+    GraphQLCacheEntry,
+    PeLoaderCacheEntry,
     RenderResult,
     RenderUrlCallableParams,
     RenderUrlParams,
@@ -108,8 +111,8 @@ export default async (url: string, args: RenderUrlParams): Promise<[File[], Meta
                 }
             },
             {
-                name: "graphql.json",
-                body: JSON.stringify(render.meta.gqlCache),
+                name: "cache.json",
+                body: JSON.stringify(render.meta.cachedData),
                 type: "application/json",
                 meta: {}
             }
@@ -118,12 +121,6 @@ export default async (url: string, args: RenderUrlParams): Promise<[File[], Meta
     ];
 };
 
-interface GraphQLCache {
-    query: any;
-    variables: Record<string, any>;
-    data: Record<string, any>;
-}
-
 export const defaultRenderUrlFunction = async (
     url: string,
     params: RenderUrlCallableParams
@@ -168,7 +165,13 @@ export const defaultRenderUrlFunction = async (
             }
         });
 
-        const gqlCache: GraphQLCache[] = [];
+        const cachedData: {
+            apolloGraphQl: GraphQLCacheEntry[];
+            peLoaders: PeLoaderCacheEntry[];
+        } = {
+            apolloGraphQl: [],
+            peLoaders: []
+        };
 
         // TODO: should be a plugin.
         browserPage.on("response", async response => {
@@ -189,7 +192,7 @@ export const defaultRenderUrlFunction = async (
 
                     if (mustCache) {
                         const data = Array.isArray(responses) ? responses[i].data : responses.data;
-                        gqlCache.push({
+                        cachedData.apolloGraphQl.push({
                             query,
                             variables,
                             data
@@ -208,11 +211,15 @@ export const defaultRenderUrlFunction = async (
             return window.getApolloState();
         });
 
+        const content = await browserPage.content();
+
+        cachedData.peLoaders = extractPeLoaderDataFromHtml(content);
+
         return {
-            content: await browserPage.content(),
+            content,
             // TODO: ideally, meta should be assigned here in a more "plugins style" way, not hardcoded.
             meta: {
-                gqlCache,
+                cachedData,
                 apolloState
             }
         };
diff --git a/packages/api-prerendering-service/src/render/types.ts b/packages/api-prerendering-service/src/render/types.ts
index 98731bc11a..a4976ffa91 100644
--- a/packages/api-prerendering-service/src/render/types.ts
+++ b/packages/api-prerendering-service/src/render/types.ts
@@ -25,11 +25,25 @@ export interface RenderApolloState {
 /**
  * @internal
  */
+
+export interface GraphQLCacheEntry {
+    query: any;
+    variables: Record<string, any>;
+    data: Record<string, any>;
+}
+
+export interface PeLoaderCacheEntry {
+    key: string;
+    value: string;
+}
+
 export interface RenderResult {
     content: string;
     meta: {
         apolloState: RenderApolloState;
-        gqlCache: {
+        cachedData: {
+            apolloGraphQl: GraphQLCacheEntry[];
+            peLoaders: PeLoaderCacheEntry[];
             [key: string]: any;
         };
         [key: string]: any;
diff --git a/packages/app-page-builder-elements/src/contexts/PageElements.tsx b/packages/app-page-builder-elements/src/contexts/PageElements.tsx
index e05dd3fc65..42b994ff4d 100644
--- a/packages/app-page-builder-elements/src/contexts/PageElements.tsx
+++ b/packages/app-page-builder-elements/src/contexts/PageElements.tsx
@@ -31,7 +31,8 @@ export const PageElementsProvider = ({
     renderers = {},
     modifiers,
     beforeRenderer = null,
-    afterRenderer = null
+    afterRenderer = null,
+    loaderCache
 }: PageElementsProviderProps) => {
     // Attributes-related callbacks.
     const getElementAttributes = useCallback<GetElementAttributes>(
@@ -42,7 +43,8 @@ export const PageElementsProvider = ({
                 renderers,
                 modifiers,
                 beforeRenderer,
-                afterRenderer
+                afterRenderer,
+                loaderCache
             });
         },
         [theme]
@@ -79,7 +81,8 @@ export const PageElementsProvider = ({
                 modifiers,
                 assignStyles: customAssignStylesCallback,
                 beforeRenderer,
-                afterRenderer
+                afterRenderer,
+                loaderCache
             });
         },
         [theme, customElementStylesCallback, customAssignStylesCallback]
@@ -95,7 +98,8 @@ export const PageElementsProvider = ({
                 modifiers,
                 assignStyles: customAssignStylesCallback,
                 beforeRenderer,
-                afterRenderer
+                afterRenderer,
+                loaderCache
             });
         },
         [theme, customStylesCallback, customAssignStylesCallback]
@@ -122,7 +126,8 @@ export const PageElementsProvider = ({
         setElementStylesCallback,
         setStylesCallback,
         beforeRenderer,
-        afterRenderer
+        afterRenderer,
+        loaderCache
     };
 
     return (
diff --git a/packages/app-page-builder-elements/src/hooks/useLoader.ts b/packages/app-page-builder-elements/src/hooks/useLoader.ts
new file mode 100644
index 0000000000..095b13e4bb
--- /dev/null
+++ b/packages/app-page-builder-elements/src/hooks/useLoader.ts
@@ -0,0 +1,61 @@
+import { useEffect, useMemo, useState, type DependencyList } from "react";
+import { createObjectHash } from "./useLoader/createObjectHash";
+import { useRenderer } from "..";
+
+export interface RendererLoader<TData = unknown> {
+    data: TData | null;
+    loading: boolean;
+    cacheHit: boolean;
+    cacheKey: null | string;
+}
+
+export interface UseLoaderOptions {
+    cacheKey?: DependencyList;
+}
+
+export function useLoader<TData = unknown>(
+    loaderFn: () => Promise<TData>,
+    options?: UseLoaderOptions
+): RendererLoader<TData> {
+    const { getElement, loaderCache } = useRenderer();
+
+    const element = getElement();
+
+    const elementDataCacheKey = element.id;
+    const optionsCacheKey = options?.cacheKey || [];
+    const cacheKey = createObjectHash([elementDataCacheKey, ...optionsCacheKey]);
+
+    const cachedData = useMemo(() => {
+        return loaderCache.read<TData>(cacheKey);
+    }, [cacheKey]);
+
+    const [loader, setLoader] = useState<RendererLoader<TData>>(
+        cachedData
+            ? {
+                  data: cachedData,
+                  loading: false,
+                  cacheHit: true,
+                  cacheKey
+              }
+            : { data: null, loading: true, cacheHit: false, cacheKey: null }
+    );
+
+    useEffect(() => {
+        if (cacheKey === loader.cacheKey) {
+            return;
+        }
+
+        if (cachedData) {
+            setLoader({ data: cachedData, loading: false, cacheKey, cacheHit: true });
+            return;
+        }
+
+        setLoader({ data: loader.data, loading: true, cacheKey, cacheHit: false });
+        loaderFn().then(data => {
+            loaderCache.write(cacheKey, data);
+            setLoader({ data, loading: false, cacheKey, cacheHit: false });
+        });
+    }, [cacheKey]);
+
+    return loader;
+}
diff --git a/packages/app-page-builder-elements/src/hooks/useLoader/ILoaderCache.ts b/packages/app-page-builder-elements/src/hooks/useLoader/ILoaderCache.ts
new file mode 100644
index 0000000000..31abcbdc53
--- /dev/null
+++ b/packages/app-page-builder-elements/src/hooks/useLoader/ILoaderCache.ts
@@ -0,0 +1,6 @@
+export interface ILoaderCache {
+    read: <TData = unknown>(key: string) => TData | null;
+    write: <TData = unknown>(key: string, value: TData) => void;
+    remove: (key: string) => void;
+    clear: () => void;
+}
diff --git a/packages/app-page-builder-elements/src/hooks/useLoader/NullLoaderCache.ts b/packages/app-page-builder-elements/src/hooks/useLoader/NullLoaderCache.ts
new file mode 100644
index 0000000000..5649d75f19
--- /dev/null
+++ b/packages/app-page-builder-elements/src/hooks/useLoader/NullLoaderCache.ts
@@ -0,0 +1,19 @@
+import { ILoaderCache } from "./ILoaderCache";
+
+export class NullLoaderCache implements ILoaderCache {
+    read() {
+        return null;
+    }
+
+    write() {
+        return;
+    }
+
+    remove() {
+        return;
+    }
+
+    clear() {
+        return;
+    }
+}
diff --git a/packages/app-page-builder-elements/src/hooks/useLoader/createObjectHash.ts b/packages/app-page-builder-elements/src/hooks/useLoader/createObjectHash.ts
new file mode 100644
index 0000000000..f619c11e20
--- /dev/null
+++ b/packages/app-page-builder-elements/src/hooks/useLoader/createObjectHash.ts
@@ -0,0 +1,17 @@
+export const createObjectHash = (object: Record<string, any>) => {
+    const jsonString = JSON.stringify(object);
+
+    // Create a hash string from string.
+    if (jsonString.length === 0) {
+        return "";
+    }
+
+    let hash = 0;
+    for (let i = 0; i < jsonString.length; i++) {
+        const charCode = jsonString.charCodeAt(i);
+        hash = (hash << 5) - hash + charCode;
+        hash |= 0; // Convert to 32bit integer
+    }
+
+    return String(hash);
+};
diff --git a/packages/app-page-builder-elements/src/index.ts b/packages/app-page-builder-elements/src/index.ts
index 4865e5ee8f..19ca8705fd 100644
--- a/packages/app-page-builder-elements/src/index.ts
+++ b/packages/app-page-builder-elements/src/index.ts
@@ -6,6 +6,7 @@ export * from "./hooks/usePage";
 export * from "./hooks/usePageElements";
 export * from "./hooks/useRenderer";
 export * from "./hooks/useFacepaint";
+export * from "./hooks/useLoader";
 
 export * from "./contexts/PageElements";
 export * from "./contexts/Page";
diff --git a/packages/app-page-builder-elements/src/types.ts b/packages/app-page-builder-elements/src/types.ts
index a96ec8f6a1..19ea0dac7e 100644
--- a/packages/app-page-builder-elements/src/types.ts
+++ b/packages/app-page-builder-elements/src/types.ts
@@ -6,6 +6,7 @@ import React, { HTMLAttributes } from "react";
 import { type CSSObject } from "@emotion/react";
 import { StylesObject, ThemeBreakpoints, Theme } from "@webiny/theme/types";
 import { ElementInputs, ElementInputValues } from "~/inputs/ElementInput";
+import { ILoaderCache } from "~/hooks/useLoader/ILoaderCache";
 
 export interface Page {
     id: string;
@@ -34,6 +35,7 @@ export interface PageElementsProviderProps {
     beforeRenderer?: React.ComponentType | null;
     afterRenderer?: React.ComponentType | null;
     children?: React.ReactNode;
+    loaderCache: ILoaderCache;
 }
 
 export type AttributesObject = React.ComponentProps<any>;
diff --git a/packages/app-page-builder/src/PageBuilder.tsx b/packages/app-page-builder/src/PageBuilder.tsx
index 04232ee09a..2ee9e4ab1b 100644
--- a/packages/app-page-builder/src/PageBuilder.tsx
+++ b/packages/app-page-builder/src/PageBuilder.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from "react";
+import React, { Fragment, useMemo } from "react";
 import { HasPermission } from "@webiny/app-security";
 import { Plugins, AddMenu as Menu, createProviderPlugin } from "@webiny/app-admin";
 import { Global, css } from "@emotion/react";
@@ -16,6 +16,7 @@ import { AddButtonClickHandlers } from "~/elementDecorators/AddButtonClickHandle
 import { InjectElementVariables } from "~/render/variables/InjectElementVariables";
 import { LexicalParagraphRenderer } from "~/render/plugins/elements/paragraph/LexicalParagraph";
 import { LexicalHeadingRenderer } from "~/render/plugins/elements/heading/LexicalHeading";
+import { NullLoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/NullLoaderCache";
 import { ConvertIconSettings as EditorConvertIconSettings } from "~/editor/prepareEditorContent/ConvertIconSettings";
 import { ConvertIconSettings as RendererConvertIconSettings } from "~/render/plugins/elementSettings/icon";
 
@@ -26,8 +27,12 @@ export * from "~/admin/views/Pages/hooks";
 
 const PageBuilderProviderPlugin = createProviderPlugin(Component => {
     return function PageBuilderProvider({ children }) {
+        const noLoaderCache = useMemo(() => {
+            return new NullLoaderCache();
+        }, []);
+
         return (
-            <ContextProvider>
+            <ContextProvider loaderCache={noLoaderCache}>
                 <AdminPageBuilderContextProvider>
                     <Component>{children}</Component>
                 </AdminPageBuilderContextProvider>
diff --git a/packages/app-page-builder/src/admin/components/ResponsiveElementsProvider/ResponsiveElementsProvider.tsx b/packages/app-page-builder/src/admin/components/ResponsiveElementsProvider/ResponsiveElementsProvider.tsx
index dc331449ae..d3481e3990 100644
--- a/packages/app-page-builder/src/admin/components/ResponsiveElementsProvider/ResponsiveElementsProvider.tsx
+++ b/packages/app-page-builder/src/admin/components/ResponsiveElementsProvider/ResponsiveElementsProvider.tsx
@@ -4,6 +4,7 @@ import { usePageBuilder } from "~/hooks/usePageBuilder";
 import { mediaToContainer } from "./mediaToContainer";
 import { PageElementsProvider } from "~/contexts/PageBuilder/PageElementsProvider";
 import styled from "@emotion/styled";
+import { NullLoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/NullLoaderCache";
 
 const ResponsiveContainer = styled.div`
     container-type: inline-size;
@@ -39,9 +40,15 @@ export const ResponsiveElementsProvider = ({ children }: { children: React.React
         } as Theme;
     }, [pageBuilder.theme]);
 
+    const nullLoaderCache = useMemo(() => {
+        return new NullLoaderCache();
+    }, []);
+
     return (
         <ResponsiveContainer>
-            <PageElementsProvider theme={containerizedTheme!}>{children}</PageElementsProvider>
+            <PageElementsProvider theme={containerizedTheme!} loaderCache={nullLoaderCache}>
+                {children}
+            </PageElementsProvider>
         </ResponsiveContainer>
     );
 };
diff --git a/packages/app-page-builder/src/contexts/PageBuilder/PageBuilderContext.tsx b/packages/app-page-builder/src/contexts/PageBuilder/PageBuilderContext.tsx
index 5caadd3d91..0eda5c49f3 100644
--- a/packages/app-page-builder/src/contexts/PageBuilder/PageBuilderContext.tsx
+++ b/packages/app-page-builder/src/contexts/PageBuilder/PageBuilderContext.tsx
@@ -4,6 +4,7 @@ import { DisplayMode, PbTheme } from "~/types";
 import { Theme } from "@webiny/app-theme/types";
 import { useTheme } from "@webiny/app-theme";
 import { PageElementsProvider } from "./PageElementsProvider";
+import { ILoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/ILoaderCache";
 
 export interface ResponsiveDisplayMode {
     displayMode: DisplayMode;
@@ -35,12 +36,13 @@ export interface PageBuilderContext {
 }
 
 export interface PageBuilderProviderProps {
+    loaderCache: ILoaderCache;
     children?: React.ReactChild | React.ReactChild[];
 }
 
 export const PageBuilderContext = React.createContext<PageBuilderContext | undefined>(undefined);
 
-export const PageBuilderProvider = ({ children }: PageBuilderProviderProps) => {
+export const PageBuilderProvider = ({ children, loaderCache }: PageBuilderProviderProps) => {
     const [displayMode, setDisplayMode] = React.useState(DisplayMode.DESKTOP);
     const [revisionType, setRevisionType] = React.useState<PbRevisionType>(
         PbRevisionType.published
@@ -62,7 +64,7 @@ export const PageBuilderProvider = ({ children }: PageBuilderProviderProps) => {
                 }
             }}
         >
-            <PageElementsProvider>{children}</PageElementsProvider>
+            <PageElementsProvider loaderCache={loaderCache}>{children}</PageElementsProvider>
         </PageBuilderContext.Provider>
     );
 };
diff --git a/packages/app-page-builder/src/contexts/PageBuilder/PageElementsProvider.tsx b/packages/app-page-builder/src/contexts/PageBuilder/PageElementsProvider.tsx
index 7c6e2cce40..9c390c040e 100644
--- a/packages/app-page-builder/src/contexts/PageBuilder/PageElementsProvider.tsx
+++ b/packages/app-page-builder/src/contexts/PageBuilder/PageElementsProvider.tsx
@@ -27,13 +27,19 @@ import { Theme } from "@webiny/app-theme/types";
 
 import { plugins } from "@webiny/plugins";
 import { PbRenderElementPlugin } from "~/types";
+import { ILoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/ILoaderCache";
 
 interface PageElementsProviderProps {
     theme?: Theme;
+    loaderCache: ILoaderCache;
     children: React.ReactNode;
 }
 
-export const PageElementsProvider = ({ theme, children }: PageElementsProviderProps) => {
+export const PageElementsProvider = ({
+    theme,
+    loaderCache,
+    children
+}: PageElementsProviderProps) => {
     const pageBuilder = usePageBuilder();
 
     const getRenderers = useCallback(() => {
@@ -76,6 +82,7 @@ export const PageElementsProvider = ({ theme, children }: PageElementsProviderPr
             theme={theme ?? (pageBuilder.theme as Theme)}
             renderers={getRenderers}
             modifiers={modifiers}
+            loaderCache={loaderCache}
         >
             {children}
         </PbPageElementsProvider>
diff --git a/packages/app-page-builder/src/editor/contexts/EditorPageElementsProvider.tsx b/packages/app-page-builder/src/editor/contexts/EditorPageElementsProvider.tsx
index c1a3661669..8531ad23b5 100644
--- a/packages/app-page-builder/src/editor/contexts/EditorPageElementsProvider.tsx
+++ b/packages/app-page-builder/src/editor/contexts/EditorPageElementsProvider.tsx
@@ -32,6 +32,7 @@ import { plugins } from "@webiny/plugins";
 import { PbEditorPageElementPlugin } from "~/types";
 import { ElementControls } from "./EditorPageElementsProvider/ElementControls";
 import { mediaToContainer } from "./EditorPageElementsProvider/mediaToContainer";
+import { NullLoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/NullLoaderCache";
 
 interface EditorPageElementsProviderProps {
     children: React.ReactNode;
@@ -96,11 +97,16 @@ export const EditorPageElementsProvider = ({ children }: EditorPageElementsProvi
         } as Theme;
     }, [pageBuilder.theme]);
 
+    const nullLoaderCache = useMemo(() => {
+        return new NullLoaderCache();
+    }, []);
+
     return (
         <PbPageElementsProvider
             theme={containerizedTheme!}
             renderers={renderers}
             modifiers={modifiers}
+            loaderCache={nullLoaderCache}
             beforeRenderer={ElementControls}
         >
             {children}
diff --git a/packages/app-page-builder/src/editor/plugins/elementSettings/save/SaveDialog.tsx b/packages/app-page-builder/src/editor/plugins/elementSettings/save/SaveDialog.tsx
index 41d07a3bf1..8a7035ce9d 100644
--- a/packages/app-page-builder/src/editor/plugins/elementSettings/save/SaveDialog.tsx
+++ b/packages/app-page-builder/src/editor/plugins/elementSettings/save/SaveDialog.tsx
@@ -1,9 +1,10 @@
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useMemo } from "react";
 import { css } from "emotion";
 import { plugins } from "@webiny/plugins";
 import ElementPreview from "./SaveDialog/ElementPreview";
 import { CircularProgress } from "@webiny/ui/Progress";
 import { PageElementsProvider } from "~/contexts/PageBuilder/PageElementsProvider";
+import { NullLoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/NullLoaderCache";
 
 import {
     Dialog,
@@ -91,6 +92,10 @@ const SaveDialog = (props: Props) => {
         }
     };
 
+    const nullLoaderCache = useMemo(() => {
+        return new NullLoaderCache();
+    }, []);
+
     return (
         <Dialog open={open} onClose={onClose} className={narrowDialog}>
             <Form onSubmit={onSubmit} data={{ type, id: element.id }}>
@@ -142,7 +147,7 @@ const SaveDialog = (props: Props) => {
                             <Grid>
                                 <Cell span={12}>
                                     <PreviewBox>
-                                        <PageElementsProvider>
+                                        <PageElementsProvider loaderCache={nullLoaderCache}>
                                             <ElementPreview element={pbElement} />
                                         </PageElementsProvider>
                                     </PreviewBox>
diff --git a/packages/app-website/src/LinkPreload.tsx b/packages/app-website/src/LinkPreload.tsx
index 82a6fae34a..594e56dc79 100644
--- a/packages/app-website/src/LinkPreload.tsx
+++ b/packages/app-website/src/LinkPreload.tsx
@@ -5,6 +5,7 @@ import { makeDecoratable } from "@webiny/app";
 import { Link, To } from "@webiny/react-router";
 import { getPrerenderId, isPrerendering } from "@webiny/app/utils";
 import { GET_PUBLISHED_PAGE } from "./Page/graphql";
+import { usePageElements } from "@webiny/app-page-builder-elements";
 
 const preloadedPaths: string[] = [];
 
@@ -23,6 +24,8 @@ const defaultGetPreloadPagePath: GetPreloadPagePath = path => {
 const useLinkPreload = (path: string | To, options: LinkPreloadOptions) => {
     const getPreloadPagePath = options.getPreloadPagePath ?? defaultGetPreloadPagePath;
 
+    const { loaderCache } = usePageElements();
+
     const apolloClient = useApolloClient();
     const preloadPath = async (pathname: string) => {
         // We only need a clean pathname, without query parameters.
@@ -34,22 +37,32 @@ const useLinkPreload = (path: string | To, options: LinkPreloadOptions) => {
 
         preloadedPaths.push(pathname);
 
-        const graphqlJson = `graphql.json?k=${getPrerenderId()}`;
+        const graphqlJson = `cache.json?k=${getPrerenderId()}`;
         const fetchPath = pathname !== "/" ? `${pathname}/${graphqlJson}` : `/${graphqlJson}`;
         const pageState = await fetch(fetchPath.replace("//", "/"))
             .then(res => res.json())
             .catch(() => null);
 
         if (pageState) {
-            for (let i = 0; i < pageState.length; i++) {
-                const { query, variables, data } = pageState[i];
-                apolloClient.writeQuery({
-                    query: gql`
-                        ${query}
-                    `,
-                    data,
-                    variables
-                });
+            const { apolloGraphQl, peLoaders } = pageState;
+            if (Array.isArray(apolloGraphQl)) {
+                for (let i = 0; i < apolloGraphQl.length; i++) {
+                    const { query, variables, data } = apolloGraphQl[i];
+                    apolloClient.writeQuery({
+                        query: gql`
+                            ${query}
+                        `,
+                        data,
+                        variables
+                    });
+                }
+            }
+
+            if (Array.isArray(peLoaders)) {
+                for (let i = 0; i < peLoaders.length; i++) {
+                    const { key, value } = peLoaders[i];
+                    loaderCache.write(key, value);
+                }
             }
         } else {
             const finalPath = getPreloadPagePath(pathname);
diff --git a/packages/app-website/src/Website.tsx b/packages/app-website/src/Website.tsx
index cd6dabbad8..5b917e0845 100644
--- a/packages/app-website/src/Website.tsx
+++ b/packages/app-website/src/Website.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useMemo } from "react";
 import { App, AppProps, Decorator, GenericComponent } from "@webiny/app";
 import { ApolloProvider } from "@apollo/react-hooks";
 import { CacheProvider } from "@emotion/react";
@@ -9,6 +9,7 @@ import { PageBuilderProvider } from "@webiny/app-page-builder/contexts/PageBuild
 import { PageBuilder } from "@webiny/app-page-builder/render";
 import { RouteProps } from "@webiny/react-router";
 import { LinkPreload } from "~/LinkPreload";
+import { WebsiteLoaderCache } from "~/utils/WebsiteLoaderCache";
 
 export interface WebsiteProps extends AppProps {
     apolloClient?: ReturnType<typeof createApolloClient>;
@@ -17,9 +18,13 @@ export interface WebsiteProps extends AppProps {
 const PageBuilderProviderHOC: Decorator<
     GenericComponent<{ children: React.ReactNode }>
 > = PreviousProvider => {
+    const websiteLoaderCache = useMemo(() => {
+        return new WebsiteLoaderCache();
+    }, []);
+
     return function PageBuilderProviderHOC({ children }) {
         return (
-            <PageBuilderProvider>
+            <PageBuilderProvider loaderCache={websiteLoaderCache}>
                 <PreviousProvider>{children}</PreviousProvider>
             </PageBuilderProvider>
         );
diff --git a/packages/app-website/src/utils/WebsiteLoaderCache.ts b/packages/app-website/src/utils/WebsiteLoaderCache.ts
new file mode 100644
index 0000000000..56d31a0326
--- /dev/null
+++ b/packages/app-website/src/utils/WebsiteLoaderCache.ts
@@ -0,0 +1,37 @@
+import type { ILoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/ILoaderCache";
+import { getPrerenderId, isPrerendering } from "@webiny/app/utils";
+import { PeLoaderHtmlCache } from "~/utils/WebsiteLoaderCache/PeLoaderHtmlCache";
+
+export class WebsiteLoaderCache implements ILoaderCache {
+    private loaderCache: Record<string, any> = {};
+
+    read<TData = unknown>(key: string) {
+        if (key in this.loaderCache) {
+            return this.loaderCache[key];
+        }
+
+        if (getPrerenderId()) {
+            this.loaderCache[key] = PeLoaderHtmlCache.read<TData>(key);
+            return this.loaderCache[key];
+        }
+
+        this.loaderCache[key] = null;
+        return this.loaderCache[key];
+    }
+
+    write<TData = unknown>(key: string, value: TData) {
+        this.loaderCache[key] = value;
+
+        if (isPrerendering()) {
+            PeLoaderHtmlCache.write(key, value);
+        }
+    }
+
+    remove(key: string) {
+        delete this.loaderCache[key];
+    }
+
+    clear() {
+        this.loaderCache = {};
+    }
+}
diff --git a/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts b/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
new file mode 100644
index 0000000000..10b3b83a1b
--- /dev/null
+++ b/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
@@ -0,0 +1,26 @@
+export class PeLoaderHtmlCache {
+    static read<TData = unknown>(key: string) {
+        const htmlElement = document.querySelector(`pe-loader-data-cache[data-key="${key}"]`);
+        if (!htmlElement) {
+            return null;
+        }
+
+        const cachedResultElementValue = htmlElement.getAttribute("data-value");
+        if (!cachedResultElementValue) {
+            return null;
+        }
+
+        try {
+            return JSON.parse(cachedResultElementValue) as TData;
+        } catch {
+            return null;
+        }
+    }
+
+    static write<TData = unknown>(key: string, value: TData) {
+        const html = `<pe-loader-data-cache data-key="${key}" data-value='${JSON.stringify(
+            value
+        )}'></pe-loader-data-cache>`;
+        document.body.insertAdjacentHTML("beforeend", html);
+    }
+}
diff --git a/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/ddbPutItemConditionalCheckFailed.js b/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/ddbPutItemConditionalCheckFailed.js
new file mode 100644
index 0000000000..db5be4d75b
--- /dev/null
+++ b/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/ddbPutItemConditionalCheckFailed.js
@@ -0,0 +1,12 @@
+const MATCH_STRING = "ConditionalCheckFailedException: The conditional request failed";
+
+module.exports = ({ error }) => {
+    const { message } = error;
+
+    if (typeof message === "string" && message.includes(MATCH_STRING)) {
+        return {
+            message: `Looks like the deployment failed because Pulumi tried to insert a record into a DynamoDB table, but the record already exists. The easiest way to resolve this is to delete the record from the table and try again.`,
+            learnMore: "https://webiny.link/deployment-ddb-conditional-check-failed"
+        };
+    }
+};
diff --git a/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/index.js b/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/index.js
index 9d8c0c559b..ddf536f448 100644
--- a/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/index.js
+++ b/packages/cli-plugin-deploy-pulumi/utils/gracefulPulumiErrorHandlers/index.js
@@ -1,4 +1,5 @@
+const ddbPutItemConditionalCheckFailed = require("./ddbPutItemConditionalCheckFailed");
 const missingFilesInBuild = require("./missingFilesInBuild");
 const pendingOperationsInfo = require("./pendingOperationsInfo");
 
-module.exports = [missingFilesInBuild, pendingOperationsInfo];
+module.exports = [ddbPutItemConditionalCheckFailed, missingFilesInBuild, pendingOperationsInfo];
diff --git a/packages/cli-plugin-extensions/src/promptQuestions.ts b/packages/cli-plugin-extensions/src/promptQuestions.ts
index 0d526db9cc..fc5f949fb1 100644
--- a/packages/cli-plugin-extensions/src/promptQuestions.ts
+++ b/packages/cli-plugin-extensions/src/promptQuestions.ts
@@ -23,10 +23,7 @@ export const promptQuestions: QuestionCollection = [
         choices: [
             { name: "Admin extension", value: "admin" },
             { name: "API extension", value: "api" },
-
-            // TODO: Bring back when we design the new PB Element React Configs API.
-            // { name: "Page Builder element", value: "pbElement" },
-
+            { name: "Page Builder element", value: "pbElement" },
             { name: "Website extension", value: "website" }
         ]
     },

From 728dbfdeb8006723e5cd6e34f35ff7df280fcf52 Mon Sep 17 00:00:00 2001
From: adrians5j <adrian@webiny.com>
Date: Thu, 5 Dec 2024 07:01:54 +0100
Subject: [PATCH 06/28] fix: add "extension" suffix to the label

---
 packages/cli-plugin-extensions/src/promptQuestions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli-plugin-extensions/src/promptQuestions.ts b/packages/cli-plugin-extensions/src/promptQuestions.ts
index fc5f949fb1..5c6bda6945 100644
--- a/packages/cli-plugin-extensions/src/promptQuestions.ts
+++ b/packages/cli-plugin-extensions/src/promptQuestions.ts
@@ -23,7 +23,7 @@ export const promptQuestions: QuestionCollection = [
         choices: [
             { name: "Admin extension", value: "admin" },
             { name: "API extension", value: "api" },
-            { name: "Page Builder element", value: "pbElement" },
+            { name: "Page Builder element extension", value: "pbElement" },
             { name: "Website extension", value: "website" }
         ]
     },

From d16b581ca59c27df7d19541ba4001eff0fac6b1e Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Thu, 12 Dec 2024 23:55:03 +0100
Subject: [PATCH 07/28] fix: compress cached loader data (#4435)

---
 .../extractPeLoaderDataFromHtml.test.ts       | 34 ++-----------------
 .../src/render/extractPeLoaderDataFromHtml.ts |  6 +---
 packages/app-website/package.json             |  1 +
 packages/app-website/src/Website.tsx          |  8 ++---
 .../src/utils/WebsiteLoaderCache.ts           |  9 +++--
 .../WebsiteLoaderCache/PeLoaderHtmlCache.ts   | 22 ++++++++++--
 6 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts b/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
index 967a670437..ae5cdb8191 100644
--- a/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
+++ b/packages/api-prerendering-service/__tests__/render/extractPeLoaderDataFromHtml.test.ts
@@ -4,42 +4,14 @@ describe("extractPeLoaderDataFromHtml Tests", () => {
     it("must detect pe-loader-data-cache tags in given HTML", async () => {
         const results = extractPeLoaderDataFromHtml(TEST_STRING);
 
+        // The value is not decompressed, so it's still a string.
         expect(results).toEqual([
             {
                 key: "GfT8AoRsYT-1238102521",
-                value: [
-                    {
-                        description:
-                            "The Falcon 1 was an expendable launch system privately developed and manufactured by SpaceX during 2006-2009. On 28 September 2008, Falcon 1 became the first privately-developed liquid-fuel launch vehicle to go into orbit around the Earth.",
-                        id: "5e9d0d95eda69955f709d1eb",
-                        name: "Falcon 1",
-                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_1"
-                    },
-                    {
-                        description:
-                            "Falcon 9 is a two-stage rocket designed and manufactured by SpaceX for the reliable and safe transport of satellites and the Dragon spacecraft into orbit.",
-                        id: "5e9d0d95eda69973a809d1ec",
-                        name: "Falcon 9",
-                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_9"
-                    },
-                    {
-                        description:
-                            "With the ability to lift into orbit over 54 metric tons (119,000 lb)--a mass equivalent to a 737 jetliner loaded with passengers, crew, luggage and fuel--Falcon Heavy can lift more than twice the payload of the next closest operational vehicle, the Delta IV Heavy, at one-third the cost.",
-                        id: "5e9d0d95eda69974db09d1ed",
-                        name: "Falcon Heavy",
-                        wikipedia: "https://en.wikipedia.org/wiki/Falcon_Heavy"
-                    },
-                    {
-                        description:
-                            "Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.",
-                        id: "5e9d0d96eda699382d09d1ee",
-                        name: "Starship",
-                        wikipedia: "https://en.wikipedia.org/wiki/SpaceX_Starship"
-                    }
-                ]
+                value: "pe_NobwRAJgpgzgxgJwJYAcAuSD2A7MAuMAFQAsoACAMQEMAbOHMgRjIHcqYyrsyoAPFKNghUARjXI0qAV2xxiZGAE8YaKAFsyKZADcqqmorLRtUGpgEROQsmq5SAZlThopCKJZGGAyiidQAGkauSNgA5mQATAAMUQBsALTRUQCcAHRkAPLcEQAcZF5Q6OoiUAiRMTkANJS09NzMJXBUauRopGT2SAgqmjp6porxxqbm7mQ0SACOUkgQ8fZSpuPSsvImxEhw4mRomGSheyG7ZJgIIkhonAiYMpZt5ACiVAhtqWCVYLP4YACsUMkQKIQZJ/YSxZIgn72ADsKQgjCgIneYGwzSg32odAYjGRLCQAGtUO4kFRvsQ0GgUDA8AB6GmCVJ4wkWEmpU6hGlMpA0zF1AD6OIAvpVwNB4Mh0FhcAReQxkmQkBwqDsWJh4ioqKFyNc4PioJcxUhQtgxlxLLZsA4nC43B5vL44AEOqcdu03BNRNszQoqPZWgguDAUKdLph7D79BNVErrPcyAARAMHbhBvyIX2XI57U7nNBvD5fAh/AFAkHuKjg5LQgDMVBycIRcGRqJaGNqctxBKJEBJZIpVNp9OwjK7LKobIQHK5PPb2D5yTAwtFsEQqAwOG+AHULvI46IkFHDMcJvZM9hjjmLicTGUfgAWGz65BwHY4DgACkYjGSlRiUXGIgAJTxPEyq2DAHBQNMSC6OI56vpwZA1tCZAAFb6hMJplGYVDQJYeJtJo7AwIIWrdNUiBQCw1Q0FIoShJq5DegspggbK3AABJQFQ2iGE03AnpcainK0xBcCqmyieQviKDhlhhq65AmrwlxbJgJE9KMAbrqiNBkOsmziNUcbxqYaDKgAkgAamQXE8Yo1R6CcJrxG0XR3O09AqPmnwQN8xaAsCoIVhC0J3hAIgNu4zZom2WKcdxvGdsyxKkgQ5KUtSdIMlyY4TlOXYzvFfJ2UlS6QCuEo6d8Xjmd0GwoFYlheFIAhlKVhgAEqYLq+pkG4WiwIIlzKgsNAGP1UBSDAnr+oGwYvHoUoKMoqgaIaxpjMcJEINokmcONZBPC88iXpcJruEqHAsKYensIpZAALKYAw3qPc8MDpCQioqmqGpavpUAbFs5AAMMAEUAEMAAGQwAKWQ9BqMGJHyeGcYtW1tmJYYOp6pc74iC9KilIBTX5HVMANWQ75U6gZMQzD8OsAeelQCY55SLQE0DZIjo1PFZA/gLdTY/Z5OJpqOA+YWvz/IFySxOWlbVjkESAgCCLoh8LbogQtUfQ1yXdr26X9llQ4jilPbjuynKFT4fj+HyBv1agi4ALpAA=="
             }
         ]);
     });
 });
 
-const TEST_STRING = `...<li><h1>Starship</h1><div>Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.</div><br><div>More info at&nbsp;<a href="https://en.wikipedia.org/wiki/SpaceX_Starship" target="_blank" rel="noreferrer">https://en.wikipedia.org/wiki/SpaceX_Starship</a></div></li></ul></pb-spacex></pb-cell></pb-grid></pb-block></pb-document></main><footer data-testid="pb-footer" class="wby-1lh86qf"><div class="wby-xv6w56"><div class="logo wby-1i3ok2b"><a href="/"></a><div class="copy">DEVR © 2024</div></div></div></footer></div></div><pe-loader-data-cache data-key="GfT8AoRsYT-1238102521" data-value="[{&quot;id&quot;:&quot;5e9d0d95eda69955f709d1eb&quot;,&quot;name&quot;:&quot;Falcon 1&quot;,&quot;description&quot;:&quot;The Falcon 1 was an expendable launch system privately developed and manufactured by SpaceX during 2006-2009. On 28 September 2008, Falcon 1 became the first privately-developed liquid-fuel launch vehicle to go into orbit around the Earth.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_1&quot;},{&quot;id&quot;:&quot;5e9d0d95eda69973a809d1ec&quot;,&quot;name&quot;:&quot;Falcon 9&quot;,&quot;description&quot;:&quot;Falcon 9 is a two-stage rocket designed and manufactured by SpaceX for the reliable and safe transport of satellites and the Dragon spacecraft into orbit.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_9&quot;},{&quot;id&quot;:&quot;5e9d0d95eda69974db09d1ed&quot;,&quot;name&quot;:&quot;Falcon Heavy&quot;,&quot;description&quot;:&quot;With the ability to lift into orbit over 54 metric tons (119,000 lb)--a mass equivalent to a 737 jetliner loaded with passengers, crew, luggage and fuel--Falcon Heavy can lift more than twice the payload of the next closest operational vehicle, the Delta IV Heavy, at one-third the cost.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/Falcon_Heavy&quot;},{&quot;id&quot;:&quot;5e9d0d96eda699382d09d1ee&quot;,&quot;name&quot;:&quot;Starship&quot;,&quot;description&quot;:&quot;Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.&quot;,&quot;wikipedia&quot;:&quot;https://en.wikipedia.org/wiki/SpaceX_Starship&quot;}]"></pe-loader-data-cache></body></html>`;
+const TEST_STRING = `...<li><h1>Starship</h1><div>Starship and Super Heavy Rocket represent a fully reusable transportation system designed to service all Earth orbit needs as well as the Moon and Mars. This two-stage vehicle — composed of the Super Heavy rocket (booster) and Starship (ship) — will eventually replace Falcon 9, Falcon Heavy and Dragon.</div><br><div>More info at&nbsp;<a href="https://en.wikipedia.org/wiki/SpaceX_Starship" target="_blank" rel="noreferrer">https://en.wikipedia.org/wiki/SpaceX_Starship</a></div></li></ul></pb-spacex></pb-cell></pb-grid></pb-block></pb-document></main><footer data-testid="pb-footer" class="wby-1lh86qf"><div class="wby-xv6w56"><div class="logo wby-1i3ok2b"><a href="/"></a><div class="copy">DEVR © 2024</div></div></div></footer></div></div><pe-loader-data-cache data-key="GfT8AoRsYT-1238102521" data-value="pe_NobwRAJgpgzgxgJwJYAcAuSD2A7MAuMAFQAsoACAMQEMAbOHMgRjIHcqYyrsyoAPFKNghUARjXI0qAV2xxiZGAE8YaKAFsyKZADcqqmorLRtUGpgEROQsmq5SAZlThopCKJZGGAyiidQAGkauSNgA5mQATAAMUQBsALTRUQCcAHRkAPLcEQAcZF5Q6OoiUAiRMTkANJS09NzMJXBUauRopGT2SAgqmjp6porxxqbm7mQ0SACOUkgQ8fZSpuPSsvImxEhw4mRomGSheyG7ZJgIIkhonAiYMpZt5ACiVAhtqWCVYLP4YACsUMkQKIQZJ/YSxZIgn72ADsKQgjCgIneYGwzSg32odAYjGRLCQAGtUO4kFRvsQ0GgUDA8AB6GmCVJ4wkWEmpU6hGlMpA0zF1AD6OIAvpVwNB4Mh0FhcAReQxkmQkBwqDsWJh4ioqKFyNc4PioJcxUhQtgxlxLLZsA4nC43B5vL44AEOqcdu03BNRNszQoqPZWgguDAUKdLph7D79BNVErrPcyAARAMHbhBvyIX2XI57U7nNBvD5fAh/AFAkHuKjg5LQgDMVBycIRcGRqJaGNqctxBKJEBJZIpVNp9OwjK7LKobIQHK5PPb2D5yTAwtFsEQqAwOG+AHULvI46IkFHDMcJvZM9hjjmLicTGUfgAWGz65BwHY4DgACkYjGSlRiUXGIgAJTxPEyq2DAHBQNMSC6OI56vpwZA1tCZAAFb6hMJplGYVDQJYeJtJo7AwIIWrdNUiBQCw1Q0FIoShJq5DegspggbK3AABJQFQ2iGE03AnpcainK0xBcCqmyieQviKDhlhhq65AmrwlxbJgJE9KMAbrqiNBkOsmziNUcbxqYaDKgAkgAamQXE8Yo1R6CcJrxG0XR3O09AqPmnwQN8xaAsCoIVhC0J3hAIgNu4zZom2WKcdxvGdsyxKkgQ5KUtSdIMlyY4TlOXYzvFfJ2UlS6QCuEo6d8Xjmd0GwoFYlheFIAhlKVhgAEqYLq+pkG4WiwIIlzKgsNAGP1UBSDAnr+oGwYvHoUoKMoqgaIaxpjMcJEINokmcONZBPC88iXpcJruEqHAsKYensIpZAALKYAw3qPc8MDpCQioqmqGpavpUAbFs5AAMMAEUAEMAAGQwAKWQ9BqMGJHyeGcYtW1tmJYYOp6pc74iC9KilIBTX5HVMANWQ75U6gZMQzD8OsAeelQCY55SLQE0DZIjo1PFZA/gLdTY/Z5OJpqOA+YWvz/IFySxOWlbVjkESAgCCLoh8LbogQtUfQ1yXdr26X9llQ4jilPbjuynKFT4fj+HyBv1agi4ALpAA=="></pe-loader-data-cache></body></html>`;
diff --git a/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts b/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
index 1618e550a2..cff831707b 100644
--- a/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
+++ b/packages/api-prerendering-service/src/render/extractPeLoaderDataFromHtml.ts
@@ -1,5 +1,4 @@
 import { PeLoaderCacheEntry } from "./types";
-import he from "he";
 
 const parsePeLoaderDataCacheTag = (content: string): PeLoaderCacheEntry | null => {
     const regex =
@@ -14,10 +13,7 @@ const parsePeLoaderDataCacheTag = (content: string): PeLoaderCacheEntry | null =
 
         const [, key, value] = m;
 
-        // JSON in `data-value` is HTML Entities-encoded. So, we need to decode it here first.
-        const heParsedValue = he.decode(value);
-        const parsedValue = JSON.parse(heParsedValue);
-        return { key, value: parsedValue };
+        return { key, value };
     }
 
     return null;
diff --git a/packages/app-website/package.json b/packages/app-website/package.json
index d986bdb728..b5be83ee0f 100644
--- a/packages/app-website/package.json
+++ b/packages/app-website/package.json
@@ -25,6 +25,7 @@
     "apollo-link": "^1.2.14",
     "apollo-link-batch-http": "^1.2.14",
     "graphql-tag": "^2.12.6",
+    "lz-string": "^1.5.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-helmet": "^6.1.0",
diff --git a/packages/app-website/src/Website.tsx b/packages/app-website/src/Website.tsx
index 5b917e0845..229798fdff 100644
--- a/packages/app-website/src/Website.tsx
+++ b/packages/app-website/src/Website.tsx
@@ -18,11 +18,11 @@ export interface WebsiteProps extends AppProps {
 const PageBuilderProviderHOC: Decorator<
     GenericComponent<{ children: React.ReactNode }>
 > = PreviousProvider => {
-    const websiteLoaderCache = useMemo(() => {
-        return new WebsiteLoaderCache();
-    }, []);
-
     return function PageBuilderProviderHOC({ children }) {
+        const websiteLoaderCache = useMemo(() => {
+            return new WebsiteLoaderCache();
+        }, []);
+
         return (
             <PageBuilderProvider loaderCache={websiteLoaderCache}>
                 <PreviousProvider>{children}</PreviousProvider>
diff --git a/packages/app-website/src/utils/WebsiteLoaderCache.ts b/packages/app-website/src/utils/WebsiteLoaderCache.ts
index 56d31a0326..bb1a7efcba 100644
--- a/packages/app-website/src/utils/WebsiteLoaderCache.ts
+++ b/packages/app-website/src/utils/WebsiteLoaderCache.ts
@@ -1,6 +1,6 @@
 import type { ILoaderCache } from "@webiny/app-page-builder-elements/hooks/useLoader/ILoaderCache";
 import { getPrerenderId, isPrerendering } from "@webiny/app/utils";
-import { PeLoaderHtmlCache } from "~/utils/WebsiteLoaderCache/PeLoaderHtmlCache";
+import { PeLoaderHtmlCache } from "./WebsiteLoaderCache/PeLoaderHtmlCache";
 
 export class WebsiteLoaderCache implements ILoaderCache {
     private loaderCache: Record<string, any> = {};
@@ -19,7 +19,12 @@ export class WebsiteLoaderCache implements ILoaderCache {
         return this.loaderCache[key];
     }
 
-    write<TData = unknown>(key: string, value: TData) {
+    write<TData = unknown>(key: string, rawValue: TData) {
+        // We assume it's compressed data if the value is a string.
+        const value = PeLoaderHtmlCache.isCompressedData<TData>(rawValue)
+            ? PeLoaderHtmlCache.decompressData(rawValue as string)
+            : rawValue;
+
         this.loaderCache[key] = value;
 
         if (isPrerendering()) {
diff --git a/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts b/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
index 10b3b83a1b..87cbe6d811 100644
--- a/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
+++ b/packages/app-website/src/utils/WebsiteLoaderCache/PeLoaderHtmlCache.ts
@@ -1,3 +1,7 @@
+import lzString from "lz-string";
+
+const COMPRESSED_DATA_PREFIX = "pe_";
+
 export class PeLoaderHtmlCache {
     static read<TData = unknown>(key: string) {
         const htmlElement = document.querySelector(`pe-loader-data-cache[data-key="${key}"]`);
@@ -11,16 +15,30 @@ export class PeLoaderHtmlCache {
         }
 
         try {
-            return JSON.parse(cachedResultElementValue) as TData;
+            return PeLoaderHtmlCache.decompressData(cachedResultElementValue) as TData;
         } catch {
             return null;
         }
     }
 
     static write<TData = unknown>(key: string, value: TData) {
-        const html = `<pe-loader-data-cache data-key="${key}" data-value='${JSON.stringify(
+        const html = `<pe-loader-data-cache data-key="${key}" data-value='${PeLoaderHtmlCache.compressData<TData>(
             value
         )}'></pe-loader-data-cache>`;
         document.body.insertAdjacentHTML("beforeend", html);
     }
+
+    static compressData<TData>(data: TData) {
+        return COMPRESSED_DATA_PREFIX + lzString.compressToBase64(JSON.stringify(data));
+    }
+
+    static decompressData(data: string) {
+        return JSON.parse(
+            lzString.decompressFromBase64(data.replace(COMPRESSED_DATA_PREFIX, "")) as string
+        );
+    }
+
+    static isCompressedData<TData>(data: TData) {
+        return typeof data === "string" && data.startsWith(COMPRESSED_DATA_PREFIX);
+    }
 }

From 90d58540d57c9272af5b6642d9d9c5a310d3e558 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Fri, 13 Dec 2024 08:11:37 +0100
Subject: [PATCH 08/28] fix:replace `render` prop with `renderer` (#4444)

---
 .../src/plugins/PbEditorPageElementPlugin.tsx | 27 +++++++++++++------
 .../src/plugins/PbRenderElementPlugin.tsx     | 16 ++++++++---
 .../src/plugins/PbRenderElementPlugin.tsx     | 16 ++++++++---
 .../src/utils/legacyPluginToReactComponent.ts | 11 +++++---
 4 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/packages/app-page-builder/src/plugins/PbEditorPageElementPlugin.tsx b/packages/app-page-builder/src/plugins/PbEditorPageElementPlugin.tsx
index ba8f4247c5..7c9e065ede 100644
--- a/packages/app-page-builder/src/plugins/PbEditorPageElementPlugin.tsx
+++ b/packages/app-page-builder/src/plugins/PbEditorPageElementPlugin.tsx
@@ -1,8 +1,10 @@
 import type { PbEditorPageElementPlugin as BasePbEditorPageElementPlugin } from "~/types";
+import type { Renderer } from "@webiny/app-page-builder-elements/types";
+
 import { legacyPluginToReactComponent } from "@webiny/app/utils";
 
-export const PbEditorPageElementPlugin = legacyPluginToReactComponent<
-    Pick<
+export interface PbEditorPageElementPluginProps
+    extends Pick<
         BasePbEditorPageElementPlugin,
         | "elementType"
         | "toolbar"
@@ -10,15 +12,24 @@ export const PbEditorPageElementPlugin = legacyPluginToReactComponent<
         | "target"
         | "settings"
         | "create"
-        | "render"
         | "canDelete"
         | "canReceiveChildren"
         | "onReceived"
         | "onChildDeleted"
         | "onCreate"
         | "renderElementPreview"
-    >
->({
-    pluginType: "pb-editor-page-element",
-    componentDisplayName: "PbEditorPageElementPlugin"
-});
+    > {
+    renderer: Renderer;
+}
+
+export const PbEditorPageElementPlugin =
+    legacyPluginToReactComponent<PbEditorPageElementPluginProps>({
+        pluginType: "pb-editor-page-element",
+        componentDisplayName: "PbEditorPageElementPlugin",
+        mapProps: props => {
+            return {
+                ...props,
+                render: props.renderer
+            };
+        }
+    });
diff --git a/packages/app-page-builder/src/plugins/PbRenderElementPlugin.tsx b/packages/app-page-builder/src/plugins/PbRenderElementPlugin.tsx
index cedbadab56..90e79829c9 100644
--- a/packages/app-page-builder/src/plugins/PbRenderElementPlugin.tsx
+++ b/packages/app-page-builder/src/plugins/PbRenderElementPlugin.tsx
@@ -1,9 +1,17 @@
 import type { PbRenderElementPlugin as BasePbRenderElementPlugin } from "~/types";
 import { legacyPluginToReactComponent } from "@webiny/app/utils";
 
-export const PbRenderElementPlugin = legacyPluginToReactComponent<
-    Pick<BasePbRenderElementPlugin, "elementType" | "render">
->({
+interface PbRenderElementPluginProps extends Pick<BasePbRenderElementPlugin, "elementType"> {
+    renderer: BasePbRenderElementPlugin["render"];
+}
+
+export const PbRenderElementPlugin = legacyPluginToReactComponent<PbRenderElementPluginProps>({
     pluginType: "pb-render-page-element",
-    componentDisplayName: "PbRenderElementPlugin"
+    componentDisplayName: "PbRenderElementPlugin",
+    mapProps: props => {
+        return {
+            ...props,
+            render: props.renderer
+        };
+    }
 });
diff --git a/packages/app-website/src/plugins/PbRenderElementPlugin.tsx b/packages/app-website/src/plugins/PbRenderElementPlugin.tsx
index ffaa7fc512..0c07c47c2a 100644
--- a/packages/app-website/src/plugins/PbRenderElementPlugin.tsx
+++ b/packages/app-website/src/plugins/PbRenderElementPlugin.tsx
@@ -1,9 +1,17 @@
 import type { PbRenderElementPlugin as BasePbRenderElementPlugin } from "@webiny/app-page-builder/types";
 import { legacyPluginToReactComponent } from "@webiny/app/utils";
 
-export const PbRenderElementPlugin = legacyPluginToReactComponent<
-    Pick<BasePbRenderElementPlugin, "elementType" | "render">
->({
+interface PbRenderElementPluginProps extends Pick<BasePbRenderElementPlugin, "elementType"> {
+    renderer: BasePbRenderElementPlugin["render"];
+}
+
+export const PbRenderElementPlugin = legacyPluginToReactComponent<PbRenderElementPluginProps>({
     pluginType: "pb-render-page-element",
-    componentDisplayName: "PbRenderElementPlugin"
+    componentDisplayName: "PbRenderElementPlugin",
+    mapProps: props => {
+        return {
+            ...props,
+            render: props.renderer
+        };
+    }
 });
diff --git a/packages/app/src/utils/legacyPluginToReactComponent.ts b/packages/app/src/utils/legacyPluginToReactComponent.ts
index 3d93cc3915..5da2e3f999 100644
--- a/packages/app/src/utils/legacyPluginToReactComponent.ts
+++ b/packages/app/src/utils/legacyPluginToReactComponent.ts
@@ -1,16 +1,21 @@
 import React from "react";
 import { useRegisterLegacyPlugin } from "~/hooks/useRegisterLegacyPlugin";
 
-export interface LegacyPluginToReactComponentParams {
+export interface LegacyPluginToReactComponentParams<TProps extends Record<string, any>> {
     pluginType: string;
     componentDisplayName: string;
+    mapProps?: (props: TProps) => TProps;
 }
 
 export const legacyPluginToReactComponent = function <TProps extends Record<string, any>>(
-    params: LegacyPluginToReactComponentParams
+    params: LegacyPluginToReactComponentParams<TProps>
 ) {
     const Component: React.ComponentType<TProps> = props => {
-        useRegisterLegacyPlugin({ ...props, type: params.pluginType });
+        const plugin = Object.assign(
+            { type: params.pluginType },
+            params.mapProps ? params.mapProps(props) : props
+        );
+        useRegisterLegacyPlugin(plugin);
         return null;
     };
 

From 456b9bbc1faebcb1e4926126fed92da70f18cbe5 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Fri, 13 Dec 2024 09:26:25 +0100
Subject: [PATCH 09/28] fix: improve import identifier uniqueness (#4437)

---
 .../cli-plugin-extensions/src/extensions/AdminExtension.ts | 7 +++----
 .../cli-plugin-extensions/src/extensions/ApiExtension.ts   | 7 ++++---
 .../src/extensions/PbElementExtension.ts                   | 7 +++----
 .../src/extensions/WebsiteExtension.ts                     | 7 +++----
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts b/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
index 75136f5e47..87575cfb6f 100644
--- a/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { JsxFragment, Node, Project } from "ts-morph";
 import { formatCode } from "@webiny/cli-plugin-scaffold/utils";
 import { updateDependencies, updateWorkspaces } from "~/utils";
+import Case from "case";
 
 export class AdminExtension extends AbstractExtension {
     async link() {
@@ -38,12 +39,10 @@ export class AdminExtension extends AbstractExtension {
     }
 
     private async addPluginToAdminApp() {
-        const { name, packageName } = this.params;
-
         const extensionsFilePath = path.join("apps", "admin", "src", "Extensions.tsx");
 
-        const ucFirstName = name.charAt(0).toUpperCase() + name.slice(1);
-        const componentName = ucFirstName + "Extension";
+        const { packageName } = this.params;
+        const componentName = Case.pascal(packageName) + "Extension";
 
         const importName = "{ Extension as " + componentName + " }";
         const importPath = packageName;
diff --git a/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts b/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
index 776374c84a..35e6c26923 100644
--- a/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { ArrayLiteralExpression, Node, Project } from "ts-morph";
 import { formatCode } from "@webiny/cli-plugin-scaffold/utils";
 import { updateDependencies, updateWorkspaces } from "~/utils";
+import Case from "case";
 
 export class ApiExtension extends AbstractExtension {
     async link() {
@@ -38,11 +39,11 @@ export class ApiExtension extends AbstractExtension {
     }
 
     private async addPluginToApiApp() {
-        const { name, packageName } = this.params;
-
         const extensionsFilePath = path.join("apps", "api", "graphql", "src", "extensions.ts");
 
-        const extensionFactory = name + "ExtensionFactory";
+        const { packageName } = this.params;
+        const extensionFactory = Case.pascal(packageName) + "ExtensionFactory";
+
         const importName = "{ createExtension as " + extensionFactory + " }";
         const importPath = packageName;
 
diff --git a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
index 9ca965948c..0f7be7d90c 100644
--- a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { JsxFragment, Node, Project } from "ts-morph";
 import { formatCode } from "@webiny/cli-plugin-scaffold/utils";
 import { updateDependencies, updateWorkspaces } from "~/utils";
+import Case from "case";
 
 export class PbElementExtension extends AbstractExtension {
     async link() {
@@ -46,12 +47,10 @@ export class PbElementExtension extends AbstractExtension {
     }
 
     private async addPluginToApp(app: "admin" | "website") {
-        const { name: extensionName, packageName } = this.params;
-
         const extensionsFilePath = path.join("apps", app, "src", "Extensions.tsx");
 
-        const ucFirstExtName = extensionName.charAt(0).toUpperCase() + extensionName.slice(1);
-        const componentName = ucFirstExtName + "Extension";
+        const { packageName } = this.params;
+        const componentName = Case.pascal(packageName) + "Extension";
 
         const importName = "{ Extension as " + componentName + " }";
         const importPath = packageName + "/src/" + app;
diff --git a/packages/cli-plugin-extensions/src/extensions/WebsiteExtension.ts b/packages/cli-plugin-extensions/src/extensions/WebsiteExtension.ts
index 42326e3bb9..875d29f010 100644
--- a/packages/cli-plugin-extensions/src/extensions/WebsiteExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/WebsiteExtension.ts
@@ -5,6 +5,7 @@ import chalk from "chalk";
 import { JsxFragment, Node, Project } from "ts-morph";
 import { formatCode } from "@webiny/cli-plugin-scaffold/utils";
 import { updateDependencies, updateWorkspaces } from "~/utils";
+import Case from "case";
 
 export class WebsiteExtension extends AbstractExtension {
     async link() {
@@ -38,12 +39,10 @@ export class WebsiteExtension extends AbstractExtension {
     }
 
     private async addPluginToWebsiteApp() {
-        const { name, packageName } = this.params;
-
         const extensionsFilePath = path.join("apps", "website", "src", "Extensions.tsx");
 
-        const ucFirstName = name.charAt(0).toUpperCase() + name.slice(1);
-        const componentName = ucFirstName + "Extension";
+        const { packageName } = this.params;
+        const componentName = Case.pascal(packageName) + "Extension";
 
         const importName = "{ Extension as " + componentName + " }";
         const importPath = packageName;

From 63a73f071e0bac0af414674b74fdda577e04b639 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Mon, 16 Dec 2024 10:51:16 +0100
Subject: [PATCH 10/28] fix: add error handling capabilities (#4447)

---
 .../src/hooks/useLoader.ts                    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/app-page-builder-elements/src/hooks/useLoader.ts b/packages/app-page-builder-elements/src/hooks/useLoader.ts
index 095b13e4bb..e96795b994 100644
--- a/packages/app-page-builder-elements/src/hooks/useLoader.ts
+++ b/packages/app-page-builder-elements/src/hooks/useLoader.ts
@@ -2,21 +2,22 @@ import { useEffect, useMemo, useState, type DependencyList } from "react";
 import { createObjectHash } from "./useLoader/createObjectHash";
 import { useRenderer } from "..";
 
-export interface RendererLoader<TData = unknown> {
+export interface RendererLoader<TData = unknown, TError = unknown> {
     data: TData | null;
     loading: boolean;
     cacheHit: boolean;
     cacheKey: null | string;
+    error: null | TError;
 }
 
 export interface UseLoaderOptions {
     cacheKey?: DependencyList;
 }
 
-export function useLoader<TData = unknown>(
+export function useLoader<TData = unknown, TError = unknown>(
     loaderFn: () => Promise<TData>,
     options?: UseLoaderOptions
-): RendererLoader<TData> {
+): RendererLoader<TData, TError> {
     const { getElement, loaderCache } = useRenderer();
 
     const element = getElement();
@@ -29,15 +30,16 @@ export function useLoader<TData = unknown>(
         return loaderCache.read<TData>(cacheKey);
     }, [cacheKey]);
 
-    const [loader, setLoader] = useState<RendererLoader<TData>>(
+    const [loader, setLoader] = useState<RendererLoader<TData, TError>>(
         cachedData
             ? {
                   data: cachedData,
                   loading: false,
                   cacheHit: true,
-                  cacheKey
+                  cacheKey,
+                  error: null
               }
-            : { data: null, loading: true, cacheHit: false, cacheKey: null }
+            : { data: null, loading: true, cacheHit: false, cacheKey: null, error: null }
     );
 
     useEffect(() => {
@@ -46,15 +48,25 @@ export function useLoader<TData = unknown>(
         }
 
         if (cachedData) {
-            setLoader({ data: cachedData, loading: false, cacheKey, cacheHit: true });
+            setLoader({ data: cachedData, loading: false, cacheKey, cacheHit: true, error: null });
             return;
         }
 
-        setLoader({ data: loader.data, loading: true, cacheKey, cacheHit: false });
-        loaderFn().then(data => {
-            loaderCache.write(cacheKey, data);
-            setLoader({ data, loading: false, cacheKey, cacheHit: false });
+        setLoader({
+            data: loader.data,
+            error: loader.error,
+            loading: true,
+            cacheKey,
+            cacheHit: false
         });
+        loaderFn()
+            .then(data => {
+                loaderCache.write(cacheKey, data);
+                setLoader({ data, error: null, loading: false, cacheKey, cacheHit: false });
+            })
+            .catch(error => {
+                setLoader({ data: null, error, loading: false, cacheKey, cacheHit: false });
+            });
     }, [cacheKey]);
 
     return loader;

From 4ff8675a29fb2873bf692644bd854fe6efa3c72d Mon Sep 17 00:00:00 2001
From: adrians5j <adrian@webiny.com>
Date: Mon, 16 Dec 2024 10:57:05 +0100
Subject: [PATCH 11/28] fix: remove exports section

---
 .../cli-plugin-extensions/templates/pbElement/package.json    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/cli-plugin-extensions/templates/pbElement/package.json b/packages/cli-plugin-extensions/templates/pbElement/package.json
index 016ab73ce4..5857ab2dc1 100644
--- a/packages/cli-plugin-extensions/templates/pbElement/package.json
+++ b/packages/cli-plugin-extensions/templates/pbElement/package.json
@@ -1,9 +1,5 @@
 {
   "name": "PACKAGE_NAME",
-  "exports": {
-    "./admin": "./src/admin.tsx",
-    "./website": "./src/website.tsx"
-  },
   "version": "1.0.0",
   "keywords": [
     "webiny-extension",

From e21409e8a04e7517161a9b606af1868d7030a446 Mon Sep 17 00:00:00 2001
From: adrians5j <adrian@webiny.com>
Date: Mon, 16 Dec 2024 11:03:30 +0100
Subject: [PATCH 12/28] fix: export utils from `@webiny/app`

---
 packages/app-admin/src/index.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/app-admin/src/index.ts b/packages/app-admin/src/index.ts
index 2746002db4..ceaecc904b 100644
--- a/packages/app-admin/src/index.ts
+++ b/packages/app-admin/src/index.ts
@@ -63,3 +63,11 @@ export { AaclPermission } from "@webiny/app-wcp/types";
 export { useTheme, ThemeProvider } from "@webiny/app-theme";
 
 export * from "@webiny/app/renderApp";
+
+// Exporting chosen utils from `@webiny/app` package.
+export * from "@webiny/app/utils/getApiUrl";
+export * from "@webiny/app/utils/getGqlApiUrl";
+export * from "@webiny/app/utils/getHeadlessCmsGqlApiUrl";
+export * from "@webiny/app/utils/getLocaleCode";
+export * from "@webiny/app/utils/getTenantId";
+export * from "@webiny/app/utils/isLocalhost";

From babec4ddb5747945eae468a34128cc167db90934 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Tue, 17 Dec 2024 08:46:07 +0100
Subject: [PATCH 13/28] fix: create settings entry when new locale is created
 (#4446)

---
 .../__tests__/graphql/i18n.ts                 |  15 ++
 .../__tests__/settings.test.ts                |  40 ++++-
 .../__tests__/useGqlHandler.ts                |  22 +--
 .../src/plugins/crud/index.ts                 | 167 ++++++++++--------
 packages/api-i18n/src/graphql/context.ts      |  22 ++-
 packages/api-i18n/src/types.ts                |   4 +
 6 files changed, 180 insertions(+), 90 deletions(-)
 create mode 100644 packages/api-form-builder/__tests__/graphql/i18n.ts

diff --git a/packages/api-form-builder/__tests__/graphql/i18n.ts b/packages/api-form-builder/__tests__/graphql/i18n.ts
new file mode 100644
index 0000000000..f33ffc38db
--- /dev/null
+++ b/packages/api-form-builder/__tests__/graphql/i18n.ts
@@ -0,0 +1,15 @@
+export const CREATE_LOCALE = /* GraphQL */ `
+    mutation CreateI18NLocale($data: I18NLocaleInput!) {
+        i18n {
+            createI18NLocale(data: $data) {
+                data {
+                    code
+                }
+                error {
+                    message
+                    code
+                }
+            }
+        }
+    }
+`;
diff --git a/packages/api-form-builder/__tests__/settings.test.ts b/packages/api-form-builder/__tests__/settings.test.ts
index 764543af83..48a100cc22 100644
--- a/packages/api-form-builder/__tests__/settings.test.ts
+++ b/packages/api-form-builder/__tests__/settings.test.ts
@@ -1,7 +1,8 @@
 import useGqlHandler from "./useGqlHandler";
+import { GET_SETTINGS } from "~tests/graphql/formBuilderSettings";
 
 describe("Settings Test", () => {
-    const { getSettings, updateSettings, install, isInstalled } = useGqlHandler();
+    const { getSettings, updateSettings, install, createI18NLocale, isInstalled } = useGqlHandler();
 
     test(`Should not be able to get & update settings before "install"`, async () => {
         // Should not have any settings without install
@@ -154,4 +155,41 @@ describe("Settings Test", () => {
             }
         });
     });
+
+    test(`Should be able to get & update settings after in a new locale`, async () => {
+        // Let's install the `Form builder`
+        await install({ domain: "http://localhost:3001" });
+
+        await createI18NLocale({ data: { code: "de-DE" } });
+
+        const { invoke } = useGqlHandler();
+
+        // Had to do it via `invoke` directly because this way it's possible to
+        // set the locale header. Wasn't easily possible via the `getSettings` helper.
+        const [newLocaleFbSettings] = await invoke({
+            body: { query: GET_SETTINGS },
+            headers: {
+                "x-i18n-locale": "default:de-DE;content:de-DE;"
+            }
+        });
+
+        // Settings should exist in the newly created locale.
+        expect(newLocaleFbSettings).toEqual({
+            data: {
+                formBuilder: {
+                    getSettings: {
+                        data: {
+                            domain: null,
+                            reCaptcha: {
+                                enabled: null,
+                                secretKey: null,
+                                siteKey: null
+                            }
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+    });
 });
diff --git a/packages/api-form-builder/__tests__/useGqlHandler.ts b/packages/api-form-builder/__tests__/useGqlHandler.ts
index 0d6a810846..e5fc524dd4 100644
--- a/packages/api-form-builder/__tests__/useGqlHandler.ts
+++ b/packages/api-form-builder/__tests__/useGqlHandler.ts
@@ -8,8 +8,12 @@ import i18nContext from "@webiny/api-i18n/graphql/context";
 import { mockLocalesPlugins } from "@webiny/api-i18n/graphql/testing";
 import { SecurityIdentity, SecurityPermission } from "@webiny/api-security/types";
 import { createFormBuilder } from "~/index";
+import { createI18NGraphQL } from "@webiny/api-i18n/graphql";
+
 // Graphql
 import { INSTALL as INSTALL_FILE_MANAGER } from "./graphql/fileManagerSettings";
+import { CREATE_LOCALE } from "./graphql/i18n";
+
 import {
     GET_SETTINGS,
     INSTALL,
@@ -41,11 +45,7 @@ import { PluginCollection } from "@webiny/plugins/types";
 import { getStorageOps } from "@webiny/project-utils/testing/environment";
 import { FileManagerStorageOperations } from "@webiny/api-file-manager/types";
 import { HeadlessCmsStorageOperations } from "@webiny/api-headless-cms/types";
-import {
-    CmsParametersPlugin,
-    createHeadlessCmsContext,
-    createHeadlessCmsGraphQL
-} from "@webiny/api-headless-cms";
+import { createHeadlessCmsContext, createHeadlessCmsGraphQL } from "@webiny/api-headless-cms";
 import { FormBuilderStorageOperations } from "~/types";
 import { APIGatewayEvent, LambdaContext } from "@webiny/handler-aws/types";
 import { createPageBuilderContext } from "@webiny/api-page-builder";
@@ -83,14 +83,9 @@ export default (params: UseGqlHandlerParams = {}) => {
             graphqlHandlerPlugins(),
             ...createTenancyAndSecurity({ permissions, identity }),
             i18nContext(),
+            createI18NGraphQL(),
             i18nStorage.storageOperations,
             mockLocalesPlugins(),
-            new CmsParametersPlugin(async () => {
-                return {
-                    locale: "en-US",
-                    type: "manage"
-                };
-            }),
             createHeadlessCmsContext({ storageOperations: cmsStorage.storageOperations }),
             createHeadlessCmsGraphQL(),
             createPageBuilderContext({
@@ -228,6 +223,11 @@ export default (params: UseGqlHandlerParams = {}) => {
         },
         async exportFormSubmissions(variables: Record<string, any>) {
             return invoke({ body: { query: EXPORT_FORM_SUBMISSIONS, variables } });
+        },
+
+        // Locales.
+        async createI18NLocale(variables: Record<string, any>) {
+            return invoke({ body: { query: CREATE_LOCALE, variables } });
         }
     };
 };
diff --git a/packages/api-form-builder/src/plugins/crud/index.ts b/packages/api-form-builder/src/plugins/crud/index.ts
index a4df2a2e98..5a20f2300b 100644
--- a/packages/api-form-builder/src/plugins/crud/index.ts
+++ b/packages/api-form-builder/src/plugins/crud/index.ts
@@ -15,94 +15,107 @@ export interface CreateFormBuilderCrudParams {
 export default (params: CreateFormBuilderCrudParams) => {
     const { storageOperations } = params;
 
-    return new ContextPlugin<FormBuilderContext>(async context => {
-        const getLocale = () => {
-            const locale = context.i18n.getContentLocale();
-            if (!locale) {
-                throw new WebinyError(
-                    "Missing locale on context.i18n locale in API Form Builder.",
-                    "LOCALE_ERROR"
-                );
+    return [
+        new ContextPlugin<FormBuilderContext>(async context => {
+            const getLocale = () => {
+                const locale = context.i18n.getContentLocale();
+                if (!locale) {
+                    throw new WebinyError(
+                        "Missing locale on context.i18n locale in API Form Builder.",
+                        "LOCALE_ERROR"
+                    );
+                }
+                return locale;
+            };
+
+            const getIdentity = () => {
+                return context.security.getIdentity();
+            };
+
+            const getTenant = () => {
+                return context.tenancy.getCurrentTenant();
+            };
+
+            if (storageOperations.beforeInit) {
+                try {
+                    await storageOperations.beforeInit(context);
+                } catch (ex) {
+                    throw new WebinyError(
+                        ex.message ||
+                            "Could not run before init in Form Builder storage operations.",
+                        ex.code || "STORAGE_OPERATIONS_BEFORE_INIT_ERROR",
+                        {
+                            ...ex
+                        }
+                    );
+                }
             }
-            return locale;
-        };
 
-        const getIdentity = () => {
-            return context.security.getIdentity();
-        };
+            const basePermissionsArgs = {
+                getIdentity,
+                fullAccessPermissionName: "fb.*"
+            };
+
+            const formsPermissions = new FormsPermissions({
+                ...basePermissionsArgs,
+                getPermissions: () => context.security.getPermissions("fb.form")
+            });
 
-        const getTenant = () => {
-            return context.tenancy.getCurrentTenant();
-        };
+            const settingsPermissions = new SettingsPermissions({
+                ...basePermissionsArgs,
+                getPermissions: () => context.security.getPermissions("fb.settings")
+            });
 
-        if (storageOperations.beforeInit) {
+            context.formBuilder = {
+                storageOperations,
+                ...createSystemCrud({
+                    getIdentity,
+                    getTenant,
+                    getLocale,
+                    context
+                }),
+                ...createSettingsCrud({
+                    getTenant,
+                    getLocale,
+                    settingsPermissions,
+                    context
+                }),
+                ...createFormsCrud({
+                    getTenant,
+                    getLocale,
+                    formsPermissions,
+                    context
+                }),
+                ...createSubmissionsCrud({
+                    context,
+                    formsPermissions
+                })
+            };
+
+            if (!storageOperations.init) {
+                return;
+            }
             try {
-                await storageOperations.beforeInit(context);
+                await storageOperations.init(context);
             } catch (ex) {
                 throw new WebinyError(
-                    ex.message || "Could not run before init in Form Builder storage operations.",
-                    ex.code || "STORAGE_OPERATIONS_BEFORE_INIT_ERROR",
+                    ex.message || "Could not run init in Form Builder storage operations.",
+                    ex.code || "STORAGE_OPERATIONS_INIT_ERROR",
                     {
                         ...ex
                     }
                 );
             }
-        }
-
-        const basePermissionsArgs = {
-            getIdentity,
-            fullAccessPermissionName: "fb.*"
-        };
-
-        const formsPermissions = new FormsPermissions({
-            ...basePermissionsArgs,
-            getPermissions: () => context.security.getPermissions("fb.form")
-        });
+        }),
 
-        const settingsPermissions = new SettingsPermissions({
-            ...basePermissionsArgs,
-            getPermissions: () => context.security.getPermissions("fb.settings")
-        });
-
-        context.formBuilder = {
-            storageOperations,
-            ...createSystemCrud({
-                getIdentity,
-                getTenant,
-                getLocale,
-                context
-            }),
-            ...createSettingsCrud({
-                getTenant,
-                getLocale,
-                settingsPermissions,
-                context
-            }),
-            ...createFormsCrud({
-                getTenant,
-                getLocale,
-                formsPermissions,
-                context
-            }),
-            ...createSubmissionsCrud({
-                context,
-                formsPermissions
-            })
-        };
-
-        if (!storageOperations.init) {
-            return;
-        }
-        try {
-            await storageOperations.init(context);
-        } catch (ex) {
-            throw new WebinyError(
-                ex.message || "Could not run init in Form Builder storage operations.",
-                ex.code || "STORAGE_OPERATIONS_INIT_ERROR",
-                {
-                    ...ex
-                }
-            );
-        }
-    });
+        // Once a new locale is created, we need to create a new settings entry for it.
+        new ContextPlugin<FormBuilderContext>(async context => {
+            context.i18n.locales.onLocaleAfterCreate.subscribe(async params => {
+                const { locale } = params;
+                await context.i18n.withLocale(locale, async () => {
+                    return context.formBuilder.createSettings({});
+                });
+            });
+        })
+    ];
 };
diff --git a/packages/api-i18n/src/graphql/context.ts b/packages/api-i18n/src/graphql/context.ts
index 4aaa948073..9293ea3af4 100644
--- a/packages/api-i18n/src/graphql/context.ts
+++ b/packages/api-i18n/src/graphql/context.ts
@@ -239,6 +239,25 @@ const createBaseContextPlugin = () => {
             return results;
         };
 
+        const withLocale: I18NContextObject["withLocale"] = async (locale, cb) => {
+            const initialLocale = getDefaultLocale();
+            if (!initialLocale) {
+                return;
+            }
+
+            setContentLocale(locale);
+            setCurrentLocale("default", locale);
+
+            try {
+                // We have to await the callback, because, in case it's an async function,
+                // the `finally` block would get executed before the callback finishes.
+                return await cb();
+            } finally {
+                setContentLocale(initialLocale);
+                setCurrentLocale("default", initialLocale);
+            }
+        };
+
         context.i18n = {
             ...context.i18n,
             getDefaultLocale,
@@ -252,7 +271,8 @@ const createBaseContextPlugin = () => {
             reloadLocales,
             hasI18NContentPermission: () => hasI18NContentPermission(context),
             checkI18NContentPermission,
-            withEachLocale
+            withEachLocale,
+            withLocale
         };
     });
 };
diff --git a/packages/api-i18n/src/types.ts b/packages/api-i18n/src/types.ts
index f0b83d43d0..407d6aea0b 100644
--- a/packages/api-i18n/src/types.ts
+++ b/packages/api-i18n/src/types.ts
@@ -44,6 +44,10 @@ export interface I18NContextObject {
         locales: I18NLocale[],
         cb: (locale: I18NLocale) => Promise<TReturn>
     ) => Promise<TReturn[] | undefined>;
+    withLocale: <TReturn>(
+        locale: I18NLocale,
+        cb: () => Promise<TReturn>
+    ) => Promise<TReturn | undefined>;
 }
 
 export interface SystemInstallParams {

From 49d4d9c75ca3af1cce9b4e8c021cf9836c5ce157 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Tue, 17 Dec 2024 17:03:49 +0100
Subject: [PATCH 14/28] fix: preload fonts (#4450)

---
 .../handlers/render/linkPreloading.test.ts    |   8 +-
 .../render/handlers/render/renderUrl.test.ts  |   8 +-
 .../src/render/defaultRenderUrlFunction.ts    | 157 ++++++++++++++++
 .../src/render/preloadCss.ts                  |   7 +
 .../src/render/preloadFonts.ts                |  37 ++++
 .../src/render/preloadJs.ts                   |   7 +
 .../src/render/renderUrl.ts                   | 169 +-----------------
 .../src/render/types.ts                       |   5 +
 8 files changed, 233 insertions(+), 165 deletions(-)
 create mode 100644 packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
 create mode 100644 packages/api-prerendering-service/src/render/preloadCss.ts
 create mode 100644 packages/api-prerendering-service/src/render/preloadFonts.ts
 create mode 100644 packages/api-prerendering-service/src/render/preloadJs.ts

diff --git a/packages/api-prerendering-service/__tests__/render/handlers/render/linkPreloading.test.ts b/packages/api-prerendering-service/__tests__/render/handlers/render/linkPreloading.test.ts
index 9ce663a69f..88c106c507 100644
--- a/packages/api-prerendering-service/__tests__/render/handlers/render/linkPreloading.test.ts
+++ b/packages/api-prerendering-service/__tests__/render/handlers/render/linkPreloading.test.ts
@@ -15,7 +15,9 @@ describe(`"renderUrl" Function Test`, () => {
             renderUrlFunction: async () => {
                 return {
                     content: BASE_HTML,
-                    meta: {}
+                    meta: {
+                        interceptedRequests: []
+                    }
                 };
             }
         });
@@ -58,7 +60,9 @@ describe(`"renderUrl" Function Test`, () => {
             renderUrlFunction: async () => {
                 return {
                     content: BASE_HTML,
-                    meta: {}
+                    meta: {
+                        interceptedRequests: []
+                    }
                 };
             }
         });
diff --git a/packages/api-prerendering-service/__tests__/render/handlers/render/renderUrl.test.ts b/packages/api-prerendering-service/__tests__/render/handlers/render/renderUrl.test.ts
index 93aa89569e..0da167a5dd 100644
--- a/packages/api-prerendering-service/__tests__/render/handlers/render/renderUrl.test.ts
+++ b/packages/api-prerendering-service/__tests__/render/handlers/render/renderUrl.test.ts
@@ -15,7 +15,9 @@ describe(`"renderUrl" Function Test`, () => {
             renderUrlFunction: async () => {
                 return {
                     content: BASE_HTML,
-                    meta: {}
+                    meta: {
+                        interceptedRequests: []
+                    }
                 };
             }
         });
@@ -58,7 +60,9 @@ describe(`"renderUrl" Function Test`, () => {
             renderUrlFunction: async () => {
                 return {
                     content: BASE_HTML,
-                    meta: {}
+                    meta: {
+                        interceptedRequests: []
+                    }
                 };
             }
         });
diff --git a/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts b/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
new file mode 100644
index 0000000000..6bbddfa5b9
--- /dev/null
+++ b/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
@@ -0,0 +1,157 @@
+import chromium from "@sparticuz/chromium";
+import puppeteer, { Browser, Page } from "puppeteer-core";
+import extractPeLoaderDataFromHtml from "./extractPeLoaderDataFromHtml";
+import { RenderResult, RenderUrlCallableParams } from "./types";
+import { TagPathLink } from "~/types";
+
+const windowSet = (page: Page, name: string, value: string | boolean) => {
+    page.evaluateOnNewDocument(`
+    Object.defineProperty(window, '${name}', {
+      get() {
+        return '${value}'
+      }
+    })`);
+};
+
+export interface File {
+    type: string;
+    body: any;
+    name: string;
+    meta: {
+        tags?: TagPathLink[];
+        [key: string]: any;
+    };
+}
+
+export const defaultRenderUrlFunction = async (
+    url: string,
+    params: RenderUrlCallableParams
+): Promise<RenderResult> => {
+    let browser!: Browser;
+
+    try {
+        browser = await puppeteer.launch({
+            args: chromium.args,
+            defaultViewport: chromium.defaultViewport,
+            executablePath: await chromium.executablePath(),
+            headless: chromium.headless,
+            ignoreHTTPSErrors: true
+        });
+
+        const browserPage = await browser.newPage();
+
+        // Can be used to add additional logic - e.g. skip a GraphQL query to be made when in pre-rendering process.
+        windowSet(browserPage, "__PS_RENDER__", true);
+
+        const tenant = params.args.tenant;
+        if (tenant) {
+            console.log("Setting tenant (__PS_RENDER_TENANT__) to window object....");
+            windowSet(browserPage, "__PS_RENDER_TENANT__", tenant);
+        }
+
+        const locale = params.args.locale;
+        if (locale) {
+            console.log("Setting locale (__PS_RENDER_LOCALE__) to window object....");
+            windowSet(browserPage, "__PS_RENDER_LOCALE__", locale);
+        }
+
+        const renderResult: RenderResult = {
+            content: "",
+            meta: {
+                interceptedRequests: [],
+                apolloState: {},
+                cachedData: {
+                    apolloGraphQl: [],
+                    peLoaders: []
+                }
+            }
+        };
+
+        // Don't load these resources during prerender.
+        const skipResources = ["image"];
+        await browserPage.setRequestInterception(true);
+
+        browserPage.on("request", request => {
+            const issuedRequest = {
+                type: request.resourceType(),
+                url: request.url(),
+                aborted: false
+            };
+
+            if (skipResources.includes(issuedRequest.type)) {
+                issuedRequest.aborted = true;
+                request.abort();
+            } else {
+                request.continue();
+            }
+
+            renderResult.meta.interceptedRequests.push(issuedRequest);
+        });
+
+        // TODO: should be a plugin.
+        browserPage.on("response", async response => {
+            const request = response.request();
+            const url = request.url();
+            if (url.includes("/graphql") && request.method() === "POST") {
+                const responses = (await response.json()) as Record<string, any>;
+                const postData = JSON.parse(request.postData() as string);
+                const operations = Array.isArray(postData) ? postData : [postData];
+
+                for (let i = 0; i < operations.length; i++) {
+                    const { query, variables } = operations[i];
+
+                    // For now, we're doing a basic @ps(cache: true) match to determine if the
+                    // cache was set true. In the future, if we start introducing additional
+                    // parameters here, we should probably make this parsing smarter.
+                    const mustCache = query.match(/@ps\((cache: true)\)/);
+
+                    if (mustCache) {
+                        const data = Array.isArray(responses) ? responses[i].data : responses.data;
+                        renderResult.meta.cachedData.apolloGraphQl.push({
+                            query,
+                            variables,
+                            data
+                        });
+                    }
+                }
+                return;
+            }
+        });
+
+        // Load URL and wait for all network requests to settle.
+        await browserPage.goto(url, { waitUntil: "networkidle0" });
+
+        renderResult.content = await browserPage.content();
+
+        renderResult.meta.apolloState = await browserPage.evaluate(() => {
+            // @ts-expect-error
+            return window.getApolloState();
+        });
+
+        renderResult.meta.cachedData.peLoaders = extractPeLoaderDataFromHtml(renderResult.content);
+
+        return renderResult;
+    } finally {
+        if (browser) {
+            // We need to close all open pages first, to prevent browser from hanging when closed.
+            const pages = await browser.pages();
+            for (const page of pages) {
+                await page.close();
+            }
+
+            // This is fixing an issue where the `await browser.close()` would hang indefinitely.
+            // The "inspiration" for this fix came from the following issue:
+            // https://github.com/Sparticuz/chromium/issues/85
+            console.log("Killing browser process...");
+            const childProcess = browser.process();
+            if (childProcess) {
+                childProcess.kill(9);
+            }
+
+            console.log("Browser process killed.");
+        }
+    }
+
+    // There's no catch block here because errors are already being handled
+    // in the entrypoint function, located in `./index.ts` file.
+};
diff --git a/packages/api-prerendering-service/src/render/preloadCss.ts b/packages/api-prerendering-service/src/render/preloadCss.ts
new file mode 100644
index 0000000000..805967db6c
--- /dev/null
+++ b/packages/api-prerendering-service/src/render/preloadCss.ts
@@ -0,0 +1,7 @@
+import { RenderResult } from "./types";
+
+export const preloadCss = (render: RenderResult): void => {
+    const regex = /<link href="\/static\/css\//gm;
+    const subst = `<link data-link-preload data-link-preload-type="markup" href="/static/css/`;
+    render.content = render.content.replace(regex, subst);
+};
diff --git a/packages/api-prerendering-service/src/render/preloadFonts.ts b/packages/api-prerendering-service/src/render/preloadFonts.ts
new file mode 100644
index 0000000000..e177403a98
--- /dev/null
+++ b/packages/api-prerendering-service/src/render/preloadFonts.ts
@@ -0,0 +1,37 @@
+import { RenderResult } from "~/render/types";
+
+function getFontType(url: string) {
+    if (url.endsWith(".woff2")) {
+        return "woff2";
+    }
+    if (url.endsWith(".woff")) {
+        return "woff";
+    }
+    if (url.endsWith(".ttf")) {
+        return "truetype";
+    }
+    if (url.endsWith(".otf")) {
+        return "opentype";
+    }
+    if (url.endsWith(".eot")) {
+        return "embedded-opentype";
+    }
+    return "font";
+}
+
+export const preloadFonts = (render: RenderResult): void => {
+    const fontsRequests = render.meta.interceptedRequests.filter(
+        req => req.type === "font" && req.url
+    );
+
+    const preloadLinks: string = Array.from(fontsRequests)
+        .map(req => {
+            return `<link rel="preload" href="${req.url}" as="font" type="font/${getFontType(
+                req.url
+            )}" crossorigin="anonymous">`;
+        })
+        .join("\n");
+
+    // Inject the preload tags into the <head> section
+    render.content = render.content.replace("</head>", `${preloadLinks}</head>`);
+};
diff --git a/packages/api-prerendering-service/src/render/preloadJs.ts b/packages/api-prerendering-service/src/render/preloadJs.ts
new file mode 100644
index 0000000000..63fae20d82
--- /dev/null
+++ b/packages/api-prerendering-service/src/render/preloadJs.ts
@@ -0,0 +1,7 @@
+import { RenderResult } from "~/render/types";
+
+export const preloadJs = (render: RenderResult): void => {
+    const regex = /<script (src="\/static\/js\/)/gm;
+    const subst = `<script data-link-preload data-link-preload-type="markup" src="/static/js/`;
+    render.content = render.content.replace(regex, subst);
+};
diff --git a/packages/api-prerendering-service/src/render/renderUrl.ts b/packages/api-prerendering-service/src/render/renderUrl.ts
index de07395b8e..da139ba1c9 100644
--- a/packages/api-prerendering-service/src/render/renderUrl.ts
+++ b/packages/api-prerendering-service/src/render/renderUrl.ts
@@ -1,5 +1,3 @@
-import chromium from "@sparticuz/chromium";
-import puppeteer, { Browser, Page } from "puppeteer-core";
 import posthtml from "posthtml";
 import { noopener } from "posthtml-noopener";
 /**
@@ -14,26 +12,13 @@ import injectRenderTs from "./injectRenderTs";
 import injectTenantLocale from "./injectTenantLocale";
 import injectNotFoundPageFlag from "./injectNotFoundPageFlag";
 import getPsTags from "./getPsTags";
-import extractPeLoaderDataFromHtml from "./extractPeLoaderDataFromHtml";
+import { defaultRenderUrlFunction } from "./defaultRenderUrlFunction";
 import { generateAlphaNumericId } from "@webiny/utils/generateId";
-import {
-    GraphQLCacheEntry,
-    PeLoaderCacheEntry,
-    RenderResult,
-    RenderUrlCallableParams,
-    RenderUrlParams,
-    RenderUrlPostHtmlParams
-} from "./types";
+import { RenderResult, RenderUrlParams, RenderUrlPostHtmlParams } from "./types";
 import { TagPathLink } from "~/types";
-
-const windowSet = (page: Page, name: string, value: string | boolean) => {
-    page.evaluateOnNewDocument(`
-    Object.defineProperty(window, '${name}', {
-      get() {
-        return '${value}'
-      }
-    })`);
-};
+import { preloadJs } from "~/render/preloadJs";
+import { preloadCss } from "~/render/preloadCss";
+import { preloadFonts } from "~/render/preloadFonts";
 
 interface Meta {
     path: string;
@@ -66,22 +51,11 @@ export default async (url: string, args: RenderUrlParams): Promise<[File[], Meta
     const render = await renderUrl(url, args);
 
     // Process HTML.
-    // TODO: should be plugins (will also eliminate lower ts-ignore instructions).
     console.log("Processing HTML...");
 
-    // TODO: regular text processing plugins...
-
-    {
-        const regex = /<script (src="\/static\/js\/)/gm;
-        const subst = `<script data-link-preload data-link-preload-type="markup" src="/static/js/`;
-        render.content = render.content.replace(regex, subst);
-    }
-
-    {
-        const regex = /<link href="\/static\/css\//gm;
-        const subst = `<link data-link-preload data-link-preload-type="markup" href="/static/css/`;
-        render.content = render.content.replace(regex, subst);
-    }
+    preloadJs(render);
+    preloadCss(render);
+    preloadFonts(render);
 
     const allArgs: RenderUrlPostHtmlParams = { render, args, path: args.args.path, id, ts };
     const { html } = await posthtml([
@@ -120,130 +94,3 @@ export default async (url: string, args: RenderUrlParams): Promise<[File[], Meta
         allArgs
     ];
 };
-
-export const defaultRenderUrlFunction = async (
-    url: string,
-    params: RenderUrlCallableParams
-): Promise<RenderResult> => {
-    let browser!: Browser;
-
-    try {
-        browser = await puppeteer.launch({
-            args: chromium.args,
-            defaultViewport: chromium.defaultViewport,
-            executablePath: await chromium.executablePath(),
-            headless: chromium.headless,
-            acceptInsecureCerts: true
-        });
-
-        const browserPage = await browser.newPage();
-
-        // Can be used to add additional logic - e.g. skip a GraphQL query to be made when in pre-rendering process.
-        windowSet(browserPage, "__PS_RENDER__", true);
-
-        const tenant = params.args.tenant;
-        if (tenant) {
-            console.log("Setting tenant (__PS_RENDER_TENANT__) to window object....");
-            windowSet(browserPage, "__PS_RENDER_TENANT__", tenant);
-        }
-
-        const locale = params.args.locale;
-        if (locale) {
-            console.log("Setting locale (__PS_RENDER_LOCALE__) to window object....");
-            windowSet(browserPage, "__PS_RENDER_LOCALE__", locale);
-        }
-
-        // Don't load these resources during prerender.
-        const skipResources = ["image", "stylesheet"];
-        await browserPage.setRequestInterception(true);
-
-        browserPage.on("request", request => {
-            if (skipResources.includes(request.resourceType())) {
-                request.abort();
-            } else {
-                request.continue();
-            }
-        });
-
-        const cachedData: {
-            apolloGraphQl: GraphQLCacheEntry[];
-            peLoaders: PeLoaderCacheEntry[];
-        } = {
-            apolloGraphQl: [],
-            peLoaders: []
-        };
-
-        // TODO: should be a plugin.
-        browserPage.on("response", async response => {
-            const request = response.request();
-            const url = request.url();
-            if (url.includes("/graphql") && request.method() === "POST") {
-                const responses = (await response.json()) as Record<string, any>;
-                const postData = JSON.parse(request.postData() as string);
-                const operations = Array.isArray(postData) ? postData : [postData];
-
-                for (let i = 0; i < operations.length; i++) {
-                    const { query, variables } = operations[i];
-
-                    // For now, we're doing a basic @ps(cache: true) match to determine if the
-                    // cache was set true. In the future, if we start introducing additional
-                    // parameters here, we should probably make this parsing smarter.
-                    const mustCache = query.match(/@ps\((cache: true)\)/);
-
-                    if (mustCache) {
-                        const data = Array.isArray(responses) ? responses[i].data : responses.data;
-                        cachedData.apolloGraphQl.push({
-                            query,
-                            variables,
-                            data
-                        });
-                    }
-                }
-                return;
-            }
-        });
-
-        // Load URL and wait for all network requests to settle.
-        await browserPage.goto(url, { waitUntil: "networkidle0" });
-
-        const apolloState = await browserPage.evaluate(() => {
-            // @ts-expect-error
-            return window.getApolloState();
-        });
-
-        const content = await browserPage.content();
-
-        cachedData.peLoaders = extractPeLoaderDataFromHtml(content);
-
-        return {
-            content,
-            // TODO: ideally, meta should be assigned here in a more "plugins style" way, not hardcoded.
-            meta: {
-                cachedData,
-                apolloState
-            }
-        };
-    } finally {
-        if (browser) {
-            // We need to close all open pages first, to prevent browser from hanging when closed.
-            const pages = await browser.pages();
-            for (const page of pages) {
-                await page.close();
-            }
-
-            // This is fixing an issue where the `await browser.close()` would hang indefinitely.
-            // The "inspiration" for this fix came from the following issue:
-            // https://github.com/Sparticuz/chromium/issues/85
-            console.log("Killing browser process...");
-            const childProcess = browser.process();
-            if (childProcess) {
-                childProcess.kill(9);
-            }
-
-            console.log("Browser process killed.");
-        }
-    }
-
-    // There's no catch block here because errors are already being handled
-    // in the entrypoint function, located in `./index.ts` file.
-};
diff --git a/packages/api-prerendering-service/src/render/types.ts b/packages/api-prerendering-service/src/render/types.ts
index a4976ffa91..783692b325 100644
--- a/packages/api-prerendering-service/src/render/types.ts
+++ b/packages/api-prerendering-service/src/render/types.ts
@@ -22,6 +22,7 @@ export interface RenderHookPlugin extends Plugin {
 export interface RenderApolloState {
     [key: string]: string;
 }
+
 /**
  * @internal
  */
@@ -40,6 +41,7 @@ export interface PeLoaderCacheEntry {
 export interface RenderResult {
     content: string;
     meta: {
+        interceptedRequests: Array<{ type: string; url: string }>;
         apolloState: RenderApolloState;
         cachedData: {
             apolloGraphQl: GraphQLCacheEntry[];
@@ -49,6 +51,7 @@ export interface RenderResult {
         [key: string]: any;
     };
 }
+
 /**
  * @internal
  */
@@ -56,12 +59,14 @@ export interface RenderUrlCallableParams {
     context: Context;
     args: RenderEvent;
 }
+
 /**
  * @internal
  */
 export interface RenderUrlParams extends RenderUrlCallableParams {
     renderUrlFunction?: (url: string, params: RenderUrlCallableParams) => Promise<RenderResult>;
 }
+
 /**
  * @internal
  */

From 294d49f878fbec528e8870d25bf32b99329d0372 Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Wed, 18 Dec 2024 10:45:13 +0100
Subject: [PATCH 15/28] fix(app-headless-cms): add delete prompt to objects and
 dynamic zones (#4428)

---
 .../dynamicZone/MultiValueDynamicZone.tsx     | 15 ++++++++++++++-
 .../dynamicZone/SingleValueDynamicZone.tsx    | 11 ++++++++++-
 .../fieldRenderers/object/multipleObjects.tsx | 19 ++++++++++++++++++-
 .../object/multipleObjectsAccordion.tsx       | 19 ++++++++++++++++++-
 4 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/MultiValueDynamicZone.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/MultiValueDynamicZone.tsx
index ea6efceeea..44d6abacb7 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/MultiValueDynamicZone.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/MultiValueDynamicZone.tsx
@@ -22,6 +22,7 @@ import {
 import { makeDecoratable } from "@webiny/react-composition";
 import { TemplateProvider } from "~/admin/plugins/fieldRenderers/dynamicZone/TemplateProvider";
 import { ParentValueIndexProvider } from "~/admin/components/ModelFieldProvider";
+import { useConfirmationDialog } from "@webiny/app-admin";
 
 const BottomMargin = styled.div`
     margin-bottom: 20px;
@@ -189,6 +190,12 @@ interface MultiValueDynamicZoneProps {
 }
 
 export const MultiValueDynamicZone = (props: MultiValueDynamicZoneProps) => {
+    const { showConfirmation } = useConfirmationDialog({
+        message: `Are you sure you want to delete this item? This action is not reversible.`,
+        acceptLabel: `Yes, I'm sure!`,
+        cancelLabel: `No, leave it.`
+    });
+
     const { bind, getBind, contentModel } = props;
     const onTemplate = (template: CmsDynamicZoneTemplateWithTypename) => {
         bind.appendValue({ _templateId: template.id, __typename: template.__typename });
@@ -211,6 +218,12 @@ export const MultiValueDynamicZone = (props: MultiValueDynamicZoneProps) => {
                         {values.map((value, index) => {
                             const Bind = getBind(index);
 
+                            const onDelete = () => {
+                                showConfirmation(() => {
+                                    bind.removeValue(index);
+                                });
+                            };
+
                             return (
                                 <ParentValueIndexProvider key={index} index={index}>
                                     <TemplateValueForm
@@ -221,7 +234,7 @@ export const MultiValueDynamicZone = (props: MultiValueDynamicZoneProps) => {
                                         isLast={index === values.length - 1}
                                         onMoveUp={() => bind.moveValueUp(index)}
                                         onMoveDown={() => bind.moveValueDown(index)}
-                                        onDelete={() => bind.removeValue(index)}
+                                        onDelete={onDelete}
                                         onClone={value => cloneValue(value, index)}
                                     />
                                 </ParentValueIndexProvider>
diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/SingleValueDynamicZone.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/SingleValueDynamicZone.tsx
index aa7450755f..aabf0891b7 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/SingleValueDynamicZone.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/dynamicZone/SingleValueDynamicZone.tsx
@@ -18,6 +18,7 @@ import {
     ParentValueIndexProvider,
     ModelFieldProvider
 } from "~/admin/components/ModelFieldProvider";
+import { useConfirmationDialog } from "@webiny/app-admin";
 
 type GetBind = CmsModelFieldRendererProps["getBind"];
 
@@ -34,6 +35,12 @@ export const SingleValueDynamicZone = ({
     contentModel,
     getBind
 }: SingleValueDynamicZoneProps) => {
+    const { showConfirmation } = useConfirmationDialog({
+        message: `Are you sure you want to remove this item? This action is not reversible.`,
+        acceptLabel: `Yes, I'm sure!`,
+        cancelLabel: `No, leave it.`
+    });
+
     const onTemplate = (template: CmsDynamicZoneTemplateWithTypename) => {
         bind.onChange({ _templateId: template.id, __typename: template.__typename });
     };
@@ -47,7 +54,9 @@ export const SingleValueDynamicZone = ({
     const Bind = getBind();
 
     const unsetValue = () => {
-        bind.onChange(null);
+        showConfirmation(() => {
+            bind.onChange(null);
+        });
     };
 
     return (
diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
index 8d09900a8d..4e33f8cc59 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
@@ -22,6 +22,7 @@ import {
 } from "./StyledComponents";
 import { generateAlphaNumericLowerCaseId } from "@webiny/utils";
 import { FieldSettings } from "~/admin/plugins/fieldRenderers/object/FieldSettings";
+import { useConfirmationDialog } from "@webiny/app-admin";
 
 const t = i18n.ns("app-headless-cms/admin/fields/text");
 
@@ -35,6 +36,12 @@ interface ActionsProps {
 }
 
 const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
+    const { showConfirmation } = useConfirmationDialog({
+        message: `Are you sure you want to delete this item? This action is not reversible.`,
+        acceptLabel: `Yes, I'm sure!`,
+        cancelLabel: `No, leave it.`
+    });
+
     const { moveValueDown, moveValueUp } = bind.field;
 
     const onDown = useCallback(
@@ -61,11 +68,21 @@ const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
         [moveValueUp, index]
     );
 
+    const onDelete = useCallback(
+        (ev: React.BaseSyntheticEvent) => {
+            ev.stopPropagation();
+            showConfirmation(() => {
+                bind.field.removeValue(index);
+            });
+        },
+        [index]
+    );
+
     return (
         <>
             <IconButton icon={<ArrowDown />} onClick={onDown} />
             <IconButton icon={<ArrowUp />} onClick={onUp} />
-            <IconButton icon={<DeleteIcon />} onClick={() => bind.field.removeValue(index)} />
+            <IconButton icon={<DeleteIcon />} onClick={onDelete} />
         </>
     );
 };
diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
index bdcc6fe438..24d35ac9f7 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
@@ -24,6 +24,7 @@ import {
 import { generateAlphaNumericLowerCaseId } from "@webiny/utils";
 import { FieldSettings } from "./FieldSettings";
 import { AccordionRenderSettings, getAccordionRenderSettings } from "../AccordionRenderSettings";
+import { useConfirmationDialog } from "@webiny/app-admin";
 
 const t = i18n.ns("app-headless-cms/admin/fields/text");
 
@@ -39,6 +40,12 @@ interface ActionsProps {
 const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
     const { moveValueDown, moveValueUp } = bind.field;
 
+    const { showConfirmation } = useConfirmationDialog({
+        message: `Are you sure you want to delete this item? This action is not reversible.`,
+        acceptLabel: `Yes, I'm sure!`,
+        cancelLabel: `No, leave it.`
+    });
+
     const onDown = useCallback(
         (ev: React.BaseSyntheticEvent) => {
             ev.stopPropagation();
@@ -63,11 +70,21 @@ const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
         [moveValueUp, index]
     );
 
+    const onDelete = useCallback(
+        (ev: React.BaseSyntheticEvent) => {
+            ev.stopPropagation();
+            showConfirmation(() => {
+                bind.field.removeValue(index);
+            });
+        },
+        [index]
+    );
+
     return (
         <>
             <IconButton icon={<ArrowDown />} onClick={onDown} />
             <IconButton icon={<ArrowUp />} onClick={onUp} />
-            <IconButton icon={<DeleteIcon />} onClick={() => bind.field.removeValue(index)} />
+            <IconButton icon={<DeleteIcon />} onClick={onDelete} />
         </>
     );
 };

From f19cac16b73728b4dd413f03c253fee0c46d0f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Zori=C4=87?= <bruno.zoric@gmail.com>
Date: Wed, 18 Dec 2024 11:54:07 +0100
Subject: [PATCH 16/28] fix(db-dynamodb): tools for batch write (#4445)

---
 .../src/definitions/entry.ts                  |   14 +-
 .../src/tasks/Manager.ts                      |   34 +-
 .../tasks/reindexing/ReindexingTaskRunner.ts  |   20 +-
 packages/api-elasticsearch-tasks/src/types.ts |   27 +-
 .../operations/AliasesStorageOperations.ts    |   52 +-
 .../src/definitions/elasticsearch.ts          |    1 -
 .../src/operations/form/index.ts              |  266 +++--
 .../src/operations/submission/index.ts        |    2 +-
 .../src/operations/form/index.ts              |  285 +++--
 .../__tests__/__api__/setupFile.js            |    3 +
 .../converters/convertersDisabled.test.ts     |    2 -
 .../__tests__/graphql/dummyLocales.ts         |    5 +-
 .../src/definitions/entryElasticsearch.ts     |    3 +
 .../dataLoader/getLatestRevisionByEntryId.ts  |    2 +-
 .../getPublishedRevisionByEntryId.ts          |    2 +-
 .../entry/dataLoader/getRevisionById.ts       |    2 +-
 .../src/operations/entry/index.ts             | 1034 ++++++++---------
 .../dataLoader/getLatestRevisionByEntryId.ts  |    2 +-
 .../getPublishedRevisionByEntryId.ts          |    2 +-
 .../entry/dataLoader/getRevisionById.ts       |    2 +-
 .../src/operations/entry/index.ts             |  765 ++++++------
 .../src/definitions/localeEntity.ts           |   18 +-
 .../src/definitions/systemEntity.ts           |   16 +-
 .../locales/LocalesStorageOperations.ts       |   93 +-
 .../system/SystemStorageOperations.ts         |   32 +-
 .../definitions/pageElasticsearchEntity.ts    |    3 +
 .../operations/blockCategory/dataLoader.ts    |    2 +-
 .../src/operations/category/dataLoader.ts     |    2 +-
 .../src/operations/pageBlock/dataLoader.ts    |    2 +-
 .../src/operations/pageTemplate/dataLoader.ts |    2 +-
 .../src/operations/pages/index.ts             |  517 ++++-----
 .../operations/blockCategory/dataLoader.ts    |    2 +-
 .../src/operations/category/dataLoader.ts     |    2 +-
 .../src/operations/pageBlock/dataLoader.ts    |    2 +-
 .../src/operations/pageTemplate/dataLoader.ts |    2 +-
 .../src/operations/pages/index.ts             |  307 +++--
 .../src/operations/queueJob.ts                |   28 +-
 .../src/operations/render.ts                  |  101 +-
 packages/api-security-so-ddb/src/index.ts     |   75 +-
 packages/api-tenancy-so-ddb/src/index.ts      |  109 +-
 packages/db-dynamodb/README.md                |   82 +-
 packages/db-dynamodb/package.json             |    1 -
 packages/db-dynamodb/src/index.ts             |    2 +-
 packages/db-dynamodb/src/toolbox.ts           |    2 +
 .../src/utils/{ => batch}/batchRead.ts        |    0
 .../src/utils/{ => batch}/batchWrite.ts       |   21 +-
 packages/db-dynamodb/src/utils/batch/index.ts |    3 +
 packages/db-dynamodb/src/utils/batch/types.ts |   30 +
 packages/db-dynamodb/src/utils/delete.ts      |   14 +-
 .../db-dynamodb/src/utils/entity/Entity.ts    |  112 ++
 .../src/utils/entity/EntityReadBatch.ts       |   55 +
 .../utils/entity/EntityReadBatchBuilder.ts    |   34 +
 .../src/utils/entity/EntityWriteBatch.ts      |   77 ++
 .../utils/entity/EntityWriteBatchBuilder.ts   |   28 +
 .../db-dynamodb/src/utils/entity/getEntity.ts |   14 +
 .../db-dynamodb/src/utils/entity/index.ts     |    7 +
 .../db-dynamodb/src/utils/entity/types.ts     |   69 ++
 packages/db-dynamodb/src/utils/get.ts         |   10 +-
 packages/db-dynamodb/src/utils/index.ts       |    6 +-
 packages/db-dynamodb/src/utils/put.ts         |    7 +-
 packages/db-dynamodb/src/utils/scan.ts        |    8 +-
 packages/db-dynamodb/src/utils/table.ts       |   16 -
 packages/db-dynamodb/src/utils/table/Table.ts |   44 +
 .../src/utils/table/TableReadBatch.ts         |   75 ++
 .../src/utils/table/TableWriteBatch.ts        |   84 ++
 packages/db-dynamodb/src/utils/table/index.ts |    4 +
 packages/db-dynamodb/src/utils/table/types.ts |   53 +
 packages/db-dynamodb/src/utils/update.ts      |    4 +-
 packages/db-dynamodb/tsconfig.build.json      |    1 -
 packages/db-dynamodb/tsconfig.json            |    3 -
 .../5.35.0/001/ddb-es/FileDataMigration.ts    |   15 +-
 .../src/migrations/5.35.0/003/index.ts        |   42 +-
 .../src/migrations/5.35.0/005/index.ts        |   36 +-
 .../src/migrations/5.37.0/002/ddb-es/index.ts |    8 +-
 .../5.37.0/003/ddb-es/AcoFolderMigration.ts   |   33 +-
 .../src/migrations/5.40.0/001/ddb/index.ts    |   26 +-
 .../src/migrations/5.41.0/001/index.ts        |   38 +-
 .../src/utils/forEachTenantLocale.ts          |   12 +-
 78 files changed, 2755 insertions(+), 2161 deletions(-)
 rename packages/db-dynamodb/src/utils/{ => batch}/batchRead.ts (100%)
 rename packages/db-dynamodb/src/utils/{ => batch}/batchWrite.ts (79%)
 create mode 100644 packages/db-dynamodb/src/utils/batch/index.ts
 create mode 100644 packages/db-dynamodb/src/utils/batch/types.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/Entity.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/EntityReadBatch.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/EntityReadBatchBuilder.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/EntityWriteBatch.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/EntityWriteBatchBuilder.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/getEntity.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/index.ts
 create mode 100644 packages/db-dynamodb/src/utils/entity/types.ts
 delete mode 100644 packages/db-dynamodb/src/utils/table.ts
 create mode 100644 packages/db-dynamodb/src/utils/table/Table.ts
 create mode 100644 packages/db-dynamodb/src/utils/table/TableReadBatch.ts
 create mode 100644 packages/db-dynamodb/src/utils/table/TableWriteBatch.ts
 create mode 100644 packages/db-dynamodb/src/utils/table/index.ts
 create mode 100644 packages/db-dynamodb/src/utils/table/types.ts

diff --git a/packages/api-elasticsearch-tasks/src/definitions/entry.ts b/packages/api-elasticsearch-tasks/src/definitions/entry.ts
index fa3c9bb7af..e2559d417f 100644
--- a/packages/api-elasticsearch-tasks/src/definitions/entry.ts
+++ b/packages/api-elasticsearch-tasks/src/definitions/entry.ts
@@ -1,13 +1,18 @@
-import { Entity, TableDef } from "@webiny/db-dynamodb/toolbox";
+/**
+ * TODO If adding GSIs to the Elasticsearch table, add them here.
+ */
+import type { TableDef } from "@webiny/db-dynamodb/toolbox";
+import type { IEntity } from "@webiny/db-dynamodb";
+import { createEntity } from "@webiny/db-dynamodb";
 
 interface Params {
     table: TableDef;
     entityName: string;
 }
 
-export const createEntry = (params: Params): Entity<any> => {
+export const createEntry = (params: Params): IEntity => {
     const { table, entityName } = params;
-    return new Entity({
+    return createEntity({
         name: entityName,
         table,
         attributes: {
@@ -24,6 +29,9 @@ export const createEntry = (params: Params): Entity<any> => {
             },
             data: {
                 type: "map"
+            },
+            TYPE: {
+                type: "string"
             }
         }
     });
diff --git a/packages/api-elasticsearch-tasks/src/tasks/Manager.ts b/packages/api-elasticsearch-tasks/src/tasks/Manager.ts
index a62664742a..2d981674e4 100644
--- a/packages/api-elasticsearch-tasks/src/tasks/Manager.ts
+++ b/packages/api-elasticsearch-tasks/src/tasks/Manager.ts
@@ -1,19 +1,16 @@
 import { DynamoDBDocument, getDocumentClient } from "@webiny/aws-sdk/client-dynamodb";
 import { Client, createElasticsearchClient } from "@webiny/api-elasticsearch";
 import { createTable } from "~/definitions";
-import { Context, IManager } from "~/types";
+import type { Context, IManager } from "~/types";
 import { createEntry } from "~/definitions/entry";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
-import { ITaskResponse } from "@webiny/tasks/response/abstractions";
-import { IIsCloseToTimeoutCallable, ITaskManagerStore } from "@webiny/tasks/runner/abstractions";
-import {
-    batchReadAll,
-    BatchReadItem,
-    batchWriteAll,
-    BatchWriteItem,
-    BatchWriteResult
-} from "@webiny/db-dynamodb";
-import { ITimer } from "@webiny/handler-aws/utils";
+import type { ITaskResponse } from "@webiny/tasks/response/abstractions";
+import type {
+    IIsCloseToTimeoutCallable,
+    ITaskManagerStore
+} from "@webiny/tasks/runner/abstractions";
+import type { BatchReadItem, IEntity } from "@webiny/db-dynamodb";
+import { batchReadAll } from "@webiny/db-dynamodb";
+import type { ITimer } from "@webiny/handler-aws/utils";
 
 export interface ManagerParams<T> {
     context: Context;
@@ -37,7 +34,7 @@ export class Manager<T> implements IManager<T> {
     public readonly store: ITaskManagerStore<T>;
     public readonly timer: ITimer;
 
-    private readonly entities: Record<string, Entity<any>> = {};
+    private readonly entities: Record<string, IEntity> = {};
 
     public constructor(params: ManagerParams<T>) {
         this.context = params.context;
@@ -64,7 +61,7 @@ export class Manager<T> implements IManager<T> {
         this.timer = params.timer;
     }
 
-    public getEntity(name: string): Entity<any> {
+    public getEntity(name: string): IEntity {
         if (this.entities[name]) {
             return this.entities[name];
         }
@@ -75,17 +72,10 @@ export class Manager<T> implements IManager<T> {
         }));
     }
 
-    public async read<T>(items: BatchReadItem[]) {
+    public async read<T>(items: BatchReadItem[]): Promise<T[]> {
         return await batchReadAll<T>({
             table: this.table,
             items
         });
     }
-
-    public async write(items: BatchWriteItem[]): Promise<BatchWriteResult> {
-        return await batchWriteAll({
-            table: this.table,
-            items
-        });
-    }
 }
diff --git a/packages/api-elasticsearch-tasks/src/tasks/reindexing/ReindexingTaskRunner.ts b/packages/api-elasticsearch-tasks/src/tasks/reindexing/ReindexingTaskRunner.ts
index 908d8d911b..930eb1b816 100644
--- a/packages/api-elasticsearch-tasks/src/tasks/reindexing/ReindexingTaskRunner.ts
+++ b/packages/api-elasticsearch-tasks/src/tasks/reindexing/ReindexingTaskRunner.ts
@@ -6,7 +6,7 @@ import {
 } from "~/types";
 import { ITaskResponse, ITaskResponseResult } from "@webiny/tasks/response/abstractions";
 import { scan } from "~/helpers/scan";
-import { BatchWriteItem, ScanResponse } from "@webiny/db-dynamodb";
+import { createTableWriteBatch, ScanResponse } from "@webiny/db-dynamodb";
 import { IndexManager } from "~/settings";
 import { IIndexManager } from "~/settings/types";
 
@@ -73,7 +73,10 @@ export class ReindexingTaskRunner {
                     return this.response.done("No more items to process.");
                 }
 
-                const batch: BatchWriteItem[] = [];
+                const tableWriteBatch = createTableWriteBatch({
+                    table: this.manager.table
+                });
+
                 for (const item of results.items) {
                     /**
                      * No index defined? Impossible but let's skip if really happens.
@@ -110,14 +113,13 @@ export class ReindexingTaskRunner {
                     /**
                      * Reindexing will be triggered by the `putBatch` method.
                      */
-                    batch.push(
-                        entity.putBatch({
-                            ...item,
-                            modified: new Date().toISOString()
-                        })
-                    );
+                    tableWriteBatch.put(entity.entity, {
+                        ...item,
+                        TYPE: item.TYPE || "unknown",
+                        modified: new Date().toISOString()
+                    });
                 }
-                await this.manager.write(batch);
+                await tableWriteBatch.execute();
                 /**
                  * We always store the index settings, so we can restore them later.
                  * Also, we always want to store what was the last key we processed, just in case something breaks, so we can continue from this point.
diff --git a/packages/api-elasticsearch-tasks/src/types.ts b/packages/api-elasticsearch-tasks/src/types.ts
index abce57122f..0595352a2b 100644
--- a/packages/api-elasticsearch-tasks/src/types.ts
+++ b/packages/api-elasticsearch-tasks/src/types.ts
@@ -1,17 +1,17 @@
-import { ElasticsearchContext } from "@webiny/api-elasticsearch/types";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
-import {
+import type { ElasticsearchContext } from "@webiny/api-elasticsearch/types";
+import type {
     Context as TasksContext,
     IIsCloseToTimeoutCallable,
+    ITaskManagerStore,
+    ITaskResponse,
     ITaskResponseDoneResultOutput
 } from "@webiny/tasks/types";
-import { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
-import { Client } from "@webiny/api-elasticsearch";
+import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
+import type { Client } from "@webiny/api-elasticsearch";
 import { createTable } from "~/definitions";
-import { ITaskResponse } from "@webiny/tasks/response/abstractions";
-import { ITaskManagerStore } from "@webiny/tasks/runner/abstractions";
-import { BatchWriteItem, BatchWriteResult } from "@webiny/db-dynamodb";
-import { ITimer } from "@webiny/handler-aws";
+import type { BatchReadItem, IEntity } from "@webiny/db-dynamodb";
+import type { ITimer } from "@webiny/handler-aws";
+import type { GenericRecord } from "@webiny/api/types";
 import { Context as LoggerContext } from "@webiny/api-log/types";
 
 export interface Context extends ElasticsearchContext, TasksContext, LoggerContext {}
@@ -43,17 +43,18 @@ export interface IElasticsearchIndexingTaskValues {
 }
 
 export interface AugmentedError extends Error {
-    data?: Record<string, any>;
+    data?: GenericRecord;
     [key: string]: any;
 }
 
 export interface IDynamoDbElasticsearchRecord {
     PK: string;
     SK: string;
+    TYPE?: string;
     index: string;
     _et?: string;
     entity: string;
-    data: Record<string, any>;
+    data: GenericRecord;
     modified: string;
 }
 
@@ -71,7 +72,7 @@ export interface IManager<
     readonly store: ITaskManagerStore<T>;
     readonly timer: ITimer;
 
-    getEntity: (name: string) => Entity<any>;
+    getEntity: (name: string) => IEntity;
 
-    write: (items: BatchWriteItem[]) => Promise<BatchWriteResult>;
+    read<T>(items: BatchReadItem[]): Promise<T[]>;
 }
diff --git a/packages/api-file-manager-ddb/src/operations/AliasesStorageOperations.ts b/packages/api-file-manager-ddb/src/operations/AliasesStorageOperations.ts
index 47d2ed6280..af1f8aba00 100644
--- a/packages/api-file-manager-ddb/src/operations/AliasesStorageOperations.ts
+++ b/packages/api-file-manager-ddb/src/operations/AliasesStorageOperations.ts
@@ -1,13 +1,12 @@
-import { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
-import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
-import {
-    FileManagerAliasesStorageOperations,
+import type { DynamoDBDocument } from "@webiny/aws-sdk/client-dynamodb";
+import type { Entity, Table } from "@webiny/db-dynamodb/toolbox";
+import type {
     File,
-    FileAlias
+    FileAlias,
+    FileManagerAliasesStorageOperations
 } from "@webiny/api-file-manager/types";
 import {
-    BatchWriteItem,
-    batchWriteAll,
+    createEntityWriteBatch,
     createStandardEntity,
     createTable,
     DbItem,
@@ -39,52 +38,49 @@ export class AliasesStorageOperations implements FileManagerAliasesStorageOperat
 
     async deleteAliases(file: File): Promise<void> {
         const aliasItems = await this.getExistingAliases(file);
-        const items: BatchWriteItem[] = [];
 
-        aliasItems.forEach(item => {
-            items.push(
-                this.aliasEntity.deleteBatch({
+        const batchWrite = createEntityWriteBatch({
+            entity: this.aliasEntity,
+            delete: aliasItems.map(item => {
+                return {
                     PK: this.createPartitionKey({
                         id: item.fileId,
                         tenant: item.tenant,
                         locale: item.locale
                     }),
                     SK: `ALIAS#${item.alias}`
-                })
-            );
+                };
+            })
         });
 
-        await batchWriteAll({ table: this.table, items });
+        await batchWrite.execute();
     }
 
     async storeAliases(file: File): Promise<void> {
-        const items: BatchWriteItem[] = [];
         const existingAliases = await this.getExistingAliases(file);
         const newAliases = this.createNewAliasesRecords(file, existingAliases);
 
-        newAliases.forEach(alias => {
-            items.push(this.aliasEntity.putBatch(alias));
+        const batchWrite = createEntityWriteBatch({
+            entity: this.aliasEntity
         });
+        for (const alias of newAliases) {
+            batchWrite.put(alias);
+        }
 
         // Delete aliases that are in the DB but are NOT in the file.
         for (const data of existingAliases) {
             if (!file.aliases.some(alias => data.alias === alias)) {
-                items.push(
-                    this.aliasEntity.deleteBatch({
-                        PK: this.createPartitionKey(file),
-                        SK: `ALIAS#${data.alias}`
-                    })
-                );
+                batchWrite.delete({
+                    PK: this.createPartitionKey(file),
+                    SK: `ALIAS#${data.alias}`
+                });
             }
         }
 
-        await batchWriteAll({
-            table: this.table,
-            items
-        });
+        await batchWrite.execute();
     }
 
-    private async getExistingAliases(file: File) {
+    private async getExistingAliases(file: File): Promise<FileAlias[]> {
         const aliases = await queryAll<{ data: FileAlias }>({
             entity: this.aliasEntity,
             partitionKey: this.createPartitionKey(file),
diff --git a/packages/api-form-builder-so-ddb-es/src/definitions/elasticsearch.ts b/packages/api-form-builder-so-ddb-es/src/definitions/elasticsearch.ts
index 84f28c9538..9236ce07ee 100644
--- a/packages/api-form-builder-so-ddb-es/src/definitions/elasticsearch.ts
+++ b/packages/api-form-builder-so-ddb-es/src/definitions/elasticsearch.ts
@@ -28,7 +28,6 @@ export const createElasticsearchEntity = (params: Params) => {
             TYPE: {
                 type: "string"
             },
-
             ...(attributes || {})
         }
     });
diff --git a/packages/api-form-builder-so-ddb-es/src/operations/form/index.ts b/packages/api-form-builder-so-ddb-es/src/operations/form/index.ts
index db1e3cf4c0..5ca078d491 100644
--- a/packages/api-form-builder-so-ddb-es/src/operations/form/index.ts
+++ b/packages/api-form-builder-so-ddb-es/src/operations/form/index.ts
@@ -17,7 +17,7 @@ import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Client } from "@elastic/elasticsearch";
 import { queryAll, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
 import WebinyError from "@webiny/error";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
+import { createEntityWriteBatch, getClean, IPutParamsItem, put } from "@webiny/db-dynamodb";
 import { configurations } from "~/configurations";
 import { filterItems } from "@webiny/db-dynamodb/utils/filter";
 import fields from "./fields";
@@ -28,7 +28,6 @@ import { decodeCursor, encodeCursor } from "@webiny/api-elasticsearch";
 import { PluginsContainer } from "@webiny/plugins";
 import { FormBuilderFormCreateKeyParams, FormBuilderFormStorageOperations } from "~/types";
 import { ElasticsearchSearchResponse } from "@webiny/api-elasticsearch/types";
-import { deleteItem, getClean, put } from "@webiny/db-dynamodb";
 
 export type DbRecord<T = any> = T & {
     PK: string;
@@ -71,7 +70,7 @@ const getESDataForLatestRevision = (form: FbForm): FbFormElastic => ({
 export const createFormStorageOperations = (
     params: CreateFormStorageOperationsParams
 ): FormBuilderFormStorageOperations => {
-    const { entity, esEntity, table, plugins, elasticsearch } = params;
+    const { entity, esEntity, plugins, elasticsearch } = params;
 
     const formDynamoDbFields = fields();
 
@@ -123,24 +122,24 @@ export const createFormStorageOperations = (
             SK: createLatestSortKey()
         };
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                TYPE: createFormType(),
-                ...revisionKeys
-            }),
-            entity.putBatch({
-                ...form,
-                TYPE: createFormLatestType(),
-                ...latestKeys
-            })
-        ];
+        const itemsBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    TYPE: createFormType(),
+                    ...revisionKeys
+                },
+                {
+                    ...form,
+                    TYPE: createFormLatestType(),
+                    ...latestKeys
+                }
+            ]
+        });
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await itemsBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not insert form data into regular table.",
@@ -194,24 +193,24 @@ export const createFormStorageOperations = (
             SK: createLatestSortKey()
         };
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                TYPE: createFormType()
-            }),
-            entity.putBatch({
-                ...form,
-                ...latestKeys,
-                TYPE: createFormLatestType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    TYPE: createFormType()
+                },
+                {
+                    ...form,
+                    ...latestKeys,
+                    TYPE: createFormLatestType()
+                }
+            ]
+        });
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
@@ -283,27 +282,26 @@ export const createFormStorageOperations = (
         });
         const isLatestForm = latestForm ? latestForm.id === form.id : false;
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                TYPE: createFormType(),
-                ...revisionKeys
-            })
-        ];
-        if (isLatestForm) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...form,
-                    TYPE: createFormLatestType(),
-                    ...latestKeys
-                })
-            );
+                    TYPE: createFormType(),
+                    ...revisionKeys
+                }
+            ]
+        });
+
+        if (isLatestForm) {
+            entityBatch.put({
+                ...form,
+                TYPE: createFormLatestType(),
+                ...latestKeys
+            });
         }
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update form data in the regular table.",
@@ -547,17 +545,18 @@ export const createFormStorageOperations = (
             );
         }
 
-        const deleteItems = items.map(item => {
-            return entity.deleteBatch({
-                PK: item.PK,
-                SK: item.SK
-            });
+        const deleteBatch = createEntityWriteBatch({
+            entity,
+            delete: items.map(item => {
+                return {
+                    PK: item.PK,
+                    SK: item.SK
+                };
+            })
         });
+
         try {
-            await batchWriteAll({
-                table,
-                items: deleteItems
-            });
+            await deleteBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete form and it's submissions.",
@@ -569,11 +568,13 @@ export const createFormStorageOperations = (
             PK: createFormPartitionKey(form),
             SK: createLatestSortKey()
         };
+        const deleteEsBatch = createEntityWriteBatch({
+            entity: esEntity,
+            delete: [latestKeys]
+        });
+
         try {
-            await deleteItem({
-                entity: esEntity,
-                keys: latestKeys
-            });
+            await deleteEsBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete latest form record from Elasticsearch.",
@@ -612,8 +613,12 @@ export const createFormStorageOperations = (
         const isLatest = latestForm ? latestForm.id === form.id : false;
         const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
 
-        const items = [entity.deleteBatch(revisionKeys)];
-        let esDataItem = undefined;
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [revisionKeys]
+        });
+
+        let esDataItem: IPutParamsItem | undefined = undefined;
 
         if (isLatest || isLatestPublished) {
             /**
@@ -630,34 +635,28 @@ export const createFormStorageOperations = (
                     })
                     .shift();
                 if (previouslyPublishedForm) {
-                    items.push(
-                        entity.putBatch({
-                            ...previouslyPublishedForm,
-                            PK: createFormPartitionKey(previouslyPublishedForm),
-                            SK: createLatestPublishedSortKey(),
-                            TYPE: createFormLatestPublishedType()
-                        })
-                    );
+                    entityBatch.put({
+                        ...previouslyPublishedForm,
+                        PK: createFormPartitionKey(previouslyPublishedForm),
+                        SK: createLatestPublishedSortKey(),
+                        TYPE: createFormLatestPublishedType()
+                    });
                 } else {
-                    items.push(
-                        entity.deleteBatch({
-                            PK: createFormPartitionKey(form),
-                            SK: createLatestPublishedSortKey()
-                        })
-                    );
+                    entityBatch.delete({
+                        PK: createFormPartitionKey(form),
+                        SK: createLatestPublishedSortKey()
+                    });
                 }
             }
             /**
              * Sort out the latest record.
              */
             if (isLatest && previous) {
-                items.push(
-                    entity.putBatch({
-                        ...previous,
-                        ...latestKeys,
-                        TYPE: createFormLatestType()
-                    })
-                );
+                entityBatch.put({
+                    ...previous,
+                    ...latestKeys,
+                    TYPE: createFormLatestType()
+                });
 
                 const { index } = configurations.es({
                     tenant: previous.tenant,
@@ -675,10 +674,7 @@ export const createFormStorageOperations = (
          * Now save the batch data.
          */
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete form revision from regular table.",
@@ -759,36 +755,35 @@ export const createFormStorageOperations = (
         /**
          * Update revision and latest published records
          */
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                TYPE: createFormType()
-            }),
-            entity.putBatch({
-                ...form,
-                ...latestPublishedKeys,
-                TYPE: createFormLatestPublishedType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    TYPE: createFormType()
+                },
+                {
+                    ...form,
+                    ...latestPublishedKeys,
+                    TYPE: createFormLatestPublishedType()
+                }
+            ]
+        });
+
         /**
          * Update the latest form as well
          */
         if (isLatestForm) {
-            items.push(
-                entity.putBatch({
-                    ...form,
-                    ...latestKeys,
-                    TYPE: createFormLatestType()
-                })
-            );
+            entityBatch.put({
+                ...form,
+                ...latestKeys,
+                TYPE: createFormLatestType()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not publish form.",
@@ -887,14 +882,18 @@ export const createFormStorageOperations = (
         const isLatest = latestForm ? latestForm.id === form.id : false;
         const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                TYPE: createFormType()
-            })
-        ];
-        let esData: any = undefined;
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    TYPE: createFormType()
+                }
+            ]
+        });
+
+        let esData: FbFormElastic | undefined = undefined;
         if (isLatest) {
             esData = getESDataForLatestRevision(form);
         }
@@ -916,23 +915,18 @@ export const createFormStorageOperations = (
 
             const previouslyPublishedRevision = revisions.shift();
             if (previouslyPublishedRevision) {
-                items.push(
-                    entity.putBatch({
-                        ...previouslyPublishedRevision,
-                        ...latestPublishedKeys,
-                        TYPE: createFormLatestPublishedType()
-                    })
-                );
+                entityBatch.put({
+                    ...previouslyPublishedRevision,
+                    ...latestPublishedKeys,
+                    TYPE: createFormLatestPublishedType()
+                });
             } else {
-                items.push(entity.deleteBatch(latestPublishedKeys));
+                entityBatch.delete(latestPublishedKeys);
             }
         }
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not unpublish form.",
diff --git a/packages/api-form-builder-so-ddb-es/src/operations/submission/index.ts b/packages/api-form-builder-so-ddb-es/src/operations/submission/index.ts
index a1e1a00aaf..e93ee28b58 100644
--- a/packages/api-form-builder-so-ddb-es/src/operations/submission/index.ts
+++ b/packages/api-form-builder-so-ddb-es/src/operations/submission/index.ts
@@ -10,7 +10,7 @@ import {
 import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { Client } from "@elastic/elasticsearch";
 import WebinyError from "@webiny/error";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { sortItems } from "@webiny/db-dynamodb/utils/sort";
 import { createLimit, decodeCursor, encodeCursor } from "@webiny/api-elasticsearch";
 import {
diff --git a/packages/api-form-builder-so-ddb/src/operations/form/index.ts b/packages/api-form-builder-so-ddb/src/operations/form/index.ts
index 3ade575baa..c25f60780d 100644
--- a/packages/api-form-builder-so-ddb/src/operations/form/index.ts
+++ b/packages/api-form-builder-so-ddb/src/operations/form/index.ts
@@ -1,5 +1,5 @@
 import WebinyError from "@webiny/error";
-import {
+import type {
     FbForm,
     FormBuilderStorageOperationsCreateFormFromParams,
     FormBuilderStorageOperationsCreateFormParams,
@@ -14,14 +14,14 @@ import {
     FormBuilderStorageOperationsUnpublishFormParams,
     FormBuilderStorageOperationsUpdateFormParams
 } from "@webiny/api-form-builder/types";
-import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
+import type { Entity, Table } from "@webiny/db-dynamodb/toolbox";
 import { queryAll, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 import { filterItems } from "@webiny/db-dynamodb/utils/filter";
 import { sortItems } from "@webiny/db-dynamodb/utils/sort";
 import { createIdentifier, parseIdentifier } from "@webiny/utils";
-import { PluginsContainer } from "@webiny/plugins";
-import {
+import type { PluginsContainer } from "@webiny/plugins";
+import type {
     FormBuilderFormCreateGSIPartitionKeyParams,
     FormBuilderFormCreatePartitionKeyParams,
     FormBuilderFormStorageOperations
@@ -60,7 +60,7 @@ export interface CreateFormStorageOperationsParams {
 export const createFormStorageOperations = (
     params: CreateFormStorageOperationsParams
 ): FormBuilderFormStorageOperations => {
-    const { entity, table, plugins } = params;
+    const { entity, plugins } = params;
 
     const formDynamoDbFields = plugins.byType<FormDynamoDbFieldPlugin>(
         FormDynamoDbFieldPlugin.type
@@ -123,28 +123,30 @@ export const createFormStorageOperations = (
         return "fb.form.latestPublished";
     };
 
-    const createRevisionKeys = (form: FbForm): Keys => {
+    const createRevisionKeys = (form: Pick<FbForm, "id" | "tenant" | "locale">): Keys => {
         return {
             PK: createFormPartitionKey(form),
             SK: createRevisionSortKey(form)
         };
     };
 
-    const createLatestKeys = (form: FbForm): Keys => {
+    const createLatestKeys = (form: Pick<FbForm, "tenant" | "locale" | "id" | "formId">): Keys => {
         return {
             PK: createFormLatestPartitionKey(form),
             SK: createFormLatestSortKey(form)
         };
     };
 
-    const createLatestPublishedKeys = (form: FbForm): Keys => {
+    const createLatestPublishedKeys = (
+        form: Pick<FbForm, "tenant" | "locale" | "id" | "formId">
+    ): Keys => {
         return {
             PK: createFormLatestPublishedPartitionKey(form),
             SK: createLatestPublishedSortKey(form)
         };
     };
 
-    const createGSIKeys = (form: FbForm): GsiKeys => {
+    const createGSIKeys = (form: Pick<FbForm, "version" | "tenant" | "locale">): GsiKeys => {
         return {
             GSI1_PK: createFormGSIPartitionKey(form),
             GSI1_SK: createGSISortKey(form.version)
@@ -160,25 +162,25 @@ export const createFormStorageOperations = (
         const latestKeys = createLatestKeys(form);
         const gsiKeys = createGSIKeys(form);
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                ...gsiKeys,
-                TYPE: createFormType()
-            }),
-            entity.putBatch({
-                ...form,
-                ...latestKeys,
-                TYPE: createFormLatestType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    ...gsiKeys,
+                    TYPE: createFormType()
+                },
+                {
+                    ...form,
+                    ...latestKeys,
+                    TYPE: createFormLatestType()
+                }
+            ]
+        });
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not insert form data into table.",
@@ -202,25 +204,25 @@ export const createFormStorageOperations = (
         const latestKeys = createLatestKeys(form);
         const gsiKeys = createGSIKeys(form);
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                ...gsiKeys,
-                TYPE: createFormType()
-            }),
-            entity.putBatch({
-                ...form,
-                ...latestKeys,
-                TYPE: createFormLatestType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    ...gsiKeys,
+                    TYPE: createFormType()
+                },
+                {
+                    ...form,
+                    ...latestKeys,
+                    TYPE: createFormLatestType()
+                }
+            ]
+        });
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not create form data in the table, from existing form.",
@@ -259,28 +261,27 @@ export const createFormStorageOperations = (
         });
         const isLatestForm = latestForm ? latestForm.id === form.id : false;
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                ...gsiKeys,
-                TYPE: createFormType()
-            })
-        ];
-        if (isLatestForm) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...form,
-                    ...latestKeys,
-                    TYPE: createFormLatestType()
-                })
-            );
+                    ...revisionKeys,
+                    ...gsiKeys,
+                    TYPE: createFormType()
+                }
+            ]
+        });
+
+        if (isLatestForm) {
+            entityBatch.put({
+                ...form,
+                ...latestKeys,
+                TYPE: createFormLatestType()
+            });
         }
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update form data in the table.",
@@ -510,29 +511,27 @@ export const createFormStorageOperations = (
                 }
             );
         }
+        let latestPublishedKeys: Keys | undefined;
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
 
-        let hasLatestPublishedRecord = false;
-
-        const deleteItems = items.map(item => {
-            if (!hasLatestPublishedRecord && item.published) {
-                hasLatestPublishedRecord = true;
+        for (const item of items) {
+            if (!latestPublishedKeys && item.published) {
+                latestPublishedKeys = createLatestPublishedKeys(item);
             }
-            return entity.deleteBatch({
+            entityBatch.delete({
                 PK: item.PK,
                 SK: item.SK
             });
-        });
-        if (hasLatestPublishedRecord) {
-            deleteItems.push(entity.deleteBatch(createLatestPublishedKeys(items[0])));
         }
 
-        deleteItems.push(entity.deleteBatch(createLatestKeys(items[0])));
+        if (latestPublishedKeys) {
+            entityBatch.delete(latestPublishedKeys);
+        }
 
         try {
-            await batchWriteAll({
-                table,
-                items: deleteItems
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete form and it's submissions.",
@@ -561,7 +560,10 @@ export const createFormStorageOperations = (
         const isLatest = latestForm ? latestForm.id === form.id : false;
         const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
 
-        const items = [entity.deleteBatch(revisionKeys)];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [revisionKeys]
+        });
 
         if (isLatest || isLatestPublished) {
             /**
@@ -578,42 +580,36 @@ export const createFormStorageOperations = (
                     })
                     .shift();
                 if (previouslyPublishedForm) {
-                    items.push(
-                        entity.putBatch({
-                            ...previouslyPublishedForm,
-                            ...createLatestPublishedKeys(previouslyPublishedForm),
-                            GSI1_PK: null,
-                            GSI1_SK: null,
-                            TYPE: createFormLatestPublishedType()
-                        })
-                    );
+                    entityBatch.put({
+                        ...previouslyPublishedForm,
+                        ...createLatestPublishedKeys(previouslyPublishedForm),
+                        GSI1_PK: null,
+                        GSI1_SK: null,
+                        TYPE: createFormLatestPublishedType()
+                    });
                 } else {
-                    items.push(entity.deleteBatch(createLatestPublishedKeys(form)));
+                    entityBatch.delete(createLatestPublishedKeys(form));
                 }
             }
             /**
              * Sort out the latest record.
              */
             if (isLatest) {
-                items.push(
-                    entity.putBatch({
-                        ...previous,
-                        ...latestKeys,
-                        GSI1_PK: null,
-                        GSI1_SK: null,
-                        TYPE: createFormLatestType()
-                    })
-                );
+                entityBatch.put({
+                    ...previous,
+                    ...latestKeys,
+                    GSI1_PK: null,
+                    GSI1_SK: null,
+                    TYPE: createFormLatestType()
+                });
             }
         }
         /**
          * Now save the batch data.
          */
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
+
             return form;
         } catch (ex) {
             throw new WebinyError(
@@ -667,37 +663,36 @@ export const createFormStorageOperations = (
         /**
          * Update revision and latest published records
          */
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                ...gsiKeys,
-                TYPE: createFormType()
-            }),
-            entity.putBatch({
-                ...form,
-                ...latestPublishedKeys,
-                TYPE: createFormLatestPublishedType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    ...gsiKeys,
+                    TYPE: createFormType()
+                },
+                {
+                    ...form,
+                    ...latestPublishedKeys,
+                    TYPE: createFormLatestPublishedType()
+                }
+            ]
+        });
+
         /**
          * Update the latest form as well
          */
         if (isLatestForm) {
-            items.push(
-                entity.putBatch({
-                    ...form,
-                    ...latestKeys,
-                    TYPE: createFormLatestType()
-                })
-            );
+            entityBatch.put({
+                ...form,
+                ...latestKeys,
+                TYPE: createFormLatestType()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not publish form.",
@@ -754,17 +749,20 @@ export const createFormStorageOperations = (
         const isLatest = latestForm ? latestForm.id === form.id : false;
         const isLatestPublished = latestPublishedForm ? latestPublishedForm.id === form.id : false;
 
-        const items = [
-            entity.putBatch({
-                ...form,
-                ...revisionKeys,
-                ...gsiKeys,
-                TYPE: createFormType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...form,
+                    ...revisionKeys,
+                    ...gsiKeys,
+                    TYPE: createFormType()
+                }
+            ]
+        });
 
         if (isLatest) {
-            entity.putBatch({
+            entityBatch.put({
                 ...form,
                 ...latestKeys,
                 TYPE: createFormLatestType()
@@ -788,23 +786,18 @@ export const createFormStorageOperations = (
 
             const previouslyPublishedRevision = revisions.shift();
             if (previouslyPublishedRevision) {
-                items.push(
-                    entity.putBatch({
-                        ...previouslyPublishedRevision,
-                        ...latestPublishedKeys,
-                        TYPE: createFormLatestPublishedType()
-                    })
-                );
+                entityBatch.put({
+                    ...previouslyPublishedRevision,
+                    ...latestPublishedKeys,
+                    TYPE: createFormLatestPublishedType()
+                });
             } else {
-                items.push(entity.deleteBatch(latestPublishedKeys));
+                entityBatch.delete(latestPublishedKeys);
             }
         }
 
         try {
-            await batchWriteAll({
-                table,
-                items
-            });
+            await entityBatch.execute();
             return form;
         } catch (ex) {
             throw new WebinyError(
diff --git a/packages/api-headless-cms-ddb-es/__tests__/__api__/setupFile.js b/packages/api-headless-cms-ddb-es/__tests__/__api__/setupFile.js
index 4988c78bb7..7e0106d1f5 100644
--- a/packages/api-headless-cms-ddb-es/__tests__/__api__/setupFile.js
+++ b/packages/api-headless-cms-ddb-es/__tests__/__api__/setupFile.js
@@ -73,6 +73,9 @@ module.exports = () => {
             })
         });
 
+        createOrRefreshIndexSubscription.name =
+            "headlessCmsDdbEs.context.createOrRefreshIndexSubscription";
+
         return {
             storageOperations: createStorageOperations({
                 documentClient,
diff --git a/packages/api-headless-cms-ddb-es/__tests__/converters/convertersDisabled.test.ts b/packages/api-headless-cms-ddb-es/__tests__/converters/convertersDisabled.test.ts
index b3193273d4..dac86634f7 100644
--- a/packages/api-headless-cms-ddb-es/__tests__/converters/convertersDisabled.test.ts
+++ b/packages/api-headless-cms-ddb-es/__tests__/converters/convertersDisabled.test.ts
@@ -7,8 +7,6 @@ import { CmsModel } from "@webiny/api-headless-cms/types";
 import { get } from "@webiny/db-dynamodb";
 import { createPartitionKey } from "~/operations/entry/keys";
 
-jest.retryTimes(0);
-
 describe("storage field path converters disabled", () => {
     const { elasticsearch, entryEntity } = useHandler();
 
diff --git a/packages/api-headless-cms-ddb-es/__tests__/graphql/dummyLocales.ts b/packages/api-headless-cms-ddb-es/__tests__/graphql/dummyLocales.ts
index 9424ee10e2..f6b763e697 100644
--- a/packages/api-headless-cms-ddb-es/__tests__/graphql/dummyLocales.ts
+++ b/packages/api-headless-cms-ddb-es/__tests__/graphql/dummyLocales.ts
@@ -2,7 +2,7 @@ import { ContextPlugin } from "@webiny/api";
 import { CmsContext } from "@webiny/api-headless-cms/types";
 
 export const createDummyLocales = () => {
-    return new ContextPlugin<CmsContext>(async context => {
+    const plugin = new ContextPlugin<CmsContext>(async context => {
         const { i18n, security } = context;
 
         await security.withoutAuthorization(async () => {
@@ -23,4 +23,7 @@ export const createDummyLocales = () => {
             });
         });
     });
+
+    plugin.name = "headlessCmsDdbEs.context.createDummyLocales";
+    return plugin;
 };
diff --git a/packages/api-headless-cms-ddb-es/src/definitions/entryElasticsearch.ts b/packages/api-headless-cms-ddb-es/src/definitions/entryElasticsearch.ts
index 97bffededb..338b1b42af 100644
--- a/packages/api-headless-cms-ddb-es/src/definitions/entryElasticsearch.ts
+++ b/packages/api-headless-cms-ddb-es/src/definitions/entryElasticsearch.ts
@@ -28,6 +28,9 @@ export const createEntryElasticsearchEntity = (
             data: {
                 type: "map"
             },
+            TYPE: {
+                type: "string"
+            },
             ...(attributes || {})
         }
     });
diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
index 1e35ed5630..6338066f71 100644
--- a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
+++ b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { createBatchScheduleFn } from "./createBatchScheduleFn";
diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
index 5e510a2a71..d6a409bd91 100644
--- a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
+++ b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { createPartitionKey, createPublishedSortKey } from "~/operations/entry/keys";
diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getRevisionById.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getRevisionById.ts
index 8374efbcb7..4458e9a34f 100644
--- a/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getRevisionById.ts
+++ b/packages/api-headless-cms-ddb-es/src/operations/entry/dataLoader/getRevisionById.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { createPartitionKey, createRevisionSortKey } from "~/operations/entry/keys";
diff --git a/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts b/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
index 574423f811..f5d098b658 100644
--- a/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
+++ b/packages/api-headless-cms-ddb-es/src/operations/entry/index.ts
@@ -1,17 +1,25 @@
 import WebinyError from "@webiny/error";
-import {
+import type {
     CmsEntry,
     CmsModel,
     CmsStorageEntry,
-    CONTENT_ENTRY_STATUS,
     StorageOperationsCmsModel
 } from "@webiny/api-headless-cms/types";
+import { CONTENT_ENTRY_STATUS } from "@webiny/api-headless-cms/types";
 import { extractEntriesFromIndex } from "~/helpers";
 import { configurations } from "~/configurations";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
-import { Client } from "@elastic/elasticsearch";
-import { PluginsContainer } from "@webiny/plugins";
-import { batchWriteAll, BatchWriteItem } from "@webiny/db-dynamodb/utils/batchWrite";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { Client } from "@elastic/elasticsearch";
+import type { PluginsContainer } from "@webiny/plugins";
+import type { BatchReadItem, QueryAllParams, QueryOneParams } from "@webiny/db-dynamodb";
+import {
+    batchReadAll,
+    cleanupItem,
+    createEntityWriteBatch,
+    getClean,
+    queryAll,
+    queryOne
+} from "@webiny/db-dynamodb";
 import { DataLoadersHandler } from "./dataLoaders";
 import {
     createLatestSortKey,
@@ -19,12 +27,6 @@ import {
     createPublishedSortKey,
     createRevisionSortKey
 } from "./keys";
-import {
-    queryAll,
-    QueryAllParams,
-    queryOne,
-    QueryOneParams
-} from "@webiny/db-dynamodb/utils/query";
 import {
     compress,
     createLimit,
@@ -32,21 +34,17 @@ import {
     decompress,
     encodeCursor
 } from "@webiny/api-elasticsearch";
-import { getClean } from "@webiny/db-dynamodb/utils/get";
 import { zeroPad } from "@webiny/utils";
-import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
-import {
+import type {
     ElasticsearchSearchResponse,
     SearchBody as ElasticsearchSearchBody
 } from "@webiny/api-elasticsearch/types";
-import { CmsEntryStorageOperations, CmsIndexEntry } from "~/types";
+import type { CmsEntryStorageOperations, CmsIndexEntry } from "~/types";
 import { createElasticsearchBody } from "./elasticsearch/body";
 import { logIgnoredEsResponseError } from "./elasticsearch/logIgnoredEsResponseError";
 import { shouldIgnoreEsResponseError } from "./elasticsearch/shouldIgnoreEsResponseError";
 import { createLatestRecordType, createPublishedRecordType, createRecordType } from "./recordType";
 import { StorageOperationsCmsModelPlugin } from "@webiny/api-headless-cms";
-import { WriteRequest } from "@webiny/aws-sdk/client-dynamodb";
-import { batchReadAll, BatchReadItem } from "@webiny/db-dynamodb";
 import { createTransformer } from "./transformations";
 import { convertEntryKeysFromStorage } from "./transformations/convertEntryKeys";
 import {
@@ -57,6 +55,9 @@ import {
 } from "@webiny/api-headless-cms/constants";
 
 interface ElasticsearchDbRecord {
+    PK: string;
+    SK: string;
+    TYPE: string;
     index: string;
     data: Record<string, any>;
 }
@@ -164,37 +165,35 @@ export const createEntriesStorageOperations = (
             SK: createPublishedSortKey()
         };
 
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                ...revisionKeys,
-                TYPE: createRecordType()
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                ...latestKeys,
-                TYPE: createLatestRecordType()
-            })
-        ];
-
-        if (isPublished) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...storageEntry,
                     locked,
-                    ...publishedKeys,
-                    TYPE: createPublishedRecordType()
-                })
-            );
+                    ...revisionKeys,
+                    TYPE: createRecordType()
+                },
+                {
+                    ...storageEntry,
+                    locked,
+                    ...latestKeys,
+                    TYPE: createLatestRecordType()
+                }
+            ]
+        });
+
+        if (isPublished) {
+            entityBatch.put({
+                ...storageEntry,
+                locked,
+                ...publishedKeys,
+                TYPE: createPublishedRecordType()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -211,29 +210,29 @@ export const createEntriesStorageOperations = (
         }
 
         const esLatestData = await transformer.getElasticsearchLatestEntryData();
-        const esItems: BatchWriteItem[] = [
-            esEntity.putBatch({
-                ...latestKeys,
-                index: esIndex,
-                data: esLatestData
-            })
-        ];
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            put: [
+                {
+                    ...latestKeys,
+                    index: esIndex,
+                    data: esLatestData
+                }
+            ]
+        });
+
         if (isPublished) {
             const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-            esItems.push(
-                esEntity.putBatch({
-                    ...publishedKeys,
-                    index: esIndex,
-                    data: esPublishedData
-                })
-            );
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: esPublishedData
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not insert entry data into the Elasticsearch DynamoDB table.",
@@ -295,27 +294,28 @@ export const createEntriesStorageOperations = (
 
         const esLatestData = await transformer.getElasticsearchLatestEntryData();
 
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                TYPE: createRecordType(),
-                ...revisionKeys
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                TYPE: createLatestRecordType(),
-                ...latestKeys
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...storageEntry,
+                    TYPE: createRecordType(),
+                    ...revisionKeys
+                },
+                {
+                    ...storageEntry,
+                    TYPE: createLatestRecordType(),
+                    ...latestKeys
+                }
+            ]
+        });
 
         if (isPublished) {
-            items.push(
-                entity.putBatch({
-                    ...storageEntry,
-                    TYPE: createPublishedRecordType(),
-                    ...publishedKeys
-                })
-            );
+            entityBatch.put({
+                ...storageEntry,
+                TYPE: createPublishedRecordType(),
+                ...publishedKeys
+            });
 
             // Unpublish previously published revision (if any).
             const [publishedRevisionStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId(
@@ -326,27 +326,23 @@ export const createEntriesStorageOperations = (
             );
 
             if (publishedRevisionStorageEntry) {
-                items.push(
-                    entity.putBatch({
-                        ...publishedRevisionStorageEntry,
-                        PK: createPartitionKey({
-                            id: publishedRevisionStorageEntry.id,
-                            locale: model.locale,
-                            tenant: model.tenant
-                        }),
-                        SK: createRevisionSortKey(publishedRevisionStorageEntry),
-                        TYPE: createRecordType(),
-                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED
-                    })
-                );
+                entityBatch.put({
+                    ...publishedRevisionStorageEntry,
+                    PK: createPartitionKey({
+                        id: publishedRevisionStorageEntry.id,
+                        locale: model.locale,
+                        tenant: model.tenant
+                    }),
+                    SK: createRevisionSortKey(publishedRevisionStorageEntry),
+                    TYPE: createRecordType(),
+                    status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                });
             }
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -366,30 +362,28 @@ export const createEntriesStorageOperations = (
             model
         });
 
-        const esItems: BatchWriteItem[] = [
-            esEntity.putBatch({
-                ...latestKeys,
-                index: esIndex,
-                data: esLatestData
-            })
-        ];
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            put: [
+                {
+                    ...latestKeys,
+                    index: esIndex,
+                    data: esLatestData
+                }
+            ]
+        });
 
         if (isPublished) {
             const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-            esItems.push(
-                esEntity.putBatch({
-                    ...publishedKeys,
-                    index: esIndex,
-                    data: esPublishedData
-                })
-            );
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: esPublishedData
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update latest entry in the DynamoDB Elasticsearch table.",
@@ -461,26 +455,30 @@ export const createEntriesStorageOperations = (
             ids: [entry.id]
         });
 
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                ...revisionKeys,
-                TYPE: createRecordType()
-            })
-        ];
-        if (isPublished) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...storageEntry,
                     locked,
-                    ...publishedKeys,
-                    TYPE: createPublishedRecordType()
-                })
-            );
+                    ...revisionKeys,
+                    TYPE: createRecordType()
+                }
+            ]
+        });
+
+        if (isPublished) {
+            entityBatch.put({
+                ...storageEntry,
+                locked,
+                ...publishedKeys,
+                TYPE: createPublishedRecordType()
+            });
         }
 
-        const esItems: BatchWriteItem[] = [];
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
 
         const { index: esIndex } = configurations.es({
             model
@@ -495,26 +493,22 @@ export const createEntriesStorageOperations = (
                 /**
                  * First we update the regular DynamoDB table.
                  */
-                items.push(
-                    entity.putBatch({
-                        ...storageEntry,
-                        ...latestKeys,
-                        TYPE: createLatestRecordType()
-                    })
-                );
+                entityBatch.put({
+                    ...storageEntry,
+                    ...latestKeys,
+                    TYPE: createLatestRecordType()
+                });
 
                 /**
                  * And then update the Elasticsearch table to propagate changes to the Elasticsearch
                  */
                 const elasticsearchLatestData = await transformer.getElasticsearchLatestEntryData();
 
-                esItems.push(
-                    esEntity.putBatch({
-                        ...latestKeys,
-                        index: esIndex,
-                        data: elasticsearchLatestData
-                    })
-                );
+                elasticsearchEntityBatch.put({
+                    ...latestKeys,
+                    index: esIndex,
+                    data: elasticsearchLatestData
+                });
             } else {
                 /**
                  * If not updating latest revision, we still want to update the latest revision's
@@ -536,25 +530,21 @@ export const createEntriesStorageOperations = (
                  * - one for the actual revision record
                  * - one for the latest record
                  */
-                items.push(
-                    entity.putBatch({
-                        ...updatedLatestStorageEntry,
-                        PK: createPartitionKey({
-                            id: latestStorageEntry.id,
-                            locale: model.locale,
-                            tenant: model.tenant
-                        }),
-                        SK: createRevisionSortKey(latestStorageEntry),
-                        TYPE: createRecordType()
-                    })
-                );
+                entityBatch.put({
+                    ...updatedLatestStorageEntry,
+                    PK: createPartitionKey({
+                        id: latestStorageEntry.id,
+                        locale: model.locale,
+                        tenant: model.tenant
+                    }),
+                    SK: createRevisionSortKey(latestStorageEntry),
+                    TYPE: createRecordType()
+                });
 
-                items.push(
-                    entity.putBatch({
-                        ...updatedLatestStorageEntry,
-                        TYPE: createLatestRecordType()
-                    })
-                );
+                entityBatch.put({
+                    ...updatedLatestStorageEntry,
+                    TYPE: createLatestRecordType()
+                });
 
                 /**
                  * Update the Elasticsearch table to propagate changes to the Elasticsearch.
@@ -575,13 +565,11 @@ export const createEntriesStorageOperations = (
                         ...updatedEntryLevelMetaFields
                     });
 
-                    esItems.push(
-                        esEntity.putBatch({
-                            ...latestKeys,
-                            index: esIndex,
-                            data: updatedLatestEntry
-                        })
-                    );
+                    elasticsearchEntityBatch.put({
+                        ...latestKeys,
+                        index: esIndex,
+                        data: updatedLatestEntry
+                    });
                 }
             }
         }
@@ -589,19 +577,15 @@ export const createEntriesStorageOperations = (
         if (isPublished && publishedStorageEntry?.id === entry.id) {
             const elasticsearchPublishedData =
                 await transformer.getElasticsearchPublishedEntryData();
-            esItems.push(
-                esEntity.putBatch({
-                    ...publishedKeys,
-                    index: esIndex,
-                    data: elasticsearchPublishedData
-                })
-            );
+            elasticsearchEntityBatch.put({
+                ...publishedKeys,
+                index: esIndex,
+                data: elasticsearchPublishedData
+            });
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -616,15 +600,8 @@ export const createEntriesStorageOperations = (
                 }
             );
         }
-        if (esItems.length === 0) {
-            return initialStorageEntry;
-        }
-
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update entry DynamoDB Elasticsearch records.",
@@ -664,17 +641,19 @@ export const createEntriesStorageOperations = (
          */
         let latestRecord: CmsEntry | undefined = undefined;
         let publishedRecord: CmsEntry | undefined = undefined;
-        const items: BatchWriteItem[] = [];
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
+
         for (const record of records) {
-            items.push(
-                entity.putBatch({
-                    ...record,
-                    location: {
-                        ...record?.location,
-                        folderId
-                    }
-                })
-            );
+            entityBatch.put({
+                ...record,
+                location: {
+                    ...record?.location,
+                    folderId
+                }
+            });
+
             /**
              * We need to get the published and latest records, so we can update the Elasticsearch.
              */
@@ -685,10 +664,7 @@ export const createEntriesStorageOperations = (
             }
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -743,27 +719,27 @@ export const createEntriesStorageOperations = (
         if (esItems.length === 0) {
             return;
         }
-        const esUpdateItems: BatchWriteItem[] = [];
-        for (const item of esItems) {
-            esUpdateItems.push(
-                esEntity.putBatch({
-                    ...item,
-                    data: await compress(plugins, {
-                        ...item.data,
-                        location: {
-                            ...item.data?.location,
-                            folderId
-                        }
-                    })
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            put: await Promise.all(
+                esItems.map(async item => {
+                    return {
+                        ...item,
+                        data: await compress(plugins, {
+                            ...item.data,
+                            location: {
+                                ...item.data?.location,
+                                folderId
+                            }
+                        })
+                    };
                 })
-            );
-        }
+            )
+        });
 
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esUpdateItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not move entry DynamoDB Elasticsearch records.",
@@ -820,18 +796,20 @@ export const createEntriesStorageOperations = (
          */
         let latestRecord: CmsEntry | undefined = undefined;
         let publishedRecord: CmsEntry | undefined = undefined;
-        const items: BatchWriteItem[] = [];
+
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
 
         for (const record of records) {
-            items.push(
-                entity.putBatch({
-                    ...record,
-                    ...updatedEntryMetaFields,
-                    wbyDeleted: storageEntry.wbyDeleted,
-                    location: storageEntry.location,
-                    binOriginalFolderId: storageEntry.binOriginalFolderId
-                })
-            );
+            entityBatch.put({
+                ...record,
+                ...updatedEntryMetaFields,
+                wbyDeleted: storageEntry.wbyDeleted,
+                location: storageEntry.location,
+                binOriginalFolderId: storageEntry.binOriginalFolderId
+            });
+
             /**
              * We need to get the published and latest records, so we can update the Elasticsearch.
              */
@@ -846,10 +824,8 @@ export const createEntriesStorageOperations = (
          * We write the records back to the primary DynamoDB table.
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -915,30 +891,28 @@ export const createEntriesStorageOperations = (
         /**
          * We update all ES records with data received.
          */
-        const esUpdateItems: BatchWriteItem[] = [];
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
+
         for (const item of esItems) {
-            esUpdateItems.push(
-                esEntity.putBatch({
-                    ...item,
-                    data: await compress(plugins, {
-                        ...item.data,
-                        ...updatedEntryMetaFields,
-                        wbyDeleted: entry.wbyDeleted,
-                        location: entry.location,
-                        binOriginalFolderId: entry.binOriginalFolderId
-                    })
+            elasticsearchEntityBatch.put({
+                ...item,
+                data: await compress(plugins, {
+                    ...item.data,
+                    ...updatedEntryMetaFields,
+                    wbyDeleted: entry.wbyDeleted,
+                    location: entry.location,
+                    binOriginalFolderId: entry.binOriginalFolderId
                 })
-            );
+            });
         }
 
         /**
          * We write the records back to the primary DynamoDB Elasticsearch table.
          */
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esUpdateItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
@@ -1000,18 +974,20 @@ export const createEntriesStorageOperations = (
          */
         let latestRecord: CmsEntry | undefined = undefined;
         let publishedRecord: CmsEntry | undefined = undefined;
-        const items: BatchWriteItem[] = [];
+
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
 
         for (const record of records) {
-            items.push(
-                entity.putBatch({
-                    ...record,
-                    ...updatedEntryMetaFields,
-                    wbyDeleted: storageEntry.wbyDeleted,
-                    location: storageEntry.location,
-                    binOriginalFolderId: storageEntry.binOriginalFolderId
-                })
-            );
+            entityBatch.put({
+                ...record,
+                ...updatedEntryMetaFields,
+                wbyDeleted: storageEntry.wbyDeleted,
+                location: storageEntry.location,
+                binOriginalFolderId: storageEntry.binOriginalFolderId
+            });
+
             /**
              * We need to get the published and latest records, so we can update the Elasticsearch.
              */
@@ -1026,10 +1002,8 @@ export const createEntriesStorageOperations = (
          * We write the records back to the primary DynamoDB table.
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -1092,30 +1066,27 @@ export const createEntriesStorageOperations = (
         /**
          * We update all ES records with data received.
          */
-        const esUpdateItems: BatchWriteItem[] = [];
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
         for (const item of esItems) {
-            esUpdateItems.push(
-                esEntity.putBatch({
-                    ...item,
-                    data: await compress(plugins, {
-                        ...item.data,
-                        ...updatedEntryMetaFields,
-                        wbyDeleted: entry.wbyDeleted,
-                        location: entry.location,
-                        binOriginalFolderId: entry.binOriginalFolderId
-                    })
+            elasticsearchEntityBatch.put({
+                ...item,
+                data: await compress(plugins, {
+                    ...item.data,
+                    ...updatedEntryMetaFields,
+                    wbyDeleted: entry.wbyDeleted,
+                    location: entry.location,
+                    binOriginalFolderId: entry.binOriginalFolderId
                 })
-            );
+            });
         }
 
         /**
          * We write the records back to the primary DynamoDB Elasticsearch table.
          */
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esUpdateItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not restore entry records from DynamoDB Elasticsearch table.",
@@ -1158,25 +1129,29 @@ export const createEntriesStorageOperations = (
             }
         });
 
-        const deleteItems = items.map(item => {
-            return entity.deleteBatch({
-                PK: item.PK,
-                SK: item.SK
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: items.map(item => {
+                return {
+                    PK: item.PK,
+                    SK: item.SK
+                };
+            })
         });
 
-        const deleteEsItems = esItems.map(item => {
-            return esEntity.deleteBatch({
-                PK: item.PK,
-                SK: item.SK
-            });
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            delete: esItems.map(item => {
+                return {
+                    PK: item.PK,
+                    SK: item.SK
+                };
+            })
         });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items: deleteItems
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -1192,10 +1167,7 @@ export const createEntriesStorageOperations = (
         }
 
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: deleteEsItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not destroy entry records from DynamoDB Elasticsearch table.",
@@ -1234,34 +1206,33 @@ export const createEntriesStorageOperations = (
         /**
          * We need to delete all existing records of the given entry revision.
          */
-        const items = [
-            /**
-             * Delete records of given entry revision.
-             */
-            entity.deleteBatch({
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry)
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry)
+                }
+            ]
+        });
 
-        const esItems: BatchWriteItem[] = [];
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
 
         /**
          * If revision we are deleting is the published one as well, we need to delete those records as well.
          */
         if (publishedStorageEntry?.id === entry.id) {
-            items.push(
-                entity.deleteBatch({
-                    PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
-            esItems.push(
-                esEntity.deleteBatch({
-                    PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
+
+            elasticsearchEntityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
         }
 
         if (latestEntry && initialLatestStorageEntry) {
@@ -1273,31 +1244,27 @@ export const createEntriesStorageOperations = (
             /**
              * In the end we need to set the new latest entry.
              */
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntry,
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestRecordType()
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntry,
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                TYPE: createLatestRecordType()
+            });
 
             /**
              * Also perform an update on the actual revision. This is needed
              * because of updates on the entry-level meta fields.
              */
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntry,
-                    PK: createPartitionKey({
-                        id: initialLatestStorageEntry.id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: createRevisionSortKey(initialLatestStorageEntry),
-                    TYPE: createRecordType()
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntry,
+                PK: createPartitionKey({
+                    id: initialLatestStorageEntry.id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: createRevisionSortKey(initialLatestStorageEntry),
+                TYPE: createRecordType()
+            });
 
             const latestTransformer = createTransformer({
                 plugins,
@@ -1307,21 +1274,16 @@ export const createEntriesStorageOperations = (
             });
 
             const esLatestData = await latestTransformer.getElasticsearchLatestEntryData();
-            esItems.push(
-                esEntity.putBatch({
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    index,
-                    data: esLatestData
-                })
-            );
+            elasticsearchEntityBatch.put({
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                index,
+                data: esLatestData
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
 
             dataLoaders.clearAll({
                 model
@@ -1339,15 +1301,8 @@ export const createEntriesStorageOperations = (
             );
         }
 
-        if (esItems.length === 0) {
-            return;
-        }
-
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
@@ -1379,82 +1334,74 @@ export const createEntriesStorageOperations = (
         /**
          * Then we need to construct the queries for all the revisions and entries.
          */
-        const items: Record<string, WriteRequest>[] = [];
-        const esItems: Record<string, WriteRequest>[] = [];
+
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
         for (const id of entries) {
             /**
              * Latest item.
              */
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "L"
-                })
-            );
-            esItems.push(
-                esEntity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "L"
-                })
-            );
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: "L"
+            });
+
+            elasticsearchEntityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: "L"
+            });
+
             /**
              * Published item.
              */
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "P"
-                })
-            );
-            esItems.push(
-                esEntity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "P"
-                })
-            );
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: "P"
+            });
+
+            elasticsearchEntityBatch.delete({
+                PK: createPartitionKey({
+                    id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: "P"
+            });
         }
         /**
          * Exact revisions of all the entries
          */
         for (const revision of revisions) {
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id: revision.id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: createRevisionSortKey({
-                        version: revision.version
-                    })
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id: revision.id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: createRevisionSortKey({
+                    version: revision.version
                 })
-            );
+            });
         }
 
-        await batchWriteAll({
-            table: entity.table,
-            items
-        });
-        await batchWriteAll({
-            table: esEntity.table,
-            items: esItems
-        });
+        await entityBatch.execute();
+        await elasticsearchEntityBatch.execute();
     };
 
     const list: CmsEntryStorageOperations["list"] = async (initialModel, params) => {
@@ -1641,19 +1588,25 @@ export const createEntriesStorageOperations = (
         });
 
         // 1. Update REV# and P records with new data.
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                ...revisionKeys,
-                TYPE: createRecordType()
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                ...publishedKeys,
-                TYPE: createPublishedRecordType()
-            })
-        ];
-        const esItems: BatchWriteItem[] = [];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...storageEntry,
+                    ...revisionKeys,
+                    TYPE: createRecordType()
+                },
+                {
+                    ...storageEntry,
+                    ...publishedKeys,
+                    TYPE: createPublishedRecordType()
+                }
+            ]
+        });
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
 
         const { index: esIndex } = configurations.es({
             model
@@ -1666,12 +1619,10 @@ export const createEntriesStorageOperations = (
 
         if (publishingLatestRevision) {
             // 2.1 If we're publishing the latest revision, we first need to update the L record.
-            items.push(
-                entity.putBatch({
-                    ...storageEntry,
-                    ...latestKeys
-                })
-            );
+            entityBatch.put({
+                ...storageEntry,
+                ...latestKeys
+            });
 
             // 2.2 Additionally, if we have a previously published entry, we need to mark it as unpublished.
             //     Note that we need to take re-publishing into account (same published revision being
@@ -1680,18 +1631,16 @@ export const createEntriesStorageOperations = (
             if (publishedStorageEntry) {
                 const isRepublishing = publishedStorageEntry.id === entry.id;
                 if (!isRepublishing) {
-                    items.push(
-                        /**
-                         * Update currently published entry (unpublish it)
-                         */
-                        entity.putBatch({
-                            ...publishedStorageEntry,
-                            status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
-                            TYPE: createRecordType(),
-                            PK: createPartitionKey(publishedStorageEntry),
-                            SK: createRevisionSortKey(publishedStorageEntry)
-                        })
-                    );
+                    /**
+                     * Update currently published entry (unpublish it)
+                     */
+                    entityBatch.put({
+                        ...publishedStorageEntry,
+                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
+                        TYPE: createRecordType(),
+                        PK: createPartitionKey(publishedStorageEntry),
+                        SK: createRevisionSortKey(publishedStorageEntry)
+                    });
                 }
             }
         } else {
@@ -1716,24 +1665,20 @@ export const createEntriesStorageOperations = (
                 status: latestRevisionStatus
             };
 
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntryFields,
-                    PK: createPartitionKey(latestStorageEntry),
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestRecordType()
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntryFields,
+                PK: createPartitionKey(latestStorageEntry),
+                SK: createLatestSortKey(),
+                TYPE: createLatestRecordType()
+            });
 
             // 2.5 Update REV# record.
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntryFields,
-                    PK: createPartitionKey(latestStorageEntry),
-                    SK: createRevisionSortKey(latestStorageEntry),
-                    TYPE: createRecordType()
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntryFields,
+                PK: createPartitionKey(latestStorageEntry),
+                SK: createRevisionSortKey(latestStorageEntry),
+                TYPE: createRecordType()
+            });
 
             // 2.6 Additionally, if we have a previously published entry, we need to mark it as unpublished.
             //     Note that we need to take re-publishing into account (same published revision being
@@ -1745,15 +1690,13 @@ export const createEntriesStorageOperations = (
                     publishedRevisionId !== latestStorageEntry.id;
 
                 if (!isRepublishing && publishedRevisionDifferentFromLatest) {
-                    items.push(
-                        entity.putBatch({
-                            ...publishedStorageEntry,
-                            PK: createPartitionKey(publishedStorageEntry),
-                            SK: createRevisionSortKey(publishedStorageEntry),
-                            TYPE: createRecordType(),
-                            status: CONTENT_ENTRY_STATUS.UNPUBLISHED
-                        })
-                    );
+                    entityBatch.put({
+                        ...publishedStorageEntry,
+                        PK: createPartitionKey(publishedStorageEntry),
+                        SK: createRevisionSortKey(publishedStorageEntry),
+                        TYPE: createRecordType(),
+                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED
+                    });
                 }
             }
         }
@@ -1764,13 +1707,11 @@ export const createEntriesStorageOperations = (
          * Update the published revision entry in ES.
          */
         const esPublishedData = await transformer.getElasticsearchPublishedEntryData();
-        esItems.push(
-            esEntity.putBatch({
-                ...publishedKeys,
-                index: esIndex,
-                data: esPublishedData
-            })
-        );
+        elasticsearchEntityBatch.put({
+            ...publishedKeys,
+            index: esIndex,
+            data: esPublishedData
+        });
 
         /**
          * Need to decompress the data from Elasticsearch DynamoDB table.
@@ -1797,14 +1738,12 @@ export const createEntriesStorageOperations = (
                 }
             });
 
-            esItems.push(
-                esEntity.putBatch({
-                    index: esIndex,
-                    PK: createPartitionKey(latestEsEntryDataDecompressed),
-                    SK: createLatestSortKey(),
-                    data: await latestTransformer.getElasticsearchLatestEntryData()
-                })
-            );
+            elasticsearchEntityBatch.put({
+                index: esIndex,
+                PK: createPartitionKey(latestEsEntryDataDecompressed),
+                SK: createLatestSortKey(),
+                data: await latestTransformer.getElasticsearchLatestEntryData()
+            });
         } else {
             const updatedEntryLevelMetaFields = pickEntryMetaFields(
                 entry,
@@ -1836,13 +1775,11 @@ export const createEntriesStorageOperations = (
                     status: latestRevisionStatus
                 });
 
-                esItems.push(
-                    esEntity.putBatch({
-                        ...latestKeys,
-                        index: esIndex,
-                        data: updatedLatestEntry
-                    })
-                );
+                elasticsearchEntityBatch.put({
+                    ...latestKeys,
+                    index: esIndex,
+                    data: updatedLatestEntry
+                });
             }
         }
 
@@ -1850,10 +1787,8 @@ export const createEntriesStorageOperations = (
          * Finally, execute regular table batch.
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -1873,10 +1808,7 @@ export const createEntriesStorageOperations = (
          * And Elasticsearch table batch.
          */
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
@@ -1919,25 +1851,34 @@ export const createEntriesStorageOperations = (
             tenant: model.tenant
         });
 
-        const items = [
-            entity.deleteBatch({
-                PK: partitionKey,
-                SK: createPublishedSortKey()
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry),
-                TYPE: createRecordType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry),
+                    TYPE: createRecordType()
+                }
+            ],
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ]
+        });
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ]
+        });
 
-        const esItems: BatchWriteItem[] = [
-            esEntity.deleteBatch({
-                PK: partitionKey,
-                SK: createPublishedSortKey()
-            })
-        ];
         /**
          * If we are unpublishing the latest revision, let's also update the latest revision entry's status in both DynamoDB tables.
          */
@@ -1946,34 +1887,28 @@ export const createEntriesStorageOperations = (
                 model
             });
 
-            items.push(
-                entity.putBatch({
-                    ...storageEntry,
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestRecordType()
-                })
-            );
+            entityBatch.put({
+                ...storageEntry,
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                TYPE: createLatestRecordType()
+            });
 
             const esLatestData = await transformer.getElasticsearchLatestEntryData();
-            esItems.push(
-                esEntity.putBatch({
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    index,
-                    data: esLatestData
-                })
-            );
+            elasticsearchEntityBatch.put({
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                index,
+                data: esLatestData
+            });
         }
 
         /**
          * Finally, execute regular table batch.
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -1991,10 +1926,7 @@ export const createEntriesStorageOperations = (
          * And Elasticsearch table batch.
          */
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
diff --git a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
index b35994d54f..fc13f4270d 100644
--- a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
+++ b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getLatestRevisionByEntryId.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { createBatchScheduleFn } from "./createBatchScheduleFn";
diff --git a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
index 062ebae055..d3b97b70ea 100644
--- a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
+++ b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getPublishedRevisionByEntryId.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { createPartitionKey, createPublishedSortKey } from "~/operations/entry/keys";
diff --git a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getRevisionById.ts b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getRevisionById.ts
index 7c020d8257..04b5783ace 100644
--- a/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getRevisionById.ts
+++ b/packages/api-headless-cms-ddb/src/operations/entry/dataLoader/getRevisionById.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { CmsStorageEntry } from "@webiny/api-headless-cms/types";
 import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
 import { createPartitionKey, createRevisionSortKey } from "~/operations/entry/keys";
diff --git a/packages/api-headless-cms-ddb/src/operations/entry/index.ts b/packages/api-headless-cms-ddb/src/operations/entry/index.ts
index 9c5f84e5b9..5600f97a03 100644
--- a/packages/api-headless-cms-ddb/src/operations/entry/index.ts
+++ b/packages/api-headless-cms-ddb/src/operations/entry/index.ts
@@ -1,15 +1,15 @@
 import WebinyError from "@webiny/error";
 import { DataLoadersHandler } from "./dataLoaders";
-import {
+import type {
     CmsEntry,
     CmsEntryListWhere,
     CmsEntryUniqueValue,
     CmsModel,
     CmsStorageEntry,
-    CONTENT_ENTRY_STATUS,
     StorageOperationsCmsModel
 } from "@webiny/api-headless-cms/types";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
+import { CONTENT_ENTRY_STATUS } from "@webiny/api-headless-cms/types";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 import {
     createGSIPartitionKey,
     createGSISortKey,
@@ -18,24 +18,23 @@ import {
     createPublishedSortKey,
     createRevisionSortKey
 } from "~/operations/entry/keys";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
 import {
-    DbItem,
+    cleanupItem,
+    cleanupItems,
+    createEntityWriteBatch,
     queryAll,
     QueryAllParams,
     queryOne,
     QueryOneParams
-} from "@webiny/db-dynamodb/utils/query";
-import { cleanupItem, cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
-import { PluginsContainer } from "@webiny/plugins";
+} from "@webiny/db-dynamodb";
+import type { PluginsContainer } from "@webiny/plugins";
 import { decodeCursor, encodeCursor } from "@webiny/utils/cursor";
 import { zeroPad } from "@webiny/utils/zeroPad";
 import { StorageOperationsCmsModelPlugin, StorageTransformPlugin } from "@webiny/api-headless-cms";
-import { FilterItemFromStorage } from "./filtering/types";
+import type { FilterItemFromStorage } from "./filtering/types";
 import { createFields } from "~/operations/entry/filtering/createFields";
 import { filter, sort } from "~/operations/entry/filtering";
-import { WriteRequest } from "@webiny/aws-sdk/client-dynamodb";
-import { CmsEntryStorageOperations } from "~/types";
+import type { CmsEntryStorageOperations } from "~/types";
 import {
     isDeletedEntryMetaField,
     isEntryLevelEntryMetaField,
@@ -167,49 +166,47 @@ export const createEntriesStorageOperations = (
          *  - create new main entry item
          *  - create new or update the latest entry item
          */
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry),
-                TYPE: createType(),
-                GSI1_PK: createGSIPartitionKey(model, "A"),
-                GSI1_SK: createGSISortKey(storageEntry)
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                PK: partitionKey,
-                SK: createLatestSortKey(),
-                TYPE: createLatestType(),
-                GSI1_PK: createGSIPartitionKey(model, "L"),
-                GSI1_SK: createGSISortKey(storageEntry)
-            })
-        ];
-
-        /**
-         * We need to create published entry if
-         */
-        if (isPublished) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...storageEntry,
                     locked,
                     PK: partitionKey,
-                    SK: createPublishedSortKey(),
+                    SK: createRevisionSortKey(entry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(storageEntry)
+                },
+                {
+                    ...storageEntry,
+                    locked,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
                     TYPE: createLatestType(),
-                    GSI1_PK: createGSIPartitionKey(model, "P"),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
                     GSI1_SK: createGSISortKey(storageEntry)
-                })
-            );
+                }
+            ]
+        });
+
+        /**
+         * We need to create published entry if
+         */
+        if (isPublished) {
+            entityBatch.put({
+                ...storageEntry,
+                locked,
+                PK: partitionKey,
+                SK: createPublishedSortKey(),
+                TYPE: createLatestType(),
+                GSI1_PK: createGSIPartitionKey(model, "P"),
+                GSI1_SK: createGSISortKey(storageEntry)
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -253,37 +250,38 @@ export const createEntriesStorageOperations = (
          *      - update the published entry item to the current one
          *      - unpublish previously published revision (if any)
          */
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createRevisionSortKey(storageEntry),
-                TYPE: createType(),
-                GSI1_PK: createGSIPartitionKey(model, "A"),
-                GSI1_SK: createGSISortKey(storageEntry)
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createLatestSortKey(),
-                TYPE: createLatestType(),
-                GSI1_PK: createGSIPartitionKey(model, "L"),
-                GSI1_SK: createGSISortKey(storageEntry)
-            })
-        ];
-
-        const isPublished = entry.status === "published";
-        if (isPublished) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...storageEntry,
                     PK: partitionKey,
-                    SK: createPublishedSortKey(),
-                    TYPE: createPublishedType(),
-                    GSI1_PK: createGSIPartitionKey(model, "P"),
+                    SK: createRevisionSortKey(storageEntry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
                     GSI1_SK: createGSISortKey(storageEntry)
-                })
-            );
+                },
+                {
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    TYPE: createLatestType(),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
+                    GSI1_SK: createGSISortKey(storageEntry)
+                }
+            ]
+        });
+
+        const isPublished = entry.status === "published";
+        if (isPublished) {
+            entityBatch.put({
+                ...storageEntry,
+                PK: partitionKey,
+                SK: createPublishedSortKey(),
+                TYPE: createPublishedType(),
+                GSI1_PK: createGSIPartitionKey(model, "P"),
+                GSI1_SK: createGSISortKey(storageEntry)
+            });
 
             // Unpublish previously published revision (if any).
             const [publishedRevisionStorageEntry] = await dataLoaders.getPublishedRevisionByEntryId(
@@ -294,25 +292,20 @@ export const createEntriesStorageOperations = (
             );
 
             if (publishedRevisionStorageEntry) {
-                items.push(
-                    entity.putBatch({
-                        ...publishedRevisionStorageEntry,
-                        PK: partitionKey,
-                        SK: createRevisionSortKey(publishedRevisionStorageEntry),
-                        TYPE: createType(),
-                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
-                        GSI1_PK: createGSIPartitionKey(model, "A"),
-                        GSI1_SK: createGSISortKey(publishedRevisionStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...publishedRevisionStorageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(publishedRevisionStorageEntry),
+                    TYPE: createType(),
+                    status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(publishedRevisionStorageEntry)
+                });
             }
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -346,8 +339,6 @@ export const createEntriesStorageOperations = (
         const isPublished = entry.status === "published";
         const locked = isPublished ? true : entry.locked;
 
-        const items = [];
-
         const storageEntry = convertToStorageEntry({
             model,
             storageEntry: initialStorageEntry
@@ -357,30 +348,32 @@ export const createEntriesStorageOperations = (
          *  - update the current entry
          *  - update the latest entry if the current entry is the latest one
          */
-        items.push(
-            entity.putBatch({
-                ...storageEntry,
-                locked,
-                PK: partitionKey,
-                SK: createRevisionSortKey(storageEntry),
-                TYPE: createType(),
-                GSI1_PK: createGSIPartitionKey(model, "A"),
-                GSI1_SK: createGSISortKey(storageEntry)
-            })
-        );
 
-        if (isPublished) {
-            items.push(
-                entity.putBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
                     ...storageEntry,
                     locked,
                     PK: partitionKey,
-                    SK: createPublishedSortKey(),
-                    TYPE: createPublishedType(),
-                    GSI1_PK: createGSIPartitionKey(model, "P"),
+                    SK: createRevisionSortKey(storageEntry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
                     GSI1_SK: createGSISortKey(storageEntry)
-                })
-            );
+                }
+            ]
+        });
+
+        if (isPublished) {
+            entityBatch.put({
+                ...storageEntry,
+                locked,
+                PK: partitionKey,
+                SK: createPublishedSortKey(),
+                TYPE: createPublishedType(),
+                GSI1_PK: createGSIPartitionKey(model, "P"),
+                GSI1_SK: createGSISortKey(storageEntry)
+            });
         }
 
         /**
@@ -391,17 +384,15 @@ export const createEntriesStorageOperations = (
         if (latestStorageEntry) {
             const updatingLatestRevision = latestStorageEntry.id === entry.id;
             if (updatingLatestRevision) {
-                items.push(
-                    entity.putBatch({
-                        ...storageEntry,
-                        locked,
-                        PK: partitionKey,
-                        SK: createLatestSortKey(),
-                        TYPE: createLatestType(),
-                        GSI1_PK: createGSIPartitionKey(model, "L"),
-                        GSI1_SK: createGSISortKey(entry)
-                    })
-                );
+                entityBatch.put({
+                    ...storageEntry,
+                    locked,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    TYPE: createLatestType(),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
+                    GSI1_SK: createGSISortKey(entry)
+                });
             } else {
                 /**
                  * If not updating latest revision, we still want to update the latest revision's
@@ -417,37 +408,30 @@ export const createEntriesStorageOperations = (
                  * - one for the actual revision record
                  * - one for the latest record
                  */
-                items.push(
-                    entity.putBatch({
-                        ...latestStorageEntry,
-                        ...updatedEntryLevelMetaFields,
-                        PK: partitionKey,
-                        SK: createRevisionSortKey(latestStorageEntry),
-                        TYPE: createType(),
-                        GSI1_PK: createGSIPartitionKey(model, "A"),
-                        GSI1_SK: createGSISortKey(latestStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...latestStorageEntry,
+                    ...updatedEntryLevelMetaFields,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(latestStorageEntry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(latestStorageEntry)
+                });
 
-                items.push(
-                    entity.putBatch({
-                        ...latestStorageEntry,
-                        ...updatedEntryLevelMetaFields,
-                        PK: partitionKey,
-                        SK: createLatestSortKey(),
-                        TYPE: createLatestType(),
-                        GSI1_PK: createGSIPartitionKey(model, "L"),
-                        GSI1_SK: createGSISortKey(latestStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...latestStorageEntry,
+                    ...updatedEntryLevelMetaFields,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    TYPE: createLatestType(),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
+                    GSI1_SK: createGSISortKey(latestStorageEntry)
+                });
             }
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -490,23 +474,24 @@ export const createEntriesStorageOperations = (
         /**
          * Then create the batch writes for the DynamoDB, with the updated folderId.
          */
-        const items = records.map(item => {
-            return entity.putBatch({
-                ...item,
-                location: {
-                    ...item.location,
-                    folderId
-                }
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: records.map(item => {
+                return {
+                    ...item,
+                    location: {
+                        ...item.location,
+                        folderId
+                    }
+                };
+            })
         });
+
         /**
          * And finally write it...
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw WebinyError.from(ex, {
                 message: "Could not move records to a new folder.",
@@ -518,7 +503,10 @@ export const createEntriesStorageOperations = (
         }
     };
 
-    const moveToBin: CmsEntryStorageOperations["moveToBin"] = async (initialModel, params) => {
+    const moveToBin: CmsEntryStorageOperations["moveToBin"] = async (
+        initialModel,
+        params
+    ): Promise<void> => {
         const { entry, storageEntry: initialStorageEntry } = params;
         const model = getStorageOperationsModel(initialModel);
 
@@ -537,9 +525,9 @@ export const createEntriesStorageOperations = (
             }
         };
 
-        let records: DbItem<CmsEntry>[] = [];
+        let records: Awaited<ReturnType<typeof queryAll<CmsEntry>>> = [];
         try {
-            records = await queryAll(queryAllParams);
+            records = await queryAll<CmsEntry>(queryAllParams);
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not load all records.",
@@ -550,6 +538,9 @@ export const createEntriesStorageOperations = (
                 }
             );
         }
+        if (records.length === 0) {
+            return;
+        }
 
         const storageEntry = convertToStorageEntry({
             model,
@@ -564,23 +555,23 @@ export const createEntriesStorageOperations = (
         /**
          * Then create the batch writes for the DynamoDB, with the updated data.
          */
-        const items = records.map(record => {
-            return entity.putBatch({
-                ...record,
-                ...updatedDeletedMetaFields,
-                wbyDeleted: storageEntry.wbyDeleted,
-                location: storageEntry.location,
-                binOriginalFolderId: storageEntry.binOriginalFolderId
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: records.map(record => {
+                return {
+                    ...record,
+                    ...updatedDeletedMetaFields,
+                    wbyDeleted: storageEntry.wbyDeleted,
+                    location: storageEntry.location,
+                    binOriginalFolderId: storageEntry.binOriginalFolderId
+                };
+            })
         });
         /**
          * And finally write it...
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not move the entry to the bin.",
@@ -611,7 +602,7 @@ export const createEntriesStorageOperations = (
             }
         };
 
-        let records: DbItem<CmsEntry>[] = [];
+        let records: Awaited<ReturnType<typeof queryAll<CmsEntry>>> = [];
         try {
             records = await queryAll(queryAllParams);
         } catch (ex) {
@@ -624,18 +615,19 @@ export const createEntriesStorageOperations = (
                 }
             );
         }
-        const items = records.map(item => {
-            return entity.deleteBatch({
-                PK: item.PK,
-                SK: item.SK
-            });
+
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: records.map(item => {
+                return {
+                    PK: item.PK,
+                    SK: item.SK
+                };
+            })
         });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -655,7 +647,7 @@ export const createEntriesStorageOperations = (
     const restoreFromBin: CmsEntryStorageOperations["restoreFromBin"] = async (
         initialModel,
         params
-    ) => {
+    ): Promise<CmsStorageEntry> => {
         const { entry, storageEntry: initialStorageEntry } = params;
         const model = getStorageOperationsModel(initialModel);
 
@@ -674,9 +666,9 @@ export const createEntriesStorageOperations = (
             }
         };
 
-        let records: DbItem<CmsEntry>[] = [];
+        let records: Awaited<ReturnType<typeof queryAll<CmsEntry>>> = [];
         try {
-            records = await queryAll(queryAllParams);
+            records = await queryAll<CmsEntry>(queryAllParams);
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not load all records.",
@@ -687,6 +679,9 @@ export const createEntriesStorageOperations = (
                 }
             );
         }
+        if (records.length === 0) {
+            return initialStorageEntry;
+        }
 
         const storageEntry = convertToStorageEntry({
             model,
@@ -701,23 +696,24 @@ export const createEntriesStorageOperations = (
             isRestoredEntryMetaField
         );
 
-        const items = records.map(record => {
-            return entity.putBatch({
-                ...record,
-                ...updatedRestoredMetaFields,
-                wbyDeleted: storageEntry.wbyDeleted,
-                location: storageEntry.location,
-                binOriginalFolderId: storageEntry.binOriginalFolderId
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: records.map(record => {
+                return {
+                    ...record,
+                    ...updatedRestoredMetaFields,
+                    wbyDeleted: storageEntry.wbyDeleted,
+                    location: storageEntry.location,
+                    binOriginalFolderId: storageEntry.binOriginalFolderId
+                };
+            })
         });
+
         /**
          * And finally write it...
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
 
             dataLoaders.clearAll({
                 model
@@ -751,12 +747,15 @@ export const createEntriesStorageOperations = (
             tenant: model.tenant
         });
 
-        const items = [
-            entity.deleteBatch({
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry)
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry)
+                }
+            ]
+        });
 
         const publishedStorageEntry = await getPublishedRevisionByEntryId(model, entry);
 
@@ -764,12 +763,10 @@ export const createEntriesStorageOperations = (
          * If revision we are deleting is the published one as well, we need to delete those records as well.
          */
         if (publishedStorageEntry && entry.id === publishedStorageEntry.id) {
-            items.push(
-                entity.deleteBatch({
-                    PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
         }
 
         if (initialLatestStorageEntry) {
@@ -777,35 +774,29 @@ export const createEntriesStorageOperations = (
                 storageEntry: initialLatestStorageEntry,
                 model
             });
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntry,
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestType(),
-                    GSI1_PK: createGSIPartitionKey(model, "L"),
-                    GSI1_SK: createGSISortKey(latestStorageEntry)
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntry,
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                TYPE: createLatestType(),
+                GSI1_PK: createGSIPartitionKey(model, "L"),
+                GSI1_SK: createGSISortKey(latestStorageEntry)
+            });
 
             // Do an update on the latest revision. We need to update the latest revision's
             // entry-level meta fields to match the previous revision's entry-level meta fields.
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntry,
-                    PK: partitionKey,
-                    SK: createRevisionSortKey(initialLatestStorageEntry),
-                    TYPE: createType(),
-                    GSI1_PK: createGSIPartitionKey(model, "A"),
-                    GSI1_SK: createGSISortKey(initialLatestStorageEntry)
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntry,
+                PK: partitionKey,
+                SK: createRevisionSortKey(initialLatestStorageEntry),
+                TYPE: createType(),
+                GSI1_PK: createGSIPartitionKey(model, "A"),
+                GSI1_SK: createGSISortKey(initialLatestStorageEntry)
+            });
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            entityBatch.execute();
+
             dataLoaders.clearAll({
                 model
             });
@@ -834,57 +825,43 @@ export const createEntriesStorageOperations = (
         /**
          * Then we need to construct the queries for all the revisions and entries.
          */
-        const items: Record<string, WriteRequest>[] = [];
+
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
+
         for (const id of entries) {
-            /**
-             * Latest item.
-             */
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "L"
-                })
-            );
-            /**
-             * Published item.
-             */
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: "P"
-                })
-            );
+            const partitionKey = createPartitionKey({
+                id,
+                locale: model.locale,
+                tenant: model.tenant
+            });
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: "L"
+            });
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: "P"
+            });
         }
         /**
          * Exact revisions of all the entries
          */
         for (const revision of revisions) {
-            items.push(
-                entity.deleteBatch({
-                    PK: createPartitionKey({
-                        id: revision.id,
-                        locale: model.locale,
-                        tenant: model.tenant
-                    }),
-                    SK: createRevisionSortKey({
-                        version: revision.version
-                    })
+            entityBatch.delete({
+                PK: createPartitionKey({
+                    id: revision.id,
+                    locale: model.locale,
+                    tenant: model.tenant
+                }),
+                SK: createRevisionSortKey({
+                    version: revision.version
                 })
-            );
+            });
         }
 
-        await batchWriteAll({
-            table: entity.table,
-            items
-        });
+        await entityBatch.execute();
     };
 
     const getLatestRevisionByEntryId: CmsEntryStorageOperations["getLatestRevisionByEntryId"] =
@@ -1239,24 +1216,27 @@ export const createEntriesStorageOperations = (
         });
 
         // 1. Update REV# and P records with new data.
-        const items = [
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry),
-                TYPE: createType(),
-                GSI1_PK: createGSIPartitionKey(model, "A"),
-                GSI1_SK: createGSISortKey(entry)
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createPublishedSortKey(),
-                TYPE: createPublishedType(),
-                GSI1_PK: createGSIPartitionKey(model, "P"),
-                GSI1_SK: createGSISortKey(entry)
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(entry)
+                },
+                {
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createPublishedSortKey(),
+                    TYPE: createPublishedType(),
+                    GSI1_PK: createGSIPartitionKey(model, "P"),
+                    GSI1_SK: createGSISortKey(entry)
+                }
+            ]
+        });
 
         // 2. When it comes to the latest record, we need to perform a couple of different
         // updates, based on whether the entry being published is the latest revision or not.
@@ -1265,16 +1245,14 @@ export const createEntriesStorageOperations = (
 
         if (publishingLatestRevision) {
             // 2.1 If we're publishing the latest revision, we first need to update the L record.
-            items.push(
-                entity.putBatch({
-                    ...storageEntry,
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestType(),
-                    GSI1_PK: createGSIPartitionKey(model, "L"),
-                    GSI1_SK: createGSISortKey(entry)
-                })
-            );
+            entityBatch.put({
+                ...storageEntry,
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                TYPE: createLatestType(),
+                GSI1_PK: createGSIPartitionKey(model, "L"),
+                GSI1_SK: createGSISortKey(entry)
+            });
 
             // 2.2 Additionally, if we have a previously published entry, we need to mark it as unpublished.
             if (publishedRevisionId && publishedRevisionId !== entry.id) {
@@ -1283,17 +1261,15 @@ export const createEntriesStorageOperations = (
                     model
                 });
 
-                items.push(
-                    entity.putBatch({
-                        ...publishedStorageEntry,
-                        PK: partitionKey,
-                        SK: createRevisionSortKey(publishedStorageEntry),
-                        TYPE: createType(),
-                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
-                        GSI1_PK: createGSIPartitionKey(model, "A"),
-                        GSI1_SK: createGSISortKey(publishedStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...publishedStorageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(publishedStorageEntry),
+                    TYPE: createType(),
+                    status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(publishedStorageEntry)
+                });
             }
         } else {
             // 2.3 If the published revision is not the latest one, the situation is a bit
@@ -1322,28 +1298,24 @@ export const createEntriesStorageOperations = (
                 status: latestRevisionStatus
             };
 
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntryFields,
-                    PK: partitionKey,
-                    SK: createLatestSortKey(),
-                    TYPE: createLatestType(),
-                    GSI1_PK: createGSIPartitionKey(model, "L"),
-                    GSI1_SK: createGSISortKey(latestStorageEntry)
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntryFields,
+                PK: partitionKey,
+                SK: createLatestSortKey(),
+                TYPE: createLatestType(),
+                GSI1_PK: createGSIPartitionKey(model, "L"),
+                GSI1_SK: createGSISortKey(latestStorageEntry)
+            });
 
             // 2.3.2 Update REV# record.
-            items.push(
-                entity.putBatch({
-                    ...latestStorageEntryFields,
-                    PK: partitionKey,
-                    SK: createRevisionSortKey(latestStorageEntry),
-                    TYPE: createType(),
-                    GSI1_PK: createGSIPartitionKey(model, "A"),
-                    GSI1_SK: createGSISortKey(latestStorageEntry)
-                })
-            );
+            entityBatch.put({
+                ...latestStorageEntryFields,
+                PK: partitionKey,
+                SK: createRevisionSortKey(latestStorageEntry),
+                TYPE: createType(),
+                GSI1_PK: createGSIPartitionKey(model, "A"),
+                GSI1_SK: createGSISortKey(latestStorageEntry)
+            });
 
             // 2.3.3 Finally, if we got a published entry, but it wasn't the latest one, we need to take
             //    an extra step and mark it as unpublished.
@@ -1355,25 +1327,20 @@ export const createEntriesStorageOperations = (
                     model
                 });
 
-                items.push(
-                    entity.putBatch({
-                        ...publishedStorageEntry,
-                        PK: partitionKey,
-                        SK: createRevisionSortKey(publishedStorageEntry),
-                        TYPE: createType(),
-                        status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
-                        GSI1_PK: createGSIPartitionKey(model, "A"),
-                        GSI1_SK: createGSISortKey(publishedStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...publishedStorageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(publishedStorageEntry),
+                    TYPE: createType(),
+                    status: CONTENT_ENTRY_STATUS.UNPUBLISHED,
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(publishedStorageEntry)
+                });
             }
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
@@ -1411,20 +1378,25 @@ export const createEntriesStorageOperations = (
          *  - update current entry revision with new data
          *  - update the latest entry status - if entry being unpublished is latest
          */
-        const items = [
-            entity.deleteBatch({
-                PK: partitionKey,
-                SK: createPublishedSortKey()
-            }),
-            entity.putBatch({
-                ...storageEntry,
-                PK: partitionKey,
-                SK: createRevisionSortKey(entry),
-                TYPE: createType(),
-                GSI1_PK: createGSIPartitionKey(model, "A"),
-                GSI1_SK: createGSISortKey(entry)
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [
+                {
+                    PK: partitionKey,
+                    SK: createPublishedSortKey()
+                }
+            ],
+            put: [
+                {
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(entry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(entry)
+                }
+            ]
+        });
 
         /**
          * We need the latest entry to see if something needs to be updated alongside the unpublishing one.
@@ -1434,16 +1406,14 @@ export const createEntriesStorageOperations = (
         if (initialLatestStorageEntry) {
             const unpublishingLatestRevision = entry.id === initialLatestStorageEntry.id;
             if (unpublishingLatestRevision) {
-                items.push(
-                    entity.putBatch({
-                        ...storageEntry,
-                        PK: partitionKey,
-                        SK: createLatestSortKey(),
-                        TYPE: createLatestType(),
-                        GSI1_PK: createGSIPartitionKey(model, "L"),
-                        GSI1_SK: createGSISortKey(entry)
-                    })
-                );
+                entityBatch.put({
+                    ...storageEntry,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    TYPE: createLatestType(),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
+                    GSI1_SK: createGSISortKey(entry)
+                });
             } else {
                 const latestStorageEntry = convertToStorageEntry({
                     storageEntry: initialLatestStorageEntry,
@@ -1458,38 +1428,31 @@ export const createEntriesStorageOperations = (
                 );
 
                 // 1. Update actual revision record.
-                items.push(
-                    entity.putBatch({
-                        ...latestStorageEntry,
-                        ...updatedEntryLevelMetaFields,
-                        PK: partitionKey,
-                        SK: createRevisionSortKey(latestStorageEntry),
-                        TYPE: createType(),
-                        GSI1_PK: createGSIPartitionKey(model, "A"),
-                        GSI1_SK: createGSISortKey(latestStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...latestStorageEntry,
+                    ...updatedEntryLevelMetaFields,
+                    PK: partitionKey,
+                    SK: createRevisionSortKey(latestStorageEntry),
+                    TYPE: createType(),
+                    GSI1_PK: createGSIPartitionKey(model, "A"),
+                    GSI1_SK: createGSISortKey(latestStorageEntry)
+                });
 
                 // 2. Update latest record.
-                items.push(
-                    entity.putBatch({
-                        ...latestStorageEntry,
-                        ...updatedEntryLevelMetaFields,
-                        PK: partitionKey,
-                        SK: createLatestSortKey(),
-                        TYPE: createLatestType(),
-                        GSI1_PK: createGSIPartitionKey(model, "L"),
-                        GSI1_SK: createGSISortKey(latestStorageEntry)
-                    })
-                );
+                entityBatch.put({
+                    ...latestStorageEntry,
+                    ...updatedEntryLevelMetaFields,
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    TYPE: createLatestType(),
+                    GSI1_PK: createGSIPartitionKey(model, "L"),
+                    GSI1_SK: createGSISortKey(latestStorageEntry)
+                });
             }
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             dataLoaders.clearAll({
                 model
             });
diff --git a/packages/api-i18n-ddb/src/definitions/localeEntity.ts b/packages/api-i18n-ddb/src/definitions/localeEntity.ts
index 4513054a2d..bdbed1a974 100644
--- a/packages/api-i18n-ddb/src/definitions/localeEntity.ts
+++ b/packages/api-i18n-ddb/src/definitions/localeEntity.ts
@@ -1,15 +1,19 @@
-import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
-import { I18NContext } from "@webiny/api-i18n/types";
-import { getExtraAttributes } from "@webiny/db-dynamodb/utils/attributes";
+import type { Table } from "@webiny/db-dynamodb/toolbox";
+import type { I18NContext } from "@webiny/api-i18n/types";
+import { getExtraAttributesFromPlugins } from "@webiny/db-dynamodb/utils/attributes";
+import type { IEntity } from "@webiny/db-dynamodb";
+import { createEntity } from "@webiny/db-dynamodb";
 
-export default (params: {
+export interface ILocaleEntityParams {
     context: I18NContext;
     table: Table<string, string, string>;
-}): Entity<any> => {
+}
+
+export default (params: ILocaleEntityParams): IEntity => {
     const { context, table } = params;
     const entityName = "I18NLocale";
-    const attributes = getExtraAttributes(context, entityName);
-    return new Entity({
+    const attributes = getExtraAttributesFromPlugins(context.plugins, entityName);
+    return createEntity({
         name: entityName,
         table,
         attributes: {
diff --git a/packages/api-i18n-ddb/src/definitions/systemEntity.ts b/packages/api-i18n-ddb/src/definitions/systemEntity.ts
index a2e80306a9..44cf24d380 100644
--- a/packages/api-i18n-ddb/src/definitions/systemEntity.ts
+++ b/packages/api-i18n-ddb/src/definitions/systemEntity.ts
@@ -1,15 +1,17 @@
-import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
-import { I18NContext } from "@webiny/api-i18n/types";
-import { getExtraAttributes } from "@webiny/db-dynamodb/utils/attributes";
+import type { Table } from "@webiny/db-dynamodb/toolbox";
+import type { I18NContext } from "@webiny/api-i18n/types";
+import { getExtraAttributesFromPlugins } from "@webiny/db-dynamodb/utils/attributes";
+import type { IEntity } from "@webiny/db-dynamodb";
+import { createEntity } from "@webiny/db-dynamodb";
 
 export default (params: {
-    context: I18NContext;
+    context: Pick<I18NContext, "plugins">;
     table: Table<string, string, string>;
-}): Entity<any> => {
+}): IEntity => {
     const { context, table } = params;
     const entityName = "I18NSystem";
-    const attributes = getExtraAttributes(context, entityName);
-    return new Entity({
+    const attributes = getExtraAttributesFromPlugins(context.plugins, entityName);
+    return createEntity({
         name: entityName,
         table,
         attributes: {
diff --git a/packages/api-i18n-ddb/src/operations/locales/LocalesStorageOperations.ts b/packages/api-i18n-ddb/src/operations/locales/LocalesStorageOperations.ts
index 96abf44272..18e344863d 100644
--- a/packages/api-i18n-ddb/src/operations/locales/LocalesStorageOperations.ts
+++ b/packages/api-i18n-ddb/src/operations/locales/LocalesStorageOperations.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     I18NContext,
     I18NLocaleData,
     I18NLocalesStorageOperations,
@@ -11,17 +11,13 @@ import {
     I18NLocalesStorageOperationsUpdateDefaultParams,
     I18NLocalesStorageOperationsUpdateParams
 } from "@webiny/api-i18n/types";
-import { Entity, Table } from "@webiny/db-dynamodb/toolbox";
+import type { Table } from "@webiny/db-dynamodb/toolbox";
 import WebinyError from "@webiny/error";
 import defineTable from "~/definitions/table";
 import defineLocaleEntity from "~/definitions/localeEntity";
-import { queryAll, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
-import { filterItems } from "@webiny/db-dynamodb/utils/filter";
-import { sortItems } from "@webiny/db-dynamodb/utils/sort";
-import { createListResponse } from "@webiny/db-dynamodb/utils/listResponse";
-import { cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
+import type { IEntity, IEntityQueryAllParams } from "@webiny/db-dynamodb";
+import { createListResponse, filterItems, sortItems } from "@webiny/db-dynamodb";
 import { LocaleDynamoDbFieldPlugin } from "~/plugins/LocaleDynamoDbFieldPlugin";
-import { deleteItem, getClean, put } from "@webiny/db-dynamodb";
 
 interface ConstructorParams {
     context: I18NContext;
@@ -32,7 +28,7 @@ const DEFAULT_SORT_KEY = "default";
 export class LocalesStorageOperations implements I18NLocalesStorageOperations {
     private readonly context: I18NContext;
     private readonly table: Table<string, string, string>;
-    private readonly entity: Entity<any>;
+    private readonly entity: IEntity;
 
     public constructor({ context }: ConstructorParams) {
         this.context = context;
@@ -48,12 +44,9 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
 
     public async getDefault(params: I18NLocalesStorageOperationsGetDefaultParams) {
         try {
-            return await getClean<I18NLocaleData>({
-                entity: this.entity,
-                keys: {
-                    PK: this.createDefaultPartitionKey(params),
-                    SK: DEFAULT_SORT_KEY
-                }
+            return this.entity.getClean<I18NLocaleData>({
+                PK: this.createDefaultPartitionKey(params),
+                SK: DEFAULT_SORT_KEY
             });
         } catch (ex) {
             throw new WebinyError(
@@ -65,12 +58,9 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
 
     public async get(params: I18NLocalesStorageOperationsGetParams) {
         try {
-            return await getClean<I18NLocaleData>({
-                entity: this.entity,
-                keys: {
-                    PK: this.createPartitionKey(params),
-                    SK: params.code
-                }
+            return this.entity.getClean<I18NLocaleData>({
+                PK: this.createPartitionKey(params),
+                SK: params.code
             });
         } catch (ex) {
             throw new WebinyError(
@@ -89,12 +79,9 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
         };
 
         try {
-            await put({
-                entity: this.entity,
-                item: {
-                    ...locale,
-                    ...keys
-                }
+            await this.entity.put({
+                ...locale,
+                ...keys
             });
             return locale;
         } catch (ex) {
@@ -117,12 +104,9 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
             SK: this.getSortKey(locale)
         };
         try {
-            await put({
-                entity: this.entity,
-                item: {
-                    ...locale,
-                    ...keys
-                }
+            await this.entity.put({
+                ...locale,
+                ...keys
             });
             return locale;
         } catch (ex) {
@@ -144,23 +128,24 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
         /**
          * Set the locale as the default one.
          */
-        const batch = [
-            {
-                ...locale,
-                PK: this.createPartitionKey(locale),
-                SK: this.getSortKey(locale)
-            },
-            {
-                ...locale,
-                PK: this.createDefaultPartitionKey(locale),
-                SK: DEFAULT_SORT_KEY
-            }
-        ];
+        const entityBatch = this.entity.createEntityWriter();
+
+        entityBatch.put({
+            ...locale,
+            PK: this.createPartitionKey(locale),
+            SK: this.getSortKey(locale)
+        });
+        entityBatch.put({
+            ...locale,
+            PK: this.createDefaultPartitionKey(locale),
+            SK: DEFAULT_SORT_KEY
+        });
+
         /**
          * Set the previous locale not to be default in its data.
          */
         if (previous) {
-            batch.push({
+            entityBatch.put({
                 ...previous,
                 default: false,
                 PK: this.createPartitionKey(locale),
@@ -168,8 +153,10 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
             });
         }
 
+        const batch = entityBatch.items;
+
         try {
-            await this.table.batchWrite(batch.map(item => this.entity.putBatch(item)));
+            await entityBatch.execute();
             return locale;
         } catch (ex) {
             throw new WebinyError(
@@ -190,10 +177,7 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
             SK: this.getSortKey(locale)
         };
         try {
-            await deleteItem({
-                entity: this.entity,
-                keys
-            });
+            await this.entity.delete(keys);
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Cannot delete I18N locale.",
@@ -220,7 +204,7 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
 
         let results: I18NLocaleData[] = [];
         try {
-            results = await queryAll<I18NLocaleData>(queryAllParams);
+            results = await this.entity.queryAll<I18NLocaleData>(queryAllParams);
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Cannot list I18N locales.",
@@ -256,7 +240,7 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
          * Use the common db-dynamodb method to create the required response.
          */
         return createListResponse<I18NLocaleData>({
-            items: cleanupItems(this.entity, sortedFiles),
+            items: sortedFiles,
             after,
             totalCount,
             limit
@@ -282,7 +266,7 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
 
     private createQueryAllParamsOptions(
         params: I18NLocalesStorageOperationsListParams
-    ): QueryAllParams {
+    ): IEntityQueryAllParams {
         const { where } = params;
 
         const tenant = where.tenant;
@@ -295,7 +279,6 @@ export class LocalesStorageOperations implements I18NLocalesStorageOperations {
             delete where.default;
         }
         return {
-            entity: this.entity,
             partitionKey,
             options: {}
         };
diff --git a/packages/api-i18n-ddb/src/operations/system/SystemStorageOperations.ts b/packages/api-i18n-ddb/src/operations/system/SystemStorageOperations.ts
index e333f8eef5..b840cf0c0e 100644
--- a/packages/api-i18n-ddb/src/operations/system/SystemStorageOperations.ts
+++ b/packages/api-i18n-ddb/src/operations/system/SystemStorageOperations.ts
@@ -1,15 +1,14 @@
-import {
+import type {
     I18NContext,
     I18NSystem,
     I18NSystemStorageOperations,
     I18NSystemStorageOperationsCreate,
     I18NSystemStorageOperationsUpdate
 } from "@webiny/api-i18n/types";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
 import WebinyError from "@webiny/error";
 import defineSystemEntity from "~/definitions/systemEntity";
 import defineTable from "~/definitions/table";
-import { getClean, put } from "@webiny/db-dynamodb";
+import type { IEntity } from "@webiny/db-dynamodb";
 
 interface ConstructorParams {
     context: I18NContext;
@@ -19,7 +18,7 @@ const SORT_KEY = "I18N";
 
 export class SystemStorageOperations implements I18NSystemStorageOperations {
     private readonly _context: I18NContext;
-    private readonly _entity: Entity<any>;
+    private readonly entity: IEntity;
 
     private get partitionKey(): string {
         const tenant = this._context.tenancy.getCurrentTenant();
@@ -35,7 +34,7 @@ export class SystemStorageOperations implements I18NSystemStorageOperations {
             context
         });
 
-        this._entity = defineSystemEntity({
+        this.entity = defineSystemEntity({
             context,
             table
         });
@@ -48,10 +47,7 @@ export class SystemStorageOperations implements I18NSystemStorageOperations {
         };
 
         try {
-            return await getClean<I18NSystem>({
-                entity: this._entity,
-                keys
-            });
+            return await this.entity.getClean<I18NSystem>(keys);
         } catch (ex) {
             throw new WebinyError(
                 "Could not load system data from the database.",
@@ -67,12 +63,9 @@ export class SystemStorageOperations implements I18NSystemStorageOperations {
             SK: SORT_KEY
         };
         try {
-            await put({
-                entity: this._entity,
-                item: {
-                    ...system,
-                    ...keys
-                }
+            await this.entity.put({
+                ...system,
+                ...keys
             });
             return system;
         } catch (ex) {
@@ -90,12 +83,9 @@ export class SystemStorageOperations implements I18NSystemStorageOperations {
             SK: SORT_KEY
         };
         try {
-            await put({
-                entity: this._entity,
-                item: {
-                    ...system,
-                    ...keys
-                }
+            await this.entity.put({
+                ...system,
+                ...keys
             });
             return system;
         } catch (ex) {
diff --git a/packages/api-page-builder-so-ddb-es/src/definitions/pageElasticsearchEntity.ts b/packages/api-page-builder-so-ddb-es/src/definitions/pageElasticsearchEntity.ts
index 0d0bf837a2..5d21fc487f 100644
--- a/packages/api-page-builder-so-ddb-es/src/definitions/pageElasticsearchEntity.ts
+++ b/packages/api-page-builder-so-ddb-es/src/definitions/pageElasticsearchEntity.ts
@@ -25,6 +25,9 @@ export const createPageElasticsearchEntity = (params: Params): Entity<any> => {
             data: {
                 type: "map"
             },
+            TYPE: {
+                type: "string"
+            },
             ...(attributes || {})
         }
     });
diff --git a/packages/api-page-builder-so-ddb-es/src/operations/blockCategory/dataLoader.ts b/packages/api-page-builder-so-ddb-es/src/operations/blockCategory/dataLoader.ts
index 5a158ff5aa..1fd149702d 100644
--- a/packages/api-page-builder-so-ddb-es/src/operations/blockCategory/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb-es/src/operations/blockCategory/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { BlockCategory } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb-es/src/operations/category/dataLoader.ts b/packages/api-page-builder-so-ddb-es/src/operations/category/dataLoader.ts
index 50a0d6a835..913ee4fc3b 100644
--- a/packages/api-page-builder-so-ddb-es/src/operations/category/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb-es/src/operations/category/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { Category } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb-es/src/operations/pageBlock/dataLoader.ts b/packages/api-page-builder-so-ddb-es/src/operations/pageBlock/dataLoader.ts
index c9505ba785..b3614d766f 100644
--- a/packages/api-page-builder-so-ddb-es/src/operations/pageBlock/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb-es/src/operations/pageBlock/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { PageBlock } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb-es/src/operations/pageTemplate/dataLoader.ts b/packages/api-page-builder-so-ddb-es/src/operations/pageTemplate/dataLoader.ts
index 32437cbacc..248b6ffe12 100644
--- a/packages/api-page-builder-so-ddb-es/src/operations/pageTemplate/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb-es/src/operations/pageTemplate/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { PageTemplate } from "@webiny/api-page-builder/types";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { createPrimaryPK } from "./keys";
diff --git a/packages/api-page-builder-so-ddb-es/src/operations/pages/index.ts b/packages/api-page-builder-so-ddb-es/src/operations/pages/index.ts
index 2bde41b247..b523ec37d0 100644
--- a/packages/api-page-builder-so-ddb-es/src/operations/pages/index.ts
+++ b/packages/api-page-builder-so-ddb-es/src/operations/pages/index.ts
@@ -1,4 +1,4 @@
-import {
+import type {
     Page,
     PageStorageOperations,
     PageStorageOperationsCreateFromParams,
@@ -14,12 +14,12 @@ import {
     PageStorageOperationsUnpublishParams,
     PageStorageOperationsUpdateParams
 } from "@webiny/api-page-builder/types";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 import omit from "lodash/omit";
 import WebinyError from "@webiny/error";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
-import { Client } from "@elastic/elasticsearch";
-import {
+import type { Client } from "@elastic/elasticsearch";
+import type {
     ElasticsearchBoolQueryConfig,
     ElasticsearchSearchResponse
 } from "@webiny/api-elasticsearch/types";
@@ -28,11 +28,18 @@ import { createLimit, encodeCursor } from "@webiny/api-elasticsearch";
 import { createElasticsearchQueryBody } from "./elasticsearchQueryBody";
 import { SearchLatestPagesPlugin } from "~/plugins/definitions/SearchLatestPagesPlugin";
 import { SearchPublishedPagesPlugin } from "~/plugins/definitions/SearchPublishedPagesPlugin";
-import { DbItem, queryAll, QueryAllParams, queryOne } from "@webiny/db-dynamodb/utils/query";
+import {
+    createEntityWriteBatch,
+    getClean,
+    put,
+    queryAll,
+    QueryAllParams,
+    queryOne,
+    sortItems
+} from "@webiny/db-dynamodb";
 import { SearchPagesPlugin } from "~/plugins/definitions/SearchPagesPlugin";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
 import { getESLatestPageData, getESPublishedPageData } from "./helpers";
-import { PluginsContainer } from "@webiny/plugins";
+import type { PluginsContainer } from "@webiny/plugins";
 import {
     createBasicType,
     createLatestSortKey,
@@ -45,9 +52,7 @@ import {
     createPublishedType,
     createSortKey
 } from "./keys";
-import { sortItems } from "@webiny/db-dynamodb/utils/sort";
 import { PageDynamoDbElasticsearchFieldPlugin } from "~/plugins/definitions/PageDynamoDbElasticsearchFieldPlugin";
-import { getClean, put } from "@webiny/db-dynamodb";
 import { shouldIgnoreEsResponseError } from "~/operations/pages/shouldIgnoreEsResponseError";
 import { logIgnoredEsResponseError } from "~/operations/pages/logIgnoredEsResponseError";
 
@@ -81,24 +86,26 @@ export const createPageStorageOperations = (
             SK: createLatestSortKey()
         };
 
-        const items = [
-            entity.putBatch({
-                ...page,
-                ...versionKeys,
-                TYPE: createBasicType()
-            }),
-            entity.putBatch({
-                ...page,
-                ...latestKeys,
-                TYPE: createLatestType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    ...versionKeys,
+                    TYPE: createBasicType()
+                },
+                {
+                    ...page,
+                    ...latestKeys,
+                    TYPE: createLatestType()
+                }
+            ]
+        });
+
         const esData = getESLatestPageData(plugins, page, input);
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items: items
-            });
+            await entityBatch.execute();
+
             await put({
                 entity: esEntity,
                 item: {
@@ -133,26 +140,26 @@ export const createPageStorageOperations = (
             SK: createLatestSortKey()
         };
 
-        const items = [
-            entity.putBatch({
-                ...page,
-                TYPE: createBasicType(),
-                ...versionKeys
-            }),
-            entity.putBatch({
-                ...page,
-                TYPE: createLatestType(),
-                ...latestKeys
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    TYPE: createBasicType(),
+                    ...versionKeys
+                },
+                {
+                    ...page,
+                    TYPE: createLatestType(),
+                    ...latestKeys
+                }
+            ]
+        });
 
         const esData = getESLatestPageData(plugins, page);
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
 
             await put({
                 entity: esEntity,
@@ -195,13 +202,16 @@ export const createPageStorageOperations = (
             keys: latestKeys
         });
 
-        const items = [
-            entity.putBatch({
-                ...page,
-                TYPE: createBasicType(),
-                ...keys
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    TYPE: createBasicType(),
+                    ...keys
+                }
+            ]
+        });
 
         const esData = getESLatestPageData(plugins, page, input);
 
@@ -209,22 +219,17 @@ export const createPageStorageOperations = (
             /**
              * We also update the regular record.
              */
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    TYPE: createLatestType(),
-                    ...latestKeys
-                })
-            );
+            entityBatch.put({
+                ...page,
+                TYPE: createLatestType(),
+                ...latestKeys
+            });
         }
         /**
          * Unfortunately we cannot push regular and es record in the batch write because they are two separate tables.
          */
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
 
             await put({
                 entity: esEntity,
@@ -265,32 +270,35 @@ export const createPageStorageOperations = (
 
         const partitionKey = createPartitionKey(page);
 
-        const items = [
-            entity.deleteBatch({
-                PK: partitionKey,
-                SK: createSortKey(page)
-            })
-        ];
-        const esItems = [];
-        if (publishedPage && publishedPage.id === page.id) {
-            items.push(
-                entity.deleteBatch({
-                    PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
-            items.push(
-                entity.deleteBatch({
-                    PK: createPathPartitionKey(page),
-                    SK: createPathSortKey(page)
-                })
-            );
-            esItems.push(
-                esEntity.deleteBatch({
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [
+                {
                     PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
+                    SK: createSortKey(page)
+                }
+            ]
+        });
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
+
+        if (publishedPage && publishedPage.id === page.id) {
+            entityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
+
+            entityBatch.delete({
+                PK: createPathPartitionKey(page),
+                SK: createPathSortKey(page)
+            });
+
+            elasticsearchEntityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
         }
         let previousLatestPage: Page | null = null;
         if (latestPage && latestPage.id === page.id) {
@@ -303,44 +311,34 @@ export const createPageStorageOperations = (
                 }
             });
             if (previousLatestRecord) {
-                items.push(
-                    entity.putBatch({
-                        ...previousLatestRecord,
-                        TYPE: createLatestType(),
-                        PK: partitionKey,
-                        SK: createLatestSortKey()
-                    })
-                );
-                esItems.push(
-                    esEntity.putBatch({
-                        PK: partitionKey,
-                        SK: createLatestSortKey(),
-                        index: configurations.es(page).index,
-                        data: getESLatestPageData(plugins, previousLatestRecord)
-                    })
-                );
+                entityBatch.put({
+                    ...previousLatestRecord,
+                    TYPE: createLatestType(),
+                    PK: partitionKey,
+                    SK: createLatestSortKey()
+                });
+
+                elasticsearchEntityBatch.put({
+                    PK: partitionKey,
+                    SK: createLatestSortKey(),
+                    index: configurations.es(page).index,
+                    data: getESLatestPageData(plugins, previousLatestRecord)
+                });
+
                 previousLatestPage = cleanupItem(entity, previousLatestRecord);
             }
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not batch write all the page records.",
                 ex.code || "BATCH_WRITE_RECORDS_ERROR"
             );
         }
-        if (esItems.length === 0) {
-            return [page, previousLatestPage];
-        }
+
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not batch write all the page Elasticsearch records.",
@@ -370,7 +368,7 @@ export const createPageStorageOperations = (
                 gte: " "
             }
         };
-        let revisions: DbItem<Page>[];
+        let revisions: Awaited<ReturnType<typeof queryAll<Page>>>;
         try {
             revisions = await queryAll<Page>(queryAllParams);
         } catch (ex) {
@@ -387,48 +385,45 @@ export const createPageStorageOperations = (
          * We need to go through all possible entries and delete them.
          * Also, delete the published entry path record.
          */
-        const items = [];
+
+        const entityBatch = createEntityWriteBatch({
+            entity
+        });
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
+
         let publishedPathEntryDeleted = false;
         for (const revision of revisions) {
             if (revision.status === "published" && !publishedPathEntryDeleted) {
                 publishedPathEntryDeleted = true;
-                items.push(
-                    entity.deleteBatch({
-                        PK: createPathPartitionKey(page),
-                        SK: revision.path
-                    })
-                );
+                entityBatch.delete({
+                    PK: createPathPartitionKey(page),
+                    SK: revision.path
+                });
             }
-            items.push(
-                entity.deleteBatch({
-                    PK: revision.PK,
-                    SK: revision.SK
-                })
-            );
+            entityBatch.delete({
+                PK: revision.PK,
+                SK: revision.SK
+            });
         }
-        const esItems = [
-            esEntity.deleteBatch({
-                PK: partitionKey,
-                SK: createLatestSortKey()
-            })
-        ];
+        elasticsearchEntityBatch.delete({
+            PK: partitionKey,
+            SK: createLatestSortKey()
+        });
+
         /**
          * Delete published record if it is published.
          */
         if (publishedPathEntryDeleted) {
-            esItems.push(
-                esEntity.deleteBatch({
-                    PK: partitionKey,
-                    SK: createPublishedSortKey()
-                })
-            );
+            elasticsearchEntityBatch.delete({
+                PK: partitionKey,
+                SK: createPublishedSortKey()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete all the page records.",
@@ -436,10 +431,7 @@ export const createPageStorageOperations = (
             );
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete all the page Elasticsearch records.",
@@ -457,118 +449,100 @@ export const createPageStorageOperations = (
         /**
          * Update the given revision of the page.
          */
-        const items = [
-            entity.putBatch({
-                ...page,
-                TYPE: createBasicType(),
-                PK: createPartitionKey(page),
-                SK: createSortKey(page)
-            })
-        ];
-        const esItems = [];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    TYPE: createBasicType(),
+                    PK: createPartitionKey(page),
+                    SK: createSortKey(page)
+                }
+            ]
+        });
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity
+        });
         /**
          * If we are publishing the latest revision, update the latest revision
          * status in ES. We also need to update the latest page revision entry in ES.
          */
         if (latestPage.id === page.id) {
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    TYPE: createLatestType(),
-                    PK: createPartitionKey(page),
-                    SK: createLatestSortKey()
-                })
-            );
+            entityBatch.put({
+                ...page,
+                TYPE: createLatestType(),
+                PK: createPartitionKey(page),
+                SK: createLatestSortKey()
+            });
 
-            esItems.push(
-                esEntity.putBatch({
-                    PK: createPartitionKey(page),
-                    SK: createLatestSortKey(),
-                    index: configurations.es(page).index,
-                    data: getESLatestPageData(plugins, page)
-                })
-            );
+            elasticsearchEntityBatch.put({
+                PK: createPartitionKey(page),
+                SK: createLatestSortKey(),
+                index: configurations.es(page).index,
+                data: getESLatestPageData(plugins, page)
+            });
         }
         /**
          * If we already have a published revision, and it's not the revision being published:
          *  - set the existing published revision to "unpublished"
          */
         if (publishedPage && publishedPage.id !== page.id) {
-            items.push(
-                entity.putBatch({
-                    ...publishedPage,
-                    status: "unpublished",
-                    PK: createPartitionKey(publishedPage),
-                    SK: createSortKey(publishedPage)
-                })
-            );
+            entityBatch.put({
+                ...publishedPage,
+                status: "unpublished",
+                PK: createPartitionKey(publishedPage),
+                SK: createSortKey(publishedPage)
+            });
+
             /**
              * Remove old published path if required.
              */
             if (publishedPage.path !== page.path) {
-                items.push(
-                    entity.deleteBatch({
-                        PK: createPathPartitionKey(page),
-                        SK: publishedPage.path
-                    })
-                );
+                entityBatch.delete({
+                    PK: createPathPartitionKey(page),
+                    SK: publishedPage.path
+                });
             }
         }
 
-        esItems.push(
-            esEntity.putBatch({
-                PK: createPartitionKey(page),
-                SK: createPublishedSortKey(),
-                index: configurations.es(page).index,
-                data: getESPublishedPageData(plugins, page)
-            })
-        );
+        elasticsearchEntityBatch.put({
+            PK: createPartitionKey(page),
+            SK: createPublishedSortKey(),
+            index: configurations.es(page).index,
+            data: getESPublishedPageData(plugins, page)
+        });
 
         /**
          * Update or insert published path.
          */
-        items.push(
-            entity.putBatch({
-                ...page,
-                TYPE: createPublishedPathType(),
-                PK: createPathPartitionKey(page),
-                SK: createPathSortKey(page)
-            })
-        );
+        entityBatch.put({
+            ...page,
+            TYPE: createPublishedPathType(),
+            PK: createPathPartitionKey(page),
+            SK: createPathSortKey(page)
+        });
+
         /**
          * Update or insert published page.
          */
-        items.push(
-            entity.putBatch({
-                ...page,
-                TYPE: createPublishedType(),
-                PK: createPartitionKey(page),
-                SK: createPublishedSortKey()
-            })
-        );
+        entityBatch.put({
+            ...page,
+            TYPE: createPublishedType(),
+            PK: createPartitionKey(page),
+            SK: createPublishedSortKey()
+        });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update all the page records when publishing.",
                 ex.code || "UPDATE_RECORDS_ERROR"
             );
         }
-        /**
-         * No point in continuing if there are no items in Elasticsearch data
-         */
-        if (esItems.length === 0) {
-            return page;
-        }
+
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
@@ -584,74 +558,67 @@ export const createPageStorageOperations = (
 
         page.status = "unpublished";
 
-        const items = [
-            entity.deleteBatch({
-                PK: createPartitionKey(page),
-                SK: createPublishedSortKey()
-            }),
-            entity.deleteBatch({
-                PK: createPathPartitionKey(page),
-                SK: createPathSortKey(page)
-            }),
-            entity.putBatch({
-                ...page,
-                TYPE: createBasicType(),
-                PK: createPartitionKey(page),
-                SK: createSortKey(page)
-            })
-        ];
-        const esItems = [];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [
+                {
+                    PK: createPartitionKey(page),
+                    SK: createPublishedSortKey()
+                },
+                {
+                    PK: createPathPartitionKey(page),
+                    SK: createPathSortKey(page)
+                }
+            ],
+            put: [
+                {
+                    ...page,
+                    TYPE: createBasicType(),
+                    PK: createPartitionKey(page),
+                    SK: createSortKey(page)
+                }
+            ]
+        });
+
+        const elasticsearchEntityBatch = createEntityWriteBatch({
+            entity: esEntity,
+            delete: [
+                {
+                    PK: createPartitionKey(page),
+                    SK: createPublishedSortKey()
+                }
+            ]
+        });
         /*
          * If we are unpublishing the latest revision, let's also update the latest revision entry's status in ES.
          */
         if (latestPage.id === page.id) {
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    TYPE: createLatestType(),
-                    PK: createPartitionKey(page),
-                    SK: createLatestSortKey()
-                })
-            );
-            esItems.push(
-                esEntity.putBatch({
-                    PK: createPartitionKey(page),
-                    SK: createLatestSortKey(),
-                    index: configurations.es(page).index,
-                    data: getESLatestPageData(plugins, page)
-                })
-            );
-        }
+            entityBatch.put({
+                ...page,
+                TYPE: createLatestType(),
+                PK: createPartitionKey(page),
+                SK: createLatestSortKey()
+            });
 
-        esItems.push(
-            esEntity.deleteBatch({
+            elasticsearchEntityBatch.put({
                 PK: createPartitionKey(page),
-                SK: createPublishedSortKey()
-            })
-        );
+                SK: createLatestSortKey(),
+                index: configurations.es(page).index,
+                data: getESLatestPageData(plugins, page)
+            });
+        }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update all the page records when unpublishing.",
                 ex.code || "UPDATE_RECORDS_ERROR"
             );
         }
-        /**
-         * No need to go further if no Elasticsearch items to be applied.
-         */
-        if (esItems.length === 0) {
-            return page;
-        }
+
         try {
-            await batchWriteAll({
-                table: esEntity.table,
-                items: esItems
-            });
+            await elasticsearchEntityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message ||
diff --git a/packages/api-page-builder-so-ddb/src/operations/blockCategory/dataLoader.ts b/packages/api-page-builder-so-ddb/src/operations/blockCategory/dataLoader.ts
index a8112be7e3..cd030e6a91 100644
--- a/packages/api-page-builder-so-ddb/src/operations/blockCategory/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb/src/operations/blockCategory/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { BlockCategory } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb/src/operations/category/dataLoader.ts b/packages/api-page-builder-so-ddb/src/operations/category/dataLoader.ts
index 2c9ebc9c70..661b32359d 100644
--- a/packages/api-page-builder-so-ddb/src/operations/category/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb/src/operations/category/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { Category } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb/src/operations/pageBlock/dataLoader.ts b/packages/api-page-builder-so-ddb/src/operations/pageBlock/dataLoader.ts
index c9505ba785..b3614d766f 100644
--- a/packages/api-page-builder-so-ddb/src/operations/pageBlock/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb/src/operations/pageBlock/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { PageBlock } from "@webiny/api-page-builder/types";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
diff --git a/packages/api-page-builder-so-ddb/src/operations/pageTemplate/dataLoader.ts b/packages/api-page-builder-so-ddb/src/operations/pageTemplate/dataLoader.ts
index 32437cbacc..248b6ffe12 100644
--- a/packages/api-page-builder-so-ddb/src/operations/pageTemplate/dataLoader.ts
+++ b/packages/api-page-builder-so-ddb/src/operations/pageTemplate/dataLoader.ts
@@ -1,5 +1,5 @@
 import DataLoader from "dataloader";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
+import { batchReadAll } from "@webiny/db-dynamodb";
 import { PageTemplate } from "@webiny/api-page-builder/types";
 import { Entity } from "@webiny/db-dynamodb/toolbox";
 import { createPrimaryPK } from "./keys";
diff --git a/packages/api-page-builder-so-ddb/src/operations/pages/index.ts b/packages/api-page-builder-so-ddb/src/operations/pages/index.ts
index f2619b1fdb..1938bace62 100644
--- a/packages/api-page-builder-so-ddb/src/operations/pages/index.ts
+++ b/packages/api-page-builder-so-ddb/src/operations/pages/index.ts
@@ -1,6 +1,5 @@
 import WebinyError from "@webiny/error";
-import lodashGet from "lodash/get";
-import {
+import type {
     Page,
     PageStorageOperations,
     PageStorageOperationsCreateFromParams,
@@ -18,21 +17,21 @@ import {
     PageStorageOperationsUpdateParams
 } from "@webiny/api-page-builder/types";
 import { getClean } from "@webiny/db-dynamodb/utils/get";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
 import { cleanupItem } from "@webiny/db-dynamodb/utils/cleanup";
+import type { QueryAllParams } from "@webiny/db-dynamodb";
 import {
-    DbItem,
+    createEntityWriteBatch,
+    decodeCursor,
+    encodeCursor,
+    filterItems,
     queryAll,
-    QueryAllParams,
     queryOne,
-    queryOneClean
-} from "@webiny/db-dynamodb/utils/query";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
-import { filterItems } from "@webiny/db-dynamodb/utils/filter";
-import { sortItems } from "@webiny/db-dynamodb/utils/sort";
-import { decodeCursor, encodeCursor } from "@webiny/db-dynamodb/utils/cursor";
+    queryOneClean,
+    sortItems
+} from "@webiny/db-dynamodb";
 import { PageDynamoDbFieldPlugin } from "~/plugins/definitions/PageDynamoDbFieldPlugin";
-import { PluginsContainer } from "@webiny/plugins";
+import type { PluginsContainer } from "@webiny/plugins";
 import {
     createLatestPartitionKey,
     createLatestSortKey,
@@ -105,25 +104,26 @@ export const createPageStorageOperations = (
          * - latest
          * - revision
          */
-        const items = [
-            entity.putBatch({
-                ...page,
-                titleLC,
-                ...latestKeys,
-                TYPE: createLatestType()
-            }),
-            entity.putBatch({
-                ...page,
-                titleLC,
-                ...revisionKeys,
-                TYPE: createRevisionType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    titleLC,
+                    ...latestKeys,
+                    TYPE: createLatestType()
+                },
+                {
+                    ...page,
+                    titleLC,
+                    ...revisionKeys,
+                    TYPE: createRevisionType()
+                }
+            ]
+        });
+
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             return page;
         } catch (ex) {
             throw new WebinyError(
@@ -154,24 +154,24 @@ export const createPageStorageOperations = (
          * - latest
          * - revision
          */
-        const items = [
-            entity.putBatch({
-                ...page,
-                ...latestKeys,
-                TYPE: createLatestType()
-            }),
-            entity.putBatch({
-                ...page,
-                ...revisionKeys,
-                TYPE: createRevisionType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    ...latestKeys,
+                    TYPE: createLatestType()
+                },
+                {
+                    ...page,
+                    ...revisionKeys,
+                    TYPE: createRevisionType()
+                }
+            ]
+        });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             return page;
         } catch (ex) {
             throw new WebinyError(
@@ -211,33 +211,32 @@ export const createPageStorageOperations = (
          * - revision
          * - latest if this is the latest
          */
-        const items = [
-            entity.putBatch({
-                ...page,
-                titleLC,
-                ...revisionKeys,
-                TYPE: createRevisionType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    titleLC,
+                    ...revisionKeys,
+                    TYPE: createRevisionType()
+                }
+            ]
+        });
+
         /**
          * Latest if it is the one.
          */
         if (latestPage && latestPage.id === page.id) {
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    titleLC,
-                    ...latestKeys,
-                    TYPE: createLatestType()
-                })
-            );
+            entityBatch.put({
+                ...page,
+                titleLC,
+                ...latestKeys,
+                TYPE: createLatestType()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
 
             return page;
         } catch (ex) {
@@ -280,9 +279,13 @@ export const createPageStorageOperations = (
          * We need to update
          * - latest, if it exists, with previous record
          */
-        const items = [entity.deleteBatch(revisionKeys)];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [revisionKeys]
+        });
+
         if (publishedPage && publishedPage.id === page.id) {
-            items.push(entity.deleteBatch(publishedKeys));
+            entityBatch.delete(publishedKeys);
         }
         let previousLatestPage: Page | null = null;
         if (latestPage && latestPage.id === page.id) {
@@ -296,21 +299,17 @@ export const createPageStorageOperations = (
                 }
             });
             if (previousLatestRecord) {
-                items.push(
-                    entity.putBatch({
-                        ...previousLatestRecord,
-                        ...latestKeys,
-                        TYPE: createLatestType()
-                    })
-                );
+                entityBatch.put({
+                    ...previousLatestRecord,
+                    ...latestKeys,
+                    TYPE: createLatestType()
+                });
+
                 previousLatestPage = cleanupItem(entity, previousLatestRecord);
             }
         }
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not batch write all the page records.",
@@ -347,11 +346,14 @@ export const createPageStorageOperations = (
             SK: createPublishedSortKey(page)
         };
 
-        const items = [entity.deleteBatch(latestKeys)];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: [latestKeys]
+        });
 
-        let revisions: DbItem<Page>[];
+        let revisions: Awaited<ReturnType<typeof queryAll<Page>>> = [];
         try {
-            revisions = await queryAll(queryAllParams);
+            revisions = await queryAll<Page>(queryAllParams);
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not query for all revisions of the page.",
@@ -369,22 +371,17 @@ export const createPageStorageOperations = (
          */
         for (const revision of revisions) {
             if (!deletedPublishedRecord && revision.status === "published") {
-                items.push(entity.deleteBatch(publishedKeys));
+                entityBatch.delete(publishedKeys);
                 deletedPublishedRecord = true;
             }
-            items.push(
-                entity.deleteBatch({
-                    PK: revision.PK,
-                    SK: revision.SK
-                })
-            );
+            entityBatch.delete({
+                PK: revision.PK,
+                SK: revision.SK
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete all the page records.",
@@ -420,22 +417,23 @@ export const createPageStorageOperations = (
         /**
          * Update the given revision of the page.
          */
-        const items = [
-            entity.putBatch({
-                ...page,
-                ...revisionKeys,
-                TYPE: createRevisionType()
-            })
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    ...revisionKeys,
+                    TYPE: createRevisionType()
+                }
+            ]
+        });
 
         if (latestPage.id === page.id) {
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    ...latestKeys,
-                    TYPE: createLatestType()
-                })
-            );
+            entityBatch.put({
+                ...page,
+                ...latestKeys,
+                TYPE: createLatestType()
+            });
         }
         /**
          * If we already have a published revision, and it's not the revision being published:
@@ -446,31 +444,24 @@ export const createPageStorageOperations = (
                 PK: createRevisionPartitionKey(publishedPage),
                 SK: createRevisionSortKey(publishedPage)
             };
-            items.push(
-                entity.putBatch({
-                    ...publishedPage,
-                    status: "unpublished",
-                    ...publishedRevisionKeys,
-                    TYPE: createRevisionType()
-                })
-            );
+            entityBatch.put({
+                ...publishedPage,
+                status: "unpublished",
+                ...publishedRevisionKeys,
+                TYPE: createRevisionType()
+            });
         }
 
-        items.push(
-            entity.putBatch({
-                ...page,
-                ...publishedKeys,
-                GSI1_PK: createPathPartitionKey(page),
-                GSI1_SK: page.path,
-                TYPE: createPublishedType()
-            })
-        );
+        entityBatch.put({
+            ...page,
+            ...publishedKeys,
+            GSI1_PK: createPathPartitionKey(page),
+            GSI1_SK: page.path,
+            TYPE: createPublishedType()
+        });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update all the page records when publishing.",
@@ -504,30 +495,28 @@ export const createPageStorageOperations = (
             SK: createPublishedSortKey(page)
         };
 
-        const items = [
-            entity.putBatch({
-                ...page,
-                ...revisionKeys,
-                TYPE: createRevisionType()
-            }),
-            entity.deleteBatch(publishedKeys)
-        ];
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            put: [
+                {
+                    ...page,
+                    ...revisionKeys,
+                    TYPE: createRevisionType()
+                }
+            ],
+            delete: [publishedKeys]
+        });
 
         if (latestPage.id === page.id) {
-            items.push(
-                entity.putBatch({
-                    ...page,
-                    ...latestKeys,
-                    TYPE: createLatestType()
-                })
-            );
+            entityBatch.put({
+                ...page,
+                ...latestKeys,
+                TYPE: createLatestType()
+            });
         }
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not update all the page records when unpublishing.",
@@ -819,7 +808,7 @@ export const createPageStorageOperations = (
             options
         };
 
-        let pages: DbItem<Page>[] = [];
+        let pages: Awaited<ReturnType<typeof queryAll<Page>>> = [];
         try {
             pages = await queryAll<Page>(queryAllParams);
         } catch (ex) {
@@ -833,22 +822,20 @@ export const createPageStorageOperations = (
             );
         }
 
-        const tags = pages.reduce((collection, page) => {
-            let list: string[] = lodashGet(page, "settings.general.tags") as unknown as string[];
-            if (!list || list.length === 0) {
-                return collection;
+        const tags = new Set<string>();
+        for (const page of pages) {
+            let tagList = page.settings?.general?.tags;
+            if (!tagList?.length) {
+                continue;
             } else if (where.search) {
                 const re = new RegExp(where.search, "i");
-                list = list.filter(t => t.match(re) !== null);
+                tagList = tagList.filter(tag => !!tag && tag.match(re) !== null);
             }
-
-            for (const t of list) {
-                collection[t] = undefined;
+            for (const tag of tagList) {
+                tags.add(tag);
             }
-            return collection;
-        }, {} as Record<string, string | undefined>);
-
-        return Object.keys(tags);
+        }
+        return Array.from(tags);
     };
 
     return {
diff --git a/packages/api-prerendering-service-so-ddb/src/operations/queueJob.ts b/packages/api-prerendering-service-so-ddb/src/operations/queueJob.ts
index 3499661f22..f8371e1c7e 100644
--- a/packages/api-prerendering-service-so-ddb/src/operations/queueJob.ts
+++ b/packages/api-prerendering-service-so-ddb/src/operations/queueJob.ts
@@ -1,14 +1,14 @@
 import WebinyError from "@webiny/error";
-import {
+import type {
     PrerenderingServiceQueueJobStorageOperations,
     PrerenderingServiceStorageOperationsCreateQueueJobParams,
     PrerenderingServiceStorageOperationsDeleteQueueJobsParams,
     QueueJob
 } from "@webiny/api-prerendering-service/types";
-import { Entity } from "@webiny/db-dynamodb/toolbox";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
-import { queryAllClean, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
-import { put } from "@webiny/db-dynamodb";
+import type { Entity } from "@webiny/db-dynamodb/toolbox";
+import { createEntityWriteBatch, put } from "@webiny/db-dynamodb";
+import type { QueryAllParams } from "@webiny/db-dynamodb/utils/query";
+import { queryAllClean } from "@webiny/db-dynamodb/utils/query";
 
 export interface CreateQueueJobStorageOperationsParams {
     entity: Entity<any>;
@@ -89,18 +89,18 @@ export const createQueueJobStorageOperations = (
     ) => {
         const { queueJobs } = params;
 
-        const items = queueJobs.map(job => {
-            return entity.deleteBatch({
-                PK: createQueueJobPartitionKey(),
-                SK: createQueueJobSortKey(job.id)
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity,
+            delete: queueJobs.map(job => {
+                return {
+                    PK: createQueueJobPartitionKey(),
+                    SK: createQueueJobSortKey(job.id)
+                };
+            })
         });
 
         try {
-            await batchWriteAll({
-                table: entity.table,
-                items
-            });
+            await entityBatch.execute();
             return queueJobs;
         } catch (ex) {
             throw new WebinyError(
diff --git a/packages/api-prerendering-service-so-ddb/src/operations/render.ts b/packages/api-prerendering-service-so-ddb/src/operations/render.ts
index 07565470dc..b9fb75a89b 100644
--- a/packages/api-prerendering-service-so-ddb/src/operations/render.ts
+++ b/packages/api-prerendering-service-so-ddb/src/operations/render.ts
@@ -1,5 +1,5 @@
 import WebinyError from "@webiny/error";
-import {
+import type {
     PrerenderingServiceRenderStorageOperations,
     PrerenderingServiceStorageOperationsCreateRenderParams,
     PrerenderingServiceStorageOperationsCreateTagPathLinksParams,
@@ -12,18 +12,24 @@ import {
     Tag,
     TagPathLink
 } from "@webiny/api-prerendering-service/types";
-import { Entity, EntityQueryOptions } from "@webiny/db-dynamodb/toolbox";
-import { get } from "@webiny/db-dynamodb/utils/get";
-import { queryAll, queryAllClean, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
-import { cleanupItem, cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
-import { DataContainer } from "~/types";
-import { deleteItem, put } from "@webiny/db-dynamodb";
+import type { Entity, EntityQueryOptions } from "@webiny/db-dynamodb/toolbox";
+import {
+    batchReadAll,
+    cleanupItem,
+    cleanupItems,
+    createEntityWriteBatch,
+    deleteItem,
+    get,
+    put,
+    queryAll,
+    queryAllClean
+} from "@webiny/db-dynamodb";
+import type { QueryAllParams } from "@webiny/db-dynamodb";
+import type { DataContainer } from "~/types";
 
 export interface CreateRenderStorageOperationsParams {
-    entity: Entity<any>;
-    tagPathLinkEntity: Entity<any>;
+    entity: Entity;
+    tagPathLinkEntity: Entity;
 }
 
 export interface CreateTagPathLinkPartitionKeyParams {
@@ -276,29 +282,29 @@ export const createRenderStorageOperations = (
     ) => {
         const { tagPathLinks } = params;
 
-        const items = tagPathLinks.map(item => {
-            return tagPathLinkEntity.putBatch({
-                data: item,
-                TYPE: createTagPathLinkType(),
-                PK: createTagPathLinkPartitionKey({
-                    tenant: item.tenant,
-                    tag: item,
-                    path: item.path
-                }),
-                SK: createTagPathLinkSortKey({
-                    tag: item,
-                    path: item.path
-                }),
-                GSI1_PK: createTagPathLinkGSI1PartitionKey({ tag: item, tenant: item.tenant }),
-                GSI1_SK: createTagPathLinkGSI1SortKey({ tag: item, path: item.path })
-            });
+        const tagPathLinksBatch = createEntityWriteBatch({
+            entity: tagPathLinkEntity,
+            put: tagPathLinks.map(item => {
+                return {
+                    data: item,
+                    TYPE: createTagPathLinkType(),
+                    PK: createTagPathLinkPartitionKey({
+                        tenant: item.tenant,
+                        tag: item,
+                        path: item.path
+                    }),
+                    SK: createTagPathLinkSortKey({
+                        tag: item,
+                        path: item.path
+                    }),
+                    GSI1_PK: createTagPathLinkGSI1PartitionKey({ tag: item, tenant: item.tenant }),
+                    GSI1_SK: createTagPathLinkGSI1SortKey({ tag: item, path: item.path })
+                };
+            })
         });
 
         try {
-            await batchWriteAll({
-                table: tagPathLinkEntity.table,
-                items
-            });
+            await tagPathLinksBatch.execute();
             return tagPathLinks;
         } catch (ex) {
             throw new WebinyError(
@@ -315,25 +321,26 @@ export const createRenderStorageOperations = (
         params: PrerenderingServiceStorageOperationsDeleteTagPathLinksParams
     ): Promise<void> => {
         const { tenant, tags, path } = params;
-        const items = tags.map(tag => {
-            return tagPathLinkEntity.deleteBatch({
-                PK: createTagPathLinkPartitionKey({
-                    tag,
-                    tenant,
-                    path
-                }),
-                SK: createTagPathLinkSortKey({
-                    tag,
-                    path
-                })
-            });
+
+        const tagPathLinksBatch = createEntityWriteBatch({
+            entity: tagPathLinkEntity,
+            delete: tags.map(tag => {
+                return {
+                    PK: createTagPathLinkPartitionKey({
+                        tag,
+                        tenant,
+                        path
+                    }),
+                    SK: createTagPathLinkSortKey({
+                        tag,
+                        path
+                    })
+                };
+            })
         });
 
         try {
-            await batchWriteAll({
-                table: tagPathLinkEntity.table,
-                items
-            });
+            await tagPathLinksBatch.execute();
         } catch (ex) {
             throw new WebinyError(
                 ex.message || "Could not delete tagPathLink records.",
diff --git a/packages/api-security-so-ddb/src/index.ts b/packages/api-security-so-ddb/src/index.ts
index c900f2e926..628e339a5c 100644
--- a/packages/api-security-so-ddb/src/index.ts
+++ b/packages/api-security-so-ddb/src/index.ts
@@ -1,5 +1,5 @@
 import { ENTITIES, SecurityStorageParams } from "~/types";
-import {
+import type {
     ApiKey,
     Group,
     ListTenantLinksByTypeParams,
@@ -18,16 +18,19 @@ import {
     createTeamEntity,
     createTenantLinkEntity
 } from "~/definitions/entities";
-import { cleanupItem, cleanupItems } from "@webiny/db-dynamodb/utils/cleanup";
+import type { QueryOneParams } from "@webiny/db-dynamodb";
 import {
+    cleanupItem,
+    cleanupItems,
+    createEntityWriteBatch,
+    deleteItem,
+    getClean,
+    put,
     queryAll,
     queryAllClean,
     queryOneClean,
-    QueryOneParams
-} from "@webiny/db-dynamodb/utils/query";
-import { sortItems } from "@webiny/db-dynamodb/utils/sort";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
-import { deleteItem, getClean, put } from "@webiny/db-dynamodb";
+    sortItems
+} from "@webiny/db-dynamodb";
 
 const reservedFields: string[] = ["PK", "SK", "index", "data"];
 
@@ -187,17 +190,20 @@ export const createStorageOperations = (
             }
         },
         async createTenantLinks(links): Promise<void> {
-            const items = links.map(link => {
-                return entities.tenantLinks.putBatch({
-                    PK: `IDENTITY#${link.identity}`,
-                    SK: `LINK#T#${link.tenant}`,
-                    GSI1_PK: `T#${link.tenant}`,
-                    GSI1_SK: `TYPE#${link.type}#IDENTITY#${link.identity}`,
-                    ...cleanupItem(entities.tenantLinks, link)
-                });
+            const batchWrite = createEntityWriteBatch({
+                entity: entities.tenantLinks,
+                put: links.map(link => {
+                    return {
+                        PK: `IDENTITY#${link.identity}`,
+                        SK: `LINK#T#${link.tenant}`,
+                        GSI1_PK: `T#${link.tenant}`,
+                        GSI1_SK: `TYPE#${link.type}#IDENTITY#${link.identity}`,
+                        ...cleanupItem(entities.tenantLinks, link)
+                    };
+                })
             });
 
-            await batchWriteAll({ table, items });
+            await batchWrite.execute();
         },
         async deleteApiKey({ apiKey }) {
             const keys = createApiKeyKeys(apiKey);
@@ -248,14 +254,16 @@ export const createStorageOperations = (
             }
         },
         async deleteTenantLinks(links): Promise<void> {
-            const items = links.map(link => {
-                return entities.tenantLinks.deleteBatch({
-                    PK: `IDENTITY#${link.identity}`,
-                    SK: `LINK#T#${link.tenant}`
-                });
+            const batchWrite = createEntityWriteBatch({
+                entity: entities.tenantLinks,
+                delete: links.map(link => {
+                    return {
+                        PK: `IDENTITY#${link.identity}`,
+                        SK: `LINK#T#${link.tenant}`
+                    };
+                })
             });
-
-            await batchWriteAll({ table, items });
+            await batchWrite.execute();
         },
         async getApiKey({ id, tenant }) {
             const keys = createApiKeyKeys({ id, tenant });
@@ -586,17 +594,20 @@ export const createStorageOperations = (
             }
         },
         async updateTenantLinks(links): Promise<void> {
-            const items = links.map(link => {
-                return entities.tenantLinks.putBatch({
-                    PK: `IDENTITY#${link.identity}`,
-                    SK: `LINK#T#${link.tenant}`,
-                    GSI1_PK: `T#${link.tenant}`,
-                    GSI1_SK: `TYPE#${link.type}#IDENTITY#${link.identity}`,
-                    ...cleanupItem(entities.tenantLinks, link)
-                });
+            const batchWrite = createEntityWriteBatch({
+                entity: entities.tenantLinks,
+                put: links.map(link => {
+                    return {
+                        PK: `IDENTITY#${link.identity}`,
+                        SK: `LINK#T#${link.tenant}`,
+                        GSI1_PK: `T#${link.tenant}`,
+                        GSI1_SK: `TYPE#${link.type}#IDENTITY#${link.identity}`,
+                        ...cleanupItem(entities.tenantLinks, link)
+                    };
+                })
             });
 
-            await batchWriteAll({ table, items });
+            await batchWrite.execute();
         }
     };
 };
diff --git a/packages/api-tenancy-so-ddb/src/index.ts b/packages/api-tenancy-so-ddb/src/index.ts
index 9e8a3cca18..a81ea07bf6 100644
--- a/packages/api-tenancy-so-ddb/src/index.ts
+++ b/packages/api-tenancy-so-ddb/src/index.ts
@@ -1,5 +1,10 @@
-import { batchReadAll } from "@webiny/db-dynamodb/utils/batchRead";
-import { batchWriteAll } from "@webiny/db-dynamodb/utils/batchWrite";
+import {
+    batchReadAll,
+    createEntityWriteBatch,
+    createTableWriteBatch,
+    getClean,
+    put
+} from "@webiny/db-dynamodb";
 import { queryAll, QueryAllParams } from "@webiny/db-dynamodb/utils/query";
 import WebinyError from "@webiny/error";
 import { createTable } from "~/definitions/table";
@@ -7,8 +12,7 @@ import { createTenantEntity } from "~/definitions/tenantEntity";
 import { createSystemEntity } from "~/definitions/systemEntity";
 import { createDomainEntity } from "~/definitions/domainEntity";
 import { CreateTenancyStorageOperations, ENTITIES } from "~/types";
-import { ListTenantsParams, System, Tenant, TenantDomain } from "@webiny/api-tenancy/types";
-import { getClean, put } from "@webiny/db-dynamodb";
+import type { ListTenantsParams, System, Tenant, TenantDomain } from "@webiny/api-tenancy/types";
 
 interface TenantDomainRecord {
     PK: string;
@@ -181,20 +185,24 @@ export const createStorageOperations: CreateTenancyStorageOperations = params =>
             };
 
             try {
-                const items: any[] = [
-                    entities.tenants.putBatch({ TYPE: "tenancy.tenant", ...keys, data })
-                ];
-                const newDomains = createNewDomainsRecords(data);
-
-                newDomains.forEach(record => {
-                    items.push(entities.domains.putBatch(record));
+                const tableWrite = createTableWriteBatch({
+                    table: tableInstance
                 });
 
-                await batchWriteAll({
-                    table: tableInstance,
-                    items: items
+                tableWrite.put(entities.tenants, {
+                    TYPE: "tenancy.tenant",
+                    ...keys,
+                    data
                 });
 
+                const newDomains = createNewDomainsRecords(data);
+
+                for (const domain of newDomains) {
+                    tableWrite.put(entities.domains, domain);
+                }
+
+                await tableWrite.execute();
+
                 return data as TTenant;
             } catch (err) {
                 throw WebinyError.from(err, {
@@ -215,8 +223,6 @@ export const createStorageOperations: CreateTenancyStorageOperations = params =>
                 GSI1_SK: `T#${data.parent}#${data.createdOn}`
             };
 
-            const items: any[] = [entities.tenants.putBatch({ ...keys, data })];
-
             const existingDomains = await queryAll<TenantDomain>({
                 entity: entities.domains,
                 partitionKey: "DOMAINS",
@@ -228,31 +234,30 @@ export const createStorageOperations: CreateTenancyStorageOperations = params =>
 
             const newDomains = createNewDomainsRecords(data, existingDomains);
 
+            const tableWrite = createTableWriteBatch({
+                table: tableInstance
+            });
+
+            tableWrite.put(entities.tenants, { ...keys, data });
+
             // Delete domains that are in the DB but are NOT in the settings.
-            const deleteDomains = [];
+
             for (const { fqdn } of existingDomains) {
-                if (!data.settings.domains.find(d => d.fqdn === fqdn)) {
-                    deleteDomains.push({
-                        PK: `DOMAIN#${fqdn}`,
-                        SK: `A`
-                    });
+                if (data.settings.domains.some(d => d.fqdn === fqdn)) {
+                    continue;
                 }
-            }
-
-            try {
-                newDomains.forEach(record => {
-                    items.push(entities.domains.putBatch(record));
-                });
-
-                deleteDomains.forEach(item => {
-                    items.push(entities.domains.deleteBatch(item));
+                tableWrite.delete(entities.domains, {
+                    PK: `DOMAIN#${fqdn}`,
+                    SK: `A`
                 });
+            }
 
-                await batchWriteAll({
-                    table: tableInstance,
-                    items: items
-                });
+            for (const domain of newDomains) {
+                tableWrite.put(entities.domains, domain);
+            }
 
+            try {
+                await tableWrite.execute();
                 return data as TTenant;
             } catch (err) {
                 throw WebinyError.from(err, {
@@ -273,27 +278,25 @@ export const createStorageOperations: CreateTenancyStorageOperations = params =>
                 }
             });
 
-            const items = [
-                entities.tenants.deleteBatch({
-                    PK: `T#${id}`,
-                    SK: "A"
-                })
-            ];
-
-            existingDomains.forEach(domain => {
-                items.push(
-                    entities.domains.deleteBatch({
-                        PK: domain.PK,
-                        SK: domain.SK
-                    })
-                );
+            const batchWrite = createEntityWriteBatch({
+                entity: entities.tenants,
+                delete: [
+                    {
+                        PK: `T#${id}`,
+                        SK: "A"
+                    }
+                ]
             });
 
+            for (const domain of existingDomains) {
+                batchWrite.delete({
+                    PK: domain.PK,
+                    SK: domain.SK
+                });
+            }
+
             // Delete tenant and domain items
-            await batchWriteAll({
-                table: tableInstance,
-                items
-            });
+            await batchWrite.execute();
         }
     };
 };
diff --git a/packages/db-dynamodb/README.md b/packages/db-dynamodb/README.md
index 7990665227..b6bbb74300 100644
--- a/packages/db-dynamodb/README.md
+++ b/packages/db-dynamodb/README.md
@@ -14,6 +14,86 @@ For more information, please visit
 yarn add @webiny/db-dynamodb
 ```
 
+### Helper classes
+We have some classes that ease the use of dynamodb-toolbox.
+#### [Table](./src/utils/table/Table.ts)
+```typescript
+import { createTable } from "@webiny/db-dynamodb";
+
+const table = createTable({...params});
+const writer = table.createWriter(); // see TableWriteBatch
+const reader = table.createReader(); // see TableReadBatch
+
+const result = await table.scan({...params}); // see scan
+```
+
+#### [Entity](./src/utils/entity/Entity.ts)
+```typescript
+
+import { createEntity } from "@webiny/db-dynamodb";
+
+const entity = createEntity({...params});
+const writer = entity.createWriter(); // see EntityWriteBatch
+const reader = entity.createReader(); // see EntityReadBatch
+const tableWriter = entity.createTableWriter(); // see TableWriteBatch
+
+const getResult = await entity.get({...params}); // see get
+const getCleanResult = await entity.getClean({...params}); // see get
+const queryAllResult = await entity.queryAll({...params}); // see queryAllClean
+const queryOneResult = await entity.queryOne({...params}); // see queryOneClean
+const putResult = await entity.put({...params}); // see put
+
+```
+
+#### [EntityWriteBatch](./src/utils/entity/EntityWriteBatch.ts)
+```typescript
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
+
+const writer = createEntityWriteBatch({...params});
+
+writer.put({...item});
+writer.delete({...keys});
+writer.delete({...moreKeys});
+
+await writer.execute();
+```
+
+#### [EntityReadBatch](./src/utils/entity/EntityReadBatch.ts)
+```typescript
+import { createEntityReadBatch } from "@webiny/db-dynamodb";
+
+const reader = createEntityReadBatch({...params});
+
+reader.get({...keys});
+reader.get({...moreKeys});
+
+const result = await reader.execute();
+```
+#### [TableWriteBatch](./src/utils/table/TableWriteBatch.ts)
+```typescript
+import { createTableWriteBatch } from "@webiny/db-dynamodb";
+
+const writer = createTableWriteBatch({...params});
+
+writer.put(entity, {...item});
+writer.delete(entity, {...keys});
+writer.delete(entity, {...moreKeys});
+
+await writer.execute();
+```
+#### [TableReadBatch](./src/utils/table/TableReadBatch.ts)
+```typescript
+import {createTableReadBatch} from "@webiny/db-dynamodb";
+
+const reader = createTableReadBatch({...params});
+
+writer.get(entity, {...keys});
+writer.get(entity, {...moreKeys});
+
+const result = await reader.execute();
+```
+
+
 
 ### Helper functions
 We have a number [helper](./src/utils) functions that ease the use of either dynamodb-toolbox, filtering, sorting or just creating proper response.
@@ -64,4 +144,4 @@ This function accepts items (records) to be filtered, a definition of fields to
 #### [sort](./src/utils/sort.ts)
 Sort the DynamoDB records by given sort condition.
 
-This function accepts items (records) to be sorted, sort options (eg. createdBy_ASC, id_DESC, etc.) and a definitions of fields to sort by (not required by default if no field modification is required).
\ No newline at end of file
+This function accepts items (records) to be sorted, sort options (eg. createdBy_ASC, id_DESC, etc.) and a definitions of fields to sort by (not required by default if no field modification is required).
diff --git a/packages/db-dynamodb/package.json b/packages/db-dynamodb/package.json
index 141f7bb73e..bfe0e7d353 100644
--- a/packages/db-dynamodb/package.json
+++ b/packages/db-dynamodb/package.json
@@ -14,7 +14,6 @@
     "@webiny/aws-sdk": "0.0.0",
     "@webiny/db": "0.0.0",
     "@webiny/error": "0.0.0",
-    "@webiny/handler-db": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "@webiny/utils": "0.0.0",
     "date-fns": "^2.22.1",
diff --git a/packages/db-dynamodb/src/index.ts b/packages/db-dynamodb/src/index.ts
index 3aa680435a..e56b1e1455 100644
--- a/packages/db-dynamodb/src/index.ts
+++ b/packages/db-dynamodb/src/index.ts
@@ -1,6 +1,6 @@
 import { default as DynamoDbDriver } from "./DynamoDbDriver";
 
 export * from "./utils";
-export { DbItem } from "./types";
+export type { DbItem } from "./types";
 
 export { DynamoDbDriver };
diff --git a/packages/db-dynamodb/src/toolbox.ts b/packages/db-dynamodb/src/toolbox.ts
index 22b943165e..7d90fb1c65 100644
--- a/packages/db-dynamodb/src/toolbox.ts
+++ b/packages/db-dynamodb/src/toolbox.ts
@@ -6,6 +6,8 @@ export type {
     TableConstructor
 } from "dynamodb-toolbox/dist/cjs/classes/Table";
 export type {
+    Readonly,
+    EntityConstructor,
     AttributeDefinition,
     EntityQueryOptions,
     AttributeDefinitions
diff --git a/packages/db-dynamodb/src/utils/batchRead.ts b/packages/db-dynamodb/src/utils/batch/batchRead.ts
similarity index 100%
rename from packages/db-dynamodb/src/utils/batchRead.ts
rename to packages/db-dynamodb/src/utils/batch/batchRead.ts
diff --git a/packages/db-dynamodb/src/utils/batchWrite.ts b/packages/db-dynamodb/src/utils/batch/batchWrite.ts
similarity index 79%
rename from packages/db-dynamodb/src/utils/batchWrite.ts
rename to packages/db-dynamodb/src/utils/batch/batchWrite.ts
index 3bd50ef0e0..17f83d4277 100644
--- a/packages/db-dynamodb/src/utils/batchWrite.ts
+++ b/packages/db-dynamodb/src/utils/batch/batchWrite.ts
@@ -1,31 +1,12 @@
 import lodashChunk from "lodash/chunk";
 import { TableDef } from "~/toolbox";
-import { WriteRequest } from "@webiny/aws-sdk/client-dynamodb";
-
-export interface BatchWriteItem {
-    [key: string]: WriteRequest;
-}
+import { BatchWriteItem, BatchWriteResponse, BatchWriteResult } from "./types";
 
 export interface BatchWriteParams {
     table: TableDef | undefined;
     items: BatchWriteItem[];
 }
 
-export interface BatchWriteResponse {
-    next?: () => Promise<BatchWriteResponse>;
-    $metadata: {
-        httpStatusCode: number;
-        requestId: string;
-        attempts: number;
-        totalRetryDelay: number;
-    };
-    UnprocessedItems?: {
-        [table: string]: WriteRequest[];
-    };
-}
-
-export type BatchWriteResult = BatchWriteResponse[];
-
 const hasUnprocessedItems = (result: BatchWriteResponse): boolean => {
     if (typeof result.next !== "function") {
         return false;
diff --git a/packages/db-dynamodb/src/utils/batch/index.ts b/packages/db-dynamodb/src/utils/batch/index.ts
new file mode 100644
index 0000000000..cc976f7463
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/batch/index.ts
@@ -0,0 +1,3 @@
+export * from "./batchRead";
+export * from "./batchWrite";
+export * from "./types";
diff --git a/packages/db-dynamodb/src/utils/batch/types.ts b/packages/db-dynamodb/src/utils/batch/types.ts
new file mode 100644
index 0000000000..f7b3ad9984
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/batch/types.ts
@@ -0,0 +1,30 @@
+import type { WriteRequest } from "@webiny/aws-sdk/client-dynamodb";
+
+export interface BatchWriteResponse {
+    next?: () => Promise<BatchWriteResponse>;
+    $metadata: {
+        httpStatusCode: number;
+        requestId: string;
+        attempts: number;
+        totalRetryDelay: number;
+    };
+    UnprocessedItems?: {
+        [table: string]: WriteRequest[];
+    };
+}
+
+export type BatchWriteResult = BatchWriteResponse[];
+
+export interface IDeleteBatchItem {
+    PK: string;
+    SK: string;
+}
+
+export type IPutBatchItem<T extends Record<string, any> = Record<string, any>> = {
+    PK: string;
+    SK: string;
+} & T;
+
+export interface BatchWriteItem {
+    [key: string]: WriteRequest;
+}
diff --git a/packages/db-dynamodb/src/utils/delete.ts b/packages/db-dynamodb/src/utils/delete.ts
index 0540e39d57..b4adc394d0 100644
--- a/packages/db-dynamodb/src/utils/delete.ts
+++ b/packages/db-dynamodb/src/utils/delete.ts
@@ -1,14 +1,14 @@
 import { Entity } from "~/toolbox";
-
-interface Params {
+export interface IDeleteItemKeys {
+    PK: string;
+    SK: string;
+}
+export interface IDeleteItemParams {
     entity: Entity;
-    keys: {
-        PK: string;
-        SK: string;
-    };
+    keys: IDeleteItemKeys;
 }
 
-export const deleteItem = async (params: Params) => {
+export const deleteItem = async (params: IDeleteItemParams) => {
     const { entity, keys } = params;
 
     return await entity.delete(keys, {
diff --git a/packages/db-dynamodb/src/utils/entity/Entity.ts b/packages/db-dynamodb/src/utils/entity/Entity.ts
new file mode 100644
index 0000000000..3e056d2b01
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/Entity.ts
@@ -0,0 +1,112 @@
+import type {
+    AttributeDefinitions,
+    EntityConstructor as BaseEntityConstructor,
+    Readonly,
+    TableDef
+} from "~/toolbox";
+import { Entity as BaseEntity } from "~/toolbox";
+import type { ITableWriteBatch } from "../table/types";
+import type {
+    IEntity,
+    IEntityQueryAllParams,
+    IEntityQueryOneParams,
+    IEntityReadBatch,
+    IEntityWriteBatch
+} from "./types";
+import type { IPutParamsItem } from "../put";
+import { put } from "../put";
+import type { GetRecordParamsKeys } from "../get";
+import { get, getClean } from "../get";
+import type { IDeleteItemKeys } from "../delete";
+import { deleteItem } from "../delete";
+import { createEntityReadBatch } from "./EntityReadBatch";
+import { createEntityWriteBatch } from "./EntityWriteBatch";
+import { createTableWriteBatch } from "~/utils/table/TableWriteBatch";
+import { queryAllClean, queryOneClean } from "../query";
+
+export type EntityConstructor<
+    T extends Readonly<AttributeDefinitions> = Readonly<AttributeDefinitions>
+> = BaseEntityConstructor<
+    TableDef,
+    string,
+    true,
+    true,
+    true,
+    "created",
+    "modified",
+    "entity",
+    false,
+    T
+>;
+
+export class Entity implements IEntity {
+    public readonly entity: BaseEntity;
+
+    public constructor(params: EntityConstructor) {
+        this.entity = new BaseEntity(params);
+    }
+
+    public createEntityReader(): IEntityReadBatch {
+        return createEntityReadBatch({
+            entity: this.entity
+        });
+    }
+
+    public createEntityWriter(): IEntityWriteBatch {
+        return createEntityWriteBatch({
+            entity: this.entity
+        });
+    }
+
+    public createTableWriter(): ITableWriteBatch {
+        return createTableWriteBatch({
+            table: this.entity.table as TableDef
+        });
+    }
+
+    public async put(item: IPutParamsItem): ReturnType<typeof put> {
+        return put({
+            entity: this.entity,
+            item
+        });
+    }
+
+    public async get<T>(keys: GetRecordParamsKeys): ReturnType<typeof get<T>> {
+        return get<T>({
+            entity: this.entity,
+            keys
+        });
+    }
+
+    public async getClean<T>(keys: GetRecordParamsKeys): ReturnType<typeof getClean<T>> {
+        return getClean<T>({
+            entity: this.entity,
+            keys
+        });
+    }
+
+    public async delete(keys: IDeleteItemKeys): ReturnType<typeof deleteItem> {
+        return deleteItem({
+            entity: this.entity,
+            keys
+        });
+    }
+
+    public queryOne<T>(params: IEntityQueryOneParams): Promise<T | null> {
+        return queryOneClean<T>({
+            ...params,
+            entity: this.entity
+        });
+    }
+
+    public queryAll<T>(params: IEntityQueryAllParams): Promise<T[]> {
+        return queryAllClean<T>({
+            ...params,
+            entity: this.entity
+        });
+    }
+}
+
+export const createEntity = (params: EntityConstructor): IEntity => {
+    return new Entity(params);
+};
diff --git a/packages/db-dynamodb/src/utils/entity/EntityReadBatch.ts b/packages/db-dynamodb/src/utils/entity/EntityReadBatch.ts
new file mode 100644
index 0000000000..c1101bf84b
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/EntityReadBatch.ts
@@ -0,0 +1,55 @@
+import type { IPutBatchItem } from "~/utils/batch/types";
+import type {
+    IEntityReadBatch,
+    IEntityReadBatchBuilder,
+    IEntityReadBatchBuilderGetResponse,
+    IEntityReadBatchKey
+} from "./types";
+import type { TableDef } from "~/toolbox";
+import type { Entity as ToolboxEntity } from "~/toolbox";
+import { batchReadAll } from "~/utils/batch/batchRead";
+import { GenericRecord } from "@webiny/api/types";
+import { createEntityReadBatchBuilder } from "./EntityReadBatchBuilder";
+import type { EntityOption } from "./getEntity";
+import { getEntity } from "./getEntity";
+
+export interface IEntityReadBatchParams {
+    entity: EntityOption;
+    read?: IPutBatchItem[];
+}
+
+export class EntityReadBatch implements IEntityReadBatch {
+    private readonly entity: ToolboxEntity;
+    private readonly builder: IEntityReadBatchBuilder;
+    private readonly _items: IEntityReadBatchBuilderGetResponse[] = [];
+
+    public constructor(params: IEntityReadBatchParams) {
+        this.entity = getEntity(params.entity);
+        this.builder = createEntityReadBatchBuilder(this.entity);
+        for (const item of params.read || []) {
+            this.get(item);
+        }
+    }
+    public get(input: IEntityReadBatchKey | IEntityReadBatchKey[]): void {
+        if (Array.isArray(input)) {
+            this._items.push(
+                ...input.map(item => {
+                    return this.builder.get(item);
+                })
+            );
+            return;
+        }
+        this._items.push(this.builder.get(input));
+    }
+
+    public async execute<T = GenericRecord>() {
+        return await batchReadAll<T>({
+            table: this.entity.table as TableDef,
+            items: this._items
+        });
+    }
+}
+
+export const createEntityReadBatch = (params: IEntityReadBatchParams): IEntityReadBatch => {
+    return new EntityReadBatch(params);
+};
diff --git a/packages/db-dynamodb/src/utils/entity/EntityReadBatchBuilder.ts b/packages/db-dynamodb/src/utils/entity/EntityReadBatchBuilder.ts
new file mode 100644
index 0000000000..9b72ca8ee8
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/EntityReadBatchBuilder.ts
@@ -0,0 +1,34 @@
+import type { Entity as ToolboxEntity } from "~/toolbox";
+import type {
+    IEntityReadBatchBuilder,
+    IEntityReadBatchBuilderGetResponse,
+    IEntityReadBatchKey
+} from "./types";
+import { WebinyError } from "@webiny/error";
+import { Entity } from "./Entity";
+import type { EntityOption } from "./getEntity";
+import { getEntity } from "./getEntity";
+
+export class EntityReadBatchBuilder implements IEntityReadBatchBuilder {
+    private readonly entity: ToolboxEntity;
+
+    public constructor(entity: EntityOption) {
+        this.entity = getEntity(entity);
+    }
+
+    public get(item: IEntityReadBatchKey): IEntityReadBatchBuilderGetResponse {
+        const result = this.entity.getBatch(item);
+        if (!result.Table) {
+            throw new WebinyError(`No table provided for entity ${this.entity.name}.`);
+        } else if (!result.Key) {
+            throw new WebinyError(`No key provided for entity ${this.entity.name}.`);
+        }
+        return result as IEntityReadBatchBuilderGetResponse;
+    }
+}
+
+export const createEntityReadBatchBuilder = (
+    entity: ToolboxEntity | Entity
+): IEntityReadBatchBuilder => {
+    return new EntityReadBatchBuilder(entity);
+};
diff --git a/packages/db-dynamodb/src/utils/entity/EntityWriteBatch.ts b/packages/db-dynamodb/src/utils/entity/EntityWriteBatch.ts
new file mode 100644
index 0000000000..49eef6beaa
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/EntityWriteBatch.ts
@@ -0,0 +1,77 @@
+import type { TableDef } from "~/toolbox";
+import type { Entity as ToolboxEntity } from "~/toolbox";
+import { batchWriteAll } from "~/utils/batch/batchWrite";
+import type {
+    BatchWriteItem,
+    BatchWriteResult,
+    IDeleteBatchItem,
+    IPutBatchItem
+} from "~/utils/batch/types";
+import type { IEntityWriteBatch, IEntityWriteBatchBuilder } from "./types";
+import type { ITableWriteBatch } from "~/utils/table/types";
+import { createTableWriteBatch } from "~/utils/table/TableWriteBatch";
+import { createEntityWriteBatchBuilder } from "./EntityWriteBatchBuilder";
+import type { EntityOption } from "./getEntity";
+import { getEntity } from "./getEntity";
+
+export interface IEntityWriteBatchParams {
+    entity: EntityOption;
+    put?: IPutBatchItem[];
+    delete?: IDeleteBatchItem[];
+}
+
+export class EntityWriteBatch implements IEntityWriteBatch {
+    private readonly entity: ToolboxEntity;
+    private readonly _items: BatchWriteItem[] = [];
+    private readonly builder: IEntityWriteBatchBuilder;
+
+    public get total(): number {
+        return this._items.length;
+    }
+
+    public get items(): BatchWriteItem[] {
+        return Array.from(this._items);
+    }
+
+    public constructor(params: IEntityWriteBatchParams) {
+        this.entity = getEntity(params.entity);
+        this.builder = createEntityWriteBatchBuilder(this.entity);
+        for (const item of params.put || []) {
+            this.put(item);
+        }
+        for (const item of params.delete || []) {
+            this.delete(item);
+        }
+    }
+
+    public put<T extends Record<string, any>>(item: IPutBatchItem<T>): void {
+        this._items.push(this.builder.put(item));
+    }
+
+    public delete(item: IDeleteBatchItem): void {
+        this._items.push(this.builder.delete(item));
+    }
+
+    public combine(items: BatchWriteItem[]): ITableWriteBatch {
+        return createTableWriteBatch({
+            table: this.entity!.table as TableDef,
+            items: this._items.concat(items)
+        });
+    }
+
+    public async execute(): Promise<BatchWriteResult> {
+        if (this._items.length === 0) {
+            return [];
+        }
+        const items = Array.from(this._items);
+        this._items.length = 0;
+        return await batchWriteAll({
+            items,
+            table: this.entity.table
+        });
+    }
+}
+
+export const createEntityWriteBatch = (params: IEntityWriteBatchParams): IEntityWriteBatch => {
+    return new EntityWriteBatch(params);
+};
diff --git a/packages/db-dynamodb/src/utils/entity/EntityWriteBatchBuilder.ts b/packages/db-dynamodb/src/utils/entity/EntityWriteBatchBuilder.ts
new file mode 100644
index 0000000000..73cb5cff13
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/EntityWriteBatchBuilder.ts
@@ -0,0 +1,28 @@
+import type { Entity } from "~/toolbox";
+import type { BatchWriteItem, IDeleteBatchItem, IPutBatchItem } from "~/utils/batch/types";
+import type { IEntityWriteBatchBuilder } from "./types";
+import type { EntityOption } from "./getEntity";
+import { getEntity } from "./getEntity";
+
+export class EntityWriteBatchBuilder implements IEntityWriteBatchBuilder {
+    private readonly entity: Entity;
+
+    public constructor(entity: EntityOption) {
+        this.entity = getEntity(entity);
+    }
+
+    public put<T extends Record<string, any>>(item: IPutBatchItem<T>): BatchWriteItem {
+        return this.entity.putBatch(item, {
+            execute: true,
+            strictSchemaCheck: false
+        });
+    }
+
+    public delete(item: IDeleteBatchItem): BatchWriteItem {
+        return this.entity.deleteBatch(item);
+    }
+}
+
+export const createEntityWriteBatchBuilder = (entity: Entity): IEntityWriteBatchBuilder => {
+    return new EntityWriteBatchBuilder(entity);
+};
diff --git a/packages/db-dynamodb/src/utils/entity/getEntity.ts b/packages/db-dynamodb/src/utils/entity/getEntity.ts
new file mode 100644
index 0000000000..5634f6d3b7
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/getEntity.ts
@@ -0,0 +1,14 @@
+import { Entity as ToolboxEntity } from "~/toolbox";
+import { Entity } from "./Entity";
+
+export type EntityOption = ToolboxEntity | Entity;
+
+export const getEntity = (entity: EntityOption): ToolboxEntity => {
+    const result = entity instanceof ToolboxEntity ? entity : entity.entity;
+    if (!result.name) {
+        throw new Error(`No name provided for entity.`);
+    } else if (!result.table) {
+        throw new Error(`No table provided for entity ${result.name}.`);
+    }
+    return result;
+};
diff --git a/packages/db-dynamodb/src/utils/entity/index.ts b/packages/db-dynamodb/src/utils/entity/index.ts
new file mode 100644
index 0000000000..cab547e858
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/index.ts
@@ -0,0 +1,7 @@
+export * from "./Entity";
+export * from "./EntityReadBatch";
+export * from "./EntityReadBatchBuilder";
+export * from "./EntityWriteBatch";
+export * from "./EntityWriteBatchBuilder";
+export * from "./getEntity";
+export * from "./types";
diff --git a/packages/db-dynamodb/src/utils/entity/types.ts b/packages/db-dynamodb/src/utils/entity/types.ts
new file mode 100644
index 0000000000..a3322d22d4
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/entity/types.ts
@@ -0,0 +1,69 @@
+import type { Entity as BaseEntity } from "dynamodb-toolbox";
+import type {
+    BatchWriteItem,
+    BatchWriteResult,
+    IDeleteBatchItem,
+    IPutBatchItem
+} from "~/utils/batch/types";
+import type { GenericRecord } from "@webiny/api/types";
+import type { TableDef } from "~/toolbox";
+import type { ITableWriteBatch } from "~/utils/table/types";
+import type { IPutParamsItem, put } from "~/utils/put";
+import type { QueryAllParams, QueryOneParams } from "~/utils/query";
+import type { get, getClean, GetRecordParamsKeys } from "~/utils/get";
+import type { deleteItem, IDeleteItemKeys } from "~/utils/delete";
+import type { batchReadAll } from "~/utils/batch/batchRead";
+
+export type IEntityQueryOneParams = Omit<QueryOneParams, "entity">;
+
+export type IEntityQueryAllParams = Omit<QueryAllParams, "entity">;
+
+export interface IEntity {
+    readonly entity: BaseEntity;
+    createEntityReader(): IEntityReadBatch;
+    createEntityWriter(): IEntityWriteBatch;
+    createTableWriter(): ITableWriteBatch;
+    put(item: IPutParamsItem): ReturnType<typeof put>;
+    get<T>(keys: GetRecordParamsKeys): ReturnType<typeof get<T>>;
+    getClean<T>(keys: GetRecordParamsKeys): ReturnType<typeof getClean<T>>;
+    delete(keys: IDeleteItemKeys): ReturnType<typeof deleteItem>;
+    queryOne<T>(params: IEntityQueryOneParams): Promise<T | null>;
+    queryAll<T>(params: IEntityQueryAllParams): Promise<T[]>;
+}
+
+export interface IEntityWriteBatchBuilder {
+    // readonly entity: Entity;
+    put<T extends Record<string, any>>(item: IPutBatchItem<T>): BatchWriteItem;
+    delete(item: IDeleteBatchItem): BatchWriteItem;
+}
+
+export interface IEntityWriteBatch {
+    readonly total: number;
+    // readonly entity: Entity;
+    readonly items: BatchWriteItem[];
+    // readonly builder: IEntityWriteBatchBuilder;
+
+    put(item: IPutBatchItem): void;
+    delete(item: IDeleteBatchItem): void;
+    execute(): Promise<BatchWriteResult>;
+    combine(items: BatchWriteItem[]): ITableWriteBatch;
+}
+
+export interface IEntityReadBatchKey {
+    PK: string;
+    SK: string;
+}
+
+export interface IEntityReadBatch {
+    get(input: IEntityReadBatchKey | IEntityReadBatchKey[]): void;
+    execute<T = GenericRecord>(): ReturnType<typeof batchReadAll<T>>;
+}
+
+export interface IEntityReadBatchBuilderGetResponse {
+    Table: TableDef;
+    Key: IEntityReadBatchKey;
+}
+
+export interface IEntityReadBatchBuilder {
+    get(item: IEntityReadBatchKey): IEntityReadBatchBuilderGetResponse;
+}
diff --git a/packages/db-dynamodb/src/utils/get.ts b/packages/db-dynamodb/src/utils/get.ts
index b3e9d0f52e..b3d2998085 100644
--- a/packages/db-dynamodb/src/utils/get.ts
+++ b/packages/db-dynamodb/src/utils/get.ts
@@ -1,12 +1,14 @@
 import { Entity } from "~/toolbox";
 import { cleanupItem } from "~/utils/cleanup";
 
+export interface GetRecordParamsKeys {
+    PK: string;
+    SK: string;
+}
+
 export interface GetRecordParams {
     entity: Entity;
-    keys: {
-        PK: string;
-        SK: string;
-    };
+    keys: GetRecordParamsKeys;
 }
 
 /**
diff --git a/packages/db-dynamodb/src/utils/index.ts b/packages/db-dynamodb/src/utils/index.ts
index b382377340..6e5246f389 100644
--- a/packages/db-dynamodb/src/utils/index.ts
+++ b/packages/db-dynamodb/src/utils/index.ts
@@ -1,5 +1,3 @@
-export * from "./batchRead";
-export * from "./batchWrite";
 export * from "./cleanup";
 export * from "./createEntity";
 export * from "./createTable";
@@ -13,5 +11,7 @@ export * from "./query";
 export * from "./count";
 export * from "./scan";
 export * from "./sort";
-export * from "./table";
 export * from "./update";
+export * from "./batch";
+export * from "./entity";
+export * from "./table";
diff --git a/packages/db-dynamodb/src/utils/put.ts b/packages/db-dynamodb/src/utils/put.ts
index a1e848d156..937ccdcbb7 100644
--- a/packages/db-dynamodb/src/utils/put.ts
+++ b/packages/db-dynamodb/src/utils/put.ts
@@ -1,6 +1,6 @@
 import { Entity } from "~/toolbox";
 
-export type IPutItem<T extends Record<string, any>> = {
+export type IPutParamsItem<T extends Record<string, any>> = {
     PK: string;
     SK: string;
     [key: string]: any;
@@ -8,13 +8,14 @@ export type IPutItem<T extends Record<string, any>> = {
 
 export interface IPutParams<T extends Record<string, any>> {
     entity: Entity;
-    item: IPutItem<T>;
+    item: IPutParamsItem<T>;
 }
 
 export const put = async <T extends Record<string, any>>(params: IPutParams<T>) => {
     const { entity, item } = params;
 
     return await entity.put(item, {
-        execute: true
+        execute: true,
+        strictSchemaCheck: false
     });
 };
diff --git a/packages/db-dynamodb/src/utils/scan.ts b/packages/db-dynamodb/src/utils/scan.ts
index 6feac2268f..8606f85a41 100644
--- a/packages/db-dynamodb/src/utils/scan.ts
+++ b/packages/db-dynamodb/src/utils/scan.ts
@@ -1,8 +1,8 @@
-import { ScanInput, ScanOutput } from "@webiny/aws-sdk/client-dynamodb";
-import { Entity, ScanOptions, Table } from "~/toolbox";
+import type { ScanInput, ScanOutput } from "@webiny/aws-sdk/client-dynamodb";
+import type { Entity, ScanOptions, TableDef } from "~/toolbox";
 import { executeWithRetry, ExecuteWithRetryOptions } from "@webiny/utils";
 
-export type { ScanOptions };
+export type { ScanOptions, ScanInput, ScanOutput };
 
 export interface BaseScanParams {
     options?: ScanOptions;
@@ -10,7 +10,7 @@ export interface BaseScanParams {
 }
 
 export interface ScanWithTable extends BaseScanParams {
-    table: Table<any, any, any>;
+    table: TableDef;
     entity?: never;
 }
 
diff --git a/packages/db-dynamodb/src/utils/table.ts b/packages/db-dynamodb/src/utils/table.ts
deleted file mode 100644
index a435ba992d..0000000000
--- a/packages/db-dynamodb/src/utils/table.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import WebinyError from "@webiny/error";
-import { DbContext } from "@webiny/handler-db/types";
-
-/**
- * Will be removed in favor of passing the table name directly to the storage operations.
- *
- * @deprecated
- */
-export const getTable = <T extends DbContext>(context: T): string => {
-    if (!context.db) {
-        throw new WebinyError("Missing db on context.", "DB_ERROR");
-    } else if (!context.db.table) {
-        throw new WebinyError("Missing table on context.db.", "TABLE_ERROR");
-    }
-    return context.db.table;
-};
diff --git a/packages/db-dynamodb/src/utils/table/Table.ts b/packages/db-dynamodb/src/utils/table/Table.ts
new file mode 100644
index 0000000000..7d7fba286e
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/table/Table.ts
@@ -0,0 +1,44 @@
+import type { TableConstructor } from "~/toolbox";
+import { Table as BaseTable } from "~/toolbox";
+import type {
+    ITable,
+    ITableReadBatch,
+    ITableScanParams,
+    ITableScanResponse,
+    ITableWriteBatch
+} from "./types";
+import { createTableWriteBatch } from "./TableWriteBatch";
+import { createTableReadBatch } from "./TableReadBatch";
+import { scan } from "../scan";
+
+export class Table<
+    Name extends string = string,
+    PartitionKey extends string = string,
+    SortKey extends string = string
+> implements ITable
+{
+    public readonly table: BaseTable<Name, PartitionKey, SortKey>;
+
+    public constructor(params: TableConstructor<Name, PartitionKey, SortKey>) {
+        this.table = new BaseTable(params);
+    }
+
+    public createWriter(): ITableWriteBatch {
+        return createTableWriteBatch({
+            table: this.table
+        });
+    }
+
+    public createReader(): ITableReadBatch {
+        return createTableReadBatch({
+            table: this.table
+        });
+    }
+
+    public async scan<T>(params: ITableScanParams): Promise<ITableScanResponse<T>> {
+        return scan<T>({
+            ...params,
+            table: this.table
+        });
+    }
+}
diff --git a/packages/db-dynamodb/src/utils/table/TableReadBatch.ts b/packages/db-dynamodb/src/utils/table/TableReadBatch.ts
new file mode 100644
index 0000000000..826bae5f96
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/table/TableReadBatch.ts
@@ -0,0 +1,75 @@
+import type { Entity, TableDef } from "~/toolbox";
+import type {
+    IEntityReadBatchBuilder,
+    IEntityReadBatchBuilderGetResponse
+} from "~/utils/entity/types";
+import { batchReadAll } from "~/utils/batch/batchRead";
+import { createEntityReadBatchBuilder } from "~/utils/entity/EntityReadBatchBuilder";
+import type { GenericRecord } from "@webiny/api/types";
+import { WebinyError } from "@webiny/error";
+import type { ITableReadBatch, ITableReadBatchKey } from "./types";
+
+export interface ITableReadBatchParams {
+    table: TableDef;
+}
+
+export class TableReadBatch implements ITableReadBatch {
+    private readonly table: TableDef;
+
+    private readonly _items: IEntityReadBatchBuilderGetResponse[] = [];
+    private readonly builders: Map<string, IEntityReadBatchBuilder> = new Map();
+
+    public constructor(params: ITableReadBatchParams) {
+        this.table = params.table;
+    }
+
+    public get total(): number {
+        return this._items.length;
+    }
+
+    public get items(): IEntityReadBatchBuilderGetResponse[] {
+        return Array.from(this._items);
+    }
+
+    public get(entity: Entity, input: ITableReadBatchKey): void {
+        const builder = this.getBuilder(entity);
+
+        const items = Array.isArray(input) ? input : [input];
+        for (const item of items) {
+            /**
+             * We cannot read from two tables at the same time, so check for that.
+             */
+            if (this.table.name !== entity.table!.name) {
+                throw new WebinyError(`Cannot read from two different tables at the same time.`);
+            }
+
+            this._items.push(builder.get(item));
+        }
+    }
+
+    public async execute<T = GenericRecord>(): Promise<T[]> {
+        if (this._items.length === 0) {
+            return [];
+        }
+        const items = Array.from(this._items);
+        this._items.length = 0;
+        return await batchReadAll<T>({
+            items,
+            table: this.table
+        });
+    }
+
+    private getBuilder(entity: Entity): IEntityReadBatchBuilder {
+        const builder = this.builders.get(entity.name);
+        if (builder) {
+            return builder;
+        }
+        const newBuilder = createEntityReadBatchBuilder(entity);
+        this.builders.set(entity.name, newBuilder);
+        return newBuilder;
+    }
+}
+
+export const createTableReadBatch = (params: ITableReadBatchParams): ITableReadBatch => {
+    return new TableReadBatch(params);
+};
diff --git a/packages/db-dynamodb/src/utils/table/TableWriteBatch.ts b/packages/db-dynamodb/src/utils/table/TableWriteBatch.ts
new file mode 100644
index 0000000000..a8cbf0c5c9
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/table/TableWriteBatch.ts
@@ -0,0 +1,84 @@
+import type { Entity, TableDef } from "~/toolbox";
+import type {
+    BatchWriteItem,
+    BatchWriteResult,
+    IDeleteBatchItem,
+    IPutBatchItem
+} from "~/utils/batch/types";
+import type { IEntityWriteBatchBuilder } from "~/utils/entity/types";
+import { batchWriteAll } from "~/utils/batch/batchWrite";
+import { createEntityWriteBatchBuilder } from "~/utils/entity/EntityWriteBatchBuilder";
+import type { ITableWriteBatch } from "./types";
+
+export interface ITableWriteBatchParams {
+    table: TableDef;
+    items?: BatchWriteItem[];
+}
+
+export class TableWriteBatch implements ITableWriteBatch {
+    private readonly table: TableDef;
+    private readonly _items: BatchWriteItem[] = [];
+    private readonly builders: Map<string, IEntityWriteBatchBuilder> = new Map();
+
+    public get total(): number {
+        return this._items.length;
+    }
+
+    public get items(): BatchWriteItem[] {
+        return Array.from(this._items);
+    }
+
+    public constructor(params: ITableWriteBatchParams) {
+        this.table = params.table;
+        if (!params.items?.length) {
+            return;
+        }
+        this._items.push(...params.items);
+    }
+
+    public put(entity: Entity, item: IPutBatchItem): void {
+        const builder = this.getBuilder(entity);
+        this._items.push(builder.put(item));
+    }
+
+    public delete(entity: Entity, item: IDeleteBatchItem): void {
+        const builder = this.getBuilder(entity);
+        this._items.push(builder.delete(item));
+    }
+
+    public combine(items: BatchWriteItem[]): ITableWriteBatch {
+        return createTableWriteBatch({
+            table: this.table,
+            items: this._items.concat(items)
+        });
+    }
+
+    public async execute(): Promise<BatchWriteResult> {
+        if (this._items.length === 0) {
+            return [];
+        }
+        const items = Array.from(this._items);
+        this._items.length = 0;
+        return await batchWriteAll({
+            items,
+            table: this.table
+        });
+    }
+
+    private getBuilder(entity: Entity): IEntityWriteBatchBuilder {
+        if (!entity.name) {
+            throw new Error("Entity must have a name.");
+        }
+        const builder = this.builders.get(entity.name);
+        if (builder) {
+            return builder;
+        }
+        const newBuilder = createEntityWriteBatchBuilder(entity);
+        this.builders.set(entity.name, newBuilder);
+        return newBuilder;
+    }
+}
+
+export const createTableWriteBatch = (params: ITableWriteBatchParams): ITableWriteBatch => {
+    return new TableWriteBatch(params);
+};
diff --git a/packages/db-dynamodb/src/utils/table/index.ts b/packages/db-dynamodb/src/utils/table/index.ts
new file mode 100644
index 0000000000..fd8e934067
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/table/index.ts
@@ -0,0 +1,4 @@
+export * from "./Table";
+export * from "./TableReadBatch";
+export * from "./TableWriteBatch";
+export * from "./types";
diff --git a/packages/db-dynamodb/src/utils/table/types.ts b/packages/db-dynamodb/src/utils/table/types.ts
new file mode 100644
index 0000000000..c35ce53f1e
--- /dev/null
+++ b/packages/db-dynamodb/src/utils/table/types.ts
@@ -0,0 +1,53 @@
+import type { TableDef } from "dynamodb-toolbox/dist/cjs/classes/Table/types";
+import type {
+    BatchWriteItem,
+    BatchWriteResult,
+    IDeleteBatchItem,
+    IPutBatchItem
+} from "~/utils/batch/types";
+import type { BaseScanParams, ScanResponse } from "../scan";
+import type { Entity } from "~/toolbox";
+import type { GenericRecord } from "@webiny/api/types";
+
+export type ITableScanParams = BaseScanParams;
+
+export type ITableScanResponse<T> = ScanResponse<T>;
+
+export interface ITable {
+    table: TableDef;
+    createWriter(): ITableWriteBatch;
+    createReader(): ITableReadBatch;
+    scan<T>(params: ITableScanParams): Promise<ITableScanResponse<T>>;
+}
+
+export interface ITableWriteBatch {
+    readonly total: number;
+    // readonly table: TableDef;
+    readonly items: BatchWriteItem[];
+    put(entity: Entity, item: IPutBatchItem): void;
+    delete(entity: Entity, item: IDeleteBatchItem): void;
+    execute(): Promise<BatchWriteResult>;
+    combine(items: BatchWriteItem[]): ITableWriteBatch;
+}
+
+export interface ITableReadBatchKey {
+    PK: string;
+    SK: string;
+}
+
+export interface ITableReadBatchBuilderGetResponse {
+    Table: TableDef;
+    Key: ITableReadBatchKey;
+}
+
+export interface ITableReadBatchKey {
+    PK: string;
+    SK: string;
+}
+
+export interface ITableReadBatch {
+    readonly total: number;
+    readonly items: ITableReadBatchBuilderGetResponse[];
+    get(entity: Entity, input: ITableReadBatchKey | ITableReadBatchKey[]): void;
+    execute<T = GenericRecord>(): Promise<T[]>;
+}
diff --git a/packages/db-dynamodb/src/utils/update.ts b/packages/db-dynamodb/src/utils/update.ts
index b7fad30da8..c4e563972a 100644
--- a/packages/db-dynamodb/src/utils/update.ts
+++ b/packages/db-dynamodb/src/utils/update.ts
@@ -5,6 +5,7 @@ interface Params {
     item: {
         PK: string;
         SK: string;
+        TYPE?: string;
         [key: string]: any;
     };
 }
@@ -13,6 +14,7 @@ export const update = async (params: Params) => {
     const { entity, item } = params;
 
     return await entity.update(item, {
-        execute: true
+        execute: true,
+        strictSchemaCheck: false
     });
 };
diff --git a/packages/db-dynamodb/tsconfig.build.json b/packages/db-dynamodb/tsconfig.build.json
index d14ec0b973..a1e7b5b5b2 100644
--- a/packages/db-dynamodb/tsconfig.build.json
+++ b/packages/db-dynamodb/tsconfig.build.json
@@ -6,7 +6,6 @@
     { "path": "../aws-sdk/tsconfig.build.json" },
     { "path": "../db/tsconfig.build.json" },
     { "path": "../error/tsconfig.build.json" },
-    { "path": "../handler-db/tsconfig.build.json" },
     { "path": "../plugins/tsconfig.build.json" },
     { "path": "../utils/tsconfig.build.json" }
   ],
diff --git a/packages/db-dynamodb/tsconfig.json b/packages/db-dynamodb/tsconfig.json
index 13fd84d124..df4af1353b 100644
--- a/packages/db-dynamodb/tsconfig.json
+++ b/packages/db-dynamodb/tsconfig.json
@@ -6,7 +6,6 @@
     { "path": "../aws-sdk" },
     { "path": "../db" },
     { "path": "../error" },
-    { "path": "../handler-db" },
     { "path": "../plugins" },
     { "path": "../utils" }
   ],
@@ -25,8 +24,6 @@
       "@webiny/db": ["../db/src"],
       "@webiny/error/*": ["../error/src/*"],
       "@webiny/error": ["../error/src"],
-      "@webiny/handler-db/*": ["../handler-db/src/*"],
-      "@webiny/handler-db": ["../handler-db/src"],
       "@webiny/plugins/*": ["../plugins/src/*"],
       "@webiny/plugins": ["../plugins/src"],
       "@webiny/utils/*": ["../utils/src/*"],
diff --git a/packages/migrations/src/migrations/5.35.0/001/ddb-es/FileDataMigration.ts b/packages/migrations/src/migrations/5.35.0/001/ddb-es/FileDataMigration.ts
index 0f2750f925..b4848b89c7 100644
--- a/packages/migrations/src/migrations/5.35.0/001/ddb-es/FileDataMigration.ts
+++ b/packages/migrations/src/migrations/5.35.0/001/ddb-es/FileDataMigration.ts
@@ -5,12 +5,12 @@ import { PrimitiveValue } from "@webiny/api-elasticsearch/types";
 import { executeWithRetry } from "@webiny/utils";
 import { DataMigration, DataMigrationContext } from "@webiny/data-migration";
 import {
-    createStandardEntity,
-    queryOne,
-    queryAll,
     batchWriteAll,
+    createStandardEntity,
+    esGetIndexName,
     esQueryAllWithCallback,
-    esGetIndexName
+    queryAll,
+    queryOne
 } from "~/utils";
 import { createFileEntity, getFileData, legacyAttributes } from "../entities/createFileEntity";
 import { createLocaleEntity } from "../entities/createLocaleEntity";
@@ -160,8 +160,11 @@ export class FileManager_5_35_0_001_FileData implements DataMigration<FileMigrat
 
                         const execute = () => {
                             return Promise.all(
-                                chunk(items, 200).map(fileChunk => {
-                                    return batchWriteAll({
+                                chunk(items, 200).map(async fileChunk => {
+                                    /**
+                                     * Leave batch write for now.
+                                     */
+                                    return await batchWriteAll({
                                         table: this.newFileEntity.table,
                                         items: fileChunk
                                     });
diff --git a/packages/migrations/src/migrations/5.35.0/003/index.ts b/packages/migrations/src/migrations/5.35.0/003/index.ts
index 562a703c3b..92d7685ea3 100644
--- a/packages/migrations/src/migrations/5.35.0/003/index.ts
+++ b/packages/migrations/src/migrations/5.35.0/003/index.ts
@@ -1,10 +1,11 @@
 import { Table } from "@webiny/db-dynamodb/toolbox";
 import { DataMigrationContext, PrimaryDynamoTableSymbol } from "@webiny/data-migration";
-import { queryOne, queryAll, batchWriteAll } from "~/utils";
+import { queryAll, queryOne } from "~/utils";
 import { createTenantEntity } from "./createTenantEntity";
 import { createLegacyUserEntity, createUserEntity, getUserData } from "./createUserEntity";
-import { makeInjectable, inject } from "@webiny/ioc";
+import { inject, makeInjectable } from "@webiny/ioc";
 import { executeWithRetry } from "@webiny/utils";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 
 export class AdminUsers_5_35_0_003 {
     private readonly newUserEntity: ReturnType<typeof createUserEntity>;
@@ -73,24 +74,27 @@ export class AdminUsers_5_35_0_003 {
                 continue;
             }
 
-            const newUsers = users
-                .filter(user => !user.data)
-                .map(user => {
-                    return this.newUserEntity.putBatch({
-                        PK: `T#${tenant.id}#ADMIN_USER#${user.id}`,
-                        SK: "A",
-                        GSI1_PK: `T#${tenant.id}#ADMIN_USERS`,
-                        GSI1_SK: user.email,
-                        TYPE: "adminUsers.user",
-                        ...getUserData(user),
-                        // Move all data to a `data` envelope
-                        data: getUserData(user)
-                    });
-                });
+            const newUsersEntityBatch = createEntityWriteBatch({
+                entity: this.newUserEntity,
+                put: users
+                    .filter(user => !user.data)
+                    .map(user => {
+                        return {
+                            PK: `T#${tenant.id}#ADMIN_USER#${user.id}`,
+                            SK: "A",
+                            GSI1_PK: `T#${tenant.id}#ADMIN_USERS`,
+                            GSI1_SK: user.email,
+                            TYPE: "adminUsers.user",
+                            ...getUserData(user),
+                            // Move all data to a `data` envelope
+                            data: getUserData(user)
+                        };
+                    })
+            });
 
-            await executeWithRetry(() =>
-                batchWriteAll({ table: this.newUserEntity.table, items: newUsers })
-            );
+            await executeWithRetry(async () => {
+                return await newUsersEntityBatch.execute();
+            });
         }
     }
 }
diff --git a/packages/migrations/src/migrations/5.35.0/005/index.ts b/packages/migrations/src/migrations/5.35.0/005/index.ts
index f02cd1e77c..6b32acd216 100644
--- a/packages/migrations/src/migrations/5.35.0/005/index.ts
+++ b/packages/migrations/src/migrations/5.35.0/005/index.ts
@@ -1,14 +1,15 @@
 import { Table } from "@webiny/db-dynamodb/toolbox";
-import { makeInjectable, inject } from "@webiny/ioc";
+import { inject, makeInjectable } from "@webiny/ioc";
 import { DataMigrationContext, PrimaryDynamoTableSymbol } from "@webiny/data-migration";
-import { queryAll, batchWriteAll } from "~/utils";
+import { queryAll } from "~/utils";
 import { createModelEntity } from "./createModelEntity";
 import { createTenantEntity } from "./createTenantEntity";
 import { createLocaleEntity } from "./createLocaleEntity";
-import { Tenant, I18NLocale, CmsModel } from "./types";
+import { CmsModel, I18NLocale, Tenant } from "./types";
 import pluralize from "pluralize";
 import upperFirst from "lodash/upperFirst";
 import camelCase from "lodash/camelCase";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 
 const createSingularApiName = (model: CmsModel) => {
     return upperFirst(camelCase(model.modelId));
@@ -91,22 +92,23 @@ export class CmsModels_5_35_0_005 {
             return;
         }
 
-        const items = models.map(model => {
-            return this.modelEntity.putBatch({
-                ...model,
-                /**
-                 * Add singular and plural API names.
-                 */
-                singularApiName: createSingularApiName(model),
-                pluralApiName: createPluralApiName(model)
-            });
+        const entityBatch = createEntityWriteBatch({
+            entity: this.modelEntity,
+            put: models.map(model => {
+                return {
+                    ...model,
+                    /**
+                     * Add singular and plural API names.
+                     */
+                    singularApiName: createSingularApiName(model),
+                    pluralApiName: createPluralApiName(model)
+                };
+            })
         });
-        logger.info(`Updating total of ${items.length} models.`);
 
-        await batchWriteAll({
-            table: this.modelEntity.table,
-            items
-        });
+        logger.info(`Updating total of ${entityBatch.total} models.`);
+
+        await entityBatch.execute();
         logger.info("Updated all the models.");
     }
 
diff --git a/packages/migrations/src/migrations/5.37.0/002/ddb-es/index.ts b/packages/migrations/src/migrations/5.37.0/002/ddb-es/index.ts
index f673b58b03..429fc900de 100644
--- a/packages/migrations/src/migrations/5.37.0/002/ddb-es/index.ts
+++ b/packages/migrations/src/migrations/5.37.0/002/ddb-es/index.ts
@@ -272,15 +272,15 @@ export class CmsEntriesRootFolder_5_37_0_002
                     );
                 }
 
-                const execute = () => {
-                    return batchWriteAll({
+                const execute = async () => {
+                    return await batchWriteAll({
                         table: this.ddbEntryEntity.table,
                         items: ddbItems
                     });
                 };
 
-                const executeDdbEs = () => {
-                    return batchWriteAll({
+                const executeDdbEs = async () => {
+                    return await batchWriteAll({
                         table: this.ddbEsEntryEntity.table,
                         items: ddbEsItems
                     });
diff --git a/packages/migrations/src/migrations/5.37.0/003/ddb-es/AcoFolderMigration.ts b/packages/migrations/src/migrations/5.37.0/003/ddb-es/AcoFolderMigration.ts
index 9869ada4a6..1cdc644b62 100644
--- a/packages/migrations/src/migrations/5.37.0/003/ddb-es/AcoFolderMigration.ts
+++ b/packages/migrations/src/migrations/5.37.0/003/ddb-es/AcoFolderMigration.ts
@@ -7,8 +7,6 @@ import { createLocaleEntity } from "../entities/createLocaleEntity";
 import { createTenantEntity } from "../entities/createTenantEntity";
 import { createDdbEntryEntity, createDdbEsEntryEntity } from "../entities/createEntryEntity";
 import {
-    batchWriteAll,
-    BatchWriteItem,
     esFindOne,
     esGetIndexExist,
     esGetIndexName,
@@ -20,6 +18,7 @@ import { CmsEntryAcoFolder, I18NLocale, ListLocalesParams, Tenant } from "../typ
 import { ACO_FOLDER_MODEL_ID, ROOT_FOLDER, UPPERCASE_ROOT_FOLDER } from "../constants";
 import { getElasticsearchLatestEntryData } from "./latestElasticsearchData";
 import { getDecompressedData } from "~/migrations/5.37.0/003/utils/getDecompressedData";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 
 const isGroupMigrationCompleted = (
     status: PrimitiveValue[] | boolean | undefined
@@ -236,8 +235,12 @@ export class AcoRecords_5_37_0_003_AcoFolder
                             `Processing batch #${batch} in group ${groupId} (${folders.length} folders).`
                         );
 
-                        const ddbItems: BatchWriteItem[] = [];
-                        const ddbEsItems: BatchWriteItem[] = [];
+                        const entityBatch = createEntityWriteBatch({
+                            entity: this.ddbEntryEntity
+                        });
+                        const elasticsearchEntityBatch = createEntityWriteBatch({
+                            entity: this.ddbEsEntryEntity
+                        });
 
                         for (const folder of folders) {
                             const folderPk = `T#${tenantId}#L#${localeCode}#CMS#CME#${folder.entryId}`;
@@ -278,10 +281,8 @@ export class AcoRecords_5_37_0_003_AcoFolder
                                 TYPE: "cms.entry"
                             };
 
-                            ddbItems.push(
-                                this.ddbEntryEntity.putBatch(latestDdb),
-                                this.ddbEntryEntity.putBatch(revisionDdb)
-                            );
+                            entityBatch.put(latestDdb);
+                            entityBatch.put(revisionDdb);
 
                             const esLatestRecord = await get<CmsEntryAcoFolderElasticsearchRecord>({
                                 entity: this.ddbEsEntryEntity,
@@ -316,21 +317,15 @@ export class AcoRecords_5_37_0_003_AcoFolder
                                 index: foldersIndexName
                             };
 
-                            ddbEsItems.push(this.ddbEsEntryEntity.putBatch(latestDdbEs));
+                            elasticsearchEntityBatch.put(latestDdbEs);
                         }
 
-                        const executeDdb = () => {
-                            return batchWriteAll({
-                                table: this.ddbEntryEntity.table,
-                                items: ddbItems
-                            });
+                        const executeDdb = async () => {
+                            return entityBatch.execute();
                         };
 
-                        const executeDdbEs = () => {
-                            return batchWriteAll({
-                                table: this.ddbEsEntryEntity.table,
-                                items: ddbEsItems
-                            });
+                        const executeDdbEs = async () => {
+                            return elasticsearchEntityBatch.execute();
                         };
 
                         await executeWithRetry(executeDdb, {
diff --git a/packages/migrations/src/migrations/5.40.0/001/ddb/index.ts b/packages/migrations/src/migrations/5.40.0/001/ddb/index.ts
index 4716664888..ee0fa24768 100644
--- a/packages/migrations/src/migrations/5.40.0/001/ddb/index.ts
+++ b/packages/migrations/src/migrations/5.40.0/001/ddb/index.ts
@@ -4,18 +4,13 @@ import {
     DataMigrationContext,
     PrimaryDynamoTableSymbol
 } from "@webiny/data-migration";
-import {
-    batchWriteAll,
-    BatchWriteItem,
-    count,
-    ddbQueryAllWithCallback,
-    forEachTenantLocale
-} from "~/utils";
+import { count, ddbQueryAllWithCallback, forEachTenantLocale } from "~/utils";
 import { inject, makeInjectable } from "@webiny/ioc";
 import { executeWithRetry, generateAlphaNumericId } from "@webiny/utils";
 import { createBlockEntity } from "~/migrations/5.40.0/001/ddb/createBlockEntity";
 import { ContentElement, PageBlock } from "./types";
 import { compress, decompress } from "./compression";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 
 const isGroupMigrationCompleted = (status: boolean | undefined): status is boolean => {
     return typeof status === "boolean";
@@ -99,6 +94,10 @@ export class PbUniqueBlockElementIds_5_40_0_001 implements DataMigration {
                             `Processing batch #${batch} in group ${groupId} (${blocks.length} blocks).`
                         );
 
+                        const entityBatch = createEntityWriteBatch({
+                            entity: this.blockEntity
+                        });
+
                         const items = await Promise.all(
                             blocks.map(async block => {
                                 const newContent = await this.generateElementIds(block);
@@ -106,18 +105,17 @@ export class PbUniqueBlockElementIds_5_40_0_001 implements DataMigration {
                                     return null;
                                 }
 
-                                return this.blockEntity.putBatch({
+                                const item = {
                                     ...block,
                                     content: newContent
-                                });
+                                };
+                                entityBatch.put(item);
+                                return item;
                             })
                         );
 
-                        const execute = () => {
-                            return batchWriteAll({
-                                table: this.blockEntity.table,
-                                items: items.filter(Boolean) as BatchWriteItem[]
-                            });
+                        const execute = async () => {
+                            return await entityBatch.execute();
                         };
 
                         await executeWithRetry(execute, {
diff --git a/packages/migrations/src/migrations/5.41.0/001/index.ts b/packages/migrations/src/migrations/5.41.0/001/index.ts
index 6cec0e2917..070146eb9f 100644
--- a/packages/migrations/src/migrations/5.41.0/001/index.ts
+++ b/packages/migrations/src/migrations/5.41.0/001/index.ts
@@ -1,10 +1,11 @@
 import { Table } from "@webiny/db-dynamodb/toolbox";
 import { DataMigrationContext, PrimaryDynamoTableSymbol } from "@webiny/data-migration";
-import { queryOne, queryAll, batchWriteAll } from "~/utils";
+import { queryAll, queryOne } from "~/utils";
 import { createTenantEntity } from "./createTenantEntity";
 import { createUserEntity } from "./createUserEntity";
-import { makeInjectable, inject } from "@webiny/ioc";
+import { inject, makeInjectable } from "@webiny/ioc";
 import { executeWithRetry } from "@webiny/utils";
+import { createEntityWriteBatch } from "@webiny/db-dynamodb";
 
 export class AdminUsers_5_41_0_001 {
     private readonly newUserEntity: ReturnType<typeof createUserEntity>;
@@ -71,22 +72,25 @@ export class AdminUsers_5_41_0_001 {
                 continue;
             }
 
-            const newUsers = users
-                .filter(user => !Array.isArray(user.data.groups))
-                .map(user => {
-                    return this.newUserEntity.putBatch({
-                        ...user,
-                        data: {
-                            ...user.data,
-                            groups: [user.data.group].filter(Boolean),
-                            teams: [user.data.team].filter(Boolean)
-                        }
-                    });
-                });
+            const newUsersEntityBatch = createEntityWriteBatch({
+                entity: this.newUserEntity,
+                put: users
+                    .filter(user => !Array.isArray(user.data.groups))
+                    .map(user => {
+                        return {
+                            ...user,
+                            data: {
+                                ...user.data,
+                                groups: [user.data.group].filter(Boolean),
+                                teams: [user.data.team].filter(Boolean)
+                            }
+                        };
+                    })
+            });
 
-            await executeWithRetry(() =>
-                batchWriteAll({ table: this.newUserEntity.table, items: newUsers })
-            );
+            await executeWithRetry(async () => {
+                return await newUsersEntityBatch.execute();
+            });
         }
     }
 }
diff --git a/packages/migrations/src/utils/forEachTenantLocale.ts b/packages/migrations/src/utils/forEachTenantLocale.ts
index a88284551a..bd1f7cb13c 100644
--- a/packages/migrations/src/utils/forEachTenantLocale.ts
+++ b/packages/migrations/src/utils/forEachTenantLocale.ts
@@ -1,8 +1,18 @@
 import { createLocaleEntity, createTenantEntity, queryAll } from "~/utils";
-import { I18NLocale, Tenant } from "~/migrations/5.37.0/003/types";
 import { Table } from "@webiny/db-dynamodb/toolbox";
 import { Logger } from "@webiny/logger";
 
+export interface Tenant {
+    data: {
+        id: string;
+        name: string;
+    };
+}
+
+export interface I18NLocale {
+    code: string;
+}
+
 type ForEachTenantLocaleCallback = (params: {
     tenantId: string;
     localeCode: string;

From c71817c63135949398199e3242fd8425b52ce28a Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Wed, 18 Dec 2024 15:37:40 +0100
Subject: [PATCH 17/28] fix(app-website): decorate lexical renderers on first
 mount (#4452)

---
 .../src/layouts/pages/Static/HeaderMobile.tsx |  1 +
 .../src/render/PageBuilder.tsx                |  6 +-
 .../src/render/lexicalRendererDecorators.tsx  | 10 ++++
 .../elements/heading/LexicalHeading.tsx       | 17 ++++--
 .../elements/paragraph/LexicalParagraph.tsx   | 17 ++++--
 packages/app-website/src/Website.tsx          |  6 +-
 packages/app/src/App.tsx                      | 14 ++++-
 .../src/layouts/pages/Static/HeaderMobile.tsx |  1 +
 packages/react-composition/src/Context.tsx    | 58 +++++++++++++------
 9 files changed, 93 insertions(+), 37 deletions(-)
 create mode 100644 packages/app-page-builder/src/render/lexicalRendererDecorators.tsx

diff --git a/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx b/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
index e31b913cd0..ad09d180b0 100644
--- a/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
+++ b/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
@@ -98,6 +98,7 @@ const HeaderMobileWrapper = styled.div`
         }
 
         > nav {
+            display: none;
             -moz-osx-font-smoothing: grayscale;
             -webkit-font-smoothing: antialiased;
             animation: slide-out 0.5s forwards;
diff --git a/packages/app-page-builder/src/render/PageBuilder.tsx b/packages/app-page-builder/src/render/PageBuilder.tsx
index e82b4375f2..63b9158b82 100644
--- a/packages/app-page-builder/src/render/PageBuilder.tsx
+++ b/packages/app-page-builder/src/render/PageBuilder.tsx
@@ -6,7 +6,7 @@ import { LexicalParagraphRenderer } from "~/render/plugins/elements/paragraph/Le
 import { LexicalHeadingRenderer } from "~/render/plugins/elements/heading/LexicalHeading";
 import { ConvertIconSettings } from "~/render/plugins/elementSettings/icon";
 
-export const PageBuilder = () => {
+export const PageBuilder = React.memo(() => {
     return (
         <>
             <AddButtonLinkComponent />
@@ -17,4 +17,6 @@ export const PageBuilder = () => {
             <ConvertIconSettings />
         </>
     );
-};
+});
+
+PageBuilder.displayName = "PageBuilder";
diff --git a/packages/app-page-builder/src/render/lexicalRendererDecorators.tsx b/packages/app-page-builder/src/render/lexicalRendererDecorators.tsx
new file mode 100644
index 0000000000..65bc981a45
--- /dev/null
+++ b/packages/app-page-builder/src/render/lexicalRendererDecorators.tsx
@@ -0,0 +1,10 @@
+import type { DecoratorsCollection } from "@webiny/app";
+import { ParagraphRenderer } from "@webiny/app-page-builder-elements/renderers/paragraph";
+import { HeadingRenderer } from "@webiny/app-page-builder-elements/renderers/heading";
+import { LexicalParagraphDecorator } from "~/render/plugins/elements/paragraph/LexicalParagraph";
+import { LexicalHeadingDecorator } from "~/render/plugins/elements/heading/LexicalHeading";
+
+export const lexicalRendererDecorators: DecoratorsCollection = [
+    [ParagraphRenderer.Component, [LexicalParagraphDecorator]],
+    [HeadingRenderer.Component, [LexicalHeadingDecorator]]
+];
diff --git a/packages/app-page-builder/src/render/plugins/elements/heading/LexicalHeading.tsx b/packages/app-page-builder/src/render/plugins/elements/heading/LexicalHeading.tsx
index 284fea7eff..142dbd414a 100644
--- a/packages/app-page-builder/src/render/plugins/elements/heading/LexicalHeading.tsx
+++ b/packages/app-page-builder/src/render/plugins/elements/heading/LexicalHeading.tsx
@@ -1,14 +1,16 @@
 import React from "react";
 import {
-    HeadingRenderer,
-    elementInputs
+    elementInputs,
+    HeadingRenderer
 } from "@webiny/app-page-builder-elements/renderers/heading";
 import { usePageElements, useRenderer } from "@webiny/app-page-builder-elements";
 import { assignStyles } from "@webiny/app-page-builder-elements/utils";
 import { isValidLexicalData, LexicalHtmlRenderer } from "@webiny/lexical-editor";
+import type { ComponentDecorator } from "@webiny/app";
+import type { Renderer } from "@webiny/app-page-builder-elements/types";
 
-export const LexicalHeadingRenderer = HeadingRenderer.Component.createDecorator(Original => {
-    return function LexicalHeadingRenderer() {
+export const LexicalHeadingDecorator: ComponentDecorator<Renderer> = Original => {
+    return function LexicalHeadingRenderer(props) {
         const { theme } = usePageElements();
         const { getInputValues } = useRenderer();
         const inputs = getInputValues<typeof elementInputs>();
@@ -29,6 +31,9 @@ export const LexicalHeadingRenderer = HeadingRenderer.Component.createDecorator(
             );
         }
 
-        return <Original />;
+        return <Original {...props} />;
     };
-});
+};
+
+export const LexicalHeadingRenderer =
+    HeadingRenderer.Component.createDecorator(LexicalHeadingDecorator);
diff --git a/packages/app-page-builder/src/render/plugins/elements/paragraph/LexicalParagraph.tsx b/packages/app-page-builder/src/render/plugins/elements/paragraph/LexicalParagraph.tsx
index fb6bce057d..357fecc013 100644
--- a/packages/app-page-builder/src/render/plugins/elements/paragraph/LexicalParagraph.tsx
+++ b/packages/app-page-builder/src/render/plugins/elements/paragraph/LexicalParagraph.tsx
@@ -1,14 +1,16 @@
 import React from "react";
 import {
-    ParagraphRenderer,
-    elementInputs
+    elementInputs,
+    ParagraphRenderer
 } from "@webiny/app-page-builder-elements/renderers/paragraph";
 import { usePageElements, useRenderer } from "@webiny/app-page-builder-elements";
 import { assignStyles } from "@webiny/app-page-builder-elements/utils";
 import { isValidLexicalData, LexicalHtmlRenderer } from "@webiny/lexical-editor";
+import type { ComponentDecorator } from "@webiny/app";
+import type { Renderer } from "@webiny/app-page-builder-elements/types";
 
-export const LexicalParagraphRenderer = ParagraphRenderer.Component.createDecorator(Original => {
-    return function LexicalParagraphRenderer() {
+export const LexicalParagraphDecorator: ComponentDecorator<Renderer> = Original => {
+    return function LexicalParagraphRenderer(props) {
         const { theme } = usePageElements();
         const { getInputValues } = useRenderer();
         const inputs = getInputValues<typeof elementInputs>();
@@ -29,6 +31,9 @@ export const LexicalParagraphRenderer = ParagraphRenderer.Component.createDecora
             );
         }
 
-        return <Original />;
+        return <Original {...props} />;
     };
-});
+};
+
+export const LexicalParagraphRenderer =
+    ParagraphRenderer.Component.createDecorator(LexicalParagraphDecorator);
diff --git a/packages/app-website/src/Website.tsx b/packages/app-website/src/Website.tsx
index 229798fdff..27986a23d4 100644
--- a/packages/app-website/src/Website.tsx
+++ b/packages/app-website/src/Website.tsx
@@ -2,12 +2,13 @@ import React, { useMemo } from "react";
 import { App, AppProps, Decorator, GenericComponent } from "@webiny/app";
 import { ApolloProvider } from "@apollo/react-hooks";
 import { CacheProvider } from "@emotion/react";
-import { Page } from "./Page";
-import { createApolloClient, createEmotionCache } from "~/utils";
 import { ThemeProvider } from "@webiny/app-theme";
 import { PageBuilderProvider } from "@webiny/app-page-builder/contexts/PageBuilder";
+import { lexicalRendererDecorators } from "@webiny/app-page-builder/render/lexicalRendererDecorators";
 import { PageBuilder } from "@webiny/app-page-builder/render";
 import { RouteProps } from "@webiny/react-router";
+import { createApolloClient, createEmotionCache } from "~/utils";
+import { Page } from "./Page";
 import { LinkPreload } from "~/LinkPreload";
 import { WebsiteLoaderCache } from "~/utils/WebsiteLoaderCache";
 
@@ -53,6 +54,7 @@ export const Website = ({ children, routes = [], providers = [], ...props }: Web
                         debounceRender={debounceMs}
                         routes={appRoutes}
                         providers={[PageBuilderProviderHOC, ...providers]}
+                        decorators={[...lexicalRendererDecorators]}
                     >
                         <LinkPreload />
                         <PageBuilder />
diff --git a/packages/app/src/App.tsx b/packages/app/src/App.tsx
index 2f88dff622..c4f4f5d5ca 100644
--- a/packages/app/src/App.tsx
+++ b/packages/app/src/App.tsx
@@ -13,7 +13,8 @@ import {
     GenericComponent,
     compose,
     Decorator,
-    HigherOrderComponent
+    HigherOrderComponent,
+    DecoratorsCollection
 } from "@webiny/react-composition";
 import { Routes as SortRoutes } from "./core/Routes";
 import { DebounceRender } from "./core/DebounceRender";
@@ -53,6 +54,7 @@ export interface AppProps {
     debounceRender?: number;
     routes?: Array<RouteProps>;
     providers?: Array<Decorator<GenericComponent<ProviderProps>>>;
+    decorators?: DecoratorsCollection;
     children?: React.ReactNode | React.ReactNode[];
 }
 
@@ -62,7 +64,13 @@ interface ProviderProps {
 
 type ComponentWithChildren = React.ComponentType<{ children?: React.ReactNode }>;
 
-export const App = ({ debounceRender = 50, routes = [], providers = [], children }: AppProps) => {
+export const App = ({
+    debounceRender = 50,
+    routes = [],
+    providers = [],
+    decorators = [],
+    children
+}: AppProps) => {
     const [state, setState] = useState<State>({
         routes: routes.reduce<RoutesByPath>((acc, item) => {
             return { ...acc, [item.path as string]: <Route {...item} /> };
@@ -129,7 +137,7 @@ export const App = ({ debounceRender = 50, routes = [], providers = [], children
 
     return (
         <AppContext.Provider value={appContext}>
-            <CompositionProvider>
+            <CompositionProvider decorators={decorators}>
                 {children}
                 <BrowserRouter>
                     <Providers>
diff --git a/packages/cwp-template-aws/template/common/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx b/packages/cwp-template-aws/template/common/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
index c254e2cb9a..990974bf37 100644
--- a/packages/cwp-template-aws/template/common/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
+++ b/packages/cwp-template-aws/template/common/extensions/theme/src/layouts/pages/Static/HeaderMobile.tsx
@@ -98,6 +98,7 @@ const HeaderMobileWrapper = styled.div`
         }
 
         > nav {
+            display: none;
             -moz-osx-font-smoothing: grayscale;
             -webkit-font-smoothing: antialiased;
             animation: slide-out 0.5s forwards;
diff --git a/packages/react-composition/src/Context.tsx b/packages/react-composition/src/Context.tsx
index 27b7fffd4e..f7c08166a4 100644
--- a/packages/react-composition/src/Context.tsx
+++ b/packages/react-composition/src/Context.tsx
@@ -10,6 +10,7 @@ import { useCompositionScope } from "~/CompositionScope";
 import {
     ComposedFunction,
     ComposeWith,
+    Decoratable,
     DecoratableComponent,
     DecoratableHook,
     Decorator,
@@ -70,35 +71,56 @@ interface CompositionContext {
 
 const CompositionContext = createContext<CompositionContext | undefined>(undefined);
 
+export type DecoratorsTuple = [Decoratable, Decorator<any>[]];
+export type DecoratorsCollection = Array<DecoratorsTuple>;
+
 interface CompositionProviderProps {
+    decorators?: DecoratorsCollection;
     children: React.ReactNode;
 }
 
-export const CompositionProvider = ({ children }: CompositionProviderProps) => {
-    const [components, setComponents] = useState<ComponentScopes>(new Map());
+const composeComponents = (
+    components: ComponentScopes,
+    decorators: Array<[GenericComponent | GenericHook, Decorator<any>[]]>,
+    scope = "*"
+) => {
+    const scopeMap: ComposedComponents = components.get(scope) || new Map();
+    for (const [component, hocs] of decorators) {
+        const recipe = scopeMap.get(component) || { component: null, hocs: [] };
+
+        const newHocs = [...(recipe.hocs || []), ...hocs] as Decorator<
+            GenericHook | GenericComponent
+        >[];
+
+        scopeMap.set(component, {
+            component: compose(...[...newHocs].reverse())(component),
+            hocs: newHocs
+        });
+
+        components.set(scope, scopeMap);
+    }
+
+    return components;
+};
+
+export const CompositionProvider = ({ decorators = [], children }: CompositionProviderProps) => {
+    const [components, setComponents] = useState<ComponentScopes>(() => {
+        return composeComponents(
+            new Map(),
+            decorators.map(tuple => {
+                return [tuple[0].original, tuple[1]];
+            })
+        );
+    });
 
     const composeComponent = useCallback(
         (
-            component: GenericHook | GenericComponent,
+            component: GenericComponent | GenericHook,
             hocs: HigherOrderComponent<any, any>[],
             scope: string | undefined = "*"
         ) => {
             setComponents(prevComponents => {
-                const components = new Map(prevComponents);
-                const scopeMap: ComposedComponents = components.get(scope) || new Map();
-                const recipe = scopeMap.get(component) || { component: null, hocs: [] };
-
-                const newHocs = [...(recipe.hocs || []), ...hocs] as Decorator<
-                    GenericHook | GenericComponent
-                >[];
-
-                scopeMap.set(component, {
-                    component: compose(...[...newHocs].reverse())(component),
-                    hocs: newHocs
-                });
-
-                components.set(scope, scopeMap);
-                return components;
+                return composeComponents(new Map(prevComponents), [[component, hocs]], scope);
             });
 
             // Return a function that will remove the added HOCs.

From 7525746c33c2d19f0ab2e7ad5eafc597bfe52338 Mon Sep 17 00:00:00 2001
From: adrians5j <adrian@webiny.com>
Date: Wed, 18 Dec 2024 16:41:27 +0100
Subject: [PATCH 18/28] fix: filter out non-version-like names

---
 .../cli-plugin-extensions/src/downloadAndLinkExtension.ts  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts b/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
index 923e12da8f..571c0417ee 100644
--- a/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
+++ b/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
@@ -15,15 +15,18 @@ import { CliContext } from "@webiny/cli/types";
 import { Ora } from "ora";
 
 const EXTENSIONS_ROOT_FOLDER = "extensions";
-
 const S3_BUCKET_NAME = "webiny-examples";
 const S3_BUCKET_REGION = "us-east-1";
+const FOLDER_NAME_IS_VERSION_REGEX = /^\d+\.\d+\.x$/;
 
 const getVersionFromVersionFolders = async (
     versionFoldersList: string[],
     currentWebinyVersion: string
 ) => {
-    const availableVersions = versionFoldersList.map(v => v.replace(".x", ".0")).sort();
+    const availableVersions = versionFoldersList
+        .filter(v => v.match(FOLDER_NAME_IS_VERSION_REGEX))
+        .map(v => v.replace(".x", ".0"))
+        .sort();
 
     let versionToUse = "";
 

From f363084c97af4fabfb0dee3d47cb9ca75259301b Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Thu, 19 Dec 2024 15:56:14 +0100
Subject: [PATCH 19/28] fix: introduce `CmsContentFormRendererPlugin`  (#4456)

---
 packages/app-headless-cms/src/index.tsx             |  2 ++
 .../src/plugins/CmsContentFormRendererPlugin.ts     | 13 +++++++++++++
 packages/app-headless-cms/src/plugins/index.ts      |  1 +
 3 files changed, 16 insertions(+)
 create mode 100644 packages/app-headless-cms/src/plugins/CmsContentFormRendererPlugin.ts
 create mode 100644 packages/app-headless-cms/src/plugins/index.ts

diff --git a/packages/app-headless-cms/src/index.tsx b/packages/app-headless-cms/src/index.tsx
index f2c7899b21..4207ac6cd2 100644
--- a/packages/app-headless-cms/src/index.tsx
+++ b/packages/app-headless-cms/src/index.tsx
@@ -36,3 +36,5 @@ export const ContentEntriesViewConfig = Object.assign(LegacyContentEntriesViewCo
 });
 
 export { ContentEntryEditorConfig } from "./ContentEntryEditorConfig";
+
+export * from "./plugins";
diff --git a/packages/app-headless-cms/src/plugins/CmsContentFormRendererPlugin.ts b/packages/app-headless-cms/src/plugins/CmsContentFormRendererPlugin.ts
new file mode 100644
index 0000000000..551452b04a
--- /dev/null
+++ b/packages/app-headless-cms/src/plugins/CmsContentFormRendererPlugin.ts
@@ -0,0 +1,13 @@
+import type { CmsContentFormRendererPlugin as BaseCmsContentFormRendererPlugin } from "~/types";
+import { legacyPluginToReactComponent } from "@webiny/app/utils";
+
+export type CmsContentFormRendererPluginProps = Pick<
+    BaseCmsContentFormRendererPlugin,
+    "modelId" | "render"
+>;
+
+export const CmsContentFormRendererPlugin =
+    legacyPluginToReactComponent<CmsContentFormRendererPluginProps>({
+        pluginType: "cms-content-form-renderer",
+        componentDisplayName: "CmsContentFormRendererPlugin"
+    });
diff --git a/packages/app-headless-cms/src/plugins/index.ts b/packages/app-headless-cms/src/plugins/index.ts
new file mode 100644
index 0000000000..e6993879cb
--- /dev/null
+++ b/packages/app-headless-cms/src/plugins/index.ts
@@ -0,0 +1 @@
+export * from "./CmsContentFormRendererPlugin";

From e379e6f13d0d1426e25da78b7b38538cbae0b13c Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Thu, 19 Dec 2024 16:02:20 +0100
Subject: [PATCH 20/28] fix(lexical-editor): make font sizes configurable
 through theme (#4454)

---
 .../LexicalPresets/HeadingEditorPreset.tsx    | 13 +++-
 .../LexicalPresets/ParagraphEditorPreset.tsx  | 14 ++++-
 .../src/components/Toolbar/Toolbar.css        |  4 --
 .../ToolbarActions/FontSizeAction.tsx         | 63 ++++++++++++++-----
 packages/theme/src/types.ts                   | 14 ++++-
 5 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/packages/lexical-editor-pb-element/src/components/LexicalPresets/HeadingEditorPreset.tsx b/packages/lexical-editor-pb-element/src/components/LexicalPresets/HeadingEditorPreset.tsx
index 82525b9aa8..f35b6770f2 100644
--- a/packages/lexical-editor-pb-element/src/components/LexicalPresets/HeadingEditorPreset.tsx
+++ b/packages/lexical-editor-pb-element/src/components/LexicalPresets/HeadingEditorPreset.tsx
@@ -15,15 +15,24 @@ import {
     TypographyPlugin,
     UnderlineAction,
     LexicalEditorConfig,
-    LinkPlugin
+    LinkPlugin,
+    useRichTextEditor
 } from "@webiny/lexical-editor";
 
 const { ToolbarElement, Plugin } = LexicalEditorConfig;
 
+const FontSizeActionWithTheme = () => {
+    const { theme } = useRichTextEditor();
+
+    const fontSizes = theme?.styles?.fontSizes?.heading ?? FontSizeAction.FONT_SIZES_FALLBACK;
+
+    return <FontSizeAction fontSizes={fontSizes} />;
+};
+
 export const HeadingEditorPreset = () => {
     return (
         <LexicalEditorConfig>
-            <ToolbarElement name="fontSize" element={<FontSizeAction />} />
+            <ToolbarElement name="fontSize" element={<FontSizeActionWithTheme />} />
             <ToolbarElement name="fontColor" element={<FontColorAction />} />
             <ToolbarElement name="typography" element={<TypographyAction />} />
             <ToolbarElement name="textAlignment" element={<TextAlignmentAction />} />
diff --git a/packages/lexical-editor-pb-element/src/components/LexicalPresets/ParagraphEditorPreset.tsx b/packages/lexical-editor-pb-element/src/components/LexicalPresets/ParagraphEditorPreset.tsx
index 5f2e109963..1ab46d1217 100644
--- a/packages/lexical-editor-pb-element/src/components/LexicalPresets/ParagraphEditorPreset.tsx
+++ b/packages/lexical-editor-pb-element/src/components/LexicalPresets/ParagraphEditorPreset.tsx
@@ -20,14 +20,24 @@ import {
     UnderlineAction,
     ListPlugin,
     LexicalEditorConfig,
-    LinkPlugin
+    LinkPlugin,
+    useRichTextEditor
 } from "@webiny/lexical-editor";
 
 const { ToolbarElement, Plugin } = LexicalEditorConfig;
+
+const FontSizeActionWithTheme = () => {
+    const { theme } = useRichTextEditor();
+
+    const fontSizes = theme?.styles?.fontSizes?.paragraph ?? FontSizeAction.FONT_SIZES_FALLBACK;
+
+    return <FontSizeAction fontSizes={fontSizes} />;
+};
+
 export const ParagraphEditorPreset = () => {
     return (
         <LexicalEditorConfig>
-            <ToolbarElement name="fontSize" element={<FontSizeAction />} />
+            <ToolbarElement name="fontSize" element={<FontSizeActionWithTheme />} />
             <ToolbarElement name="fontColor" element={<FontColorAction />} />
             <ToolbarElement name="typography" element={<TypographyAction />} />
             <ToolbarElement name="textAlignment" element={<TextAlignmentAction />} />
diff --git a/packages/lexical-editor/src/components/Toolbar/Toolbar.css b/packages/lexical-editor/src/components/Toolbar/Toolbar.css
index 8bc676633a..93ce67cea7 100644
--- a/packages/lexical-editor/src/components/Toolbar/Toolbar.css
+++ b/packages/lexical-editor/src/components/Toolbar/Toolbar.css
@@ -326,10 +326,6 @@ i.font-color,
   margin: 0 4px;
 }
 
-.toolbar-item.font-size {
-  width: 70px;
-}
-
 .lexical-dropdown-container {
   position: absolute;
   bottom: -5px;
diff --git a/packages/lexical-editor/src/components/ToolbarActions/FontSizeAction.tsx b/packages/lexical-editor/src/components/ToolbarActions/FontSizeAction.tsx
index 4051dbf63e..8d3eaee105 100644
--- a/packages/lexical-editor/src/components/ToolbarActions/FontSizeAction.tsx
+++ b/packages/lexical-editor/src/components/ToolbarActions/FontSizeAction.tsx
@@ -6,7 +6,13 @@ import { DropDown, DropDownItem } from "~/ui/DropDown";
 import { useDeriveValueFromSelection } from "~/hooks/useCurrentSelection";
 import { useRichTextEditor } from "~/hooks";
 
-const FONT_SIZE_OPTIONS: string[] = [
+export interface FontSize {
+    id: string;
+    name: string;
+    value: string;
+}
+
+export const FONT_SIZES_FALLBACK: FontSize[] = [
     "8px",
     "9px",
     "10px",
@@ -24,7 +30,18 @@ const FONT_SIZE_OPTIONS: string[] = [
     "60px",
     "72px",
     "96px"
-];
+].map(size => ({
+    id: size,
+    name: size,
+    value: size,
+    default: size === "15px"
+}));
+
+const emptyOption: FontSize = {
+    value: "",
+    name: "Font Size",
+    id: "empty"
+};
 
 function dropDownActiveClass(active: boolean) {
     if (active) {
@@ -34,21 +51,22 @@ function dropDownActiveClass(active: boolean) {
 }
 
 interface FontSizeDropDownProps {
+    fontSizes: FontSize[];
     editor: LexicalEditor;
-    value: string;
+    value: string | undefined;
     disabled?: boolean;
 }
 
 function FontSizeDropDown(props: FontSizeDropDownProps): JSX.Element {
-    const { editor, value, disabled = false } = props;
+    const { editor, value, fontSizes, disabled = false } = props;
 
     const handleClick = useCallback(
-        (option: string) => {
+        (option: FontSize) => {
             editor.update(() => {
                 const selection = $getSelection();
                 if ($isRangeSelection(selection)) {
                     $patchStyleText(selection, {
-                        ["font-size"]: option
+                        ["font-size"]: option.value
                     });
                 }
             });
@@ -56,39 +74,43 @@ function FontSizeDropDown(props: FontSizeDropDownProps): JSX.Element {
         [editor]
     );
 
+    const selectedOption = fontSizes.find(opt => opt.value === value) ?? emptyOption;
+
     return (
         <DropDown
             disabled={disabled}
             buttonClassName="toolbar-item font-size"
-            buttonLabel={value}
+            buttonLabel={selectedOption.name}
             buttonAriaLabel={"Formatting options for font size"}
         >
-            {FONT_SIZE_OPTIONS.map(option => (
+            {fontSizes.map(option => (
                 <DropDownItem
-                    className={`item fontsize-item ${dropDownActiveClass(value === option)}`}
+                    className={`item fontsize-item ${dropDownActiveClass(value === option.id)}`}
                     onClick={() => handleClick(option)}
-                    key={option}
+                    key={option.id}
                 >
-                    <span className="text">{option}</span>
+                    <span className="text">{option.name}</span>
                 </DropDownItem>
             ))}
         </DropDown>
     );
 }
 
-const defaultSize = "15px";
+interface FontSizeActionProps {
+    fontSizes?: FontSize[];
+}
 
-export const FontSizeAction = () => {
+const FontSize = ({ fontSizes = FONT_SIZES_FALLBACK }: FontSizeActionProps) => {
     const { editor } = useRichTextEditor();
     const [isEditable, setIsEditable] = useState(() => editor.isEditable());
     const fontSize = useDeriveValueFromSelection(({ rangeSelection }) => {
         if (!rangeSelection) {
-            return defaultSize;
+            return undefined;
         }
         try {
-            return $getSelectionStyleValueForProperty(rangeSelection, "font-size", "15px");
+            return $getSelectionStyleValueForProperty(rangeSelection, "font-size");
         } catch {
-            return defaultSize;
+            return undefined;
         }
     });
 
@@ -102,7 +124,14 @@ export const FontSizeAction = () => {
 
     return (
         <>
-            <FontSizeDropDown disabled={!isEditable} value={fontSize} editor={editor} />
+            <FontSizeDropDown
+                disabled={!isEditable}
+                value={fontSize}
+                editor={editor}
+                fontSizes={fontSizes}
+            />
         </>
     );
 };
+
+export const FontSizeAction = Object.assign(FontSize, { FONT_SIZES_FALLBACK });
diff --git a/packages/theme/src/types.ts b/packages/theme/src/types.ts
index 0c110ea939..a5b3539b3a 100644
--- a/packages/theme/src/types.ts
+++ b/packages/theme/src/types.ts
@@ -27,8 +27,10 @@ export type ThemeBreakpoints = {
 
 /*
  * Typography section
+ * We want to allow custom strings as well, thus the (string & {}).
  */
-export type TypographyType = "headings" | "paragraphs" | "quotes" | "lists" | string;
+// eslint-disable-next-line @typescript-eslint/ban-types
+export type TypographyType = "headings" | "paragraphs" | "quotes" | "lists" | (string & {});
 export type TypographyStyle = {
     id: string;
     name: string;
@@ -39,8 +41,18 @@ export type TypographyStyle = {
 export type Typography = Record<TypographyType, Readonly<TypographyStyle[]>>;
 export type ThemeTypographyStyleItems = TypographyStyle[];
 
+export interface FontSize {
+    id: string;
+    name: string;
+    value: string;
+}
+
 export interface ThemeStyles {
     colors: Record<string, any>;
+    fontSizes?: {
+        heading?: FontSize[];
+        paragraph?: FontSize[];
+    };
     borderRadius?: number;
     typography: Typography;
     elements: Record<string, Record<string, any> | StylesObject>;

From 304f391ce229923074332f18138d7c1e198359f3 Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Thu, 19 Dec 2024 16:20:03 +0100
Subject: [PATCH 21/28] fix: improve Webiny CLI developer-experience  (#4455)

---
 .../commands/newWatch.js                      | 14 +++++++----
 .../commands/newWatch/listPackages.js         |  6 +++++
 .../src/downloadAndLinkExtension.ts           |  8 +++++++
 .../src/extensions/AdminExtension.ts          |  2 +-
 .../src/extensions/ApiExtension.ts            |  2 +-
 .../src/extensions/PbElementExtension.ts      |  2 +-
 .../src/generateExtension.ts                  |  8 +++++++
 .../bundling/function/watchFunction.js        | 23 +++++++++++++++----
 8 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/packages/cli-plugin-deploy-pulumi/commands/newWatch.js b/packages/cli-plugin-deploy-pulumi/commands/newWatch.js
index 9230f92ba6..5fe5a1044e 100644
--- a/packages/cli-plugin-deploy-pulumi/commands/newWatch.js
+++ b/packages/cli-plugin-deploy-pulumi/commands/newWatch.js
@@ -121,8 +121,10 @@ module.exports = async (inputs, context) => {
     const learnMoreLink = "https://webiny.link/local-aws-lambda-development";
 
     context.info(`Local AWS Lambda development session started.`);
-    context.info(
-        `Note that you should deploy your changes once you're done. To do so, run: %s. Learn more: %s.`,
+    context.warning(
+        `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,
+        projectApplication.name,
+        "MUST",
         deployCommand,
         learnMoreLink
     );
@@ -141,9 +143,11 @@ module.exports = async (inputs, context) => {
         console.log();
         console.log();
 
-        context.info(`Stopping local AWS Lambda development session.`);
-        context.info(
-            `Note that you should deploy your changes. To do so, run: %s. Learn more: %s.`,
+        context.info(`Terminating local AWS Lambda development session.`);
+        context.warning(
+            `Note that once the session is terminated, the %s application will no longer work. To fix this, you %s redeploy it via the %s command. Learn more: %s.`,
+            projectApplication.name,
+            "MUST",
             deployCommand,
             learnMoreLink
         );
diff --git a/packages/cli-plugin-deploy-pulumi/commands/newWatch/listPackages.js b/packages/cli-plugin-deploy-pulumi/commands/newWatch/listPackages.js
index 8722bb6035..f4c6117e7b 100644
--- a/packages/cli-plugin-deploy-pulumi/commands/newWatch/listPackages.js
+++ b/packages/cli-plugin-deploy-pulumi/commands/newWatch/listPackages.js
@@ -56,6 +56,12 @@ const listPackages = async ({ inputs }) => {
                 ? path.join(root, "webiny.config.ts")
                 : path.join(root, "webiny.config.js");
 
+            // We need this because newly introduced extension
+            // packages do not have a Webiny config file.
+            if (!fs.existsSync(configPath)) {
+                continue;
+            }
+
             packages.push({
                 name: packageName,
                 config: require(configPath).default || require(configPath),
diff --git a/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts b/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
index 571c0417ee..a32e2f4a1a 100644
--- a/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
+++ b/packages/cli-plugin-extensions/src/downloadAndLinkExtension.ts
@@ -159,6 +159,14 @@ export const downloadAndLinkExtension = async ({
                 console.log(`  ‣ ${context.success.hl(p)}`);
             });
         }
+
+        console.log();
+        console.log(chalk.bold("Additional Notes"));
+        console.log(
+            `‣ note that if you already have the ${context.success.hl(
+                "webiny watch"
+            )} command running, you'll need to restart it`
+        );
     } catch (e) {
         switch (e.code) {
             case "NO_OBJECTS_FOUND":
diff --git a/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts b/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
index 87575cfb6f..bfb4caa770 100644
--- a/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/AdminExtension.ts
@@ -30,7 +30,7 @@ export class AdminExtension extends AbstractExtension {
         const indexTsxFilePath = `${extensionsFolderPath}/src/index.tsx`;
 
         return [
-            `run ${chalk.green(watchCommand)} to start a new local development session`,
+            `run ${chalk.green(watchCommand)} to start local development`,
             `open ${chalk.green(indexTsxFilePath)} and start coding`,
             `to install additional dependencies, run ${chalk.green(
                 `yarn workspace ${this.params.packageName} add <package-name>`
diff --git a/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts b/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
index 35e6c26923..8cc85806e4 100644
--- a/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/ApiExtension.ts
@@ -30,7 +30,7 @@ export class ApiExtension extends AbstractExtension {
         const indexTsxFilePath = `${extensionsFolderPath}/src/index.ts`;
 
         return [
-            `run ${chalk.green(watchCommand)} to start a new local development session`,
+            `run ${chalk.green(watchCommand)} to start local development`,
             `open ${chalk.green(indexTsxFilePath)} and start coding`,
             `to install additional dependencies, run ${chalk.green(
                 `yarn workspace ${this.params.packageName} add <package-name>`
diff --git a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
index 0f7be7d90c..c49767a149 100644
--- a/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
+++ b/packages/cli-plugin-extensions/src/extensions/PbElementExtension.ts
@@ -37,7 +37,7 @@ export class PbElementExtension extends AbstractExtension {
 
         return [
             [
-                `run the following commands to start local development sessions:`,
+                `run the following commands to start local development:`,
                 `  ∙ ${chalk.green(watchCommandAdmin)}`,
                 `  ∙ ${chalk.green(watchCommandWebsite)}`
             ].join("\n"),
diff --git a/packages/cli-plugin-extensions/src/generateExtension.ts b/packages/cli-plugin-extensions/src/generateExtension.ts
index b405ac5c26..55ece0fe8a 100644
--- a/packages/cli-plugin-extensions/src/generateExtension.ts
+++ b/packages/cli-plugin-extensions/src/generateExtension.ts
@@ -158,6 +158,14 @@ export const generateExtension = async ({ input, ora, context }: GenerateExtensi
                 console.log(`‣ ${message}`);
             });
         }
+
+        console.log();
+        console.log(chalk.bold("Additional Notes"));
+        console.log(
+            `‣ note that if you already have the ${context.success.hl(
+                "webiny watch"
+            )} command running, you'll need to restart it`
+        );
     } catch (err) {
         ora.fail("Could not create extension. Please check the logs below.");
         console.log();
diff --git a/packages/project-utils/bundling/function/watchFunction.js b/packages/project-utils/bundling/function/watchFunction.js
index 22fccbf6f4..0f909ee690 100644
--- a/packages/project-utils/bundling/function/watchFunction.js
+++ b/packages/project-utils/bundling/function/watchFunction.js
@@ -31,16 +31,29 @@ module.exports = async options => {
     }
 
     return new Promise(async (resolve, reject) => {
-        options.logs && console.log("Compiling...");
+        let initialCompilation = true;
+        if (options.logs) {
+            const message = initialCompilation ? "Initial compilation started..." : "Compiling...";
+            console.log(message);
+        }
+
         return webpack(webpackConfig).watch({}, async (err, stats) => {
             if (err) {
                 return reject(err);
             }
 
-            if (!stats.hasErrors()) {
-                options.logs && console.log("Compiled successfully.");
-            } else {
-                options.logs && console.log(stats.toString("errors-warnings"));
+            if (!options.logs) {
+                return;
+            }
+
+            if (stats.hasErrors()) {
+                console.log(stats.toString("errors-warnings"));
+                return;
+            }
+
+            if (initialCompilation) {
+                initialCompilation = false;
+                console.log("Initial compilation completed. Watching for changes...");
             }
         });
     });

From 395b6c0c3a83d3bccf7786ae7994a5fa99a9a224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Zori=C4=87?= <bruno.zoric@gmail.com>
Date: Thu, 19 Dec 2024 14:56:28 +0100
Subject: [PATCH 22/28] fix(api-form-builder): skip create fb on new locale if
 fb not installed on current locale

---
 .../api-form-builder-so-ddb/src/operations/form/index.ts  | 3 ++-
 packages/api-form-builder/__tests__/forms.test.ts         | 8 ++++----
 packages/api-form-builder/src/plugins/crud/index.ts       | 6 ++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/api-form-builder-so-ddb/src/operations/form/index.ts b/packages/api-form-builder-so-ddb/src/operations/form/index.ts
index c25f60780d..8177b0c942 100644
--- a/packages/api-form-builder-so-ddb/src/operations/form/index.ts
+++ b/packages/api-form-builder-so-ddb/src/operations/form/index.ts
@@ -513,7 +513,8 @@ export const createFormStorageOperations = (
         }
         let latestPublishedKeys: Keys | undefined;
         const entityBatch = createEntityWriteBatch({
-            entity
+            entity,
+            delete: [createLatestKeys(form)]
         });
 
         for (const item of items) {
diff --git a/packages/api-form-builder/__tests__/forms.test.ts b/packages/api-form-builder/__tests__/forms.test.ts
index 8c89be3d49..7b6398c3b1 100644
--- a/packages/api-form-builder/__tests__/forms.test.ts
+++ b/packages/api-form-builder/__tests__/forms.test.ts
@@ -40,7 +40,7 @@ describe('Form Builder "Form" Test', () => {
         }
     });
 
-    test("should create a form and return it in the list of latest forms", async () => {
+    it("should create a form and return it in the list of latest forms", async () => {
         const [create] = await createForm({ data: { name: "contact-us" } });
         const { id } = create.data.formBuilder.createForm.data;
 
@@ -70,7 +70,7 @@ describe('Form Builder "Form" Test', () => {
         expect(data[0].id).toEqual(id);
     });
 
-    test("should update form and return new data from storage", async () => {
+    it("should update form and return new data from storage", async () => {
         const [create] = await createForm({ data: { name: "contact-us" } });
         const { id } = create.data.formBuilder.createForm.data;
 
@@ -219,7 +219,7 @@ describe('Form Builder "Form" Test', () => {
         expect(revisions[0].version).toEqual(2);
     });
 
-    test("should delete a form and all of its revisions", async () => {
+    it("should delete a form and all of its revisions", async () => {
         const [create] = await createForm({ data: { name: "contact-us" } });
         const { id } = create.data.formBuilder.createForm.data;
 
@@ -246,7 +246,7 @@ describe('Form Builder "Form" Test', () => {
         expect(list.data.formBuilder.listForms.data.length).toBe(0);
     });
 
-    test("should publish, add views and unpublish", async () => {
+    it("should publish, add views and unpublish", async () => {
         const [create] = await createForm({ data: { name: "contact-us" } });
         const { id } = create.data.formBuilder.createForm.data;
 
diff --git a/packages/api-form-builder/src/plugins/crud/index.ts b/packages/api-form-builder/src/plugins/crud/index.ts
index 5a20f2300b..0c94f6f367 100644
--- a/packages/api-form-builder/src/plugins/crud/index.ts
+++ b/packages/api-form-builder/src/plugins/crud/index.ts
@@ -111,6 +111,12 @@ export default (params: CreateFormBuilderCrudParams) => {
         // Once a new locale is created, we need to create a new settings entry for it.
         new ContextPlugin<FormBuilderContext>(async context => {
             context.i18n.locales.onLocaleAfterCreate.subscribe(async params => {
+                // We don't want to auto-create the settings entry if Form Builder is not installed.
+                // This is because the entry will be created by the app's installer.
+                const fbIsInstalled = Boolean(await context.formBuilder.getSystemVersion());
+                if (!fbIsInstalled) {
+                    return;
+                }
                 const { locale } = params;
                 await context.i18n.withLocale(locale, async () => {
                     return context.formBuilder.createSettings({});

From 766148932da57569639f471960d7036a61eb6a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Zori=C4=87?= <bruno.zoric@gmail.com>
Date: Thu, 19 Dec 2024 15:29:45 +0100
Subject: [PATCH 23/28] chore: ghawac build

---
 .github/workflows/pullRequests.yml | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml
index e4dfa42ee2..ba83a616cb 100644
--- a/.github/workflows/pullRequests.yml
+++ b/.github/workflows/pullRequests.yml
@@ -3,7 +3,7 @@
 # and run "github-actions-wac build" (or "ghawac build") to regenerate this file.
 # For more information, run "github-actions-wac --help".
 name: Pull Requests
-"on": pull_request
+'on': pull_request
 concurrency:
   group: pr-${{ github.event.pull_request.number }}
   cancel-in-progress: true
@@ -19,7 +19,7 @@ jobs:
       - uses: webiny/action-conventional-commits@v1.3.0
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   validateCommitsDev:
     name: Validate commit messages (dev branch, 'feat' commits not allowed)
@@ -34,7 +34,7 @@ jobs:
           allowed-commit-types: fix,docs,style,refactor,test,build,perf,ci,chore,revert,merge,wip
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   constants:
     name: Create constants
@@ -87,7 +87,7 @@ jobs:
           $GITHUB_OUTPUT
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   assignMilestone:
     name: Assign milestone
@@ -117,7 +117,7 @@ jobs:
           milestone: ${{ steps.get-milestone-to-assign.outputs.milestone }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   build:
     name: Build
@@ -149,7 +149,7 @@ jobs:
           path: ${{ github.base_ref }}/.webiny/cached-packages
           key: ${{ needs.constants.outputs.run-cache-key }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysis:
     needs:
@@ -190,7 +190,7 @@ jobs:
         working-directory: ${{ github.base_ref }}
     runs-on: ubuntu-latest
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   staticCodeAnalysisTs:
     name: Static code analysis (TypeScript)
@@ -216,7 +216,7 @@ jobs:
         run: yarn cy:ts
         working-directory: ${{ github.base_ref }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageConstants:
     needs:
@@ -244,7 +244,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsNoStorageRun:
     needs:
@@ -265,7 +265,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsNoStorageConstants.outputs.packages-to-jest-test != '[]'
@@ -363,7 +363,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddbRun:
     needs:
@@ -383,7 +383,7 @@ jobs:
           fromJson(needs.jestTestsddbConstants.outputs.packages-to-jest-test) }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
     if: needs.jestTestsddbConstants.outputs.packages-to-jest-test != '[]'
@@ -480,7 +480,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-esRun:
     needs:
@@ -501,7 +501,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_ELASTIC_SEARCH_DOMAIN_NAME }}
@@ -610,7 +610,7 @@ jobs:
           echo '${{
           steps.list-packages-to-jest-test.outputs.packages-to-jest-test }}'
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
   jestTestsddb-osRun:
     needs:
@@ -631,7 +631,7 @@ jobs:
           }}
     runs-on: ${{ matrix.os }}
     env:
-      NODE_OPTIONS: "--max_old_space_size=4096"
+      NODE_OPTIONS: '--max_old_space_size=4096'
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
       AWS_REGION: eu-central-1
       AWS_ELASTIC_SEARCH_DOMAIN_NAME: ${{ secrets.AWS_OPEN_SEARCH_DOMAIN_NAME }}

From aef2d2d2451a5fc02a8e12f71d82b5487d7c42fd Mon Sep 17 00:00:00 2001
From: Adrian Smijulj <adrian1358@gmail.com>
Date: Fri, 20 Dec 2024 16:52:25 +0100
Subject: [PATCH 24/28] fix: delete settings entry on locale deletion (#4460)

---
 .../__tests__/graphql/i18n.ts                 | 16 ++++++
 .../__tests__/settings.test.ts                | 57 ++++++++++++++++---
 .../__tests__/useGqlHandler.ts                |  5 +-
 .../src/plugins/crud/index.ts                 |  7 +++
 4 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/packages/api-form-builder/__tests__/graphql/i18n.ts b/packages/api-form-builder/__tests__/graphql/i18n.ts
index f33ffc38db..86255c3126 100644
--- a/packages/api-form-builder/__tests__/graphql/i18n.ts
+++ b/packages/api-form-builder/__tests__/graphql/i18n.ts
@@ -13,3 +13,19 @@ export const CREATE_LOCALE = /* GraphQL */ `
         }
     }
 `;
+
+export const DELETE_LOCALE = /* GraphQL */ `
+    mutation DeleteI18NLocale($code: String!) {
+        i18n {
+            deleteI18NLocale(code: $code) {
+                data {
+                    code
+                }
+                error {
+                    message
+                    code
+                }
+            }
+        }
+    }
+`;
diff --git a/packages/api-form-builder/__tests__/settings.test.ts b/packages/api-form-builder/__tests__/settings.test.ts
index 48a100cc22..9addb5a390 100644
--- a/packages/api-form-builder/__tests__/settings.test.ts
+++ b/packages/api-form-builder/__tests__/settings.test.ts
@@ -2,9 +2,16 @@ import useGqlHandler from "./useGqlHandler";
 import { GET_SETTINGS } from "~tests/graphql/formBuilderSettings";
 
 describe("Settings Test", () => {
-    const { getSettings, updateSettings, install, createI18NLocale, isInstalled } = useGqlHandler();
-
-    test(`Should not be able to get & update settings before "install"`, async () => {
+    const {
+        getSettings,
+        updateSettings,
+        install,
+        createI18NLocale,
+        deleteI18NLocale,
+        isInstalled
+    } = useGqlHandler();
+
+    it(`Should not be able to get & update settings before "install"`, async () => {
         // Should not have any settings without install
         const [getSettingsResponse] = await getSettings();
 
@@ -40,7 +47,7 @@ describe("Settings Test", () => {
         });
     });
 
-    test("Should be able to install `Form Builder`", async () => {
+    it("Should be able to install `Form Builder`", async () => {
         // "isInstalled" should return false prior "install"
         const [isInstalledResponse] = await isInstalled();
 
@@ -78,7 +85,7 @@ describe("Settings Test", () => {
         });
     });
 
-    test(`Should be able to get & update settings after "install"`, async () => {
+    it(`Should be able to get & update settings after "install"`, async () => {
         // Let's install the `Form builder`
         const [installResponse] = await install({ domain: "http://localhost:3001" });
 
@@ -156,7 +163,7 @@ describe("Settings Test", () => {
         });
     });
 
-    test(`Should be able to get & update settings after in a new locale`, async () => {
+    it(`Should be able to get & update settings after in a new locale`, async () => {
         // Let's install the `Form builder`
         await install({ domain: "http://localhost:3001" });
 
@@ -168,9 +175,7 @@ describe("Settings Test", () => {
         // set the locale header. Wasn't easily possible via the `getSettings` helper.
         const [newLocaleFbSettings] = await invoke({
             body: { query: GET_SETTINGS },
-            headers: {
-                "x-i18n-locale": "default:de-DE;content:de-DE;"
-            }
+            headers: { "x-i18n-locale": "default:de-DE;content:de-DE;" }
         });
 
         // Settings should exist in the newly created locale.
@@ -192,4 +197,38 @@ describe("Settings Test", () => {
             }
         });
     });
+
+    it(`Should be able to create a locale, delete it, and again create it`, async () => {
+        // Let's install the `Form builder`
+        await install({ domain: "http://localhost:3001" });
+
+        await createI18NLocale({ data: { code: "en-US" } });
+        await createI18NLocale({ data: { code: "de-DE" } });
+
+        const [deleteDeLocaleResponse] = await deleteI18NLocale({ code: "de-DE" });
+        expect(deleteDeLocaleResponse).toEqual({
+            data: {
+                i18n: {
+                    deleteI18NLocale: {
+                        data: { code: "de-DE" },
+                        error: null
+                    }
+                }
+            }
+        });
+
+        const [createDeLocaleResponse] = await createI18NLocale({ data: { code: "de-DE" } });
+        expect(createDeLocaleResponse).toEqual({
+            data: {
+                i18n: {
+                    createI18NLocale: {
+                        data: {
+                            code: "de-DE"
+                        },
+                        error: null
+                    }
+                }
+            }
+        });
+    });
 });
diff --git a/packages/api-form-builder/__tests__/useGqlHandler.ts b/packages/api-form-builder/__tests__/useGqlHandler.ts
index e5fc524dd4..8dbf4b4f1b 100644
--- a/packages/api-form-builder/__tests__/useGqlHandler.ts
+++ b/packages/api-form-builder/__tests__/useGqlHandler.ts
@@ -12,7 +12,7 @@ import { createI18NGraphQL } from "@webiny/api-i18n/graphql";
 
 // Graphql
 import { INSTALL as INSTALL_FILE_MANAGER } from "./graphql/fileManagerSettings";
-import { CREATE_LOCALE } from "./graphql/i18n";
+import { DELETE_LOCALE, CREATE_LOCALE } from "./graphql/i18n";
 
 import {
     GET_SETTINGS,
@@ -228,6 +228,9 @@ export default (params: UseGqlHandlerParams = {}) => {
         // Locales.
         async createI18NLocale(variables: Record<string, any>) {
             return invoke({ body: { query: CREATE_LOCALE, variables } });
+        },
+        async deleteI18NLocale(variables: Record<string, any>) {
+            return invoke({ body: { query: DELETE_LOCALE, variables } });
         }
     };
 };
diff --git a/packages/api-form-builder/src/plugins/crud/index.ts b/packages/api-form-builder/src/plugins/crud/index.ts
index 0c94f6f367..c0aaf780b2 100644
--- a/packages/api-form-builder/src/plugins/crud/index.ts
+++ b/packages/api-form-builder/src/plugins/crud/index.ts
@@ -122,6 +122,13 @@ export default (params: CreateFormBuilderCrudParams) => {
                     return context.formBuilder.createSettings({});
                 });
             });
+
+            context.i18n.locales.onLocaleAfterDelete.subscribe(async params => {
+                const { locale } = params;
+                await context.i18n.withLocale(locale, async () => {
+                    return context.formBuilder.deleteSettings();
+                });
+            });
         })
     ];
 };

From 5350c901760358a3cdceb1788c086547429e012a Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Mon, 23 Dec 2024 18:52:27 +0100
Subject: [PATCH 25/28] fix(app-headless-cms): remove delete callback
 memoization

---
 .../admin/components/ContentEntryForm/useBind.tsx |  7 +++++--
 .../fieldRenderers/object/multipleObjects.tsx     | 15 ++++++---------
 .../object/multipleObjectsAccordion.tsx           | 15 ++++++---------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/packages/app-headless-cms/src/admin/components/ContentEntryForm/useBind.tsx b/packages/app-headless-cms/src/admin/components/ContentEntryForm/useBind.tsx
index f1bb62dc02..772e57b906 100644
--- a/packages/app-headless-cms/src/admin/components/ContentEntryForm/useBind.tsx
+++ b/packages/app-headless-cms/src/admin/components/ContentEntryForm/useBind.tsx
@@ -101,8 +101,11 @@ export function useBind({ Bind, field }: UseBindProps) {
                                     if (index < 0) {
                                         return;
                                     }
-                                    let value = bind.value;
-                                    value = [...value.slice(0, index), ...value.slice(index + 1)];
+
+                                    const value = [
+                                        ...bind.value.slice(0, index),
+                                        ...bind.value.slice(index + 1)
+                                    ];
 
                                     bind.onChange(value.length === 0 ? null : value);
 
diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
index 4e33f8cc59..808a7afc61 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjects.tsx
@@ -68,15 +68,12 @@ const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
         [moveValueUp, index]
     );
 
-    const onDelete = useCallback(
-        (ev: React.BaseSyntheticEvent) => {
-            ev.stopPropagation();
-            showConfirmation(() => {
-                bind.field.removeValue(index);
-            });
-        },
-        [index]
-    );
+    const onDelete = (ev: React.BaseSyntheticEvent) => {
+        ev.stopPropagation();
+        showConfirmation(() => {
+            bind.field.removeValue(index);
+        });
+    };
 
     return (
         <>
diff --git a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
index 24d35ac9f7..e0cdc18811 100644
--- a/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
+++ b/packages/app-headless-cms/src/admin/plugins/fieldRenderers/object/multipleObjectsAccordion.tsx
@@ -70,15 +70,12 @@ const Actions = ({ setHighlightIndex, bind, index }: ActionsProps) => {
         [moveValueUp, index]
     );
 
-    const onDelete = useCallback(
-        (ev: React.BaseSyntheticEvent) => {
-            ev.stopPropagation();
-            showConfirmation(() => {
-                bind.field.removeValue(index);
-            });
-        },
-        [index]
-    );
+    const onDelete = (ev: React.BaseSyntheticEvent) => {
+        ev.stopPropagation();
+        showConfirmation(() => {
+            bind.field.removeValue(index);
+        });
+    };
 
     return (
         <>

From 26f0b1d81a8598d7b4e3937a856f81d46882dbdc Mon Sep 17 00:00:00 2001
From: Pavel Denisjuk <pavel@webiny.com>
Date: Mon, 23 Dec 2024 20:42:21 +0100
Subject: [PATCH 26/28] fix(app-page-builder): expose a useDeleteElement hook

---
 .../src/editor/hooks/index.ts                 |  2 +
 .../src/editor/hooks/useDeleteElement.ts      | 64 +++++++++++++++++++
 .../src/editor/hooks/useFindElementBlock.ts   | 22 +++++++
 .../elementSettings/delete/DeleteAction.ts    | 59 ++---------------
 4 files changed, 95 insertions(+), 52 deletions(-)
 create mode 100644 packages/app-page-builder/src/editor/hooks/useDeleteElement.ts
 create mode 100644 packages/app-page-builder/src/editor/hooks/useFindElementBlock.ts

diff --git a/packages/app-page-builder/src/editor/hooks/index.ts b/packages/app-page-builder/src/editor/hooks/index.ts
index 827ad709e0..72385053bf 100644
--- a/packages/app-page-builder/src/editor/hooks/index.ts
+++ b/packages/app-page-builder/src/editor/hooks/index.ts
@@ -17,3 +17,5 @@ export { useRootElement } from "./useRootElement";
 export { useUI } from "./useUI";
 export { useUpdateElement } from "./useUpdateElement";
 export { useUpdateHandlers } from "./useUpdateHandlers";
+export { useDeleteElement } from "./useDeleteElement";
+export { useFindElementBlock } from "./useFindElementBlock";
diff --git a/packages/app-page-builder/src/editor/hooks/useDeleteElement.ts b/packages/app-page-builder/src/editor/hooks/useDeleteElement.ts
new file mode 100644
index 0000000000..8bf13d2a2c
--- /dev/null
+++ b/packages/app-page-builder/src/editor/hooks/useDeleteElement.ts
@@ -0,0 +1,64 @@
+import { useCallback } from "react";
+import { plugins } from "@webiny/plugins";
+import { useEventActionHandler, useFindElementBlock, useUpdateElement } from "~/editor";
+import { DeleteElementActionEvent } from "~/editor/recoil/actions";
+import type { PbBlockVariable, PbEditorElement, PbEditorPageElementPlugin } from "~/types";
+
+const removeVariableFromBlock = (block: PbEditorElement, variableId: string) => {
+    const variables = block.data.variables ?? [];
+
+    const updatedVariables = variables.filter(
+        (variable: PbBlockVariable) => variable.id.split(".")[0] !== variableId
+    );
+
+    return {
+        ...block,
+        data: {
+            ...block.data,
+            variables: updatedVariables
+        }
+    };
+};
+
+export const useDeleteElement = () => {
+    const eventActionHandler = useEventActionHandler();
+    const updateElement = useUpdateElement();
+    const { findElementBlock } = useFindElementBlock();
+
+    const canDeleteElement = useCallback((element: PbEditorElement) => {
+        const plugin = plugins
+            .byType<PbEditorPageElementPlugin>("pb-editor-page-element")
+            .find(pl => pl.elementType === element.type);
+
+        if (!plugin) {
+            return false;
+        }
+
+        if (typeof plugin.canDelete === "function") {
+            if (!plugin.canDelete({ element })) {
+                return false;
+            }
+        }
+
+        return true;
+    }, []);
+
+    const deleteElement = useCallback(async (element: PbEditorElement): Promise<void> => {
+        const block = await findElementBlock(element.id);
+
+        // We need to remove element variable from block if it exists
+        if (element.data?.variableId && block) {
+            const updatedBlock = removeVariableFromBlock(block, element.data.variableId);
+
+            updateElement(updatedBlock);
+        }
+
+        eventActionHandler.trigger(
+            new DeleteElementActionEvent({
+                element
+            })
+        );
+    }, []);
+
+    return { canDeleteElement, deleteElement };
+};
diff --git a/packages/app-page-builder/src/editor/hooks/useFindElementBlock.ts b/packages/app-page-builder/src/editor/hooks/useFindElementBlock.ts
new file mode 100644
index 0000000000..194840d422
--- /dev/null
+++ b/packages/app-page-builder/src/editor/hooks/useFindElementBlock.ts
@@ -0,0 +1,22 @@
+import { useCallback } from "react";
+import { useRecoilCallback } from "recoil";
+import { blockByElementSelector } from "~/editor/hooks/useCurrentBlockElement";
+
+/**
+ * Exposes a getter which traverses the element tree upwards from the given element id, and returns an element
+ * of type "block", if found.
+ */
+export const useFindElementBlock = () => {
+    const findBlock = useRecoilCallback(({ snapshot }) => async (id: string) => {
+        return await snapshot.getPromise(blockByElementSelector(id));
+    });
+
+    const findElementBlock = useCallback(
+        async (elementId: string) => {
+            return findBlock(elementId);
+        },
+        [findBlock]
+    );
+
+    return { findElementBlock };
+};
diff --git a/packages/app-page-builder/src/editor/plugins/elementSettings/delete/DeleteAction.ts b/packages/app-page-builder/src/editor/plugins/elementSettings/delete/DeleteAction.ts
index e57cdc387b..4a6c06dbca 100644
--- a/packages/app-page-builder/src/editor/plugins/elementSettings/delete/DeleteAction.ts
+++ b/packages/app-page-builder/src/editor/plugins/elementSettings/delete/DeleteAction.ts
@@ -1,67 +1,22 @@
 import React, { useCallback } from "react";
-import { plugins } from "@webiny/plugins";
-import { useActiveElement, useEventActionHandler } from "~/editor";
-import { PbEditorPageElementPlugin, PbBlockVariable, PbEditorElement } from "~/types";
-import { useUpdateElement } from "~/editor/hooks/useUpdateElement";
-import { useParentBlock } from "~/editor/hooks/useParentBlock";
-import { DeleteElementActionEvent } from "~/editor/recoil/actions";
-
-const removeVariableFromBlock = (block: PbEditorElement, variableId: string) => {
-    const variables = block.data.variables ?? [];
-
-    const updatedVariables = variables.filter(
-        (variable: PbBlockVariable) => variable.id.split(".")[0] !== variableId
-    );
-
-    return {
-        ...block,
-        data: {
-            ...block.data,
-            variables: updatedVariables
-        }
-    };
-};
+import { useActiveElement, useDeleteElement } from "~/editor";
 
 interface DeleteActionPropsType {
     children: React.ReactElement;
 }
 const DeleteAction = ({ children }: DeleteActionPropsType) => {
-    const eventActionHandler = useEventActionHandler();
     const [element] = useActiveElement();
-    const block = useParentBlock();
-    const updateElement = useUpdateElement();
-
-    if (!element) {
-        return null;
-    }
+    const { deleteElement, canDeleteElement } = useDeleteElement();
 
     const onClick = useCallback((): void => {
-        // We need to remove element variable from block if it exists
-        if (element.data?.variableId && block) {
-            const updatedBlock = removeVariableFromBlock(block, element.data.variableId);
-
-            updateElement(updatedBlock);
+        if (!element) {
+            return;
         }
-        eventActionHandler.trigger(
-            new DeleteElementActionEvent({
-                element
-            })
-        );
-    }, [element.id]);
-
-    const plugin = plugins
-        .byType<PbEditorPageElementPlugin>("pb-editor-page-element")
-        .find(pl => pl.elementType === element.type);
-
-    if (!plugin) {
-        return null;
-    }
 
-    if (typeof plugin.canDelete === "function") {
-        if (!plugin.canDelete({ element })) {
-            return null;
+        if (canDeleteElement(element)) {
+            deleteElement(element);
         }
-    }
+    }, [element?.id]);
 
     return React.cloneElement(children, { onClick });
 };

From c443ecc4ffe6e3978a6438e6fd0dc9f4f479a05d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Zori=C4=87?= <bruno.zoric@gmail.com>
Date: Sun, 5 Jan 2025 10:29:10 +0100
Subject: [PATCH 27/28] fix: merge dev into next

---
 packages/api-page-builder-so-ddb/package.json        |  3 +--
 .../src/render/defaultRenderUrlFunction.ts           |  2 +-
 packages/db-dynamodb/src/utils/put.ts                |  6 ++++--
 packages/db-dynamodb/src/utils/table/Table.ts        | 12 +++++++++++-
 yarn.lock                                            |  3 +--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/api-page-builder-so-ddb/package.json b/packages/api-page-builder-so-ddb/package.json
index a2b3772e41..b86f22c72e 100644
--- a/packages/api-page-builder-so-ddb/package.json
+++ b/packages/api-page-builder-so-ddb/package.json
@@ -24,8 +24,7 @@
     "@webiny/error": "0.0.0",
     "@webiny/handler-db": "0.0.0",
     "@webiny/utils": "0.0.0",
-    "dataloader": "^2.2.2",
-    "lodash": "^4.17.21"
+    "dataloader": "^2.2.2"
   },
   "devDependencies": {
     "@webiny/api-security": "0.0.0",
diff --git a/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts b/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
index 6bbddfa5b9..50fd2df614 100644
--- a/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
+++ b/packages/api-prerendering-service/src/render/defaultRenderUrlFunction.ts
@@ -35,7 +35,7 @@ export const defaultRenderUrlFunction = async (
             defaultViewport: chromium.defaultViewport,
             executablePath: await chromium.executablePath(),
             headless: chromium.headless,
-            ignoreHTTPSErrors: true
+            acceptInsecureCerts: true
         });
 
         const browserPage = await browser.newPage();
diff --git a/packages/db-dynamodb/src/utils/put.ts b/packages/db-dynamodb/src/utils/put.ts
index 937ccdcbb7..cc813dbf35 100644
--- a/packages/db-dynamodb/src/utils/put.ts
+++ b/packages/db-dynamodb/src/utils/put.ts
@@ -6,12 +6,14 @@ export type IPutParamsItem<T extends Record<string, any>> = {
     [key: string]: any;
 } & T;
 
-export interface IPutParams<T extends Record<string, any>> {
+export interface IPutParams<T extends Record<string, any> = Record<string, any>> {
     entity: Entity;
     item: IPutParamsItem<T>;
 }
 
-export const put = async <T extends Record<string, any>>(params: IPutParams<T>) => {
+export const put = async <T extends Record<string, any> = Record<string, any>>(
+    params: IPutParams<T>
+) => {
     const { entity, item } = params;
 
     return await entity.put(item, {
diff --git a/packages/db-dynamodb/src/utils/table/Table.ts b/packages/db-dynamodb/src/utils/table/Table.ts
index 7d7fba286e..6e9a759746 100644
--- a/packages/db-dynamodb/src/utils/table/Table.ts
+++ b/packages/db-dynamodb/src/utils/table/Table.ts
@@ -11,7 +11,7 @@ import { createTableWriteBatch } from "./TableWriteBatch";
 import { createTableReadBatch } from "./TableReadBatch";
 import { scan } from "../scan";
 
-export class Table<
+export class TableDefinition<
     Name extends string = string,
     PartitionKey extends string = string,
     SortKey extends string = string
@@ -42,3 +42,13 @@ export class Table<
         });
     }
 }
+
+export const defineTable = <
+    Name extends string = string,
+    PartitionKey extends string = string,
+    SortKey extends string = string
+>(
+    params: TableConstructor<Name, PartitionKey, SortKey>
+) => {
+    return new TableDefinition<Name, PartitionKey, SortKey>(params);
+};
diff --git a/yarn.lock b/yarn.lock
index f9c1073f2c..8c17275b5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12904,7 +12904,6 @@ __metadata:
     dataloader: "npm:^2.2.2"
     jest: "npm:^29.7.0"
     jest-dynalite: "npm:^3.6.1"
-    lodash: "npm:^4.17.21"
     rimraf: "npm:^6.0.1"
     ttypescript: "npm:^1.5.15"
     typescript: "npm:4.9.5"
@@ -14580,6 +14579,7 @@ __metadata:
     apollo-link: "npm:^1.2.14"
     apollo-link-batch-http: "npm:^1.2.14"
     graphql-tag: "npm:^2.12.6"
+    lz-string: "npm:^1.5.0"
     react: "npm:18.2.0"
     react-dom: "npm:18.2.0"
     react-helmet: "npm:^6.1.0"
@@ -15135,7 +15135,6 @@ __metadata:
     "@webiny/cli": "npm:0.0.0"
     "@webiny/db": "npm:0.0.0"
     "@webiny/error": "npm:0.0.0"
-    "@webiny/handler-db": "npm:0.0.0"
     "@webiny/plugins": "npm:0.0.0"
     "@webiny/project-utils": "npm:0.0.0"
     "@webiny/utils": "npm:0.0.0"

From de44705d2c8b8e9cc6c04030f07d462aa95271f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bruno=20Zori=C4=87?= <bruno.zoric@gmail.com>
Date: Sun, 5 Jan 2025 14:43:26 +0100
Subject: [PATCH 28/28] fix: merge dev into next

---
 packages/api-prerendering-service/package.json  | 2 --
 packages/db-dynamodb/src/utils/entity/Entity.ts | 5 ++++-
 packages/db-dynamodb/src/utils/entity/types.ts  | 2 +-
 packages/db-dynamodb/src/utils/put.ts           | 9 ++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/api-prerendering-service/package.json b/packages/api-prerendering-service/package.json
index dc3ba82289..7ef4468742 100644
--- a/packages/api-prerendering-service/package.json
+++ b/packages/api-prerendering-service/package.json
@@ -24,7 +24,6 @@
     "@webiny/handler-client": "0.0.0",
     "@webiny/plugins": "0.0.0",
     "@webiny/utils": "0.0.0",
-    "he": "^1.2.0",
     "lodash": "^4.17.21",
     "object-hash": "^3.0.0",
     "pluralize": "^8.0.0",
@@ -35,7 +34,6 @@
     "srcset": "^4.0.0"
   },
   "devDependencies": {
-    "@types/he": "^1.2.3",
     "@types/object-hash": "^2.2.1",
     "@types/puppeteer-core": "7.0.4",
     "@webiny/cli": "0.0.0",
diff --git a/packages/db-dynamodb/src/utils/entity/Entity.ts b/packages/db-dynamodb/src/utils/entity/Entity.ts
index 3e056d2b01..e32b579f57 100644
--- a/packages/db-dynamodb/src/utils/entity/Entity.ts
+++ b/packages/db-dynamodb/src/utils/entity/Entity.ts
@@ -23,6 +23,7 @@ import { createEntityReadBatch } from "./EntityReadBatch";
 import { createEntityWriteBatch } from "./EntityWriteBatch";
 import { createTableWriteBatch } from "~/utils/table/TableWriteBatch";
 import { queryAllClean, queryOneClean } from "../query";
+import { GenericRecord } from "@webiny/api/types";
 
 export type EntityConstructor<
     T extends Readonly<AttributeDefinitions> = Readonly<AttributeDefinitions>
@@ -64,7 +65,9 @@ export class Entity implements IEntity {
         });
     }
 
-    public async put(item: IPutParamsItem): ReturnType<typeof put> {
+    public async put<T extends GenericRecord = GenericRecord>(
+        item: IPutParamsItem<T>
+    ): ReturnType<typeof put> {
         return put({
             entity: this.entity,
             item
diff --git a/packages/db-dynamodb/src/utils/entity/types.ts b/packages/db-dynamodb/src/utils/entity/types.ts
index a3322d22d4..f4b39a9c30 100644
--- a/packages/db-dynamodb/src/utils/entity/types.ts
+++ b/packages/db-dynamodb/src/utils/entity/types.ts
@@ -23,7 +23,7 @@ export interface IEntity {
     createEntityReader(): IEntityReadBatch;
     createEntityWriter(): IEntityWriteBatch;
     createTableWriter(): ITableWriteBatch;
-    put(item: IPutParamsItem): ReturnType<typeof put>;
+    put<T extends GenericRecord = GenericRecord>(item: IPutParamsItem<T>): ReturnType<typeof put>;
     get<T>(keys: GetRecordParamsKeys): ReturnType<typeof get<T>>;
     getClean<T>(keys: GetRecordParamsKeys): ReturnType<typeof getClean<T>>;
     delete(keys: IDeleteItemKeys): ReturnType<typeof deleteItem>;
diff --git a/packages/db-dynamodb/src/utils/put.ts b/packages/db-dynamodb/src/utils/put.ts
index cc813dbf35..f82748a522 100644
--- a/packages/db-dynamodb/src/utils/put.ts
+++ b/packages/db-dynamodb/src/utils/put.ts
@@ -1,19 +1,18 @@
 import { Entity } from "~/toolbox";
+import { GenericRecord } from "@webiny/api/types";
 
-export type IPutParamsItem<T extends Record<string, any>> = {
+export type IPutParamsItem<T extends GenericRecord = GenericRecord> = {
     PK: string;
     SK: string;
     [key: string]: any;
 } & T;
 
-export interface IPutParams<T extends Record<string, any> = Record<string, any>> {
+export interface IPutParams<T extends GenericRecord = GenericRecord> {
     entity: Entity;
     item: IPutParamsItem<T>;
 }
 
-export const put = async <T extends Record<string, any> = Record<string, any>>(
-    params: IPutParams<T>
-) => {
+export const put = async <T extends GenericRecord = GenericRecord>(params: IPutParams<T>) => {
     const { entity, item } = params;
 
     return await entity.put(item, {