Merge branch 'master' into feat/schedule-create-pr09b-overlap-policy

Resolve conflicts with merged PR09 advanced accordion: adopt upstream
field ID/description constants while keeping overlap policy cluster,
schema defaults, and transform wiring.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Assem-Uber

src/utils/__tests__/sort-by.test.ts

@@ -1,4 +1,72 @@
-import { toggleSortOrder } from '../sort-by';
+import sortBy, { getSortCompareFunction, toggleSortOrder } from '../sort-by';
+
+describe(getSortCompareFunction.name, () => {
+  it('sorts strings using locale-aware comparison in ASC order', () => {
+    const compare = getSortCompareFunction<{ v: string }>(
+      (item) => item.v,
+      'ASC'
+    );
+    const items = [{ v: 'b' }, { v: 'a' }];
+
+    expect([...items].sort(compare)).toEqual([{ v: 'a' }, { v: 'b' }]);
+  });
+
+  it('sorts numbers in ASC order', () => {
+    const compare = getSortCompareFunction<{ v: number }>(
+      (item) => item.v,
+      'ASC'
+    );
+    const items = [{ v: 3 }, { v: 1 }, { v: 2 }];
+
+    expect([...items].sort(compare)).toEqual([{ v: 1 }, { v: 2 }, { v: 3 }]);
+  });
+
+  it('inverts non-equal comparisons for DESC order', () => {
+    const compare = getSortCompareFunction<{ v: number }>(
+      (item) => item.v,
+      'DESC'
+    );
+    const items = [{ v: 1 }, { v: 3 }, { v: 2 }];
+
+    expect([...items].sort(compare)).toEqual([{ v: 3 }, { v: 2 }, { v: 1 }]);
+  });
+
+  it('returns zero when sort values are equal', () => {
+    const compare = getSortCompareFunction<{ v: number }>(
+      (item) => item.v,
+      'DESC'
+    );
+
+    expect(compare({ v: 1 }, { v: 1 })).toBe(0);
+  });
+
+  it('places undefined and null before other values with undefined first', () => {
+    const compare = getSortCompareFunction<{ v: number | null | undefined }>(
+      (item) => item.v,
+      'ASC'
+    );
+    const items = [{ v: 2 }, { v: null }, { v: undefined }, { v: 1 }];
+
+    expect([...items].sort(compare)).toEqual([
+      { v: undefined },
+      { v: null },
+      { v: 1 },
+      { v: 2 },
+    ]);
+  });
+});
+
+describe(sortBy.name, () => {
+  it('sorts a copy of the input array', () => {
+    const items = [{ v: 2 }, { v: 1 }];
+
+    expect(sortBy(items, (item) => item.v, 'ASC')).toEqual([
+      { v: 1 },
+      { v: 2 },
+    ]);
+    expect(items).toEqual([{ v: 2 }, { v: 1 }]);
+  });
+});
 
 describe(toggleSortOrder.name, () => {
   it('inverts sort order of current column (ASC -> DESC)', () => {

src/utils/config/__tests__/get-config-value.node.ts

@@ -38,4 +38,21 @@ describe('getConfigValue', () => {
     expect(mockFn).toHaveBeenCalledWith(undefined);
     expect(result).toBe('resolvedValue');
   });
+
+  it('throws when resolver arguments fail validation', async () => {
+    // @ts-expect-error COMPUTED is not a loaded config
+    await expect(getConfigValue('COMPUTED', { invalid: true })).rejects.toThrow(
+      "Failed to parse config 'COMPUTED' arguments:"
+    );
+  });
+
+  it('throws when resolver return value fails validation', async () => {
+    // @ts-expect-error COMPUTED doesn't exist in the original loaded configs but it exists in the mocks
+    const mockFn = getLoadedGlobalConfigs().COMPUTED as jest.Mock;
+    mockFn.mockResolvedValue(123);
+    // @ts-expect-error COMPUTED is not a loaded config
+    await expect(getConfigValue('COMPUTED')).rejects.toThrow(
+      "Failed to parse config 'COMPUTED' resolved value:"
+    );
+  });
 });

src/utils/merge-sorted-arrays.ts

@@ -20,7 +20,7 @@
 export default function mergeSortedArrays<T>({
   sortedArrays,
   itemsCount,
-  compareFunc = (a: T, b: T): number => (a < b ? -1 : 1),
+  compareFunc,
 }: {
   sortedArrays: Array<Array<T>>;
   itemsCount: number;

src/views/domain-batch-actions/domain-batch-actions-new-action-params/schemas/batch-action-params-schema.ts

@@ -1,12 +1,10 @@
 import { z } from 'zod';
 
+import { rpsSchema } from '@/views/domain-batch-actions/schemas/rps-schema';
+
 const batchActionParamsSchema = z.object({
   description: z.string().min(1, 'Description is required'),
-  rps: z
-    .number()
-    .int()
-    .min(1, 'Must be between 1 and 999')
-    .max(999, 'Must be between 1 and 999'),
+  rps: rpsSchema,
 });
 
 export default batchActionParamsSchema;

src/views/domain-batch-actions/domain-batch-actions.constants.ts

@@ -28,6 +28,9 @@ export const BATCH_ACTION_DEFAULT_QUERY_HINT =
 export const BATCH_ACTION_TASK_LIST = 'cadence-sys-batcher-tasklist';
 export const BATCH_ACTION_EXECUTION_TIMEOUT_SECONDS = 20 * 365 * 24 * 60 * 60;
 
+// Signal sent to a running batcher workflow to adjust its RPS on the fly.
+export const BATCH_ACTION_TUNE_SIGNAL_NAME = 'cadence-sys-batch-tune-signal';
+
 export const BATCH_ACTION_DETAIL_REFETCH_INTERVAL = 10000;
 
 // Tooltip shown on a disabled per-row checkbox while "select all" is active.

src/views/domain-batch-actions/schemas/rps-schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+// Shared RPS validation used by both the new-batch-action draft form and the
+// Edit RPS modal, so the two never drift.
+export const rpsSchema = z
+  .number()
+  .int()
+  .min(1, 'Must be between 1 and 999')
+  .max(999, 'Must be between 1 and 999');

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

@@ -1,6 +1,29 @@
 import { ScheduleOverlapPolicy } from '@/__generated__/proto-ts/uber/cadence/api/v1/ScheduleOverlapPolicy';
 import { SCHEDULE_OVERLAP_POLICIES } from '@/route-handlers/create-schedule/create-schedule.constants';
 
+/** Stable ids for advanced create-schedule horizontal fields. */
+export const CREATE_SCHEDULE_ADVANCED_FIELD_IDS = {
+  scheduleId: 'domain-schedules-create-form-schedule-id',
+  jitterSeconds: 'domain-schedules-create-form-jitter-seconds',
+  workflowIdPrefix: 'domain-schedules-create-form-workflow-id-prefix',
+  bufferLimit: 'domain-schedules-create-form-buffer-limit',
+  concurrencyLimit: 'domain-schedules-create-form-concurrency-limit',
+} as const;
+
+export const CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS = {
+  scheduleId: 'Unique name provided by users to name the schedule.',
+  overlapPolicy:
+    'Policy that controls what the scheduler should do if the previous action is still running.',
+  bufferLimit:
+    'Max number of pending workflows allowed when using Buffer overlap policy.',
+  concurrencyLimit:
+    'Max number of concurrently running workflows allowed for Concurrent overlap policy.',
+  jitterSeconds:
+    'Time range to distribute starting workflows across. This helps avoiding burst of workflow creations in a single point of time.',
+  workflowIdPrefix:
+    'Prefix text to add into started workflows. Ids are formed as `${Prefix}+{auto generated postfix}`.',
+} as const;
+
 const overlapPolicyLabels: Record<
   (typeof SCHEDULE_OVERLAP_POLICIES)[number],
   string

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

@@ -15,7 +15,11 @@ import { ScheduleOverlapPolicy } from '@/__generated__/proto-ts/uber/cadence/api
 import DomainSchedulesHorizontalField from '@/views/domain-schedules/domain-schedules-horizontal-field/domain-schedules-horizontal-field';
 import getFieldErrorMessage from '@/views/workflow-actions/workflow-action-start-form/helpers/get-field-error-message';
 
-import { OVERLAP_POLICY_OPTIONS } from './domain-schedules-create-advanced-form.constants';
+import {
+  CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS,
+  CREATE_SCHEDULE_ADVANCED_FIELD_IDS,
+  OVERLAP_POLICY_OPTIONS,
+} from './domain-schedules-create-advanced-form.constants';
 import {
   overrides,
   styled,
@@ -64,18 +68,18 @@ export default function DomainSchedulesCreateAdvancedForm({
       <>
         <DomainSchedulesHorizontalField
           label="Schedule Id"
-          description="Unique name provided by users to name the schedule."
-          htmlFor="create-schedule-form-schedule-id"
+          description={CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.scheduleId}
+          htmlFor={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.scheduleId}
           error={getFieldErrorMessage(fieldErrors, 'scheduleId')}
         >
           <Controller
             name="scheduleId"
             control={control}
+            defaultValue=""
             render={({ field: { ref, ...field } }) => (
               <Input
                 {...field}
-                value={field.value ?? ''}
-                id="create-schedule-form-schedule-id"
+                id={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.scheduleId}
                 // @ts-expect-error - inputRef expects ref object while ref is a callback. It should support both.
                 inputRef={ref}
                 aria-label="Schedule Id"
@@ -91,7 +95,9 @@ export default function DomainSchedulesCreateAdvancedForm({
 
         <DomainSchedulesHorizontalField
           label="Overlap Policy"
-          description="Policy that controls what the scheduler should do if the previous action is still running."
+          description={
+            CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.overlapPolicy
+          }
           error={getFieldErrorMessage(fieldErrors, 'overlapPolicy')}
         >
           <Controller
@@ -122,8 +128,10 @@ export default function DomainSchedulesCreateAdvancedForm({
           <DomainSchedulesHorizontalField
             subfield={true}
             label="Buffer limit"
-            description="Max number of pending workflows allowed when using Buffer overlap policy."
-            htmlFor="create-schedule-form-buffer-limit"
+            description={
+              CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.bufferLimit
+            }
+            htmlFor={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.bufferLimit}
             caption="Defaults to 0 (unlimited)"
             error={getFieldErrorMessage(fieldErrors, 'bufferLimit')}
           >
@@ -133,7 +141,7 @@ export default function DomainSchedulesCreateAdvancedForm({
               render={({ field: { ref, ...field } }) => (
                 <Input
                   {...field}
-                  id="create-schedule-form-buffer-limit"
+                  id={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.bufferLimit}
                   // @ts-expect-error - inputRef expects ref object while ref is a callback. It should support both.
                   inputRef={ref}
                   aria-label="Buffer limit"
@@ -156,8 +164,10 @@ export default function DomainSchedulesCreateAdvancedForm({
           <DomainSchedulesHorizontalField
             subfield={true}
             label="Concurrency limit"
-            description="Max number of concurrently running workflows allowed for Concurrent overlap policy."
-            htmlFor="create-schedule-form-concurrency-limit"
+            description={
+              CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.concurrencyLimit
+            }
+            htmlFor={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.concurrencyLimit}
             caption="Defaults to 0 (unlimited)"
             error={getFieldErrorMessage(fieldErrors, 'concurrencyLimit')}
           >
@@ -167,7 +177,7 @@ export default function DomainSchedulesCreateAdvancedForm({
               render={({ field: { ref, ...field } }) => (
                 <Input
                   {...field}
-                  id="create-schedule-form-concurrency-limit"
+                  id={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.concurrencyLimit}
                   // @ts-expect-error - inputRef expects ref object while ref is a callback. It should support both.
                   inputRef={ref}
                   aria-label="Concurrency limit"
@@ -187,17 +197,20 @@ export default function DomainSchedulesCreateAdvancedForm({
 
         <DomainSchedulesHorizontalField
           label="Jitter duration"
-          description="Time range to distribute starting workflows across. This helps avoiding burst of workflow creations in a single point of time."
-          htmlFor="create-schedule-form-jitter"
+          description={
+            CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.jitterSeconds
+          }
+          htmlFor={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.jitterSeconds}
           error={getFieldErrorMessage(fieldErrors, 'jitterSeconds')}
         >
           <Controller
             name="jitterSeconds"
             control={control}
+            defaultValue=""
             render={({ field: { ref, ...field } }) => (
               <Input
                 {...field}
-                id="create-schedule-form-jitter"
+                id={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.jitterSeconds}
                 // @ts-expect-error - inputRef expects ref object while ref is a callback. It should support both.
                 inputRef={ref}
                 aria-label="Jitter duration"
@@ -217,18 +230,20 @@ export default function DomainSchedulesCreateAdvancedForm({
 
         <DomainSchedulesHorizontalField
           label="Workflow Id Prefix"
-          description="Prefix text to add into started workflows. Ids are formed as `${Prefix}+{auto generated postfix}`."
-          htmlFor="create-schedule-form-workflow-id-prefix"
+          description={
+            CREATE_SCHEDULE_ADVANCED_FIELD_DESCRIPTIONS.workflowIdPrefix
+          }
+          htmlFor={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.workflowIdPrefix}
           error={getFieldErrorMessage(fieldErrors, 'workflowIdPrefix')}
         >
           <Controller
             name="workflowIdPrefix"
             control={control}
+            defaultValue=""
             render={({ field: { ref, ...field } }) => (
               <Input
                 {...field}
-                value={field.value ?? ''}
-                id="create-schedule-form-workflow-id-prefix"
+                id={CREATE_SCHEDULE_ADVANCED_FIELD_IDS.workflowIdPrefix}
                 // @ts-expect-error - inputRef expects ref object while ref is a callback. It should support both.
                 inputRef={ref}
                 aria-label="Workflow Id Prefix"

src/views/domain-schedules/domain-schedules-create-modal/__tests__/transform-domain-schedules-create-form-to-body.test.ts

@@ -56,15 +56,28 @@ describe(transformDomainSchedulesCreateFormToBody.name, () => {
     expect(result.startWorkflow.input).toBeUndefined();
   });
 
-  it('trims workflow type and task list names', () => {
+  it('trims text fields', () => {
     const result = transformDomainSchedulesCreateFormToBody({
       ...baseForm,
       workflowType: { name: ' DemoWorkflow ' },
       taskList: { name: ' demo-tl ' },
+      scheduleId: '  my-schedule  ',
+      workflowIdPrefix: '  wf-prefix  ',
     });
 
     expect(result.startWorkflow.workflowType.name).toBe('DemoWorkflow');
     expect(result.startWorkflow.taskList.name).toBe('demo-tl');
+    expect(result.scheduleId).toBe('my-schedule');
+    expect(result.startWorkflow.workflowIdPrefix).toBe('wf-prefix');
+  });
+
+  it('passes 0 seconds as jitter', () => {
+    const result = transformDomainSchedulesCreateFormToBody({
+      ...baseForm,
+      jitterSeconds: '0',
+    });
+
+    expect(result.jitterSeconds).toBe(0);
   });
 
   it('maps optional simple advanced fields only when provided', () => {

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

@@ -3,13 +3,12 @@
 import React, { useEffect, useRef } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Banner } from 'baseui/banner';
+import { Banner, HIERARCHY, KIND as BANNER_KIND } from 'baseui/banner';
 import { Modal, ModalButton } from 'baseui/modal';
 import { useSnackbar } from 'baseui/snackbar';
 import { useForm } from 'react-hook-form';
 import { MdCheckCircle, MdErrorOutline } from 'react-icons/md';
 
-import { ScheduleOverlapPolicy } from '@/__generated__/proto-ts/uber/cadence/api/v1/ScheduleOverlapPolicy';
 import useCreateSchedule from '@/views/shared/hooks/use-create-schedule/use-create-schedule';
 
 import DomainSchedulesCreateForm from '../domain-schedules-create-form/domain-schedules-create-form';
@@ -44,9 +43,6 @@ export default function DomainSchedulesCreateModal({
       resolver: zodResolver(createScheduleFormSchema),
       mode: 'onSubmit',
       reValidateMode: 'onChange',
-      defaultValues: {
-        overlapPolicy: ScheduleOverlapPolicy.SCHEDULE_OVERLAP_POLICY_CONCURRENT,
-      },
     });
 
   useEffect(() => {