diff --git a/cypress/e2e/cloud/createOrg.test.ts b/cypress/e2e/cloud/createOrg.test.ts index 2c6df3a8fa..df9b0f2c64 100644 --- a/cypress/e2e/cloud/createOrg.test.ts +++ b/cypress/e2e/cloud/createOrg.test.ts @@ -227,10 +227,6 @@ describe('Free account', () => { }) describe('PAYG account', () => { - beforeEach(() => { - cy.disableClickThroughAnnouncement() - }) - it('can create new orgs, if there are orgs left in the quota', () => { setupTest({accountType: 'pay_as_you_go', canCreateOrgs: true}) diff --git a/cypress/e2e/cloud/org-list.test.ts b/cypress/e2e/cloud/org-list.test.ts index 3a1cb43b81..02b70edf73 100644 --- a/cypress/e2e/cloud/org-list.test.ts +++ b/cypress/e2e/cloud/org-list.test.ts @@ -69,8 +69,8 @@ describe('Account / Organizations Tab', () => { cy.getByTestID('question-mark-tooltip--tooltip--dialog').within(() => { cy.get('a') - .contains('support@influxdata.com') - .should('have.attr', 'href', 'mailto:support@influxdata.com') + .contains('https://support.influxdata.com/s/login') + .should('have.attr', 'href', 'https://support.influxdata.com/s/login') }) cy.getByTestID('pagination-item') diff --git a/cypress/index.d.ts b/cypress/index.d.ts index 5489fb1db5..8af8388ac4 100644 --- a/cypress/index.d.ts +++ b/cypress/index.d.ts @@ -69,7 +69,6 @@ import { selectScriptFieldOrTag, scriptsLoginWithFlags, createScript, - disableClickThroughAnnouncement, } from './support/commands' declare global { @@ -146,7 +145,6 @@ declare global { selectScriptFieldOrTag: typeof selectScriptFieldOrTag scriptsLoginWithFlags: typeof scriptsLoginWithFlags createScript: typeof createScript - disableClickThroughAnnouncement: typeof disableClickThroughAnnouncement } } } diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index 689d8d727b..7886f3fdef 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -1540,17 +1540,6 @@ export const createTaskFromEmpty = ( cy.getByTestID('task-form-offset-input').type(offset) } -export const disableClickThroughAnnouncement = () => { - const announcementState = { - pricingClickThroughAnnouncement: 'dismissed', - } - - window.localStorage.setItem( - 'clickThroughAnnouncement', - JSON.stringify(announcementState) - ) -} - /* eslint-disable */ // notification endpoints Cypress.Commands.add('createEndpoint', createEndpoint) @@ -1561,12 +1550,6 @@ Cypress.Commands.add('createCheck', createCheck) // alert group Cypress.Commands.add('createAlertGroup', createAlertGroup) -// click through announcements -Cypress.Commands.add( - 'disableClickThroughAnnouncement', - disableClickThroughAnnouncement -) - // assertions Cypress.Commands.add('fluxEqual', fluxEqual) diff --git a/src/billing/components/PayAsYouGo/PayAsYouGo.tsx b/src/billing/components/PayAsYouGo/PayAsYouGo.tsx index 8ae0ba0d0e..78e3219637 100644 --- a/src/billing/components/PayAsYouGo/PayAsYouGo.tsx +++ b/src/billing/components/PayAsYouGo/PayAsYouGo.tsx @@ -1,6 +1,5 @@ // Libraries import React, {FC} from 'react' -import {useSelector} from 'react-redux' // Components import { @@ -19,15 +18,8 @@ import CancellationPanel from 'src/billing/components/PayAsYouGo/CancellationPan import NotificationPanel from 'src/billing/components/PayAsYouGo/NotificationPanel' import InvoiceLoadingWrapper from 'src/billing/components/AssetLoading/InvoiceWrapper' import BillingInfoWrapper from 'src/billing/components/AssetLoading/BillingInfoWrapper' -import {PricingAlert} from 'src/billing/components/PayAsYouGo/PricingAlert' - -// Utils -import {selectCurrentIdentity} from 'src/identity/selectors' const BillingPayAsYouGo: FC = () => { - const {account} = useSelector(selectCurrentIdentity) - const isDirectSignup = account.billingProvider === 'zuora' - return ( { > <> - {isDirectSignup && } diff --git a/src/billing/components/PayAsYouGo/PricingAlert.tsx b/src/billing/components/PayAsYouGo/PricingAlert.tsx deleted file mode 100644 index 12f4f940f6..0000000000 --- a/src/billing/components/PayAsYouGo/PricingAlert.tsx +++ /dev/null @@ -1,72 +0,0 @@ -// Libraries -import React, {useEffect} from 'react' -import {useSelector} from 'react-redux' - -// Components -import { - Alert, - FlexBox, - IconFont, - ComponentColor, - ComponentSize, -} from '@influxdata/clockface' -import {SafeBlankLink} from 'src/utils/SafeBlankLink' - -// Utils -import {event} from 'src/cloud/utils/reporting' - -// Selectors -import {selectCurrentOrg, selectUser} from 'src/identity/selectors' - -export const PricingAlert: React.FC = () => { - useEffect(() => { - event(`pricingAnnouncementBanner.displayed`) - }, []) - - const org = useSelector(selectCurrentOrg) - const user = useSelector(selectUser) - - const encodedSubject = encodeURI('PAYG Pricing Increase') - const encodedBody = encodeURI(`User ID: ${user.email} -Org ID: ${org.id} - -Please describe your inquiry here.`) - - const handleContactUsClick = () => { - event(`pricingAnnouncementBanner.contactUs.clicked`) - } - - const handlePricingAnnouncementClick = () => { - event(`pricingAnnouncementBanner.details.clicked`) - } - - return ( - - - - Starting on December 1, 2023 there will be an increase in to - your usage-based pricing. Please feel free to{' '} - - contact us - {' '} - with questions or refer to our website for additional information. - - - -
- View Pricing Changes -
-
-
-
-
- ) -} diff --git a/src/cloud/components/CardinalityLimitOverlay.tsx b/src/cloud/components/CardinalityLimitOverlay.tsx index 85a5f976e2..1d0163ee11 100644 --- a/src/cloud/components/CardinalityLimitOverlay.tsx +++ b/src/cloud/components/CardinalityLimitOverlay.tsx @@ -102,7 +102,7 @@ const CardinalityLimitOverlayUnconnected: FC = ({onClose, orgID}) => {

- {showForm && } + {showForm && } ) diff --git a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx index 967434ee2c..b66dea20c6 100644 --- a/src/cloud/components/SeriesCardinalityIncreaseForm.tsx +++ b/src/cloud/components/SeriesCardinalityIncreaseForm.tsx @@ -1,108 +1,41 @@ // Libraries -import React, {FC, useState} from 'react' +import React, {FC} from 'react' // Components import { Form, - Input, Button, Heading, - TextArea, - ButtonType, ButtonShape, InfluxColors, ComponentSize, ComponentColor, HeadingElement, - ComponentStatus, } from '@influxdata/clockface' -interface Props { - orgID: string -} - -export const SeriesCardinalityIncreaseForm: FC = ({orgID}) => { - const [increaseAmount, onChangeIncreaseAmount] = useState('') - const [requestDetails, onChangeRequestDetails] = useState('') - - const handleAmountValidation = (value: string): string | null => { - if (!value) { - return 'Amount is required' - } - return null - } - - const handleDetailsValidation = (value: string): string | null => { - if (!value) { - return 'Use-case details are required' - } - return null - } - - const isFormValid = (): boolean => { - return !!increaseAmount && !!requestDetails - } - +export const SeriesCardinalityIncreaseForm: FC = () => { const handleSubmit = (): void => { - window.open( - `mailto:support@influxdata.com?subject=Request%20Series%20Cardinality%20Increase&body=Organization ID%3A%20${orgID}%0D%0A%0D%0ARequested Series Cardinality Limit:%20${increaseAmount}%0D%0A%0D%0AUse-Case Details:%0D%0A${requestDetails}` - ) + window.open(`https://support.influxdata.com/s/login`) } return ( -
+
Request Series Cardinality Limit Increase - - {status => ( - onChangeIncreaseAmount(e.target.value)} - testID="rate-alert-form-amount" - /> - )} - - - {status => ( -