Adding functionality for deploy via metadata package

jetstreamapp · Jun 10, 2023 · 6ee9ba9 · 6ee9ba9
1 parent e6f1d15
commit 6ee9ba9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackage.tsx b/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackage.tsx
@@ -1,5 +1,5 @@
 import { ANALYTICS_KEYS } from '@jetstream/shared/constants';
-import { DeployOptions, DeployResult, MapOf, SalesforceOrgUi } from '@jetstream/types';
+import { DeployOptions, DeployResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
 import { FileDownloadModal, Icon } from '@jetstream/ui';
 import classNames from 'classnames';
 import { Fragment, FunctionComponent, useState } from 'react';
@@ -28,6 +28,7 @@ export const DeployMetadataPackage: FunctionComponent<DeployMetadataPackageProps
   );
   const [deployOptions, setDeployOptions] = useState<DeployOptions>();
   const [deployResultsData, setDeployResultsData] = useState<MapOf<any[]>>();
+  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Undefinable<string>>(undefined);
 
   function handleClick() {
     setDestinationOrg(initialSelectedOrg);
@@ -79,6 +80,7 @@ export const DeployMetadataPackage: FunctionComponent<DeployMetadataPackageProps
           initialIsSinglePackage={fileInfo.isSinglePackage}
           onClose={() => setConfigModalOpen(false)}
           onDeploy={handleDeploy}
+          setDeploymentHistoryName={setDeploymentHistoryName}
         />
       )}
       {deployStatusModalOpen && deployOptions && fileInfo.file && (
@@ -90,6 +92,7 @@ export const DeployMetadataPackage: FunctionComponent<DeployMetadataPackageProps
           onGoBack={handleGoBackFromDeploy}
           onClose={handleCloseDeploymentModal}
           onDownload={handleDeployResultsDownload}
+          deploymentHistoryName={deploymentHistoryName}
         />
       )}
       {downloadResultsModalOpen && deployResultsData && (

diff --git a/...am/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageConfigModal.tsx b/...am/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageConfigModal.tsx
@@ -2,7 +2,7 @@ import { css } from '@emotion/react';
 import { logger } from '@jetstream/shared/client-logger';
 import { INPUT_ACCEPT_FILETYPES } from '@jetstream/shared/constants';
 import { useNonInitialEffect, useRollbar } from '@jetstream/shared/ui-utils';
-import { DeployOptions, InputReadFileContent, Maybe, SalesforceOrgUi } from '@jetstream/types';
+import { DeployOptions, InputReadFileContent, Maybe, SalesforceOrgUi, Undefinable } from '@jetstream/types';
 import { FileSelector, Grid, GridCol, Modal } from '@jetstream/ui';
 import JSZip from 'jszip';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
@@ -29,6 +29,7 @@ export interface DeployMetadataPackageConfigModalProps {
     destinationOrg: SalesforceOrgUi,
     deployOptions: DeployOptions
   ) => void;
+  setDeploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataPackageConfigModal: FunctionComponent<DeployMetadataPackageConfigModalProps> = ({
@@ -41,6 +42,7 @@ export const DeployMetadataPackageConfigModal: FunctionComponent<DeployMetadataP
   onSelection,
   onClose,
   onDeploy,
+  setDeploymentHistoryName,
 }) => {
   const rollbar = useRollbar();
   const orgs = useRecoilValue<SalesforceOrgUi[]>(salesforceOrgsState);
@@ -175,7 +177,12 @@ export const DeployMetadataPackageConfigModal: FunctionComponent<DeployMetadataP
               </div>
               <div>
                 {/* OPTIONS */}
-                <DeployMetadataOptions deployOptions={deployOptions} isSinglePackage={isSinglePackage} onChange={setDeployOptions} />
+                <DeployMetadataOptions
+                  deployOptions={deployOptions}
+                  isSinglePackage={isSinglePackage}
+                  onChange={setDeployOptions}
+                  setDeploymentHistoryName={setDeploymentHistoryName}
+                />
               </div>
             </div>
           </GridCol>

diff --git a/...am/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx b/...am/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx
@@ -1,5 +1,5 @@
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployResult, SalesforceOrgUi } from '@jetstream/types';
+import { DeployOptions, DeployResult, SalesforceOrgUi, Undefinable } from '@jetstream/types';
 import { SalesforceLogin } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -17,6 +17,7 @@ export interface DeployMetadataPackageStatusModalProps {
   onGoBack?: () => void;
   onClose: () => void;
   onDownload: (deployResults: DeployResult, deploymentUrl: string) => void;
+  deploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataPackageStatusModalProps> = ({
@@ -27,13 +28,15 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
   onGoBack,
   onClose,
   onDownload,
+  deploymentHistoryName,
 }) => {
   const [{ serverUrl }] = useRecoilState(applicationCookieState);
   const [deployStatusUrl, setDeployStatusUrl] = useState<string | null>(null);
   const { deployMetadata, results, deployId, loading, status, lastChecked, hasError, errorMessage } = useDeployMetadataPackage(
     destinationOrg,
     deployOptions,
-    file
+    file,
+    deploymentHistoryName
   );
 
   useEffect(() => {
@@ -46,7 +49,7 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
       setDeployStatusUrl(getDeploymentStatusUrl(deployId));
     }
   }, [deployId]);
-
+  console.log('PACKAGE STATUS', deploymentHistoryName);
   return (
     <DeployMetadataStatusModal
       destinationOrg={destinationOrg}
@@ -74,6 +77,7 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
       onGoBack={onGoBack}
       onClose={onClose}
       onDownload={onDownload}
+      deploymentHistoryName={deploymentHistoryName}
     />
   );
 };