fix conflict

ui/src/domain/certificate.ts

@@ -19,3 +19,11 @@ export const CERTIFICATE_SOURCES = Object.freeze({
 } as const);
 
 export type CertificateSourceType = (typeof CERTIFICATE_SOURCES)[keyof typeof CERTIFICATE_SOURCES];
+
+export const CERTIFICATE_FORMATS = Object.freeze({
+  PEM: "PEM",
+  PFX: "PFX",
+  JKS: "JKS",
+} as const);
+
+export type CertificateFormatType = (typeof CERTIFICATE_FORMATS)[keyof typeof CERTIFICATE_FORMATS];

ui/src/domain/workflow.ts

@@ -114,8 +114,10 @@ export type WorkflowNodeConfigForApply = {
   providerConfig?: Record<string, unknown>;
   keyAlgorithm: string;
   nameservers?: string;
-  propagationTimeout?: number;
+  dnsPropagationTimeout?: number;
+  dnsTTL?: number;
   disableFollowCNAME?: boolean;
+  skipBeforeExpiryDays: number;
 };
 
 export type WorkflowNodeConfigForDeploy = {
@@ -123,6 +125,7 @@ export type WorkflowNodeConfigForDeploy = {
   provider: string;
   providerAccessId: string;
   providerConfig: Record<string, unknown>;
+  skipOnLastSucceeded: boolean;
 };
 
 export type WorkflowNodeConfigForNotify = {

ui/src/domain/workflowRun.ts

@@ -6,8 +6,8 @@ export interface WorkflowRunModel extends BaseModel {
   trigger: string;
   startedAt: ISO8601String;
   endedAt: ISO8601String;
-  logs: WorkflowRunLog[];
-  error: string;
+  logs?: WorkflowRunLog[];
+  error?: string;
   expand?: {
     workflowId?: WorkflowModel;
   };
@@ -16,15 +16,15 @@ export interface WorkflowRunModel extends BaseModel {
 export type WorkflowRunLog = {
   nodeId: string;
   nodeName: string;
-  outputs: WorkflowRunLogOutput[];
-  error: string;
+  outputs?: WorkflowRunLogOutput[];
+  error?: string;
 };
 
 export type WorkflowRunLogOutput = {
   time: ISO8601String;
   title: string;
   content: string;
-  error: string;
+  error?: string;
 };
 
 export const WORKFLOW_RUN_STATUSES = Object.freeze({