@rxdrag/website-lib-core 0.0.11 → 0.0.13

package/src/entify/lib/queryPosts.ts

@@ -1,32 +1,44 @@
-import { Post, PostBoolExp, PostOrderBy, PostDistinctExp, PostFields, PublishableStatus, PostAssciations, PostQueryOptions, MediaQueryOptions, UserQueryOptions, UserFields } from "@rxdrag/rxcms-models";
+import {
+  Post,
+  PostBoolExp,
+  PostOrderBy,
+  PostDistinctExp,
+  PostFields,
+  PublishableStatus,
+  PostAssciations,
+  PostQueryOptions,
+  MediaQueryOptions,
+  UserQueryOptions,
+  UserFields,
+} from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { ListResult } from "@rxdrag/entify-hooks";
 import { EnvVariables, TSize } from "../types";
 import { TPost } from "../view-model";
 
 export interface ListConditions {
-  category?: string;//category slug
+  category?: string; //category slug
   page?: number;
   pageSize: number;
 }
 
 export async function queryPosts(
-  conditions: ListConditions, 
-  coverSize: TSize | undefined, 
+  conditions: ListConditions,
+  coverSize: TSize | undefined,
   envVariables: EnvVariables,
   selectFields?: (keyof Post)[]
 ) {
   const { category: categorySlug, page = 1, pageSize } = conditions;
 
-  let where = {}
+  let where = {};
   if (categorySlug) {
     where = {
       [PostAssciations.category]: {
         slug: {
-          "_eq": categorySlug
-        }
+          _eq: categorySlug,
+        },
       },
-    }
+    };
   }
 
   // 默认查询字段
