@vonaffenfels/contentful-slate-editor 1.0.56 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vonaffenfels/contentful-slate-editor",
-    "version": "1.0.56",
+    "version": "1.0.58",
     "scripts": {
         "prepublish": "yarn run build",
         "dev": "yarn run start",
@@ -91,10 +91,10 @@
         "webpack-watch-files-plugin": "^1.2.1"
     },
     "dependencies": {
-        "@vonaffenfels/slate-editor": "^1.0.56",
+        "@vonaffenfels/slate-editor": "^1.0.58",
         "webpack": "5.88.2"
     },
-    "gitHead": "46c4cdded137ff7fdd53011ee6b999972131dd9c",
+    "gitHead": "e85142a8a7b6863ad2aa7a1ded8ee89a5f4d64aa",
     "publishConfig": {
         "access": "public"
     }

package/src/components/Dialog.js

@@ -29,7 +29,7 @@ const Dialog = ({
 
     switch (sdk.parameters.invocation.type) {
         case "cloudinary":
-            return <DialogCloudinary sdk={sdk} config={activeConfig} />;
+            return <DialogCloudinary sdk={sdk} config={sdk.parameters.invocation} activeConfig={activeConfig} />;
         default:
             return <div className="relative flex h-full max-h-full justify-between">
                 <BlockEditor

package/src/components/DialogCloudinary.js

@@ -8,9 +8,10 @@ import "../scss/dialog-cloudinary.scss";
 const DialogCloudinary = ({
     sdk,
     config,
+    activeConfig,
 }) => {
-    const cloudinaryApiKey = config?.env?.CLOUDINARY_CLOUD_NAME;
-    const cloudinaryCloudName = config?.env?.CLOUDINARY_API_KEY;
+    const cloudinaryApiKey = activeConfig?.env?.CLOUDINARY_API_KEY;
+    const cloudinaryCloudName = activeConfig?.env?.CLOUDINARY_CLOUD_NAME;
 
     const cloudinaryRef = useRef(null);
 

package/src/components/EditorField.js

@@ -98,21 +98,18 @@ const EditorField = ({
         setIsLoadingCount(++isLoadingCountGlobal);
 
         try {
-            const fetchUrl = `/api/loader/?${new URLSearchParams({
-                portal: portal,
-                block: block,
-                variables: JSON.stringify({
-                    ...attributes,
-                    entries: null,
-                    items: null,
+            console.log("KIENZ_DEBUG: :101 / executeLoader", sdk, sdk?.entry?.sys?.id);
+            const loaderResult = await fetch(`/api/loader/?portal=${portal}&block=${block}`, {
+                method: "POST",
+                body: JSON.stringify({
+                    variables: {
+                        ...(attributes || {}),
+                    },
+                    context: {activeContent: {sys: {id: sdk?.entry?.sys?.id}}},
                 }),
-            })}`;
-
-            loaderResult = await fetch(fetchUrl)
-                .then(res => res.json())
-                .catch(err => {
-                    console.error(err);
-                });
+            }).then(res => res.json()).catch(err => {
+                console.error(err);
+            });
 
             if (loaderResult) {
                 for (let key in loaderResult) {

package/src/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {createRoot} from 'react-dom/client';
 
 import {
@@ -16,7 +16,7 @@ import Field from './components/Field';
 import Dialog from "./components/Dialog";
 
 export const BaseContentfulApp = (props) => {
-    init((sdk) => {
+    init(async (sdk) => {
         const rootContainer = document.getElementById('root');
         const RendererWrapperComponent = props?.RendererWrapperComponent || (({children}) => <div className="h-full">{children}</div>);
         const wrapperProps = {
@@ -26,7 +26,12 @@ export const BaseContentfulApp = (props) => {
             contentType: sdk.parameters?.invocation?.contentType || sdk?.entry?.getSys()?.contentType?.sys?.id,
         };
         const elementPropsMap = props?.getElementPropsMap?.(wrapperProps.contentType) || props?.elementPropsMap;
-        const activeConfig = props?.getActiveConfig?.() || props?.activeConfig;
+
+        let config;
+
+        if (sdk.parameters?.invocation?.portal) {
+            config = await props.getByPortal(sdk.parameters?.invocation?.portal);
+        }
 
         const ComponentLocationSettings = [
             {
@@ -50,7 +55,7 @@ export const BaseContentfulApp = (props) => {
             },
             {
                 location: locations.LOCATION_DIALOG,
-                component: <RendererWrapperComponent {...wrapperProps} ><Dialog sdk={sdk} elementPropsMap={elementPropsMap} activeConfig={activeConfig} /></RendererWrapperComponent>,
+                component: <Dialog sdk={sdk} elementPropsMap={elementPropsMap} activeConfig={config} />,
             },
         ];