Merge pull request #200 from jetstreamapp/bug/198

Fix deploy metadata between orgs
jetstreamapp · Mar 11, 2023 · 1bc7da1 · 1bc7da1
2 parents 9d5b81e + b2a31d6
commit 1bc7da1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrg.tsx
@@ -73,7 +73,7 @@ export const DeployMetadataToOrg: FunctionComponent<DeployMetadataToOrgProps> =
       {configModalOpen && selectedMetadata && (
         <DeployMetadataToOrgConfigModal
           sourceOrg={selectedOrg}
-          initialOptions={deployMetadataOptions || {}}
+          initialOptions={deployMetadataOptions}
           initialSelectedDestinationOrg={destinationOrg}
           selectedMetadata={selectedMetadata}
           onClose={handleCloseConfigModal}

diff --git a/...ream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx b/...ream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/react';
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, ListMetadataResult, MapOf, SalesforceOrgUi } from '@jetstream/types';
+import { DeployOptions, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { Grid, GridCol, Icon, Modal } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
 import { useRecoilValue } from 'recoil';
@@ -13,7 +13,7 @@ const DISABLED_OPTIONS = new Set<keyof DeployOptions>(['allowMissingFiles', 'aut
 
 export interface DeployMetadataToOrgConfigModalProps {
   sourceOrg: SalesforceOrgUi;
-  initialOptions?: DeployOptions;
+  initialOptions?: Maybe<DeployOptions>;
   initialSelectedDestinationOrg?: SalesforceOrgUi;
   selectedMetadata: MapOf<ListMetadataResult[]>;
   onSelection?: (deployOptions: DeployOptions) => void;