feat: replace isRegionBeta with isUpgradeable from identity (#5808)

Author: wdoconnell

src/identity/reducers/index.ts

@@ -34,6 +34,7 @@ export const initialState: CurrentIdentity = {
     type: 'free',
     accountCreatedAt: '',
     paygCreditStartDate: '',
+    isUpgradeable: false,
   },
   status: RemoteDataState.NotStarted,
 }
@@ -47,6 +48,7 @@ export default (state = initialState, action: Actions): CurrentIdentity =>
         // Store account information from /identity in state.
         draftState.account.accountCreatedAt = account.accountCreatedAt
         draftState.account.id = account.id
+        draftState.account.isUpgradeable = account.isUpgradeable
         draftState.account.name = account.name
         draftState.account.paygCreditStartDate = account.paygCreditStartDate
         draftState.account.type = account.type

src/identity/utils/convertIdentityToMe.ts

@@ -20,11 +20,14 @@ export const convertIdentityToMe = (
     accountType: account.type,
     paygCreditStartDate: account.paygCreditStartDate,
     billingProvider: account.billingProvider ? account.billingProvider : null,
+    // isRegionBeta in quartz/me has the opposite value of isUpgradeable.
+    isRegionBeta: account.isUpgradeable
+      ? !Boolean(account.isUpgradeable)
+      : true,
 
     // Organization Data
     clusterHost: org.clusterHost,
     regionCode: org.regionCode ? org.regionCode : null,
-    isRegionBeta: org.isRegionBeta ? org.isRegionBeta : null,
     regionName: org.regionName ? org.regionName : null,
   }
 }

src/shared/containers/GetOrganizations.tsx

@@ -32,7 +32,6 @@ import {CLOUD} from 'src/shared/constants'
 // Utils
 import {isFlagEnabled} from 'src/shared/utils/featureFlag'
 import {convertStringToEpoch} from 'src/shared/utils/dateTimeUtils'
-import {shouldUseQuartzIdentity} from 'src/identity/utils/shouldUseQuartzIdentity'
 import {updateReportingContext} from 'src/cloud/utils/reporting'
 
 // Types
@@ -41,13 +40,10 @@ import {PROJECT_NAME} from 'src/flows'
 import {RemoteDataState} from 'src/types'
 
 // Thunks
-import {
-  getCurrentOrgDetailsThunk,
-  getQuartzIdentityThunk,
-} from 'src/identity/actions/thunks'
+import {getQuartzIdentityThunk} from 'src/identity/actions/thunks'
 
 const canAccessCheckout = (me: Me): boolean => {
-  if (!!me?.isRegionBeta) {
+  if (Boolean(me?.isRegionBeta)) {
     return false
   }
   return me?.accountType !== 'pay_as_you_go' && me?.accountType !== 'contract'
@@ -64,14 +60,6 @@ const GetOrganizations: FunctionComponent = () => {
 
   const dispatch = useDispatch()
 
-  const identityOrgId = identity.currentIdentity.org.id
-
-  useEffect(() => {
-    if (identityOrgId && shouldUseQuartzIdentity() && !quartzMe?.isRegionBeta) {
-      dispatch(getCurrentOrgDetailsThunk(identityOrgId))
-    }
-  }, [identityOrgId]) // eslint-disable-line react-hooks/exhaustive-deps
-
   // This doesn't require another API call.
   useEffect(() => {
     if (status === RemoteDataState.NotStarted) {