diff --git a/frontend/docs/patterns.md b/frontend/docs/patterns.md index ed078232b7..75a62fc18d 100644 --- a/frontend/docs/patterns.md +++ b/frontend/docs/patterns.md @@ -127,8 +127,7 @@ interface ISoftwareCountResponse { // *FormData instead, even for programmatic request bodies (e.g. // IDeleteQueriesFormData). One consistent suffix is easier to follow than // asking each dev to judge "is this form-driven enough?" -// *PreviewPayload is fine for outgoing webhook shapes (matches the -// "Preview payload" UI terminology). +// *PreviewPayload is fine for outgoing webhook shapes. ``` ## Utilities diff --git a/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx b/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx index f6024f1f2b..e2b320ab17 100644 --- a/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx +++ b/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx @@ -9,6 +9,7 @@ import InputField from "components/forms/fields/InputField"; import Button from "components/buttons/Button"; import RevealButton from "components/buttons/RevealButton"; +import useGitOpsMode from "hooks/useGitOpsMode"; import { syntaxHighlight } from "utilities/helpers"; import CustomLink from "components/CustomLink"; @@ -44,6 +45,8 @@ const ActivityFeedAutomationsModal = ({ ); const [showExamplePayload, setShowExamplePayload] = useState(false); + const { gitOpsModeEnabled } = useGitOpsMode(); + const validateForm = (newFormData: IAFAMFormData) => { const errors: Record = {}; const { url: newUrl } = newFormData; @@ -143,6 +146,7 @@ const ActivityFeedAutomationsModal = ({ onChange={onFeatureEnabledChange} inactiveText="Disabled" activeText="Enabled" + disabled={gitOpsModeEnabled} />
- { - setShowExamplePayload(!showExamplePayload); - }} - disabled={!formData.enabled} - /> - {showExamplePayload && renderExamplePayload()}
+ { + setShowExamplePayload(!showExamplePayload); + }} + /> + {showExamplePayload && renderExamplePayload()}
); diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx index c46a97b7f1..0887a5a581 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx @@ -245,7 +245,7 @@ const EndUserMigrationSection = ({ router }: IEndUserMigrationSectionProps) => { variant="inverse" onClick={toggleExamplePayloadModal} > - Preview payload + Example payload - setShowExamplePayload(!showExamplePayload)} - disabled={!formData.enabled} - /> - {showExamplePayload && renderExamplePayload()}
+ setShowExamplePayload(!showExamplePayload)} + /> + {showExamplePayload && renderExamplePayload()} )} diff --git a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx index d1fef95dc3..5fe021aa3d 100644 --- a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx +++ b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx @@ -241,16 +241,6 @@ const OtherWorkflowsModal = forwardRef< tooltip="Provide a URL to deliver a webhook request to." disabled={!isPolicyAutomationsEnabled || gitOpsModeEnabled} /> - setShowExamplePayload(!showExamplePayload)} - disabled={!isPolicyAutomationsEnabled} - /> - {showExamplePayload && } ); @@ -353,6 +343,19 @@ const OtherWorkflowsModal = forwardRef< {isWebhookEnabled ? renderWebhook() : renderIntegrations()} + {isWebhookEnabled && ( + <> + setShowExamplePayload(!showExamplePayload)} + /> + {showExamplePayload && } + + )} ); } diff --git a/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx index 8bf96869bf..ff53abe508 100644 --- a/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx +++ b/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx @@ -230,7 +230,7 @@ const ManageQueryAutomationsModal = ({ onClick={togglePreviewDataModal} className={`${baseClass}__preview-data`} > - Preview data + Example data