fix(csvMethod): update rate limit error msg for iox (#6510)

* fix(csvMethod): update rate limit error msg for iox

* fix: update wording of error message

* chore: add an enum for query response

* chore: use shared runQuery response enum

Author: blegesse-w

src/alerting/utils/activity.ts

@@ -10,6 +10,7 @@ import {MONITORING_BUCKET} from 'src/alerting/constants'
 import {CancelBox, CheckIDsMap, StatusRow} from 'src/types'
 import {RunQueryResult} from 'src/shared/apis/query'
 import {LoadRowsOptions, Row} from 'src/types'
+import {RunQueryResponse} from 'src/types/queries'
 
 export const runAlertsActivityQuery = (
   orgID: string,
@@ -50,7 +51,7 @@ export const processResponse = ({
   cancel,
 }: CancelBox<RunQueryResult>): CancelBox<Row[]> => {
   const promise = queryPromise.then<Row[]>(resp => {
-    if (resp.type !== 'SUCCESS') {
+    if (resp.type !== RunQueryResponse.SUCCESS) {
       return Promise.reject(new Error(resp.message))
     }
 

src/alerting/utils/history.ts

@@ -16,6 +16,7 @@ import {MONITORING_BUCKET} from 'src/alerting/constants'
 
 // Types
 import {State as EventViewerState} from 'src/eventViewer/components/EventViewer.reducer'
+import {RunQueryResponse} from 'src/types/queries'
 
 import {
   CancelBox,
@@ -145,7 +146,7 @@ export const processResponse = ({
   cancel,
 }: CancelBox<RunQueryResult>): CancelBox<Row[]> => {
   const promise = queryPromise.then<Row[]>(resp => {
-    if (resp.type !== 'SUCCESS') {
+    if (resp.type !== RunQueryResponse.SUCCESS) {
       return Promise.reject(new Error(resp.message))
     }
 

src/alerting/utils/statusEvents.ts

@@ -8,8 +8,9 @@ import {MONITORING_BUCKET} from 'src/alerting/constants'
 
 // Types
 import {CancelBox, StatusRow, File} from 'src/types'
-import {RunQueryResult} from 'src/shared/apis/query'
 import {Row} from 'src/types'
+import {RunQueryResult} from 'src/shared/apis/query'
+import {RunQueryResponse} from 'src/types/queries'
 
 export const runStatusesQuery = (
   orgID: string,
@@ -46,7 +47,7 @@ export const processStatusesResponse = ({
   cancel,
 }: CancelBox<RunQueryResult>): CancelBox<Row[][]> => {
   const promise = queryPromise.then<Row[][]>(resp => {
-    if (resp.type !== 'SUCCESS') {
+    if (resp.type !== RunQueryResponse.SUCCESS) {
       return Promise.reject(new Error(resp.message))
     }
 

src/shared/components/TimeSeries.tsx

@@ -45,6 +45,7 @@ import {
   CancelBox,
 } from 'src/types'
 import {event} from 'src/cloud/utils/reporting'
+import {RunQueryResponse} from 'src/types/queries'
 
 interface QueriesState {
   files: string[] | null
@@ -278,12 +279,12 @@ class TimeSeries extends Component<Props, State> {
       const duration = Date.now() - startTime
 
       for (const result of results) {
-        if (result.type === 'UNKNOWN_ERROR') {
+        if (result.type === RunQueryResponse.UNKNOWN_ERROR) {
           errorMessage = result.message
           throw new Error(result.message)
         }
 
-        if (result.type === 'RATE_LIMIT_ERROR') {
+        if (result.type === RunQueryResponse.RATE_LIMIT_ERROR) {
           errorMessage = result.message
           notify(rateLimitReached(result.retryAfter))
 

src/shared/utils/dataListening.ts

@@ -1,6 +1,10 @@
+// Utils
 import {runQuery} from 'src/shared/apis/query'
 import {LoadingState} from 'src/shared/components/DataListening/ConnectionInformation'
 
+// Types
+import {RunQueryResponse} from 'src/types/queries'
+
 export const TIMEOUT_MILLISECONDS = 60000
 export const TIMER_WAIT = 1000
 
@@ -41,7 +45,7 @@ export const checkForData = async (orgID, bucket): Promise<LoadingState> => {
   try {
     const result = await runQuery(orgID, script).promise
 
-    if (result.type !== 'SUCCESS') {
+    if (result.type !== RunQueryResponse.SUCCESS) {
       throw new Error(result.message)
     }
 

src/timeMachine/apis/queryBuilder.ts

@@ -20,6 +20,7 @@ import {DEFAULT_LIMIT} from 'src/shared/constants/queryBuilder'
 import {TimeRange, BuilderConfig} from 'src/types'
 import {CancelBox} from 'src/types/promises'
 import {pastThirtyDaysTimeRange} from 'src/shared/constants/timeRanges'
+import {RunQueryResponse} from 'src/types/queries'
 
 const DEFAULT_TIME_RANGE: TimeRange = pastThirtyDaysTimeRange
 
@@ -155,7 +156,7 @@ export function extractBoxedCol(
   colName: string
 ): CancelBox<string[]> {
   const promise = resp.promise.then<string[]>(result => {
-    if (result.type !== 'SUCCESS') {
+    if (result.type !== RunQueryResponse.SUCCESS) {
       return Promise.reject(new Error(result.message))
     }
 

src/types/queries.ts

@@ -49,3 +49,9 @@ export interface CustomTimeRange {
   upper: string
   type: 'custom'
 }
+
+export enum RunQueryResponse {
+  SUCCESS = 'SUCCESS',
+  RATE_LIMIT_ERROR = 'RATE_LIMIT_ERROR',
+  UNKNOWN_ERROR = 'UNKNOWN_ERROR',
+}

src/variables/utils/ValueFetcher.ts

@@ -16,6 +16,7 @@ import {
   Variable,
 } from 'src/types'
 import {CancelBox} from 'src/types/promises'
+import {RunQueryResponse} from 'src/types/queries'
 
 const cacheKey = (
   url: string,
@@ -104,7 +105,7 @@ export class DefaultValueFetcher implements ValueFetcher {
     event('runQuery', {context: 'variables'})
 
     const promise = request.promise.then(result => {
-      if (result.type !== 'SUCCESS') {
+      if (result.type !== RunQueryResponse.SUCCESS) {
         return Promise.reject(result.message)
       }
 

src/writeData/components/fileUploads/CsvMethod.tsx

@@ -18,9 +18,10 @@ import StatusIndicator from 'src/buckets/components/csvUploader/StatusIndicator'
 // Utils
 import {event} from 'src/cloud/utils/reporting'
 import {getErrorMessage} from 'src/utils/api'
-import {getOrg} from 'src/organizations/selectors'
+import {getOrg, isOrgIOx} from 'src/organizations/selectors'
 import {reportErrorThroughHoneyBadger} from 'src/shared/utils/errors'
 import {runQuery} from 'src/shared/apis/query'
+import {RunQueryResponse} from 'src/types/queries'
 
 // Selectors
 import {
@@ -32,14 +33,15 @@ import {notify} from 'src/shared/actions/notifications'
 // Types
 import {RemoteDataState} from 'src/types'
 
-const CsvMethod: FC = () => {
+export const CsvMethod: FC = () => {
   const [uploadState, setUploadState] = useState(RemoteDataState.NotStarted)
   const [uploadError, setUploadError] = useState('')
 
   const {bucket} = useContext(WriteDataDetailsContext)
   const orgId = useSelector(getOrg)?.id
   const history = useHistory()
   const org = useSelector(getOrg)
+  const orgIsIOx = useSelector(isOrgIOx)
 
   const dispatch = useDispatch()
 
@@ -96,24 +98,32 @@ const CsvMethod: FC = () => {
           controller.current
         ).promise
 
-        if (resp.type === 'SUCCESS') {
+        if (resp.type === RunQueryResponse.SUCCESS) {
           setUploadState(RemoteDataState.Done)
           return
         }
-        if (resp.type === 'RATE_LIMIT_ERROR') {
+        if (resp.type === RunQueryResponse.RATE_LIMIT_ERROR) {
           setUploadState(RemoteDataState.Error)
-          setUploadError('Failed due to plan limits: read cardinality reached')
+          if (orgIsIOx) {
+            setUploadError(
+              'Failed due to request exceeding read or write limits of plan'
+            )
+          } else {
+            setUploadError(
+              'Failed due to request exceeding read, write, or cardinality limits of plan'
+            )
+          }
           return
         }
-        if (resp.type === 'UNKNOWN_ERROR') {
+        if (resp.type === RunQueryResponse.UNKNOWN_ERROR) {
           const error = getErrorMessage(resp)
           throw new Error(error)
         }
       } catch (error) {
         handleError(error)
       }
     },
-    [handleError, org?.id]
+    [handleError, org?.id, orgIsIOx]
   )
 
   const handleSeeUploadedData = () => {
@@ -173,5 +183,3 @@ const CsvMethod: FC = () => {
     </Panel>
   )
 }
-
-export default CsvMethod

src/writeData/components/fileUploads/UploadDataDetailsView.tsx

@@ -11,7 +11,7 @@ import CodeSnippet, {
   Provider as TemplateProvider,
 } from 'src/shared/components/CodeSnippet'
 import GetResources from 'src/resources/components/GetResources'
-import CsvMethod from 'src/writeData/components/fileUploads/CsvMethod'
+import {CsvMethod} from 'src/writeData/components/fileUploads/CsvMethod'
 import {LineProtocolTabs} from 'src/buckets/components/lineProtocol/configure/LineProtocolTabs'
 import {MarkdownRenderer} from 'src/shared/components/views/MarkdownRenderer'