Merge pull request #5787 from matrix-org/gsouquet-event-indexing-settings

Improve error reporting when EventIndex fails on a supported environment

src/components/views/settings/EventIndexPanel.js

@@ -190,7 +190,7 @@ export default class EventIndexPanel extends React.Component {
                     }
                 </div>
             );
-        } else {
+        } else if (!EventIndexPeg.platformHasSupport()) {
             eventIndexingSettings = (
                 <div className='mx_SettingsTab_subsectionText'>
                     {
@@ -208,6 +208,23 @@ export default class EventIndexPanel extends React.Component {
                     }
                 </div>
             );
+        } else {
+            eventIndexingSettings = (
+                <div className='mx_SettingsTab_subsectionText'>
+                    <p>
+                        {_t("Message search initilisation failed")}
+                    </p>
+                    {EventIndexPeg.error && (
+                    <details>
+                        <summary>{_t("Advanced")}</summary>
+                        <code>
+                            {EventIndexPeg.error.message}
+                        </code>
+                    </details>
+                    )}
+
+                </div>
+            );
         }
 
         return eventIndexingSettings;