Enhance error handling

rohberg · Mar 9, 2024 · 040f1dd · 040f1dd
1 parent cf8f2bd
commit 040f1dd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/acceptance/cypress/tests/blocks-searchkit.cy.js b/acceptance/cypress/tests/blocks-searchkit.cy.js
@@ -63,18 +63,18 @@ describe('Searchkit Block Tests', () => {
       force: true,
     });
 
-    // block configuration index server
-    cy.get('input#field-backend_url').type('http://localhost:55001/plone')
-    cy.get('input#field-frontend_url').type('http://localhost:3000')
-    // block configuration allowed types and states
-    cy.get("#field-allowed_content_types").click();
-    cy.get("#field-allowed_content_types .react-select__option")
-      .contains('Page')
-      .click();
-    cy.get("#field-allowed_review_states").click();
-    cy.get("#field-allowed_review_states .react-select__option")
-      .contains('Private')
-      .click();
+    // // block configuration index server
+    // cy.get('input#field-backend_url').type('http://localhost:55001/plone')
+    // cy.get('input#field-frontend_url').type('http://localhost:3000')
+    // // block configuration allowed types and states
+    // cy.get("#field-allowed_content_types").click();
+    // cy.get("#field-allowed_content_types .react-select__option")
+    //   .contains('Page')
+    //   .click();
+    // cy.get("#field-allowed_review_states").click();
+    // cy.get("#field-allowed_review_states .react-select__option")
+    //   .contains('Private')
+    //   .click();
 
     cy.get('#toolbar-save').click();
     cy.visit('/searching');

diff --git a/src/components/Searchkit/ESSearchApi.jsx b/src/components/Searchkit/ESSearchApi.jsx
@@ -63,9 +63,15 @@ export class PloneSearchApi {
       });
       // let results = await this.responseSerializer.serialize(response.data);
       let results = await response.json();
+      if (results.message) {
+        throw results
+        // throw new Error(`${results.type} ${results.message}`);
+      }
       results = this.responseSerializer.serialize(results);
       return results;
     } catch (error) {
+      console.debug('ESSearchApi. error:');
+      console.debug(error);
       throw error;
     }
   }

diff --git a/src/components/Searchkit/Error.jsx b/src/components/Searchkit/Error.jsx
@@ -3,9 +3,8 @@ import { Header, Segment } from 'semantic-ui-react';
 import { FormattedMessage } from 'react-intl';
 
 const Error = ({ error }) => {
-  const stateError = useSelector((state) => state.results?.error);
 
-  return stateError?.name ? (
+  return error?.type ? (
     <Segment inverted color="red" secondary>
       <Header icon>
         <h3>
@@ -15,7 +14,7 @@ const Error = ({ error }) => {
           />
         </h3>
       </Header>
-      <b>{stateError?.name}:</b> <i>{stateError?.message}</i>
+      <b>{error?.type}:</b> <i>{error?.message}</i>
     </Segment>
   ) : null;
 };

diff --git a/src/components/Searchkit/Results.js b/src/components/Searchkit/Results.js
@@ -49,7 +49,6 @@ class Results extends Component {
         <Grid>
           <Grid.Column width={4}>
             <Count />
-            <div>DEBUG1 {JSON.stringify(this.props.currentResultsState?.error)}</div>
           </Grid.Column>
           <Grid.Column width={6}>
             <Sort
@@ -67,7 +66,7 @@ class Results extends Component {
           <Pagination options={{ size: 'small' }} />
         </Grid>
       </div>
-    ) : <div>DEBUG2 {JSON.stringify(this.props.currentResultsState?.error)}</div>;
+    ) : null;
   }
 }