@@ -44,49 +56,54 @@ export async function queryPosts(
   // 使用指定的字段或默认字段
   const fields = selectFields || defaultFields;
 
-  const queryOptions = new PostQueryOptions(
-    fields,
-    {
-      offset: (page - 1) * pageSize,
-      limit: pageSize,
-      where: {
-        [PostFields.status]: {
-          "_eq": PublishableStatus.published
+  const queryOptions = new PostQueryOptions(fields, {
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    where: {
+      [PostFields.status]: {
+        _eq: PublishableStatus.published,
+      },
+      lang: {
+        abbr: {
+          _eq: envVariables.language,
         },
-        ...where,
       },
-      orderBy: [
-        {
-          [PostFields.createdAt]: "desc"
-        }
-      ]
-    }
-  );
+      ...where,
+    },
+    orderBy: [
+      {
+        [PostFields.createdAt]: "desc",
+      },
+    ],
+  });
 
   // 只有在需要查询封面图时才添加封面图查询
-  if (!selectFields || selectFields.includes('cover' as keyof Post)) {
+  if (!selectFields || selectFields.includes("cover" as keyof Post)) {
     queryOptions.cover(
-      new MediaQueryOptions().file(
-        [
-          "thumbnail",
-          coverSize ? `resize(width:${coverSize.width}, height:${coverSize.height})` : "resize(width:480, height:180)"
-        ]
-      )
+      new MediaQueryOptions().file([
+        "thumbnail",
+        coverSize
+          ? `resize(width:${coverSize.width}, height:${coverSize.height})`
+          : "resize(width:480, height:180)",
+      ])
     );
   }
 
   // 只有在需要查询作者时才添加作者查询
-  if (!selectFields || selectFields.includes('author' as keyof Post)) {
+  if (!selectFields || selectFields.includes("author" as keyof Post)) {
     queryOptions.author(
-      new UserQueryOptions([UserFields.id, UserFields.name])
-        .avatar(new MediaQueryOptions().file(["thumbnail"]))
+      new UserQueryOptions([UserFields.id, UserFields.name]).avatar(
+        new MediaQueryOptions().file(["thumbnail"])
+      )
     );
   }
 
-  const result = await queryEntityList<Post, PostBoolExp, PostOrderBy, PostDistinctExp>(
-    queryOptions,
-    envVariables
-  );
-  
+  const result = await queryEntityList<
+    Post,
+    PostBoolExp,
+    PostOrderBy,
+    PostDistinctExp
+  >(queryOptions, envVariables);
+
   return result as ListResult<TPost> | undefined;
 }

package/src/entify/lib/queryProductCategories.ts

@@ -15,6 +15,13 @@ export async function queryProductCategories(envVariables: EnvVariables) {
         ProductCategoryFields.description,
       ],
       {
+        where: {
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
+        },
         orderBy: [
           { [ProductCategoryFields.seqValue]: "asc" }
         ]

package/src/entify/lib/queryProducts.ts

@@ -46,6 +46,11 @@ export async function queryProducts(
         [ProductFields.status]: {
           "_eq": PublishableStatus.published
         },
+        lang: {
+          abbr: {
+            _eq: envVariables.language,
+          },
+        },
         ...where,
       },
       orderBy: [

package/src/entify/lib/queryProductsInMenu.ts

@@ -1,4 +1,8 @@
-import { ProductFields, ProductQueryOptions, PublishableStatus } from "@rxdrag/rxcms-models";
+import {
+  ProductFields,
+  ProductQueryOptions,
+  PublishableStatus,
+} from "@rxdrag/rxcms-models";
 import { queryEntityList } from "./queryEntityList";
 import { EnvVariables } from "../types";
 import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
@@ -6,25 +10,23 @@ import { newQueryProductsMediaOptions } from "./newQueryProductsMediaOptions";
 export async function queryProductsInMenu(envVariables: EnvVariables) {
   const result = await queryEntityList(
     new ProductQueryOptions(
-      [
-        ProductFields.id,
-        ProductFields.slug,
-        ProductFields.title,
-      ],
+      [ProductFields.id, ProductFields.slug, ProductFields.title],
       {
         where: {
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
           showInNavMenu: {
-            "_eq": true
+            _eq: true,
           },
           [ProductFields.status]: {
-            "_eq": PublishableStatus.published
+            _eq: PublishableStatus.published,
           },
         },
       }
-    )
-      .mediaPivots(
-        newQueryProductsMediaOptions()
-      ),
+    ).mediaPivots(newQueryProductsMediaOptions()),
     envVariables
   );
   return result;

package/src/entify/lib/queryUserPosts.ts

@@ -53,6 +53,11 @@ export async function queryUserPosts(
           [PostFields.status]: {
             _eq: PublishableStatus.published,
           },
+          lang: {
+            abbr: {
+              _eq: envVariables.language,
+            },
+          },
           [PostAssciations.author]: {
             id: {
               _eq: userId,

package/src/entify/lib/queryWebSiteSettings.ts

@@ -17,11 +17,10 @@ export async function queryWebSiteSettings(envVariables: EnvVariables) {
     WebsiteSettingsDistinctExp
   >(
     new WebsiteSettingsQueryOptions([
-      WebsiteSettingsFields.footerCode,
-      WebsiteSettingsFields.headerCode,
-      WebsiteSettingsFields.gaTrackingId,
       WebsiteSettingsFields.noticeEmail,
       WebsiteSettingsFields.smtpConfig,
+      WebsiteSettingsFields.replyToEmail,
+      WebsiteSettingsFields.useCustomizedSmtp,
     ]),
     envVariables
   );

package/src/entify/lib/queryWebsite.ts

@@ -0,0 +1,43 @@
+import {
+  Website,
+  WebsiteBoolExp,
+  WebsiteOrderBy,
+  WebsiteDistinctExp,
+  WebsiteQueryOptions,
+  WebsiteFields,
+  LangFields,
+} from "@rxdrag/rxcms-models";
+import { queryOneEntity } from "./queryOneEntity";
+import { EnvVariables } from "../types";
+
+export async function queryWebsite(envVariables: EnvVariables) {
+  const website = await queryOneEntity<
+    Website,
+    WebsiteBoolExp,
+    WebsiteOrderBy,
+    WebsiteDistinctExp
+  >(
+    new WebsiteQueryOptions(
+      [WebsiteFields.id, WebsiteFields.name, WebsiteFields.title],
+      {
+        where: {
+          id: {
+            _eq: envVariables.websiteId,
+          },
+        },
+      }
+    )
+      .baseLang([
+        LangFields.id,
+        LangFields.abbr,
+        LangFields.localName,
+        LangFields.cnName,
+        LangFields.urlFragment,
+        LangFields.htmlLang,
+      ])
+      .setNoQuery(!envVariables.websiteId),
+    { ...envVariables, websiteId: undefined }
+  );
+
+  return website as Website | undefined;
+}

package/src/entify/lib/searchProducts.ts

@@ -48,6 +48,13 @@ export async function searchProducts(
       limit: 100,
       where: {
         _and: [
+          {
+            lang: {
+              abbr: {
+                _eq: envVariables.language,
+              },
+            },
+          },
           {
             [ProductFields.status]: {
               _eq: PublishableStatus.published,

package/src/entify/view-model/models.ts

@@ -110,9 +110,7 @@ export type TWebsiteSettings = {
   facebook?: string;
   twitter?: string;
   instagram?: string;
-  footerCode?: string;
   websiteName?: string;
-  map301?: string;
 };
 
 export type TBreadcrumbItem = {
@@ -120,11 +118,6 @@ export type TBreadcrumbItem = {
   href?: string;
 };
 
-export type TPage = {
-  title?: string;
-  breadcrumbs?: TBreadcrumbItem[];
-};
-
 export type TPagination = {
   urlPrefix?: string;
   current?: number;
@@ -138,6 +131,5 @@ export const entityMaps: Record<string, string> = {
   PostCategory: "TPostCategory",
   User: "TUser",
   Media: "TMedia",
-  Page: "TPage",
   WebsiteSettings: "TWebsiteSettings",
 };

package/src/react/components/ContactForm/index.tsx

@@ -1,10 +1,9 @@
-import { forwardRef, useEffect, useState } from "react";
+import { forwardRef, useState } from "react";
 import { Input } from "./Input";
 import { Submit } from "./Submit";
 import { Textarea } from "./Textarea";
-import { DATA_POPUP_CTA } from "../../../controller/consts";
 import clsx from "clsx";
-import { popover } from "../../../controller";
+import { modal } from "../../../controller";
 
 /**
  * 简单的加密函数，用于生成防机器人的加密字段
@@ -91,7 +90,7 @@ interface FormErrors {
 export type ContactFormProps = {
   submitAlign?: "left" | "center" | "right";
   actionUrl?: string;
-  //formSalt: string;
+  formSalt: string;
   labels?: {
     name?: string;
     email?: string;
@@ -106,7 +105,7 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
     const {
       submitAlign = "right",
       actionUrl = "/api/ask-for-quote",
-      //formSalt,
+      formSalt,
       labels = {},
     } = props;
     const [formData, setFormData] = useState<QuoteRequest>({
@@ -114,7 +113,6 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
       email: "",
       company: "",
       message: "",
-      fromCta: "",
       phone: "", // 初始化蜜罐字段
     });
     // 错误状态
@@ -124,26 +122,6 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
       success?: boolean;
       message?: string;
     }>({});
-    //最近被点击过的cta
-
-    useEffect(() => {
-      const unsub = popover.onOpenAll((event) => {
-        setFormData((prev) => ({
-          ...prev,
-          fromCta: event.target?.getAttribute(DATA_POPUP_CTA) || undefined,
-        }));
-      });
-      const unsub2 = popover.onCloseAll(() => {
-        setFormData((prev) => ({
-          ...prev,
-          fromCta: "",
-        }));
-      });
-      return () => {
-        unsub();
-        unsub2();
-      };
-    }, []);
 
     // 处理输入变化
     const handleChange = (
@@ -205,12 +183,12 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
       try {
         setSubmitting(true);
         setSubmitStatus({}); // 重置提交状态
-
         const response = await fetch(actionUrl, {
           method: "POST",
           body: JSON.stringify({
             ...formData,
-            encryptedField: encrypt(formData.phone, "yizhanfeinb"),
+            fromCta: modal.lastCta,
+            encryptedField: encrypt(formData.phone, formSalt),
           }),
           headers: {
             "X-Request-URL": window.location.href,
@@ -236,7 +214,6 @@ export const ContactForm = forwardRef<HTMLDivElement, ContactFormProps>(
             email: "",
             company: "",
             message: "",
-            fromCta: "产品页面",
             phone: "",
           });
           window.location.href = "/thanks";