feat: transition from /quartz/me to /quartz/identity endpoint (#4822)

Author: wdoconnell

cypress/e2e/cloud/explorer.test.ts

@@ -36,6 +36,7 @@ describe('DataExplorer', () => {
 
     it('can use the dynamic flux function selector to build a query', () => {
       cy.setFeatureFlags({
+        uiUnificationFlag: true,
         fluxDynamicDocs: true,
       }).then(() => {
         cy.get('.view-line').should('be.visible')
@@ -68,6 +69,7 @@ describe('DataExplorer', () => {
 
     it('can use the dynamic flux function search bar to search by package or function name', () => {
       cy.setFeatureFlags({
+        uiUnificationFlag: true,
         fluxDynamicDocs: true,
       }).then(() => {
         cy.get('.view-line').should('be.visible')

cypress/e2e/cloud/flows.test.ts

@@ -195,6 +195,7 @@ describe('Flows', () => {
 
   it('can use the dynamic flux function selector to build a query', () => {
     cy.setFeatureFlags({
+      uiUnificationFlag: true,
       fluxDynamicDocs: true,
     }).then(() => {
       cy.getByTestID('preset-script')
@@ -288,7 +289,10 @@ describe('Flows with newQueryBuilder flag on', () => {
     cy.signin()
     cy.get('@org').then(({id}: Organization) =>
       cy.fixture('routes').then(({orgs}) => {
-        cy.setFeatureFlags({newQueryBuilder: true}).then(() => {
+        cy.setFeatureFlags({
+          newQueryBuilder: true,
+          uiUnificationFlag: true,
+        }).then(() => {
           cy.visit(`${orgs}/${id}`)
         })
       })

cypress/e2e/cloud/helpBar.test.ts

@@ -6,6 +6,7 @@ describe('Help bar support for free account users', () => {
           cy.setFeatureFlags({
             helpBar: true,
             helpBarSfdcIntegration: true,
+            uiUnificationFlag: true,
           }).then(() => {
             cy.quartzProvision({
               accountType: 'free',
@@ -42,6 +43,7 @@ describe('Help bar support for PAYG users', () => {
           cy.setFeatureFlags({
             helpBar: true,
             helpBarSfdcIntegration: true,
+            uiUnificationFlag: true,
           }).then(() => {
             cy.quartzProvision({
               accountType: 'pay_as_you_go',

cypress/e2e/cloud/home.test.ts

@@ -8,6 +8,7 @@ describe('Home Page Tests', () => {
           cy.getByTestID('home-page--header').should('be.visible')
           cy.setFeatureFlags({
             alertsActivity: true,
+            uiUnificationFlag: true,
           }).then(() => cy.getByTestID('nav-item-flows').should('be.visible'))
         })
       })

cypress/e2e/cloud/pinned.test.ts

@@ -9,6 +9,7 @@ describe('Pinned Items', () => {
       orgID = id
       cy.setFeatureFlags({
         pinnedItems: true,
+        uiUnificationFlag: true,
       })
       cy.getByTestID('tree-nav')
     })
@@ -26,6 +27,7 @@ describe('Pinned Items', () => {
       cy.createDashboard(orgID)
       cy.setFeatureFlags({
         pinnedItems: true,
+        uiUnificationFlag: true,
       })
       cy.getByTestID('nav-item-dashboards').should('be.visible')
       cy.getByTestID('nav-item-dashboards').click()
@@ -218,6 +220,7 @@ from(bucket: "${name}"{rightarrow}
     beforeEach(() => {
       cy.setFeatureFlags({
         pinnedItems: true,
+        uiUnificationFlag: true,
       })
       cy.intercept('GET', '/api/v2private/notebooks*').as('getNotebooks')
       cy.intercept('PATCH', '/api/v2private/notebooks/*').as('updateNotebook')

cypress/e2e/cloud/subscriptions.test.ts

@@ -12,6 +12,7 @@ describe('Subscriptions', () => {
               cy.visit(`${orgs}/${id}/load-data/sources`)
               cy.setFeatureFlags({
                 subscriptionsUI: true,
+                uiUnificationFlag: true,
               })
               cy.getByTestID('subscriptions--tab').should('be.visible')
               cy.intercept('POST', `/api/v2private/broker/subs*`).as(
@@ -617,6 +618,7 @@ describe('Subscriptions', () => {
       cy.setFeatureFlags({
         subscriptionsUI: true,
         subscriptionsSinglePage: true,
+        uiUnificationFlag: true,
       })
       let subscription = 'My Subscription'
       createBasicLPSubscription(subscription)
@@ -704,6 +706,7 @@ describe('Subscriptions', () => {
       cy.setFeatureFlags({
         subscriptionsUI: true,
         subscriptionsSinglePage: true,
+        uiUnificationFlag: true,
       })
       let subscription = 'My Subscription 2'
       cy.getByTestID('subscriptions--tab').click()
@@ -889,6 +892,7 @@ describe('Subscriptions', () => {
       cy.setFeatureFlags({
         subscriptionsUI: true,
         subscriptionsSinglePage: true,
+        uiUnificationFlag: true,
       })
 
       let subscription = 'My Subscription 3'

cypress/e2e/cloud/usage.test.ts

@@ -12,7 +12,9 @@ describe('Usage Page Free User No Data', () => {
     cy.flush().then(() =>
       cy.signin().then(() => {
         cy.get('@org').then(({id}: Organization) => {
-          cy.setFeatureFlags({uiUnificationFlag: true}).then(() => {
+          cy.setFeatureFlags({
+            uiUnificationFlag: true,
+          }).then(() => {
             cy.quartzProvision({
               hasData: false,
               accountType: 'free',
@@ -116,7 +118,9 @@ describe('Usage Page PAYG With Data', () => {
     cy.flush().then(() =>
       cy.signin().then(() => {
         cy.get('@org').then(({id}: Organization) => {
-          cy.setFeatureFlags({uiUnificationFlag: true}).then(() => {
+          cy.setFeatureFlags({
+            uiUnificationFlag: true,
+          }).then(() => {
             cy.quartzProvision({
               hasData: true,
               accountType: 'pay_as_you_go',

cypress/e2e/cloud/users.test.ts

@@ -5,7 +5,9 @@ describe('Users Page', () => {
     cy.flush().then(() =>
       cy.signin().then(() => {
         cy.get('@org').then(({id}: Organization) => {
-          cy.setFeatureFlags({uiUnificationFlag: true}).then(() => {
+          cy.setFeatureFlags({
+            uiUnificationFlag: true,
+          }).then(() => {
             cy.quartzProvision({
               hasUsers: true,
             }).then(() => {

cypress/e2e/cloud/zuoraOutage.test.ts

@@ -7,6 +7,7 @@ describe('Billing Page Free Users', () => {
         cy.get('@org').then(() => {
           cy.setFeatureFlags({
             quartzZuoraDisabled: true,
+            uiUnificationFlag: true,
           }).then(() => {
             cy.quartzProvision({
               accountType: 'free',

src/billing/components/BillingPageContents.tsx

@@ -1,6 +1,9 @@
+// Constants
+import {CLOUD} from 'src/shared/constants'
+
 // Libraries
-import React, {FC} from 'react'
-import {useSelector} from 'react-redux'
+import React, {FC, useEffect} from 'react'
+import {useSelector, useDispatch} from 'react-redux'
 
 // Components
 import BillingFree from 'src/billing/components/Free/Free'
@@ -10,14 +13,29 @@ import MarketplaceBilling from 'src/billing/components/marketplace/MarketplaceBi
 // Utils
 import {getQuartzMe} from 'src/me/selectors'
 
+// Thunks
+import {getBillingProviderThunk} from 'src/identity/actions/thunks'
+import {shouldUseQuartzIdentity} from 'src/identity/utils/shouldUseQuartzIdentity'
+
 const BillingPageContents: FC = () => {
+  const dispatch = useDispatch()
   const quartzMe = useSelector(getQuartzMe)
 
-  if (
-    (quartzMe?.accountType === 'pay_as_you_go' ||
-      quartzMe?.accountType === 'contract') &&
-    quartzMe?.billingProvider !== 'zuora'
-  ) {
+  useEffect(() => {
+    if (!CLOUD) {
+      return
+    }
+
+    if (shouldUseQuartzIdentity() && !quartzMe.billingProvider) {
+      dispatch(getBillingProviderThunk())
+    }
+  }, []) // eslint-disable-line react-hooks/exhaustive-deps
+
+  if (quartzMe?.billingProvider === null) {
+    return <BillingFree />
+  }
+
+  if (quartzMe?.billingProvider !== 'zuora') {
     return <MarketplaceBilling />
   }