studiocms 0.2.0 → 0.4.0

package/frontend/pages/[dashboard]/smtp-configuration.astro

@@ -13,6 +13,7 @@ import { Select } from 'studiocms:ui/components/select';
 import { TabItem, Tabs } from 'studiocms:ui/components/tabs';
 import { Toggle } from 'studiocms:ui/components/toggle';
 import { Effect, genLogger, runEffect } from '@withstudiocms/effect';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import PageHeader from '../../components/dashboard/PageHeader.astro';
 import TemplateEditor from '../../components/dashboard/smtp-config/TemplateEditor.astro';
 import Layout from '../../layouts/DashboardLayout.astro';
@@ -51,12 +52,20 @@ if (!mailerConfig) {
 const notificationSettingKeys = Object.keys(notificationSettings.data).filter(
 	(key) => key !== '_config_version'
 ) as Array<keyof ConfigFinal<StudioCMSNotificationSettings>>;
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'owner',
+});
+setDataContext(Astro, {
+	key: 'x-redirect-url',
+	value: Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex,
+});
 ---
 
 <Layout
   title={t("title")}
   description={t("description")}
-  requiredPermission="owner"
   {lang}
   {config}
   {currentUser}
@@ -390,7 +399,9 @@ const notificationSettingKeys = Object.keys(notificationSettings.data).filter(
 
 <script>
   import { toast } from "studiocms:ui/components/toaster/client";
-  import { DbStudioElement } from '#db-studio/viewer'
+  import { DbStudioElement } from '#db-studio/viewer';
+  import { dashboardClient, dashboardSharedCatchTags } from 'studiocms:client/apiClients';
+  import * as Effect from 'effect/Effect';
 
 	// Define the custom element if not already defined
 	if (!customElements.get('db-studio')) {
@@ -437,40 +448,45 @@ const notificationSettingKeys = Object.keys(notificationSettings.data).filter(
 
     const createNewConfig = formData.get("create-new-config") as string;
 
-    const response = await fetch(smtpConfigForm.action, {
-      method: createNewConfig ? "POST" : "PATCH",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(data),
-    });
+    const createEffect = dashboardClient.pipe(
+      Effect.flatMap((client) =>
+        client.mailer.setupMailerConfig({
+          payload: data,
+        })
+      )
+    );
+
+    const updateEffect = dashboardClient.pipe(
+      Effect.flatMap((client) =>
+        client.mailer.updateMailerConfig({
+          payload: data,
+        })
+      )
+    );
+
+    const effectToRun = createNewConfig === "true" ? createEffect : updateEffect;
+
+    const response = await effectToRun.pipe(
+      Effect.catchTags(dashboardSharedCatchTags),
+      Effect.runPromise
+    );
 
-    if (!response.ok) {
+    if ('error' in response) {
       toast({
-        title: "Error",
-        description: "Failed to save SMTP configuration",
-        type: "danger",
+        title: 'Error',
+        description: response.error,
+        type: 'danger',
       });
       return;
-    }
-
-    const result = await response.json();
-
-    if (result.message) {
+    } else {
       toast({
-        title: "Success",
-        description: result.message,
-        type: "success",
+        title: 'Success',
+        description: response.message || 'SMTP configuration saved successfully.',
+        type: 'success',
       });
       setTimeout(() => {
         window.location.reload();
       }, 1000);
-    } else {
-      toast({
-        title: "Error",
-        description: result.error,
-        type: "danger",
-      });
     }
   });
 
@@ -483,37 +499,30 @@ const notificationSettingKeys = Object.keys(notificationSettings.data).filter(
       test_email: formData.get("test_email") as string,
     };
 
-    const response = await fetch(testSmtpForm.action, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(data),
-    });
+    const response = await dashboardClient.pipe(
+      Effect.flatMap((client) =>
+        client.mailer.testEmailService({
+          payload: data,
+        })
+      ),
+      Effect.catchTags(dashboardSharedCatchTags),
+      Effect.runPromise
+    );
 
-    if (!response.ok) {
+    if ('error' in response) {
       toast({
-        title: "Error",
-        description: "Failed to send test email",
-        type: "danger",
+        title: 'Error',
+        description: response.error,
+        type: 'danger',
       });
       return;
-    }
-
-    const result = await response.json();
-
-    if (result.message) {
-      toast({
-        title: "Success",
-        description: result.message,
-        type: "success",
-      });
     } else {
       toast({
-        title: "Error",
-        description: result.error,
-        type: "danger",
+        title: 'Success',
+        description: response.message || 'Test email sent successfully.',
+        type: 'success',
       });
+      return;
     }
   });
 
