implement api to deliver a particular event (close #371) (#373)

hasura · Sep 7, 2018 · e905535 · e905535
1 parent 2814e87
commit e905535
Show file tree

Hide file tree

Showing 25 changed files with 1,166 additions and 86 deletions.
diff --git a/console/package-lock.json b/console/package-lock.json
diff --git a/console/package.json b/console/package.json
@@ -67,6 +67,7 @@
     "less": "^3.7.1",
     "lru-memoize": "^1.0.0",
     "map-props": "^1.0.0",
+    "match-sorter": "^2.3.0",
     "multireducer": "^1.0.2",
     "piping": "^0.3.0",
     "prettier": "^1.13.0",

diff --git a/console/src/components/Main/Main.js b/console/src/components/Main/Main.js
@@ -56,6 +56,7 @@ class Main extends React.Component {
           }
         } catch (e) {
           console.error(e);
+          this.setState({ showEvents: true });
         }
       });
     });

diff --git a/console/src/components/Services/Data/Metadata/Metadata.js b/console/src/components/Services/Data/Metadata/Metadata.js
@@ -82,17 +82,17 @@ class Metadata extends Component {
 
         {this.state.showMetadata
           ? [
-              <div key="meta_data_1" className={metaDataStyles.intro_note}>
-                <h4>Reload metadata</h4>
-                <div className={metaDataStyles.content_width}>
+            <div key="meta_data_1" className={metaDataStyles.intro_note}>
+              <h4>Reload metadata</h4>
+              <div className={metaDataStyles.content_width}>
                   Refresh Hasura metadata, typically required if you have
                   changed the underlying postgres.
-                </div>
-              </div>,
-              <div key="meta_data_2">
-                <ReloadMetadata {...this.props} />
-              </div>,
-            ]
+              </div>
+            </div>,
+            <div key="meta_data_2">
+              <ReloadMetadata {...this.props} />
+            </div>,
+          ]
           : null}
       </div>
     );

diff --git a/console/src/components/Services/EventTrigger/Add/AddTrigger.js b/console/src/components/Services/EventTrigger/Add/AddTrigger.js
@@ -1,6 +1,8 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Helmet from 'react-helmet';
+import * as tooltip from './Tooltips';
+import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
 
 import {
   setTriggerName,
@@ -207,6 +209,12 @@ class AddTrigger extends Component {
             >
               <h4 className={styles.subheading_text}>
                 Trigger Name &nbsp; &nbsp;
+                <OverlayTrigger
+                  placement="right"
+                  overlay={tooltip.triggerNameDescription}
+                >
+                  <i className="fa fa-question-circle" aria-hidden="true" />
+                </OverlayTrigger>{' '}
               </h4>
               <input
                 type="text"
@@ -222,6 +230,12 @@ class AddTrigger extends Component {
               <hr />
               <h4 className={styles.subheading_text}>
                 Schema/Table &nbsp; &nbsp;
+                <OverlayTrigger
+                  placement="right"
+                  overlay={tooltip.postgresDescription}
+                >
+                  <i className="fa fa-question-circle" aria-hidden="true" />
+                </OverlayTrigger>{' '}
               </h4>
               <select
                 onChange={updateTableList}
@@ -272,7 +286,15 @@ class AddTrigger extends Component {
                   styles.add_mar_bottom + ' ' + styles.selectOperations
                 }
               >
-                <h4 className={styles.subheading_text}>Operations</h4>
+                <h4 className={styles.subheading_text}>
+                  Operations &nbsp; &nbsp;
+                  <OverlayTrigger
+                    placement="right"
+                    overlay={tooltip.operationsDescription}
+                  >
+                    <i className="fa fa-question-circle" aria-hidden="true" />
+                  </OverlayTrigger>{' '}
+                </h4>
                 <div className={styles.display_inline}>
                   <label>
                     <input
@@ -443,7 +465,7 @@ class AddTrigger extends Component {
                           styles.add_mar_right + ' ' + styles.retryLabel
                         }
                       >
-                        Number of retries
+                        Number of retries (default: 0)
                       </label>
                       <input
                         onChange={e => {
@@ -465,7 +487,7 @@ class AddTrigger extends Component {
                           styles.add_mar_right + ' ' + styles.retryLabel
                         }
                       >
-                        Retry Interval in seconds
+                        Retry Interval in seconds (default: 10)
                       </label>
                       <input
                         onChange={e => {

diff --git a/console/src/components/Services/EventTrigger/Add/Tooltips.js b/console/src/components/Services/EventTrigger/Add/Tooltips.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import Tooltip from 'react-bootstrap/lib/Tooltip';
+
+export const triggerNameDescription = (
+  <Tooltip id="tooltip-trigger-name-description">
+    Trigger name can be alphanumeric and can contain underscores
+  </Tooltip>
+);
+
+export const operationsDescription = (
+  <Tooltip id="tooltip-operations-description">
+    Listen to these operations on the table
+  </Tooltip>
+);
+
+export const postgresDescription = (
+  <Tooltip id="tooltip-postgres-description">
+    Select the postgres schema and table
+  </Tooltip>
+);