Merge pull request #88 from RedisInsight/fix/RI-2124_infinity-loading

Fix/ Workbench query infinity loading

Author: ArtyomPSofteq

redisinsight/ui/src/components/query-card/QueryCard.tsx

@@ -149,7 +149,7 @@ const QueryCard = (props: Props) => {
         {isOpen && (
           <>
             {React.isValidElement(result)
-              ? <QueryCardCommonResult result={result} />
+              ? <QueryCardCommonResult loading={loading} result={result} />
               : (
                 <>
                   {viewTypeSelected === WBQueryType.Plugin && (
@@ -170,7 +170,7 @@ const QueryCard = (props: Props) => {
                     </>
                   )}
                   {viewTypeSelected === WBQueryType.Text && (
-                    <QueryCardCliResult query={query} status={status} result={result} />
+                    <QueryCardCliResult loading={loading} query={query} status={status} result={result} />
                   )}
                 </>
               )}

redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.spec.tsx

@@ -50,7 +50,7 @@ describe('QueryCardCliResult', () => {
     expect(resultEl).toHaveTextContent(result)
   })
 
-  it('Result element should not render without result prop', () => {
+  it('Result element should render (nil) result', () => {
     const result = ''
 
     const { queryByTestId } = render(
@@ -59,6 +59,6 @@ describe('QueryCardCliResult', () => {
 
     const resultEl = queryByTestId(resultTestId)
 
-    expect(resultEl).not.toBeInTheDocument()
+    expect(resultEl).toHaveTextContent('(nil)')
   })
 })

redisinsight/ui/src/components/query-card/QueryCardCliResult/QueryCardCliResult.tsx

@@ -4,25 +4,27 @@ import { EuiLoadingContent } from '@elastic/eui'
 
 import { cliParseTextResponse, CliPrefix, Maybe } from 'uiSrc/utils'
 import { CommandExecutionStatus } from 'uiSrc/slices/interfaces/cli'
+
 import styles from './styles.module.scss'
 
 export interface Props {
   status: Maybe<CommandExecutionStatus>;
   query: string;
   result: any;
+  loading?: boolean;
 }
 
 const QueryCardCliResult = (props: Props) => {
-  const { result, query, status } = props
+  const { result, query, status, loading } = props
 
   return (
     <div className={cx('queryResultsContainer', styles.container)}>
-      {!!result && (
+      {!loading && (
         <div data-testid="query-cli-result">
-          {cliParseTextResponse(result, query, status, CliPrefix.QueryCard)}
+          {cliParseTextResponse(result || '(nil)', query, status, CliPrefix.QueryCard)}
         </div>
       )}
-      {!result && (
+      {loading && (
         <div className={styles.loading}>
           <EuiLoadingContent lines={1} />
         </div>

redisinsight/ui/src/components/query-card/QueryCardCommonResult/QueryCardCommonResult.spec.tsx

@@ -17,4 +17,14 @@ describe('QueryCardCliResult', () => {
   it('should render', () => {
     expect(render(<QueryCardCommonResult {...instance(mockedProps)} />)).toBeTruthy()
   })
+  it('should render (nil) result', () => {
+    const result = ''
+    const { queryByTestId } = render(
+      <QueryCardCommonResult {...instance(mockedProps)} result={result} />
+    )
+
+    const resultEl = queryByTestId('query-common-result')
+
+    expect(resultEl).toHaveTextContent('(nil)')
+  })
 })

redisinsight/ui/src/components/query-card/QueryCardCommonResult/QueryCardCommonResult.tsx

@@ -5,20 +5,21 @@ import { EuiLoadingContent } from '@elastic/eui'
 import styles from './styles.module.scss'
 
 export interface Props {
-  result: React.ReactElement;
+  result: React.ReactElement | string;
+  loading?: boolean;
 }
 
 const QueryCardCommonResult = (props: Props) => {
-  const { result } = props
+  const { result, loading } = props
 
   return (
     <div className={cx('queryResultsContainer', styles.container)}>
-      {!!result && (
+      {!loading && (
         <div data-testid="query-common-result">
-          { result }
+          { result || '(nil)' }
         </div>
       )}
-      {!result && (
+      {loading && (
         <div className={styles.loading}>
           <EuiLoadingContent lines={1} />
         </div>