From cd7749719b85ea6a3e54d41e074fe27b4bb4cde8 Mon Sep 17 00:00:00 2001
From: Austin Turner <paustint@gmail.com>
Date: Fri, 22 Mar 2024 19:15:43 -0600
Subject: [PATCH] WIP - Remove console.log etc..

---
 .../delete-metadata/DeleteMetadataConfigModal.tsx    |  4 ++--
 .../deploy/delete-metadata/DeleteMetadataModal.tsx   |  5 ++---
 .../delete-metadata/DeleteMetadataStatusModal.tsx    |  8 +++-----
 .../DeployMetadataPackage.tsx                        |  4 ++--
 .../DeployMetadataPackageConfigModal.tsx             |  4 ++--
 .../DeployMetadataPackageStatusModal.tsx             | 12 ++++++------
 .../deploy-to-different-org/DeployMetadataToOrg.tsx  |  6 ++----
 .../DeployMetadataToOrgConfigModal.tsx               |  4 ++--
 .../DeployMetadataToOrgStatusModal.tsx               |  6 +++---
 .../deploy/utils/DeployMetadataOptions.tsx           |  6 +++---
 .../deploy/utils/DeployMetadataStatusModal.tsx       |  8 ++------
 .../deploy/utils/deploy-metadata.utils.tsx           |  6 +++---
 .../deploy/utils/useAddItemsToChangeset.tsx          |  1 -
 .../deploy/utils/useDeployMetadataBetweenOrgs.tsx    |  4 ++--
 .../deploy/utils/useDeployMetadataPackage.tsx        | 12 ++++--------
 libs/shared/ui-utils/src/lib/shared-ui-utils.ts      |  1 -
 libs/types/src/lib/types.ts                          |  1 -
 17 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataConfigModal.tsx b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataConfigModal.tsx
index 3cbfd9748..1166c1729 100644
--- a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataConfigModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataConfigModal.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/react';
 import { useNonInitialEffect, useRollbar } from '@jetstream/shared/ui-utils';
