+
+ setLimitReason(e.target.value)}
+ testID="rate-alert-form-amount"
+ type={InputType.Text}
+ />
+
+
diff --git a/src/cloud/constants/index.ts b/src/cloud/constants/index.ts
index 9e75065d47..7b11cc4c18 100644
--- a/src/cloud/constants/index.ts
+++ b/src/cloud/constants/index.ts
@@ -1,12 +1,12 @@
export const RATE_LIMIT_ERROR_STATUS = 429
export const RATE_LIMIT_ERROR_TEXT =
- 'Oops. It looks like you have exceeded the query limits allowed as part of your plan. If you would like to increase your query limits, reach out at support.influxdata.com.'
+ 'Oops. It looks like you have exceeded the query limits allowed as part of your plan. If you would like to increase your query limits, please use the Contact Support option in the Help menu.'
export const ASSET_LIMIT_ERROR_STATUS = 403
export const ASSET_LIMIT_ERROR_TEXT =
- 'Oops. It looks like you have exceeded the asset limits allowed as part of your plan. If you would like to increase your limits, reach out at support.influxdata.com.'
+ 'Oops. It looks like you have exceeded the asset limits allowed as part of your plan. If you would like to increase your limits, please use the Contact Support option in the Help menu.'
export const REQUEST_TIMEOUT_STATUS = 408
export const GATEWAY_TIMEOUT_STATUS = 504
diff --git a/src/identity/components/OrganizationListTab/OrganizationCard.tsx b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
index f4a17115a3..d6c2c300f5 100644
--- a/src/identity/components/OrganizationListTab/OrganizationCard.tsx
+++ b/src/identity/components/OrganizationListTab/OrganizationCard.tsx
@@ -1,4 +1,5 @@
import React, {FC} from 'react'
+import {useDispatch} from 'react-redux'
import {
FlexBox,
FlexDirection,
@@ -7,8 +8,8 @@ import {
ResourceCard,
} from '@influxdata/clockface'
-// Utils
-import {SafeBlankLink} from 'src/utils/SafeBlankLink'
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
// Styles
import './OrganizationCard.scss'
@@ -22,17 +23,6 @@ interface OrgCardProps {
regionName: string
}
-const tooltipContent = (
-
- Organizations can be reactivated within 7 days of deletion. Contact support
- at{' '}
-
- https://support.influxdata.com/s/login
- {' '}
- to reactivate.
-
+ Organizations can be reactivated within 7 days of deletion. Please{' '}
+
+ contact support
+ {' '}
+ to reactivate.
+
+ )
+
return (
{
this.setState({...errors, emailError})
} else {
const emailError =
- 'We have been notified of an issue while accessing your account. If this issue persists, please contact support at support.influxdata.com'
+ 'We have been notified of an issue while accessing your account. If this issue persists, please use the Contact Support option in the Help menu'
this.setState({...errors, emailError})
}
}
diff --git a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
index d6d7497062..8517c87cfa 100644
--- a/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
+++ b/src/organizations/components/OrgProfileTab/SuspendPaidOrgOverlay.tsx
@@ -41,6 +41,9 @@ import {notify} from 'src/shared/actions/notifications'
import {OverlayContext} from 'src/overlays/components/OverlayController'
import {reportErrorThroughHoneyBadger} from 'src/shared/utils/errors'
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
+
// Eventing
import {DeleteOrgOverlay, multiOrgTag} from 'src/identity/events/multiOrgEvents'
import {event} from 'src/cloud/utils/reporting'
@@ -61,20 +64,6 @@ const linkStyle = {
textDecoration: 'underline',
}
-const SupportLink = (): JSX.Element => {
- return (
-
- https://support.influxdata.com/s/login
-
- )
-}
-
export const SuspendPaidOrgOverlay: FC = () => {
const account = useSelector(selectCurrentAccount)
const org = useSelector(selectCurrentOrg)
@@ -90,6 +79,26 @@ export const SuspendPaidOrgOverlay: FC = () => {
const orgDeleteInProgress = deleteButtonStatus === ComponentStatus.Loading
const onClickCancel = orgDeleteInProgress ? noop : onClose
+ const handleContactSupport = () => {
+ dispatch(showOverlay('contact-support', null, dismissOverlay))
+ }
+
+ const SupportLink = (): JSX.Element => {
+ return (
+
+ Please{' '}
+
+ contact support
+ {' '}
+ to reach our support team.
+
+ )
+ }
+
const toggleAcceptedTerms = () => {
const currentAcceptanceStatus = !userAcceptedTerms
setUserAcceptedTerms(currentAcceptanceStatus)
diff --git a/src/pageLayout/containers/MainNavigation.tsx b/src/pageLayout/containers/MainNavigation.tsx
index 94d842993a..2cec80f574 100644
--- a/src/pageLayout/containers/MainNavigation.tsx
+++ b/src/pageLayout/containers/MainNavigation.tsx
@@ -271,8 +271,6 @@ export const MainNavigation: FC = () => {
return null
}
- const isContractCustomer = accountType === 'contract'
-
const docslink = isIOxOrg
? 'https://docs.influxdata.com/influxdb/cloud-serverless/'
: 'https://docs.influxdata.com/'
@@ -417,7 +415,7 @@ export const MainNavigation: FC = () => {
/>
)}
/>
- {CLOUD && isContractCustomer && (
+ {CLOUD && (
{
const params: typeof PostUiproxySfdcSupportParams = {
- data: {description, email, severity, subject},
+ data: {
+ description,
+ email,
+ severity,
+ subject,
+ caseOrigin,
+ deploymentType,
+ },
}
const response = await postUiproxySfdcSupport(params)
diff --git a/src/shared/components/NotFound.tsx b/src/shared/components/NotFound.tsx
index e332f490d7..d675441932 100644
--- a/src/shared/components/NotFound.tsx
+++ b/src/shared/components/NotFound.tsx
@@ -20,6 +20,7 @@ import {getOrg as fetchOrg} from 'src/organizations/apis'
// Actions
import {setCurrentPage} from 'src/shared/reducers/currentPage'
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
// Utils
import {buildDeepLinkingMap} from 'src/utils/deepLinks'
@@ -36,106 +37,112 @@ import {CLOUD} from 'src/shared/constants'
// API
import {fetchDefaultAccountDefaultOrg} from 'src/identity/apis/org'
-const NotFoundNew: FC = () => (
-
-
- {CLOUD && (
+const NotFoundNew: FC = () => {
+ const dispatch = useDispatch()
+
+ const handleContactSupport = () => {
+ dispatch(showOverlay('contact-support', null, dismissOverlay))
+ }
+
+ return (
+
+
+ {CLOUD && (
+
+
+
+
+ )}
-
-
+
+ 404: Page Not Found
+
+
Please refresh the page or check the URL and try again.
- )}
-
-
- 404: Page Not Found
-
-
Please refresh the page or check the URL and try again.
-
-
-
-
-
+
+
- {CLOUD && (
+
+ {CLOUD && (
+
+
+ Not a URL issue?
+
+
+
+ The webpage you were trying to reach may have been removed
+ or your access to this page may have expired. Please{' '}
+
+ contact support
+
+ .
+
+
+
+ )}
-
Not a URL issue?
+
+ Have more feedback?
+
-
- The webpage you were trying to reach may have been removed or
- your access to this page may have expired.
- {/* Add rel options to avoid "tabnapping" */}
-
- Contact InfluxData Support
-
-
+ We welcome and encourage your feedback and bug reports for
+ InfluxDB. The following resources are available:
- )}
-
-
- Have more feedback?
-
-
- We welcome and encourage your feedback and bug reports for
- InfluxDB. The following resources are available:
-
-
-
-
-
- {/* Add rel options to avoid "tabnapping" */}
-
- InfluxData Community
-
-
-
-
- {/* Add rel options to avoid "tabnapping" */}
-
- InfluxDB Community Slack
-
-
+
+
+
+ {/* Add rel options to avoid "tabnapping" */}
+
+ InfluxData Community
+
+
+
+
+ {/* Add rel options to avoid "tabnapping" */}
+
+ InfluxDB Community Slack
+
+
+
-
-
-
-
-
-
-
-)
+
+
+
+
+
+
+ )
+}
const NotFound: FC = () => {
const [isFetchingOrg, setIsFetchingOrg] = useState(false)
diff --git a/src/shared/copy/notifications/categories/limits.ts b/src/shared/copy/notifications/categories/limits.ts
index d4ca957f2e..937b24ccf4 100644
--- a/src/shared/copy/notifications/categories/limits.ts
+++ b/src/shared/copy/notifications/categories/limits.ts
@@ -52,7 +52,7 @@ export const writeLimitReached = (
export const resourceLimitReached = (resourceName: string): Notification => ({
...defaultErrorNotification,
- message: `Oops. It looks like you have reached the maximum number of ${resourceName} allowed as part of your plan. If you would like to upgrade and remove this restriction, reach out at support.influxdata.com.`,
+ message: `Oops. It looks like you have reached the maximum number of ${resourceName} allowed as part of your plan. If you would like to upgrade and remove this restriction, please use the Contact Support option in the Help menu.`,
duration: FIVE_SECONDS,
type: 'resourceLimitReached',
})
diff --git a/src/support/components/ConfirmationOverlay.tsx b/src/support/components/ConfirmationOverlay.tsx
index c76955478c..f16b9408c0 100644
--- a/src/support/components/ConfirmationOverlay.tsx
+++ b/src/support/components/ConfirmationOverlay.tsx
@@ -1,4 +1,5 @@
import React, {FC, useContext} from 'react'
+import {useDispatch} from 'react-redux'
// Components
import {
@@ -12,11 +13,13 @@ import {
InfluxColors,
Overlay,
} from '@influxdata/clockface'
-import {SafeBlankLink} from 'src/utils/SafeBlankLink'
// Contexts
import {OverlayContext} from 'src/overlays/components/OverlayController'
+// Actions
+import {showOverlay, dismissOverlay} from 'src/overlays/actions/overlays'
+
// Constants
import {
INFLUXDATA_SUPPORT_CONTACT_UK,
@@ -31,6 +34,11 @@ interface OwnProps {
const ConfirmationOverlay: FC = () => {
const {onClose} = useContext(OverlayContext)
+ const dispatch = useDispatch()
+
+ const handleContactSupport = () => {
+ dispatch(showOverlay('contact-support', null, dismissOverlay))
+ }
return (
@@ -65,11 +73,11 @@ const ConfirmationOverlay: FC = () => {
account email for a confirmation and follow-up.
- For more resources, check out{' '}
-
- {' '}
- support.influxdata.com{' '}
-
+ For more resources, you can{' '}
+
+ contact our support team
+
+ .