diff --git a/apps/jetstream/src/app/components/deploy/deploy-metadata-history/DeployMetadataHistoryTable.tsx b/apps/jetstream/src/app/components/deploy/deploy-metadata-history/DeployMetadataHistoryTable.tsx index 7d55f9f95..6aa91aa3d 100644 --- a/apps/jetstream/src/app/components/deploy/deploy-metadata-history/DeployMetadataHistoryTable.tsx +++ b/apps/jetstream/src/app/components/deploy/deploy-metadata-history/DeployMetadataHistoryTable.tsx @@ -19,6 +19,12 @@ const COLUMNS: ColumnWithFilter[] = [ key: 'start', width: 200, }, + { + ...setColumnFromType('name', 'text'), + name: 'Deployment History Name', + key: 'deploymentHistoryName', + width: 165, + }, { ...setColumnFromType('type', 'text'), name: 'Type', @@ -84,6 +90,7 @@ export const DeployMetadataHistoryTable: FunctionComponent { + console.log('items:', items); const context: DeployHistoryTableContext = useMemo( () => ({ orgsById, portalRefForFilters: modalRef, onView, onDownload }), [orgsById, modalRef, onView, onDownload] diff --git a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx index d91615d12..3adf6243b 100644 --- a/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx +++ b/apps/jetstream/src/app/components/deploy/utils/DeployMetadataOptions.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/react'; import { useNonInitialEffect } from '@jetstream/shared/ui-utils'; import { DeployOptions, DeployOptionsTestLevel } from '@jetstream/types'; -import { Checkbox, Icon, Radio, RadioGroup, Textarea, Tooltip } from '@jetstream/ui'; +import { Checkbox, Icon, Input, Radio, RadioGroup, Textarea, Tooltip } from '@jetstream/ui'; import { Fragment, FunctionComponent, useState } from 'react'; const SPLIT_LINE_COMMA = /(\n|, |,)/g; @@ -20,6 +20,7 @@ export interface DeployMetadataOptionsProps { disabledOptions?: Set; isSinglePackage?: boolean; onChange: (deployOptions: DeployOptions) => void; + setDeploymentHistoryName?: (deploymentHistoryName: string | undefined) => void; } export const DeployMetadataOptions: FunctionComponent = ({ @@ -28,6 +29,7 @@ export const DeployMetadataOptions: FunctionComponent { const [allowMissingFiles, setAllowMissingFiles] = useState(deployOptions.allowMissingFiles ?? false); const [autoUpdatePackage, setAutoUpdatePackage] = useState(deployOptions.autoUpdatePackage ?? false); @@ -83,6 +85,18 @@ export const DeployMetadataOptions: FunctionComponent +
+ + + setDeploymentHistoryName(event.target.value)} + autoComplete="off" + /> + +
Deployment Options
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 1123b8b8d..1c0e5bf83 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 @@ -68,6 +68,7 @@ export async function getHistoryItemFile(item: SalesforceDeployHistoryItem) { export async function saveHistory({ sourceOrg, destinationOrg, + deploymentHistoryName, type, start, metadata, @@ -77,6 +78,7 @@ export async function saveHistory({ }: { sourceOrg?: SalesforceOrgUi; destinationOrg: SalesforceOrgUi; + deploymentHistoryName?: string | undefined; type: SalesforceDeployHistoryType; start: Date; metadata?: MapOf; @@ -84,6 +86,7 @@ export async function saveHistory({ results?: DeployResult; file?: ArrayBuffer | string | null; }) { + console.log('deploymentHistoryName:', deploymentHistoryName); try { if (file && isString(file)) { try { @@ -108,6 +111,7 @@ export async function saveHistory({ label: destinationOrg.label, orgName: destinationOrg.orgName || '', }, + deploymentHistoryName: deploymentHistoryName, start, finish: new Date(), url: results?.id ? getDeploymentStatusUrl(results.id) : null, diff --git a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx index b3cadb713..4b776cc51 100644 --- a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx +++ b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataBetweenOrgs.tsx @@ -124,6 +124,7 @@ export function useDeployMetadataBetweenOrgs( saveHistory({ sourceOrg, destinationOrg, + deploymentHistoryName: 'test 2', type: 'orgToOrg', start, metadata: selectedMetadata, diff --git a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx index 7fe913141..dd8c7feff 100644 --- a/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx +++ b/apps/jetstream/src/app/components/deploy/utils/useDeployMetadataPackage.tsx @@ -114,7 +114,7 @@ export function useDeployMetadataPackage(destinationOrg: SalesforceOrgUi, deploy }, }); dispatch({ type: 'SUCCESS', payload: { results } }); - saveHistory({ destinationOrg, type: deployType, start, deployOptions, results, file }); + saveHistory({ destinationOrg, deploymentHistoryName: 'test3', type: deployType, start, deployOptions, results, file }); if (results.success) { notifyUser(`Deployment finished successfully`, { body: getNotificationMessageBody(results), diff --git a/libs/types/src/lib/ui/types.ts b/libs/types/src/lib/ui/types.ts index c23b4bd3e..b64898b97 100644 --- a/libs/types/src/lib/ui/types.ts +++ b/libs/types/src/lib/ui/types.ts @@ -563,6 +563,7 @@ export interface SalesforceDeployHistoryItem { key: string; // org:type:timestamp fileKey?: string; destinationOrg: SalesforceDeploymentHistoryOrg; + deploymentHistoryName?: string | undefined; sourceOrg?: SalesforceDeploymentHistoryOrg; start: Date; finish: Date;