-import { DeployOptions, ListMetadataResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { Grid, GridCol, Icon, Modal } from '@jetstream/ui';
 import JSZip from 'jszip';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
@@ -17,7 +17,7 @@ export interface DeleteMetadataConfigModalProps {
   onSelection?: (deployOptions: DeployOptions) => void;
   onClose: () => void;
   onDeploy: (file: ArrayBuffer, deployOptions: DeployOptions) => void;
-  setDeploymentHistoryName?: (deploymentHistoryName: Undefinable<string>) => void;
+  setDeploymentHistoryName?: (deploymentHistoryName: Maybe<string>) => void;
 }
 
 export const DeleteMetadataConfigModal: FunctionComponent<DeleteMetadataConfigModalProps> = ({
diff --git a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataModal.tsx b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataModal.tsx
index 426fc315c..734f3004b 100644
--- a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataModal.tsx
@@ -1,5 +1,5 @@
 import { ANALYTICS_KEYS } from '@jetstream/shared/constants';
-import { DeployOptions, DeployResult, ListMetadataResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { FileDownloadModal } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -25,7 +25,7 @@ export const DeleteMetadataModal: FunctionComponent<DeleteMetadataModalProps> =
   const [file, setFile] = useState<ArrayBuffer>();
   const [deployOptions, setDeployOptions] = useState<DeployOptions>();
   const [deployResultsData, setDeployResultsData] = useState<MapOf<any[]>>();
-  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Undefinable<string>>(undefined);
+  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Maybe<string>>(undefined);
 
   function handleDeploy(file: ArrayBuffer, deployOptions: DeployOptions) {
     setFile(file);
@@ -44,7 +44,6 @@ export const DeleteMetadataModal: FunctionComponent<DeleteMetadataModalProps> =
     setDeployResultsData(getDeployResultsExcelData(deployResults, deploymentUrl));
     setDownloadResultsModalOpen(true);
   }
-  console.log('deploymentHistoryName Delete Parent:', deploymentHistoryName);
 
   return (
     <Fragment>
diff --git a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataStatusModal.tsx b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataStatusModal.tsx
index fe5fbde1d..262779ea7 100644
--- a/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataStatusModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/delete-metadata/DeleteMetadataStatusModal.tsx
@@ -1,5 +1,5 @@
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployResult, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { SalesforceLogin } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
@@ -11,24 +11,24 @@ import { getStatusValue, useDeployMetadataPackage } from '../utils/useDeployMeta
 export interface DeployMetadataPackageStatusModalProps {
   destinationOrg: SalesforceOrgUi;
   deployOptions: DeployOptions;
+  deploymentHistoryName?: Maybe<string>;
   file: ArrayBuffer;
   // used to hide while download window is open
   hideModal: boolean;
   onGoBack?: () => void;
   onClose: () => void;
   onDownload: (deployResults: DeployResult, deploymentUrl: string) => void;
-  deploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataPackageStatusModalProps> = ({
   destinationOrg,
   deployOptions,
+  deploymentHistoryName,
   file,
   hideModal,
   onGoBack,
   onClose,
   onDownload,
-  deploymentHistoryName,
 }) => {
   const { serverUrl } = useRecoilValue(applicationCookieState);
   const skipFrontDoorAuth = useRecoilValue(selectSkipFrontdoorAuth);
@@ -51,8 +51,6 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
     }
   }, [deployId]);
 
-  console.log('Delete STATUS', deploymentHistoryName);
-
   return (
     <DeployMetadataStatusModal
       destinationOrg={destinationOrg}
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
index eccb26f1f..1456dcf9f 100644
--- 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, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { FileDownloadModal, Icon } from '@jetstream/ui';
 import classNames from 'classnames';
 import { Fragment, FunctionComponent, useState } from 'react';
@@ -28,7 +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);
+  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Maybe<string>>(undefined);
 
   function handleClick() {
     setDestinationOrg(initialSelectedOrg);
diff --git a/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageConfigModal.tsx b/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageConfigModal.tsx
index 2c7d74ee7..b5320dc18 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageConfigModal.tsx
+++ b/apps/jetstream/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, Undefinable } from '@jetstream/types';
+import { DeployOptions, InputReadFileContent, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { FileSelector, Grid, GridCol, Modal } from '@jetstream/ui';
 import JSZip from 'jszip';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
@@ -29,7 +29,7 @@ export interface DeployMetadataPackageConfigModalProps {
     destinationOrg: SalesforceOrgUi,
     deployOptions: DeployOptions
   ) => void;
-  setDeploymentHistoryName?: (deploymentHistoryName: Undefinable<string>) => void;
+  setDeploymentHistoryName?: (deploymentHistoryName: Maybe<string>) => void;
 }
 
 export const DeployMetadataPackageConfigModal: FunctionComponent<DeployMetadataPackageConfigModalProps> = ({
diff --git a/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx b/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx
index 0cfd29cee..f7a40ea89 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/deploy-metadata-package/DeployMetadataPackageStatusModal.tsx
@@ -1,5 +1,5 @@
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployResult, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { SalesforceLogin } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
@@ -11,24 +11,24 @@ import { getStatusValue, useDeployMetadataPackage } from '../utils/useDeployMeta
 export interface DeployMetadataPackageStatusModalProps {
   destinationOrg: SalesforceOrgUi;
   deployOptions: DeployOptions;
+  deploymentHistoryName?: Maybe<string>;
   file: ArrayBuffer;
   // used to hide while download window is open
   hideModal: boolean;
   onGoBack?: () => void;
   onClose: () => void;
   onDownload: (deployResults: DeployResult, deploymentUrl: string) => void;
-  deploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataPackageStatusModalProps> = ({
   destinationOrg,
   deployOptions,
+  deploymentHistoryName,
   file,
   hideModal,
   onGoBack,
   onClose,
   onDownload,
-  deploymentHistoryName,
 }) => {
   const { serverUrl } = useRecoilValue(applicationCookieState);
   const skipFrontDoorAuth = useRecoilValue(selectSkipFrontdoorAuth);
@@ -36,8 +36,8 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
   const { deployMetadata, results, deployId, loading, status, lastChecked, hasError, errorMessage } = useDeployMetadataPackage(
     destinationOrg,
     deployOptions,
-    file,
-    deploymentHistoryName
+    deploymentHistoryName,
+    file
   );
 
   useEffect(() => {
@@ -50,7 +50,7 @@ export const DeployMetadataPackageStatusModal: FunctionComponent<DeployMetadataP
       setDeployStatusUrl(getDeploymentStatusUrl(deployId));
     }
   }, [deployId]);
-  console.log('PACKAGE STATUS', deploymentHistoryName);
+
   return (
     <DeployMetadataStatusModal
       destinationOrg={destinationOrg}
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
index 9aff345fd..507342e4e 100644
--- 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
@@ -1,5 +1,5 @@
 import { ANALYTICS_KEYS } from '@jetstream/shared/constants';
-import { DeployOptions, DeployResult, ListMetadataResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { FileDownloadModal, Icon } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useState } from 'react';
 import { useRecoilState } from 'recoil';
@@ -29,7 +29,7 @@ export const DeployMetadataToOrg: FunctionComponent<DeployMetadataToOrgProps> =
   const [deployMetadataOptions, setDeployMetadataOptions] = useState<DeployOptions | null>(null);
 
   const [selectedMetadata, setSelectedMetadata] = useState<MapOf<ListMetadataResult[]>>();
-  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Undefinable<string>>(undefined);
+  const [deploymentHistoryName, setDeploymentHistoryName] = useState<Maybe<string>>(undefined);
 
   function handleClick() {
     setConfigModalOpen(true);
@@ -59,8 +59,6 @@ export const DeployMetadataToOrg: FunctionComponent<DeployMetadataToOrgProps> =
     setDownloadResultsModalOpen(true);
   }
 
-  console.log('deploymentHistoryName Parent:', deploymentHistoryName);
-
   return (
     <Fragment>
       <button
diff --git a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
index 7fab9bdb2..54fc6b7c9 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgConfigModal.tsx
+++ b/apps/jetstream/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, Maybe, SalesforceOrgUi, Undefinable } 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';
@@ -19,7 +19,7 @@ export interface DeployMetadataToOrgConfigModalProps {
   onSelection?: (deployOptions: DeployOptions) => void;
   onClose: () => void;
   onDeploy: (destinationOrg: SalesforceOrgUi, deployOptions: DeployOptions) => void;
-  setDeploymentHistoryName?: (deploymentHistoryName: Undefinable<string>) => void;
+  setDeploymentHistoryName?: (deploymentHistoryName: Maybe<string>) => void;
 }
 
 export const DeployMetadataToOrgConfigModal: FunctionComponent<DeployMetadataToOrgConfigModalProps> = ({
diff --git a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgStatusModal.tsx b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgStatusModal.tsx
index bc79288e7..f4940aa98 100644
--- a/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgStatusModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/deploy-to-different-org/DeployMetadataToOrgStatusModal.tsx
@@ -1,5 +1,5 @@
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployResult, ListMetadataResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { SalesforceLogin } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
@@ -11,6 +11,7 @@ import { getStatusValue, useDeployMetadataBetweenOrgs } from '../utils/useDeploy
 export interface DeployMetadataToOrgStatusModalProps {
   sourceOrg: SalesforceOrgUi;
   destinationOrg: SalesforceOrgUi;
+  deploymentHistoryName?: Maybe<string>;
   selectedMetadata: MapOf<ListMetadataResult[]>;
   deployOptions: DeployOptions;
   // used to hide while download window is open
@@ -18,19 +19,18 @@ export interface DeployMetadataToOrgStatusModalProps {
   onGoBack: () => void;
   onClose: () => void;
   onDownload: (deployResults: DeployResult, deploymentUrl: string) => void;
-  deploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataToOrgStatusModal: FunctionComponent<DeployMetadataToOrgStatusModalProps> = ({
   sourceOrg,
   destinationOrg,
+  deploymentHistoryName,
   selectedMetadata,
   deployOptions,
   hideModal,
   onGoBack,
   onClose,
   onDownload,
-  deploymentHistoryName,
 }) => {
   const { serverUrl } = useRecoilValue(applicationCookieState);
   const skipFrontDoorAuth = useRecoilValue(selectSkipFrontdoorAuth);
diff --git a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx
index 50340d6cd..b65395c06 100644
--- a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx
@@ -1,6 +1,6 @@
 import { css } from '@emotion/react';
 import { useNonInitialEffect } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployOptionsTestLevel, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployOptionsTestLevel, Maybe } from '@jetstream/types';
 import { Checkbox, Icon, Input, Radio, RadioGroup, Textarea, Tooltip } from '@jetstream/ui';
 import { Fragment, FunctionComponent, useState } from 'react';
 
@@ -20,7 +20,7 @@ export interface DeployMetadataOptionsProps {
   disabledOptions?: Set<keyof DeployOptions>;
   isSinglePackage?: boolean;
   onChange: (deployOptions: DeployOptions) => void;
-  setDeploymentHistoryName?: (deploymentHistoryName: Undefinable<string>) => void;
+  setDeploymentHistoryName?: (deploymentHistoryName: Maybe<string>) => void;
 }
 
 export const DeployMetadataOptions: FunctionComponent<DeployMetadataOptionsProps> = ({
@@ -40,7 +40,7 @@ export const DeployMetadataOptions: FunctionComponent<DeployMetadataOptionsProps
   const [singlePackage, setSinglePackage] = useState(deployOptions.singlePackage ?? true);
   const [testLevel, setTestLevel] = useState<DeployOptionsTestLevel | undefined>(deployOptions.testLevel ?? undefined);
   const [runTests, setRunTests] = useState<string[]>(deployOptions.runTests ?? []);
-  // const [deployName, setDeployName] = useState<Undefinable<string>>();
+  // const [deployName, setDeployName] = useState<Maybe<string>>();
 
   const [runSpecifiedTestsVisible, setRunSpecifiedTestsVisible] = useState(testLevel === 'RunSpecifiedTests');
   const [runTestsStr, setRunTestsStr] = useState<string>(deployOptions.runTests?.join('\n') ?? '');
diff --git a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataStatusModal.tsx b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataStatusModal.tsx
index e9a62fe1a..00226a8bb 100644
--- a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataStatusModal.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataStatusModal.tsx
@@ -1,12 +1,12 @@
 import { css } from '@emotion/react';
 import { ANALYTICS_KEYS, DATE_FORMATS } from '@jetstream/shared/constants';
-import { DeployResult, Maybe, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployResult, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { Grid, GridCol, Icon, Modal, TabsRef } from '@jetstream/ui';
 import formatDate from 'date-fns/format';
 import { Fragment, FunctionComponent, useEffect, useRef, useState } from 'react';
-import { useAmplitude } from '../../core/analytics';
 import ConfirmPageChange from '../../core/ConfirmPageChange';
 import OrgLabelBadge from '../../core/OrgLabelBadge';
+import { useAmplitude } from '../../core/analytics';
 import { DeployMetadataStatus } from '../deploy-metadata.types';
 import DeployMetadataProgressSummary from './DeployMetadataProgressSummary';
 import DeployMetadataResultsTables from './DeployMetadataResultsTables';
@@ -49,7 +49,6 @@ export interface DeployMetadataStatusModalProps {
   onGoBack?: () => void;
   onClose: () => void;
   onDownload?: (deployResults: DeployResult, deploymentUrl: string) => void;
-  deploymentHistoryName?: Undefinable<string>;
 }
 
 export const DeployMetadataStatusModal: FunctionComponent<DeployMetadataStatusModalProps> = ({
@@ -73,7 +72,6 @@ export const DeployMetadataStatusModal: FunctionComponent<DeployMetadataStatusMo
   onGoBack,
   onClose,
   onDownload,
-  deploymentHistoryName,
 }) => {
   const isDone = results?.done;
   const { trackEvent } = useAmplitude();
@@ -128,7 +126,6 @@ export const DeployMetadataStatusModal: FunctionComponent<DeployMetadataStatusMo
     });
     onGoBack && onGoBack();
   }
-  console.log('deploymentHistoryName Delete Status Modal:', deploymentHistoryName);
 
   return (
     <Modal
@@ -297,7 +294,6 @@ export const DeployMetadataStatusModal: FunctionComponent<DeployMetadataStatusMo
                 )}
               </Grid>
             )}
-            {deploymentHistoryName && 'Deployment History Name:' + deploymentHistoryName}
           </GridCol>
           <GridCol grow className="slds-scrollable">
             {results && <DeployMetadataResultsTables results={results} />}
diff --git a/apps/jetstream/src/app/components/deploy/utils/deploy-metadata.utils.tsx b/apps/jetstream/src/app/components/deploy/utils/deploy-metadata.utils.tsx
index 28b7656bb..03d25bafe 100644
--- a/apps/jetstream/src/app/components/deploy/utils/deploy-metadata.utils.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/deploy-metadata.utils.tsx
@@ -8,10 +8,10 @@ import {
   DeployResult,
   ListMetadataResult,
   MapOf,
+  Maybe,
   SalesforceDeployHistoryItem,
   SalesforceDeployHistoryType,
   SalesforceOrgUi,
-  Undefinable,
 } from '@jetstream/types';
 import {
   ColumnWithFilter,
@@ -79,7 +79,7 @@ export async function saveHistory({
 }: {
   sourceOrg?: SalesforceOrgUi;
   destinationOrg: SalesforceOrgUi;
-  deploymentHistoryName?: Undefinable<string>;
+  deploymentHistoryName?: Maybe<string>;
   type: SalesforceDeployHistoryType;
   start: Date;
   metadata?: MapOf<ListMetadataResult[]>;
@@ -111,7 +111,7 @@ export async function saveHistory({
         label: destinationOrg.label,
         orgName: destinationOrg.orgName || '',
       },
-      deploymentHistoryName: deploymentHistoryName,
+      deploymentHistoryName,
       start,
       finish: new Date(),
       url: results?.id ? getDeploymentStatusUrl(results.id) : null,
diff --git a/apps/jetstream/src/app/components/deploy/utils/useAddItemsToChangeset.tsx b/apps/jetstream/src/app/components/deploy/utils/useAddItemsToChangeset.tsx
index d45ff0b06..007596f8c 100644
--- a/apps/jetstream/src/app/components/deploy/utils/useAddItemsToChangeset.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/useAddItemsToChangeset.tsx
@@ -135,7 +135,6 @@ export function useAddItemsToChangeset(
           dispatch({ type: 'SUCCESS', payload: { results } });
           saveHistory({
             destinationOrg: selectedOrg,
-            deploymentHistoryName: 'test change set',
             type: 'changeset',
             start,
             metadata: selectedMetadata,
diff --git a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx
index 72c3c6c03..d0f701707 100644
--- a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx
@@ -1,7 +1,7 @@
 import { logger } from '@jetstream/shared/client-logger';
 import { retrieveMetadataFromListMetadata } from '@jetstream/shared/data';
 import { pollAndDeployMetadataResultsWhenReady, pollMetadataResultsUntilDone, useBrowserNotifications } from '@jetstream/shared/ui-utils';
-import { DeployResult, ListMetadataResult, MapOf, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployResult, ListMetadataResult, MapOf, Maybe, SalesforceOrgUi } from '@jetstream/types';
 import { useCallback, useEffect, useReducer, useRef, useState } from 'react';
 import { useRecoilState } from 'recoil';
 import { applicationCookieState } from '../../../app-state';
@@ -76,7 +76,7 @@ export function useDeployMetadataBetweenOrgs(
   destinationOrg: SalesforceOrgUi,
   selectedMetadata: MapOf<ListMetadataResult[]>,
   deployOptions: DeployOptions,
-  deploymentHistoryName?: Undefinable<string>
+  deploymentHistoryName?: Maybe<string>
 ) {
   const isMounted = useRef(true);
 
diff --git a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx
index 7959205a2..f7eb17ee8 100644
--- a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx
+++ b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx
@@ -1,7 +1,7 @@
 import { logger } from '@jetstream/shared/client-logger';
 import { deployMetadataZip } from '@jetstream/shared/data';
 import { pollMetadataResultsUntilDone, useBrowserNotifications } from '@jetstream/shared/ui-utils';
-import { DeployOptions, DeployResult, SalesforceDeployHistoryType, SalesforceOrgUi, Undefinable } from '@jetstream/types';
+import { DeployOptions, DeployResult, Maybe, SalesforceDeployHistoryType, SalesforceOrgUi } from '@jetstream/types';
 import { useCallback, useEffect, useReducer, useRef, useState } from 'react';
 import { useRecoilState } from 'recoil';
 import { applicationCookieState } from '../../../app-state';
@@ -77,11 +77,9 @@ function reducer(state: State, action: Action): State {
 export function useDeployMetadataPackage(
   destinationOrg: SalesforceOrgUi,
   deployOptions: DeployOptions,
-  file: ArrayBuffer,
-  deploymentHistoryName?: Undefinable<string>
+  deploymentHistoryName?: Maybe<string>,
+  file: ArrayBuffer
 ) {
-  console.log('deploymentHistoryName SAVE INSIDE', deploymentHistoryName);
-
   const isMounted = useRef(true);
 
   const [{ hasLoaded, loading, hasError, errorMessage, status, deployId, results }, dispatch] = useReducer(reducer, {
@@ -106,8 +104,6 @@ export function useDeployMetadataPackage(
 
   const deployMetadata = useCallback(
     async (deployType: SalesforceDeployHistoryType = 'package') => {
-      console.log('deploymentHistoryName SAVE', deploymentHistoryName);
-
       try {
         const start = new Date();
         dispatch({ type: 'UPLOAD' });
@@ -125,7 +121,7 @@ export function useDeployMetadataPackage(
           dispatch({ type: 'SUCCESS', payload: { results } });
           saveHistory({
             destinationOrg,
-            deploymentHistoryName: deploymentHistoryName,
+            deploymentHistoryName,
             type: deployType,
             start,
             deployOptions,
diff --git a/libs/shared/ui-utils/src/lib/shared-ui-utils.ts b/libs/shared/ui-utils/src/lib/shared-ui-utils.ts
index a7e11cf49..51614f140 100644
--- a/libs/shared/ui-utils/src/lib/shared-ui-utils.ts
+++ b/libs/shared/ui-utils/src/lib/shared-ui-utils.ts
@@ -981,7 +981,6 @@ export async function pollMetadataResultsUntilDone(
   while (!done && attempts <= maxAttempts) {
     await delay(interval);
     deployResults = await checkMetadataResults(selectedOrg, id, includeDetails);
-    deployResults = { ...deployResults };
     logger.log({ deployResults });
     onChecked(deployResults);
     done = deployResults.done;
diff --git a/libs/types/src/lib/types.ts b/libs/types/src/lib/types.ts
index 9d8b25429..285db1d8b 100644
--- a/libs/types/src/lib/types.ts
+++ b/libs/types/src/lib/types.ts
@@ -3,7 +3,6 @@ import { InsertUpdateUpsertDeleteQuery, SalesforceOrgEdition } from './salesforc
 
 export type Maybe<T> = T | null | undefined;
 export type Nullable<T> = T | null;
-export type Undefinable<T> = T | undefined;
 
 export const isNotNullish = <T>(input: T | null | undefined): input is T => input != null;
 export const isNotEmpty = <T>(input: T[]) => input.length !== 0;