Merge branch 'master' into 3239-st-d-within-in-subscriptions

hasura · May 5, 2020 · 49f5dd7 · 49f5dd7
2 parents 78ef893 + 1211c23
commit 49f5dd7
Show file tree

Hide file tree

Showing 61 changed files with 888 additions and 412 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,7 +37,8 @@ Read more about the session argument for computed fields in the [docs](https://h
 (Add entries here in the order of: server, console, cli, docs, others)
 
 - server: fix mishandling of GeoJSON inputs in subscriptions (fix #3239)
-
+- console: add read replica support section to pro popup (#4118)
+- cli: list all avialable commands in root command help (fix #4623)
 
 ## `v1.2.0`
 

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Hasura GraphQL Engine
 
-[![Docs](https://img.shields.io/badge/docs-v1.0-brightgreen.svg?style=flat)](https://hasura.io/docs)
+[![Latest release](https://img.shields.io/github/v/release/hasura/graphql-engine)](https://github.com/hasura/graphql-engine/releases/latest)
+[![Docs](https://img.shields.io/badge/docs-v1.x-brightgreen.svg?style=flat)](https://hasura.io/docs)
 [![CircleCI](https://circleci.com/gh/hasura/graphql-engine.svg?style=shield)](https://circleci.com/gh/hasura/graphql-engine)
 
 

diff --git a/cli/commands/help.go b/cli/commands/help.go
@@ -48,13 +48,17 @@ func (o *helpOptions) run() {
 				NewMigrateCmd(o.EC),
 				NewMetadataCmd(o.EC),
 				NewConsoleCmd(o.EC),
+				NewActionsCmd(o.EC),
 			},
 		},
 		{
 			Title: "Other commands",
 			Commands: []*cobra.Command{
 				NewCompletionCmd(o.EC),
 				NewVersionCmd(o.EC),
+				NewPluginsCmd(o.EC),
+				NewScriptsCmd(o.EC),
+				NewUpdateCLICmd(o.EC),
 			},
 		},
 	}

diff --git a/console/package-lock.json b/console/package-lock.json
diff --git a/console/package.json b/console/package.json
@@ -119,7 +119,7 @@
     "valid-url": "1.0.9"
   },
   "devDependencies": {
-    "@babel/core": "7.8.7",
+    "@babel/core": "7.9.0",
     "@babel/plugin-proposal-class-properties": "7.8.3",
     "@babel/plugin-proposal-decorators": "7.8.3",
     "@babel/plugin-proposal-do-expressions": "7.8.3",
@@ -136,7 +136,7 @@
     "@babel/plugin-proposal-throw-expressions": "7.8.3",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/plugin-syntax-import-meta": "7.8.3",
-    "@babel/preset-env": "7.8.7",
+    "@babel/preset-env": "7.9.5",
     "@babel/preset-react": "7.8.3",
     "@babel/preset-typescript": "7.8.3",
     "@babel/register": "7.8.6",

diff --git a/console/src/components/Common/TableCommon/Table.scss b/console/src/components/Common/TableCommon/Table.scss
@@ -188,7 +188,6 @@ a.expanded {
   display: flex;
   justify-content: center;
   align-items: center;
-  height: 100%;
 }
 
 .bulkDeleteButton {

diff --git a/console/src/components/Main/Main.js b/console/src/components/Main/Main.js
@@ -218,7 +218,9 @@ class Main extends React.Component {
     const rate = require('./images/rate.svg');
     const regression = require('./images/regression.svg');
     const management = require('./images/management.svg');
-    const allow = require('./images/allow.svg');
+    const allow = require('./images/allow-listing.svg');
+    const read = require('./images/read-replica.svg');
+
     const arrowForwardRed = require('./images/arrow_forward-red.svg');
     const currentLocation = location.pathname;
     const currentActiveBlock = getPathRoot(currentLocation);
@@ -614,6 +616,19 @@ class Main extends React.Component {
                   </div>
                 </div>
               </div>
+              <div className={styles.proFeaturesList}>
+                <div className={styles.featuresImg}>
+                  <img src={read} alt={'read'} />
+                </div>
+                <div className={styles.featuresList}>
+                  <div className={styles.featuresTitle}>
+                    Read Replicas
+                  </div>
+                  <div className={styles.featuresDescription}>
+                    Native Read Replica support for enhanced performance and scalability
+                  </div>
+                </div>
+              </div>
             </div>
             <div className={styles.popUpFooter}>
               <a

diff --git a/console/src/components/Main/Main.scss b/console/src/components/Main/Main.scss
@@ -1272,6 +1272,10 @@
         display: flex;
         .featuresImg {
           padding-right: 14px;
+          img {
+            max-width: 24px;
+            min-width: 24px;
+          }
         }
         .featuresList {
           .featuresTitle {
@@ -1336,7 +1340,7 @@
   }
 
   .helpSection {
-    font-size: 12px;    
+    font-size: 12px;
   }
 
   .proWrapper{
@@ -1351,4 +1355,4 @@
     }
   }
 
-}
+}
diff --git a/console/src/components/Main/images/allow-listing.svg b/console/src/components/Main/images/allow-listing.svg
diff --git a/console/src/components/Main/images/read-replica.svg b/console/src/components/Main/images/read-replica.svg
diff --git a/docs/graphql/manual/actions/action-connect.rst b/docs/graphql/manual/actions/action-connect.rst
@@ -94,7 +94,7 @@ You can create relationships for custom output types by:
 
      Set the output type relationship as shown below:
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/actions-relationship.png
+     .. thumbnail:: /img/graphql/manual/actions/actions-relationship.png
         :alt: Console action relationship
 
      Hit ``Save`` to create the relationship.

diff --git a/docs/graphql/manual/actions/action-handlers.rst b/docs/graphql/manual/actions/action-handlers.rst
@@ -100,7 +100,9 @@ Hasura will call the handler with the following payload:
 .. code-block:: json
 
     {
-      "action": "UserLogin",
+      "action": {
+        "name": "UserLogin"
+      },  
       "input": {
         "username": "jake",
         "password": "secretpassword"

diff --git a/docs/graphql/manual/actions/action-permissions.rst b/docs/graphql/manual/actions/action-permissions.rst
@@ -29,7 +29,7 @@ Set action permissions
      Head to the ``Actions -> [action-name] -> Permissions`` tab in the
      console.
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/actions-permissions.png
+     .. thumbnail:: /img/graphql/manual/actions/actions-permissions.png
         :alt: Console action permission
 
      Hit ``Save`` to give the role permission to access the action.

diff --git a/docs/graphql/manual/actions/codegen.rst b/docs/graphql/manual/actions/codegen.rst
@@ -41,7 +41,7 @@ Generating handler code for your action
     You can select the framework of your choice to get the corresponding
     handler boilerplate code.
 
-    .. thumbnail:: ../../../img/graphql/manual/actions/console-codegen-tab.png
+    .. thumbnail:: /img/graphql/manual/actions/console-codegen-tab.png
        :alt: Console codegen tab
 
 
@@ -59,17 +59,17 @@ Generating handler code for your action
 
     1. Choose which framework you want to codegen for:
 
-       .. thumbnail:: ../../../img/graphql/manual/actions/cli-framework-prompt.png
+       .. thumbnail:: /img/graphql/manual/actions/cli-framework-prompt.png
           :alt: CLI Framework Prompt
 
     2. Choose if you also wish to clone a starter kit for the chosen framework:
 
-       .. thumbnail:: ../../../img/graphql/manual/actions/cli-starter-kit-prompt.png
+       .. thumbnail:: /img/graphql/manual/actions/cli-starter-kit-prompt.png
           :alt: CLI Starter Kit Prompt
 
     3. Choose a path where you want to output the auto-generated code files
 
-       .. thumbnail:: ../../../img/graphql/manual/actions/cli-output-dir-prompt.png
+       .. thumbnail:: /img/graphql/manual/actions/cli-output-dir-prompt.png
           :alt: CLI Starter Kit Prompt
 
 

diff --git a/docs/graphql/manual/actions/create.rst b/docs/graphql/manual/actions/create.rst
@@ -96,7 +96,7 @@ in the GraphQL schema.
      Go to the ``Actions`` tab on the console and click on ``Create``. This will
      take you to a page like this:
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/mutation-action-create.png
+     .. thumbnail:: /img/graphql/manual/actions/mutation-action-create.png
         :alt: Console action create
         :width: 70%
 
@@ -270,7 +270,7 @@ the GraphQL schema.
      Go to the ``Actions`` tab on the console and click on ``Create``. This will
      take you to a page like this:
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/query-action-create.png
+     .. thumbnail:: /img/graphql/manual/actions/query-action-create.png
         :alt: Console action create
         :width: 70%
 

diff --git a/docs/graphql/manual/actions/derive.rst b/docs/graphql/manual/actions/derive.rst
@@ -75,13 +75,13 @@ derive our action:
 
      Next hit the ``Derive action`` button as shown below:
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/actions-derive-button.png
+     .. thumbnail:: /img/graphql/manual/actions/actions-derive-button.png
         :alt: Console derive action button
 
      This will redirect you to the ``Add a new action`` page with the action
      definition auto filled.
 
-     .. thumbnail:: ../../../img/graphql/manual/actions/actions-derive-types.png
+     .. thumbnail:: /img/graphql/manual/actions/actions-derive-types.png
         :alt: Console derived action types
 
 
@@ -149,7 +149,7 @@ the action back to the original operation.
     You can select the framework of your choice to get the corresponding
     handler boilerplate code.
 
-    .. thumbnail:: ../../../img/graphql/manual/actions/actions-derive-codegen.png
+    .. thumbnail:: /img/graphql/manual/actions/actions-derive-codegen.png
        :alt: Console derived action codegen
 
     .. note::

diff --git a/docs/graphql/manual/actions/index.rst b/docs/graphql/manual/actions/index.rst
@@ -20,7 +20,7 @@ logic using custom queries and mutations. Actions can be
 added to Hasura to handle various use cases such as data validation, data
 enrichment from external sources and any other complex business logic.
 
-.. thumbnail:: ../../../img/graphql/manual/actions/actions-arch.png
+.. thumbnail:: /img/graphql/manual/actions/actions-arch.png
    :class: no-shadow
    :alt: Actions high level architecture
 

diff --git a/docs/graphql/manual/auth/authentication/index.rst b/docs/graphql/manual/auth/authentication/index.rst
@@ -39,7 +39,7 @@ rules.
 
 Here's how a GraphQL request is processed in webhook mode:
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/auth-webhook-overview.png
+.. thumbnail:: /img/graphql/manual/auth/auth-webhook-overview.png
    :alt: Authentication using webhooks
 
 2. JWT (JSON Web Token)
@@ -51,7 +51,7 @@ evaluate access control rules.
 
 Here's how a GraphQL query is processed in JWT mode:
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/auth-jwt-overview.png
+.. thumbnail:: /img/graphql/manual/auth/auth-jwt-overview.png
    :alt: Authentication using JWT
 
 **See more details at:**

diff --git a/docs/graphql/manual/auth/authentication/jwt.rst b/docs/graphql/manual/auth/authentication/jwt.rst
@@ -21,7 +21,7 @@ The idea is that your auth server will return JWT tokens, which are decoded and
 verified by the GraphQL engine, to authorize and get metadata about the request
 (``x-hasura-*`` values).
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/jwt-auth.png
+.. thumbnail:: /img/graphql/manual/auth/jwt-auth.png
    :alt: Authentication using JWT
 
 The JWT is decoded, the signature is verified, then it is asserted that the
@@ -543,7 +543,7 @@ https://hasura.io/jwt-config.
 The config generated from this page can be directly pasted in yaml files and command line arguments as it takes
 care of escaping new lines.
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/jwt-config-generated.png
+.. thumbnail:: /img/graphql/manual/auth/jwt-config-generated.png
    :width: 75%
    :alt: Generating JWT config
 

diff --git a/docs/graphql/manual/auth/authentication/webhook.rst b/docs/graphql/manual/auth/authentication/webhook.rst
@@ -17,7 +17,7 @@ Introduction
 
 You can configure the GraphQL engine to use a webhook to authenticate all incoming requests to the Hasura GraphQL engine server. 
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/webhook-auth.png
+.. thumbnail:: /img/graphql/manual/auth/webhook-auth.png
    :alt: Authentication using webhooks
 
 .. admonition:: Prerequisite

diff --git a/docs/graphql/manual/auth/authorization/basics.rst b/docs/graphql/manual/auth/authorization/basics.rst
@@ -18,7 +18,7 @@ Introduction
 
 To understand the basics of access control in Hasura, let's take a look at this analogy to a SQL query: 
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/permissions-rule-analogy.png
+.. thumbnail:: /img/graphql/manual/auth/permissions-rule-analogy.png
   :width: 70%
   :alt: Understanding access control in Hasura
 
@@ -80,7 +80,7 @@ Head to the ``GraphiQL`` tab in your console and try out the below query:
 You'll see that this results in a response that contains all the authors because by default the GraphQL
 query is accepted with **admin** permissions.
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/fetch-authors.png
+.. thumbnail:: /img/graphql/manual/auth/fetch-authors.png
    :alt: Run a query without access control
 
 Define access control rules
@@ -90,7 +90,7 @@ Now let's define an access control rule for the ``author`` table for a role ``us
 **Permissions** section of the table (``Data`` --> <table> --> ``Permissions`` tab) and define permissions
 as shown below:
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/permission-basics-simple-example.png
+.. thumbnail:: /img/graphql/manual/auth/permission-basics-simple-example.png
    :alt: Define access control rules
 
 This permission rule reads as: "*For the role* ``user`` *, table* ``author`` *and operation* ``select``/``query``,
@@ -103,7 +103,7 @@ Let's run the same query as above but now with the ``X-Hasura-Role`` and ``X-Has
 variables also included to indicate role and user information. These session variables are passed in
 the ``Request Headers`` section of ``GraphiQL`` as highlighted below:
 
-.. thumbnail:: ../../../../img/graphql/manual/auth/permission-basics-query-with-access-control.png
+.. thumbnail:: /img/graphql/manual/auth/permission-basics-query-with-access-control.png
    :alt: Run a query with access control
 
 As you can see, the results are now filtered based on the access control rule for the role ``user``