@@ -531,37 +540,30 @@ const notificationSettingKeys = Object.keys(notificationSettings.data).filter(
       oAuthBypassVerification: formData.get("oAuthBypassVerification") === "on",
     };
 
-    const response = await fetch(notificationSettingsForm.action, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(data),
-    });
+    const response = await dashboardClient.pipe(
+      Effect.flatMap((client) =>
+        client.emailNotifications.updateEmailNotificationsSettings({
+          payload: data,
+        })
+      ),
+      Effect.catchTags(dashboardSharedCatchTags),
+      Effect.runPromise
+    );
 
-    if (!response.ok) {
+    if ('error' in response) {
       toast({
-        title: "Error",
-        description: "Failed to save notification settings",
-        type: "danger",
+        title: 'Error',
+        description: response.error,
+        type: 'danger',
       });
       return;
-    }
-
-    const result = await response.json();
-
-    if (result.message) {
-      toast({
-        title: "Success",
-        description: result.message,
-        type: "success",
-      });
     } else {
       toast({
-        title: "Error",
-        description: result.error,
-        type: "danger",
+        title: 'Success',
+        description: response.message || 'Email notification settings updated successfully.',
+        type: 'success',
       });
+      return;
     }
   });
 </script>

package/frontend/pages/[dashboard]/system-management.astro

@@ -6,6 +6,7 @@ import { isDefaultManager } from 'studiocms:storage-manager/name';
 import { Button } from 'studiocms:ui/components/button';
 import { Card } from 'studiocms:ui/components/card';
 import { Icon } from 'studiocms:ui/components/icon';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import { getConfig } from '#db-studio/config';
 import ComponentRegistryUI from '#frontend/components/shared/ComponentRegistryUI.astro';
 import StorageFileBrowser from '#frontend/components/shared/storage-manager/StorageFileBrowser.astro';
@@ -21,12 +22,20 @@ const userConfig = getConfig();
 
 // Get component registry data
 const registryData = getRegistryComponents();
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'owner',
+});
+setDataContext(Astro, {
+	key: 'x-redirect-url',
+	value: Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex,
+});
 ---
 
 <Layout
     title={t("title")}
     description={t("description")}
-    requiredPermission="owner"
     {lang}
     {config}
     {currentUser}

package/frontend/pages/[dashboard]/taxonomy/categories.astro

@@ -3,6 +3,7 @@ import { useTranslations } from 'studiocms:i18n';
 import { runSDK, SDKCoreJs } from 'studiocms:sdk';
 import { Input } from 'studiocms:ui/components/input';
 import { Select } from 'studiocms:ui/components/select';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import MetaContainer from '#frontend/components/dashboard/taxonomy/MetaContainer.astro';
 import TaxonomyLayout from '#frontend/layouts/TaxonomyLayout.astro';
 
@@ -28,6 +29,15 @@ const filterCurrent = (categoryId: number | undefined) => {
 	}
 	return editId ? Number.parseInt(editId, 10) !== categoryId : true;
 };
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'editor',
+});
+setDataContext(Astro, {
+	key: 'x-redirect-url',
+	value: Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex,
+});
 ---
 
 <TaxonomyLayout type="categories">
@@ -117,6 +127,8 @@ const filterCurrent = (categoryId: number | undefined) => {
         parseFormDataToJson,
     } from "./shared-client.js";
     import { toast } from "studiocms:ui/components/toaster/client";
