fix conflict

ui/src/components/certimate/DeployEditDialog.tsx

@@ -11,6 +11,9 @@ import AccessEditDialog from "./AccessEditDialog";
 import { Context as DeployEditContext } from "./DeployEdit";
 import DeployToAliyunOSS from "./DeployToAliyunOSS";
 import DeployToAliyunCDN from "./DeployToAliyunCDN";
+import DeployToAliyunCLB from "./DeployToAliyunCLB";
+import DeployToAliyunALB from "./DeployToAliyunALB";
+import DeployToAliyunNLB from "./DeployToAliyunNLB";
 import DeployToTencentCDN from "./DeployToTencentCDN";
 import DeployToTencentCLB from "./DeployToTencentCLB";
 import DeployToTencentCOS from "./DeployToTencentCOS";
@@ -119,6 +122,15 @@ const DeployEditDialog = ({ trigger, deployConfig, onSave }: DeployEditDialogPro
     case "aliyun-dcdn":
       childComponent = <DeployToAliyunCDN />;
       break;
+    case "aliyun-clb":
+      childComponent = <DeployToAliyunCLB />;
+      break;
+    case "aliyun-alb":
+      childComponent = <DeployToAliyunALB />;
+      break;
+    case "aliyun-nlb":
+      childComponent = <DeployToAliyunNLB />;
+      break;
     case "tencent-cdn":
     case "tencent-ecdn":
       childComponent = <DeployToTencentCDN />;

ui/src/components/certimate/DeployToAliyunALB.tsx

@@ -0,0 +1,162 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToAliyunALB = () => {
+  const { t } = useTranslation();
+
+  const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+  useEffect(() => {
+    if (!data.id) {
+      setDeploy({
+        ...data,
+        config: {
+          region: "cn-hangzhou",
+          resourceType: "",
+          loadbalancerId: "",
+          listenerId: "",
+        },
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    setError({});
+  }, []);
+
+  const formSchema = z
+    .object({
+      region: z.string().min(1, t("domain.deployment.form.aliyun_alb_region.placeholder")),
+      resourceType: z.union([z.literal("loadbalancer"), z.literal("listener")], {
+        message: t("domain.deployment.form.aliyun_alb_resource_type.placeholder"),
+      }),
+      loadbalancerId: z.string().optional(),
+      listenerId: z.string().optional(),
+    })
+    .refine((data) => (data.resourceType === "loadbalancer" ? !!data.loadbalancerId?.trim() : true), {
+      message: t("domain.deployment.form.aliyun_alb_loadbalancer_id.placeholder"),
+      path: ["loadbalancerId"],
+    })
+    .refine((data) => (data.resourceType === "listener" ? !!data.listenerId?.trim() : true), {
+      message: t("domain.deployment.form.aliyun_alb_listener_id.placeholder"),
+      path: ["listenerId"],
+    });
+
+  useEffect(() => {
+    const res = formSchema.safeParse(data.config);
+    if (!res.success) {
+      setError({
+        ...error,
+        region: res.error.errors.find((e) => e.path[0] === "region")?.message,
+        resourceType: res.error.errors.find((e) => e.path[0] === "resourceType")?.message,
+        loadbalancerId: res.error.errors.find((e) => e.path[0] === "loadbalancerId")?.message,
+        listenerId: res.error.errors.find((e) => e.path[0] === "listenerId")?.message,
+      });
+    } else {
+      setError({
+        ...error,
+        region: undefined,
+        resourceType: undefined,
+        loadbalancerId: undefined,
+        listenerId: undefined,
+      });
+    }
+  }, [data]);
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_alb_region.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.aliyun_alb_region.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.region}
+          onChange={(e) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.region = e.target.value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.region}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_alb_resource_type.label")}</Label>
+        <Select
+          value={data?.config?.resourceType}
+          onValueChange={(value) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.resourceType = value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        >
+          <SelectTrigger>
+            <SelectValue placeholder={t("domain.deployment.form.aliyun_alb_resource_type.placeholder")} />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectGroup>
+              <SelectItem value="loadbalancer">{t("domain.deployment.form.aliyun_alb_resource_type.option.loadbalancer.label")}</SelectItem>
+              <SelectItem value="listener">{t("domain.deployment.form.aliyun_alb_resource_type.option.listener.label")}</SelectItem>
+            </SelectGroup>
+          </SelectContent>
+        </Select>
+        <div className="text-red-600 text-sm mt-1">{error?.resourceType}</div>
+      </div>
+
+      {data?.config?.resourceType === "loadbalancer" ? (
+        <div>
+          <Label>{t("domain.deployment.form.aliyun_alb_loadbalancer_id.label")}</Label>
+          <Input
+            placeholder={t("domain.deployment.form.aliyun_alb_loadbalancer_id.placeholder")}
+            className="w-full mt-1"
+            value={data?.config?.loadbalancerId}
+            onChange={(e) => {
+              const newData = produce(data, (draft) => {
+                draft.config ??= {};
+                draft.config.loadbalancerId = e.target.value?.trim();
+              });
+              setDeploy(newData);
+            }}
+          />
+          <div className="text-red-600 text-sm mt-1">{error?.loadbalancerId}</div>
+        </div>
+      ) : (
+        <></>
+      )}
+
+      {data?.config?.resourceType === "listener" ? (
+        <div>
+          <Label>{t("domain.deployment.form.aliyun_alb_listener_id.label")}</Label>
+          <Input
+            placeholder={t("domain.deployment.form.aliyun_alb_listener_id.placeholder")}
+            className="w-full mt-1"
+            value={data?.config?.listenerId}
+            onChange={(e) => {
+              const newData = produce(data, (draft) => {
+                draft.config ??= {};
+                draft.config.listenerId = e.target.value?.trim();
+              });
+              setDeploy(newData);
+            }}
+          />
+          <div className="text-red-600 text-sm mt-1">{error?.listenerId}</div>
+        </div>
+      ) : (
+        <></>
+      )}
+    </div>
+  );
+};
+
+export default DeployToAliyunALB;

ui/src/components/certimate/DeployToAliyunCLB.tsx

@@ -0,0 +1,158 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToAliyunCLB = () => {
+  const { t } = useTranslation();
+
+  const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+  useEffect(() => {
+    if (!data.id) {
+      setDeploy({
+        ...data,
+        config: {
+          region: "cn-hangzhou",
+          resourceType: "",
+          loadbalancerId: "",
+          listenerPort: "443",
+        },
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    setError({});
+  }, []);
+
+  const formSchema = z
+    .object({
+      region: z.string().min(1, t("domain.deployment.form.aliyun_clb_region.placeholder")),
+      resourceType: z.union([z.literal("certificate"), z.literal("loadbalancer"), z.literal("listener")], {
+        message: t("domain.deployment.form.aliyun_clb_resource_type.placeholder"),
+      }),
+      loadbalancerId: z.string().optional(),
+      listenerPort: z.string().optional(),
+    })
+    .refine((data) => (data.resourceType === "loadbalancer" || data.resourceType === "listener" ? !!data.loadbalancerId?.trim() : true), {
+      message: t("domain.deployment.form.aliyun_clb_loadbalancer_id.placeholder"),
+      path: ["loadbalancerId"],
+    })
+    .refine((data) => (data.resourceType === "listener" ? +data.listenerPort! > 0 && +data.listenerPort! < 65535 : true), {
+      message: t("domain.deployment.form.aliyun_clb_listener_port.placeholder"),
+      path: ["listenerPort"],
+    });
+
+  useEffect(() => {
+    const res = formSchema.safeParse(data.config);
+    if (!res.success) {
+      setError({
+        ...error,
+        region: res.error.errors.find((e) => e.path[0] === "region")?.message,
+        resourceType: res.error.errors.find((e) => e.path[0] === "resourceType")?.message,
+        loadbalancerId: res.error.errors.find((e) => e.path[0] === "loadbalancerId")?.message,
+        listenerPort: res.error.errors.find((e) => e.path[0] === "listenerPort")?.message,
+      });
+    } else {
+      setError({
+        ...error,
+        region: undefined,
+        resourceType: undefined,
+        loadbalancerId: undefined,
+        listenerPort: undefined,
+      });
+    }
+  }, [data]);
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_clb_region.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.aliyun_clb_region.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.region}
+          onChange={(e) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.region = e.target.value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.region}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_clb_resource_type.label")}</Label>
+        <Select
+          value={data?.config?.resourceType}
+          onValueChange={(value) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.resourceType = value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        >
+          <SelectTrigger>
+            <SelectValue placeholder={t("domain.deployment.form.aliyun_clb_resource_type.placeholder")} />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectGroup>
+              <SelectItem value="loadbalancer">{t("domain.deployment.form.aliyun_clb_resource_type.option.loadbalancer.label")}</SelectItem>
+              <SelectItem value="listener">{t("domain.deployment.form.aliyun_clb_resource_type.option.listener.label")}</SelectItem>
+            </SelectGroup>
+          </SelectContent>
+        </Select>
+        <div className="text-red-600 text-sm mt-1">{error?.resourceType}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_clb_loadbalancer_id.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.aliyun_clb_loadbalancer_id.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.loadbalancerId}
+          onChange={(e) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.loadbalancerId = e.target.value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.loadbalancerId}</div>
+      </div>
+
+      {data?.config?.resourceType === "listener" ? (
+        <div>
+          <Label>{t("domain.deployment.form.aliyun_clb_listener_port.label")}</Label>
+          <Input
+            placeholder={t("domain.deployment.form.aliyun_clb_listener_port.placeholder")}
+            className="w-full mt-1"
+            value={data?.config?.listenerPort}
+            onChange={(e) => {
+              const newData = produce(data, (draft) => {
+                draft.config ??= {};
+                draft.config.listenerPort = e.target.value?.trim();
+              });
+              setDeploy(newData);
+            }}
+          />
+          <div className="text-red-600 text-sm mt-1">{error?.listenerPort}</div>
+        </div>
+      ) : (
+        <></>
+      )}
+    </div>
+  );
+};
+
+export default DeployToAliyunCLB;

ui/src/components/certimate/DeployToAliyunNLB.tsx

@@ -0,0 +1,162 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { z } from "zod";
+import { produce } from "immer";
+
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { useDeployEditContext } from "./DeployEdit";
+
+const DeployToAliyunNLB = () => {
+  const { t } = useTranslation();
+
+  const { deploy: data, setDeploy, error, setError } = useDeployEditContext();
+
+  useEffect(() => {
+    if (!data.id) {
+      setDeploy({
+        ...data,
+        config: {
+          region: "cn-hangzhou",
+          resourceType: "",
+          loadbalancerId: "",
+          listenerId: "",
+        },
+      });
+    }
+  }, []);
+
+  useEffect(() => {
+    setError({});
+  }, []);
+
+  const formSchema = z
+    .object({
+      region: z.string().min(1, t("domain.deployment.form.aliyun_nlb_region.placeholder")),
+      resourceType: z.union([z.literal("loadbalancer"), z.literal("listener")], {
+        message: t("domain.deployment.form.aliyun_nlb_resource_type.placeholder"),
+      }),
+      loadbalancerId: z.string().optional(),
+      listenerId: z.string().optional(),
+    })
+    .refine((data) => (data.resourceType === "loadbalancer" ? !!data.loadbalancerId?.trim() : true), {
+      message: t("domain.deployment.form.aliyun_nlb_loadbalancer_id.placeholder"),
+      path: ["loadbalancerId"],
+    })
+    .refine((data) => (data.resourceType === "listener" ? !!data.listenerId?.trim() : true), {
+      message: t("domain.deployment.form.aliyun_nlb_listener_id.placeholder"),
+      path: ["listenerId"],
+    });
+
+  useEffect(() => {
+    const res = formSchema.safeParse(data.config);
+    if (!res.success) {
+      setError({
+        ...error,
+        region: res.error.errors.find((e) => e.path[0] === "region")?.message,
+        resourceType: res.error.errors.find((e) => e.path[0] === "resourceType")?.message,
+        loadbalancerId: res.error.errors.find((e) => e.path[0] === "loadbalancerId")?.message,
+        listenerId: res.error.errors.find((e) => e.path[0] === "listenerId")?.message,
+      });
+    } else {
+      setError({
+        ...error,
+        region: undefined,
+        resourceType: undefined,
+        loadbalancerId: undefined,
+        listenerId: undefined,
+      });
+    }
+  }, [data]);
+
+  return (
+    <div className="flex flex-col space-y-8">
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_nlb_region.label")}</Label>
+        <Input
+          placeholder={t("domain.deployment.form.aliyun_nlb_region.placeholder")}
+          className="w-full mt-1"
+          value={data?.config?.region}
+          onChange={(e) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.region = e.target.value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        />
+        <div className="text-red-600 text-sm mt-1">{error?.region}</div>
+      </div>
+
+      <div>
+        <Label>{t("domain.deployment.form.aliyun_nlb_resource_type.label")}</Label>
+        <Select
+          value={data?.config?.resourceType}
+          onValueChange={(value) => {
+            const newData = produce(data, (draft) => {
+              draft.config ??= {};
+              draft.config.resourceType = value?.trim();
+            });
+            setDeploy(newData);
+          }}
+        >
+          <SelectTrigger>
+            <SelectValue placeholder={t("domain.deployment.form.aliyun_nlb_resource_type.placeholder")} />
+          </SelectTrigger>
+          <SelectContent>
+            <SelectGroup>
+              <SelectItem value="loadbalancer">{t("domain.deployment.form.aliyun_nlb_resource_type.option.loadbalancer.label")}</SelectItem>
+              <SelectItem value="listener">{t("domain.deployment.form.aliyun_nlb_resource_type.option.listener.label")}</SelectItem>
+            </SelectGroup>
+          </SelectContent>
+        </Select>
+        <div className="text-red-600 text-sm mt-1">{error?.resourceType}</div>
+      </div>
+
+      {data?.config?.resourceType === "loadbalancer" ? (
+        <div>
+          <Label>{t("domain.deployment.form.aliyun_nlb_loadbalancer_id.label")}</Label>
+          <Input
+            placeholder={t("domain.deployment.form.aliyun_nlb_loadbalancer_id.placeholder")}
+            className="w-full mt-1"
+            value={data?.config?.loadbalancerId}
+            onChange={(e) => {
+              const newData = produce(data, (draft) => {
+                draft.config ??= {};
+                draft.config.loadbalancerId = e.target.value?.trim();
+              });
+              setDeploy(newData);
+            }}
+          />
+          <div className="text-red-600 text-sm mt-1">{error?.loadbalancerId}</div>
+        </div>
+      ) : (
+        <></>
+      )}
+
+      {data?.config?.resourceType === "listener" ? (
+        <div>
+          <Label>{t("domain.deployment.form.aliyun_nlb_listener_id.label")}</Label>
+          <Input
+            placeholder={t("domain.deployment.form.aliyun_nlb_listener_id.placeholder")}
+            className="w-full mt-1"
+            value={data?.config?.listenerId}
+            onChange={(e) => {
+              const newData = produce(data, (draft) => {
+                draft.config ??= {};
+                draft.config.listenerId = e.target.value?.trim();
+              });
+              setDeploy(newData);
+            }}
+          />
+          <div className="text-red-600 text-sm mt-1">{error?.listenerId}</div>
+        </div>
+      ) : (
+        <></>
+      )}
+    </div>
+  );
+};
+
+export default DeployToAliyunNLB;

ui/src/components/certimate/DeployToHuaweiCloudELB.tsx

@@ -44,7 +44,7 @@ const DeployToHuaweiCloudCDN = () => {
       message: t("domain.deployment.form.huaweicloud_elb_certificate_id.placeholder"),
       path: ["certificateId"],
     })
-    .refine((data) => (data.resourceType === "loadbalancer" ? !!data.certificateId?.trim() : true), {
+    .refine((data) => (data.resourceType === "loadbalancer" ? !!data.loadbalancerId?.trim() : true), {
       message: t("domain.deployment.form.huaweicloud_elb_loadbalancer_id.placeholder"),
       path: ["loadbalancerId"],
     })