fix(schedules): reconcile advanced stack after rebase onto master

Author: Assem-Uber

src/views/domain-schedules/create-schedule-retry-policy-fields/create-schedule-retry-policy-fields.tsx

@@ -69,8 +69,9 @@ export default function CreateScheduleRetryPolicyFields({
       </DomainSchedulesHorizontalField>
 
       {enableRetryPolicy && (
-        <DomainSchedulesHorizontalField.GroupedFields>
+        <>
           <DomainSchedulesHorizontalField
+            subfield={true}
             label="Initial interval"
             description="How long to wait before first retry."
             htmlFor="create-schedule-form-retry-initial-interval"
@@ -112,6 +113,7 @@ export default function CreateScheduleRetryPolicyFields({
           </DomainSchedulesHorizontalField>
 
           <DomainSchedulesHorizontalField
+            subfield={true}
             label="Backoff coefficient"
             description="Multiplier applied between retries."
             htmlFor="create-schedule-form-retry-backoff-coefficient"
@@ -153,6 +155,7 @@ export default function CreateScheduleRetryPolicyFields({
           </DomainSchedulesHorizontalField>
 
           <DomainSchedulesHorizontalField
+            subfield={true}
             label="Maximum interval (optional)"
             description="Upper bound for retry interval."
             htmlFor="create-schedule-form-retry-maximum-interval"
@@ -194,6 +197,7 @@ export default function CreateScheduleRetryPolicyFields({
           </DomainSchedulesHorizontalField>
 
           <DomainSchedulesHorizontalField
+            subfield={true}
             label="Limit retries"
             description="Choose whether retries are limited by attempts or duration."
             error={getFieldErrorMessage(fieldErrors, 'limitRetries')}
@@ -226,6 +230,7 @@ export default function CreateScheduleRetryPolicyFields({
 
           {limitRetries === 'ATTEMPTS' && (
             <DomainSchedulesHorizontalField
+              subfield={true}
               label="Maximum attempts"
               description="Total number of retry attempts."
               htmlFor="create-schedule-form-retry-maximum-attempts"
@@ -265,6 +270,7 @@ export default function CreateScheduleRetryPolicyFields({
 
           {limitRetries === 'DURATION' && (
             <DomainSchedulesHorizontalField
+              subfield={true}
               label="Expiration interval"
               description="Maximum total retry duration."
               htmlFor="create-schedule-form-retry-expiration-interval"
@@ -308,7 +314,7 @@ export default function CreateScheduleRetryPolicyFields({
               />
             </DomainSchedulesHorizontalField>
           )}
-        </DomainSchedulesHorizontalField.GroupedFields>
+        </>
       )}
     </>
   );

src/views/domain-schedules/domain-schedules-create-advanced-form/__tests__/domain-schedules-create-advanced-form.test.tsx

@@ -159,6 +159,7 @@ describe(DomainSchedulesCreateAdvancedForm.name, () => {
       const {
         control,
         trigger,
+        clearErrors,
         formState: { errors: fieldErrors, isSubmitted },
       } = useForm<DomainSchedulesCreateFormData>({
         resolver: zodResolver(createScheduleFormSchema),
@@ -178,6 +179,7 @@ describe(DomainSchedulesCreateAdvancedForm.name, () => {
             fieldErrors={fieldErrors}
             trigger={trigger}
             isSubmitted={isSubmitted}
+            clearErrors={clearErrors}
             cluster="test-cluster"
           />
           <button type="button" onClick={() => trigger()}>
@@ -236,6 +238,7 @@ function setup() {
     const {
       control,
       getValues: readValues,
+      clearErrors,
       formState: { errors: fieldErrors },
     } = useForm<DomainSchedulesCreateFormData>({
       defaultValues: {},
@@ -246,6 +249,7 @@ function setup() {
       <DomainSchedulesCreateAdvancedForm
         control={control}
         fieldErrors={fieldErrors}
+        clearErrors={clearErrors}
         cluster="test-cluster"
       />
     );

src/views/domain-schedules/domain-schedules-create-advanced-form/domain-schedules-create-advanced-form.tsx

@@ -47,6 +47,7 @@ export default function DomainSchedulesCreateAdvancedForm({
   fieldErrors,
   trigger,
   isSubmitted = false,
+  clearErrors,
   cluster,
 }: Props) {
   const { data: searchAttributesData, isLoading: isLoadingSearchAttributes } =

src/views/domain-schedules/domain-schedules-create-advanced-form/domain-schedules-create-advanced-form.types.ts

@@ -1,4 +1,4 @@
-import { type Control, type FieldErrors, type UseFormTrigger } from 'react-hook-form';
+import { type Control, type FieldErrors, type UseFormClearErrors, type UseFormTrigger } from 'react-hook-form';
 
 import { type DomainSchedulesCreateFormData } from '../domain-schedules-create-modal/domain-schedules-create-modal.types';
 
@@ -7,5 +7,6 @@ export type Props = {
   fieldErrors: FieldErrors<DomainSchedulesCreateFormData>;
   trigger?: UseFormTrigger<DomainSchedulesCreateFormData>;
   isSubmitted?: boolean;
+  clearErrors: UseFormClearErrors<DomainSchedulesCreateFormData>;
   cluster: string;
 };

src/views/domain-schedules/domain-schedules-create-form/__tests__/domain-schedules-create-form.test.tsx

@@ -168,7 +168,7 @@ function TestWrapper({
   defaultValues?: Partial<DomainSchedulesCreateFormData>;
   injectFieldErrors?: boolean;
 }) {
-  const { control, trigger, setError } = useForm<DomainSchedulesCreateFormData>(
+  const { control, trigger, setError, clearErrors } = useForm<DomainSchedulesCreateFormData>(
     {
       defaultValues: { ...defaultValues },
       mode: 'onSubmit',

src/views/domain-schedules/domain-schedules-create-form/domain-schedules-create-form.tsx

@@ -30,7 +30,7 @@ import { type Props } from './domain-schedules-create-form.types';
 export default function DomainSchedulesCreateForm({
   control,
   trigger,
-  clearErrors: _clearErrors,
+  clearErrors,
   cluster,
 }: Props) {
   const { errors: fieldErrors, isSubmitted } = useFormState({ control });
@@ -313,6 +313,7 @@ export default function DomainSchedulesCreateForm({
         fieldErrors={fieldErrors}
         trigger={trigger}
         isSubmitted={isSubmitted}
+        clearErrors={clearErrors}
         cluster={cluster}
       />
     </div>

src/views/domain-schedules/domain-schedules-create-modal/__fixtures__/mock-domain-schedules-create-form-data.ts

@@ -14,4 +14,6 @@ export const mockDomainSchedulesCreateFormData = {
   workerSDKLanguage: 'GO',
   executionStartToCloseTimeoutSeconds: 3600,
   taskStartToCloseTimeoutSeconds: 45,
+  enableRetryPolicy: false,
+  limitRetries: 'ATTEMPTS',
 } satisfies DomainSchedulesCreateFormData;

src/views/domain-schedules/domain-schedules-create-modal/schemas/__tests__/create-schedule-form-schema.test.ts

@@ -1,7 +1,7 @@
 import { mockDomainSchedulesCreateFormData } from '../../__fixtures__/mock-domain-schedules-create-form-data';
 import { createScheduleFormSchema } from '../create-schedule-form-schema';
 
-describe(createScheduleFormSchema.name, () => {
+describe('createScheduleFormSchema', () => {
   it('accepts schedule period when only start or end is provided', () => {
     expect(
       createScheduleFormSchema.safeParse({
@@ -41,7 +41,7 @@ describe(createScheduleFormSchema.name, () => {
     expect(result.error.issues).toEqual(
       expect.arrayContaining([
         expect.objectContaining({
-          path: ['endTime'],
+          path: ['startTime'],
           message: 'Start date must be before end date',
         }),
       ])