+    import { dashboardClient, dashboardSharedCatchTags } from 'studiocms:client/apiClients';
+    import * as Effect from 'effect/Effect';
 
     const $ = <E extends HTMLElement>(
         selector: string,
@@ -202,56 +214,33 @@ const filterCurrent = (categoryId: number | undefined) => {
             const formData = new FormData(form);
             const jsonData = parseFormDataToJson(formData, 'categories');
 
-            let response: Response;
+            const response = await dashboardClient.pipe(
+                Effect.flatMap((client) =>
+                    client.taxonomy.taxonomy({
+                        payload: jsonData,
+                    })
+                ),
+                Effect.catchTags(dashboardSharedCatchTags),
+                Effect.runPromise
+            );
 
-            try {
-                response = await fetch(form.action, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    body: JSON.stringify(jsonData),
-                });
-            } catch (error) {
+            if ("error" in response) {
                 toast({
                     title: "Error",
-                    description:
-                        "An error occurred while saving the category",
+                    description: response.error,
                     type: "danger",
                 });
                 return;
-            }
-
-            if (response.ok) {
-                const result: { message: string } =
-                    await response.json();
-                if (response.status === 200) {
-                    toast({
-                        title: "Success",
-                        description:
-                            result.message || "Category saved successfully",
-                        type: "success",
-                    });
-
-                    if (redirectUrl) {
-                        window.location.href = redirectUrl;
-                    }
-                } else {
-                    toast({
-                        title: "Error",
-                        description:
-                            result.message ||
-                            "An error occurred while saving the category",
-                        type: "danger",
-                    });
-                }
             } else {
                 toast({
-                    title: "Error",
-                    description:
-                        "An error occurred while saving the category",
-                    type: "danger",
+                    title: "Success",
+                    description: response.message || "Category saved successfully",
+                    type: "success",
                 });
+
+                if (redirectUrl) {
+                    window.location.href = redirectUrl;
+                }
             }
         });
     }

package/frontend/pages/[dashboard]/taxonomy/index.astro

@@ -1,10 +1,20 @@
 ---
 import { useTranslations } from 'studiocms:i18n';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import TaxonomyLayout from '#frontend/layouts/TaxonomyLayout.astro';
 
 const { defaultLang: lang } = Astro.locals.StudioCMS;
 
 const t = useTranslations(lang, '@studiocms/dashboard:taxonomy-index');
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'editor',
+});
+setDataContext(Astro, {
+	key: 'x-redirect-url',
+	value: Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex,
+});
 ---
 
 <TaxonomyLayout type='index'>

package/frontend/pages/[dashboard]/taxonomy/tags.astro

@@ -1,12 +1,22 @@
 ---
 import { useTranslations } from 'studiocms:i18n';
 import { Input } from 'studiocms:ui/components/input';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import MetaContainer from '#frontend/components/dashboard/taxonomy/MetaContainer.astro';
 import TaxonomyLayout from '#frontend/layouts/TaxonomyLayout.astro';
 
 const { defaultLang: lang } = Astro.locals.StudioCMS;
 
 const t = useTranslations(lang, '@studiocms/dashboard:taxonomy-index');
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'editor',
+});
+setDataContext(Astro, {
+	key: 'x-redirect-url',
+	value: Astro.locals.StudioCMS.routeMap.mainLinks.dashboardIndex,
+});
 ---
 <TaxonomyLayout type='tags'>
     <form 
@@ -81,6 +91,8 @@ const t = useTranslations(lang, '@studiocms/dashboard:taxonomy-index');
 <script>
     import { getCurrentEntryData, parseFormDataToJson } from "./shared-client.js";
     import { toast } from 'studiocms:ui/components/toaster/client';
+    import { dashboardClient, dashboardSharedCatchTags } from 'studiocms:client/apiClients';
+    import * as Effect from 'effect/Effect';
 
     const $ = <E extends HTMLElement>(selector: string, context: Document | Element = document) =>
         context.querySelector(selector) as E;
@@ -124,56 +136,34 @@ const t = useTranslations(lang, '@studiocms/dashboard:taxonomy-index');
             const formData = new FormData(form);
             const jsonData = parseFormDataToJson(formData, 'tags');
 
-            let response: Response;
+            const response = await dashboardClient.pipe(
+                Effect.flatMap((client) =>
+                    client.taxonomy.taxonomy({
+                        payload: jsonData,
+                    })
+                ),
+                Effect.catchTags(dashboardSharedCatchTags),
+                Effect.runPromise
+            );
 
