Merge pull request #887 from jetstreamapp/feat/886

Swap order of bulk record update options
jetstreamapp · May 10, 2024 · d42e4f3 · d42e4f3
2 parents f311266 + 2942948
commit d42e4f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/apps/jetstream-e2e/src/tests/load-without-file/load-without-file.spec.ts b/apps/jetstream-e2e/src/tests/load-without-file/load-without-file.spec.ts
@@ -61,6 +61,9 @@ test.describe('LOAD WITHOUT FILE', () => {
     await page.getByTestId('dropdown-Field to Update').getByPlaceholder('Select an Option').fill('fax');
     await page.getByRole('option', { name: 'Account Fax Fax phone' }).click();
 
+    await page.getByTestId('dropdown-Record update to Apply').getByPlaceholder('Select an Option').click();
+    await page.getByRole('option', { name: 'Value from different field' }).click();
+
     await page.getByTestId('dropdown-Field to use as value').getByPlaceholder('Select an Option').click();
     await page.getByTestId('dropdown-Field to use as value').getByPlaceholder('Select an Option').fill('name');
     await page.getByRole('option', { name: 'Account Name Name' }).click();

diff --git a/...am/src/app/components/query/QueryResults/BulkUpdateFromQuery/BulkUpdateFromQueryModal.tsx b/...am/src/app/components/query/QueryResults/BulkUpdateFromQuery/BulkUpdateFromQueryModal.tsx
@@ -94,7 +94,7 @@ export const BulkUpdateFromQueryModal: FunctionComponent<BulkUpdateFromQueryModa
   const [fields, setFields] = useState<ListItem[]>([]);
   /** Fields that can be used as value */
   const [transformationOptions, setTransformationOptions] = useState<TransformationOptions>({
-    option: 'anotherField',
+    option: 'staticValue',
     alternateField: undefined,
     staticValue: '',
     criteria: 'all',

diff --git a/apps/jetstream/src/app/components/update-records/selection/useMassUpdateFieldItems.ts b/apps/jetstream/src/app/components/update-records/selection/useMassUpdateFieldItems.ts
@@ -71,7 +71,7 @@ function reducer(state: State, action: Action): State {
             batchIdToIndex: {},
           },
           transformationOptions: {
-            option: 'anotherField',
+            option: 'staticValue',
             staticValue: '',
             criteria: 'all',
             alternateField: null,

diff --git a/libs/shared/ui-core/src/mass-update-records/mass-update-records.utils.tsx b/libs/shared/ui-core/src/mass-update-records/mass-update-records.utils.tsx
@@ -17,8 +17,8 @@ export function filterMassUpdateSobject(sobject: DescribeGlobalSObjectResult) {
 }
 
 export const transformationOptionListItems: ListItem[] = [
-  { id: 'anotherField', value: 'anotherField', label: 'Value from different field' },
   { id: 'staticValue', value: 'staticValue', label: 'Provided value' },
+  { id: 'anotherField', value: 'anotherField', label: 'Value from different field' },
   { id: 'null', value: 'null', label: 'Clear field value' },
 ];