-            try {
-                response = await fetch(form.action, {
-                    method: "POST",
-                    headers: {
-                        "Content-Type": "application/json",
-                    },
-                    body: JSON.stringify(jsonData),
-                });
-            } catch (error) {
+            if ('error' in response) {
                 toast({
-                    title: "Error",
-                    description:
-                        "An error occurred while saving the tag",
-                    type: "danger",
+                    title: 'Error',
+                    description: response.error,
+                    type: 'danger',
                 });
                 return;
-            }
-
-            if (response.ok) {
-                const result: { message: string } =
-                    await response.json();
-                if (response.status === 200) {
-                    toast({
-                        title: "Success",
-                        description:
-                            result.message || "Tag saved successfully",
-                        type: "success",
-                    });
-
-                    if (redirectUrl) {
-                        window.location.href = redirectUrl;
-                    }
-                } else {
-                    toast({
-                        title: "Error",
-                        description:
-                            result.message ||
-                            "An error occurred while saving the tag",
-                        type: "danger",
-                    });
-                }
             } else {
                 toast({
-                    title: "Error",
-                    description:
-                        "An error occurred while saving the tag",
-                    type: "danger",
+                    title: 'Success',
+                    description: response.message || 'Tag saved successfully.',
+                    type: 'success',
                 });
+
+                if (redirectUrl) {
+                    window.location.href = redirectUrl;
+                }
+                return;
             }
         })
     }

package/frontend/pages/[dashboard]/unverified-email.astro

@@ -2,6 +2,7 @@
 import '../../styles/404.css';
 import { useTranslations } from 'studiocms:i18n';
 import { Button } from 'studiocms:ui/components/button';
+import { setDataContext } from '@withstudiocms/effect/astro/data-middleware';
 import Layout from '../../layouts/DashboardLayout.astro';
 
 const { siteConfig: config, defaultLang: lang, security } = Astro.locals.StudioCMS;
@@ -15,13 +16,17 @@ const userId = currentUser?.user?.id;
 if (!userId) {
 	return Astro.redirect(Astro.locals.StudioCMS.routeMap.authLinks.loginURL);
 }
+
+setDataContext(Astro, {
+	key: 'x-required-role',
+	value: 'none',
+});
 ---
 
 <Layout 
   title={t('title')}
   description={t('description')}
   sidebar={false} 
-  requiredPermission="none"
   {lang}
   {config}
   {currentUser}>
@@ -52,6 +57,8 @@ if (!userId) {
 
 <script>
   import { toast } from 'studiocms:ui/components/toaster/client';
+  import { dashboardClient, dashboardSharedCatchTags } from 'studiocms:client/apiClients';
+  import * as Effect from 'effect/Effect';
 
   document.getElementById('back-button')!.addEventListener('click', () => {
     window.location.href = '/';
@@ -61,34 +68,35 @@ if (!userId) {
 
   resendButton.addEventListener('click', async () => {
     const userId = resendButton.querySelector('div')!.dataset.userid;
-    const url = resendButton.querySelector('div')!.dataset.url;
 
-    if (!userId || !url) {
+    if (!userId) {
       return;
     }
 
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ userId }),
-    });
-
-    const data = await response.json();
-
-    if (response.ok) {
+    const response = await dashboardClient.pipe(
+      Effect.flatMap((client) => 
+        client.verifyEndpoints.resendVerifyEmail({
+          payload: {
+            userId
+          }
+        })
+      ),
+      Effect.catchTags(dashboardSharedCatchTags),
+      Effect.runPromise
+    );
+
+    if ('error' in response) {
       toast({
-        title: 'Success',
-        description: data.message,
-        type: 'success',
-      })
+        title: 'Error',
+        description: response.error,
+        type: 'danger',
+      });
       return;
     } else {
       toast({
-        title: 'Error',
-        description: data.error,
-        type: 'danger',
+        title: 'Success',
+        description: response.message || 'Verification email resent successfully.',
+        type: 'success',
       });
       return;
     }