hasura · shahidhk · May 16, 2019 · Apr 26, 2019 · Apr 26, 2019 · Apr 26, 2019
diff --git a/.circleci/test-server.sh b/.circleci/test-server.sh
@@ -432,6 +432,33 @@ if [ "$RUN_WEBHOOK_TESTS" == "true" ] ; then
 
 fi
 
+# allowlist queries test
+unset HASURA_GRAPHQL_AUTH_HOOK
+unset HASURA_GRAPHQL_AUTH_HOOK_MODE
+unset HASURA_GRAPHQL_JWT_SECRET
+unset HASURA_GRAPHQL_ENABLE_ALLOWLIST
+
+echo -e "\n$(time_elapsed): <########## TEST GRAPHQL-ENGINE WITH ALLOWLIST QUERIES ########> \n"
+export HASURA_GRAPHQL_ENABLE_ALLOWLIST=true
+TEST_TYPE="allowlist-queries"
+
+run_hge_with_args serve
+wait_for_port 8080
+
+pytest -n  1 -vv --hge-urls "$HGE_URL" --pg-urls "$HASURA_GRAPHQL_DATABASE_URL" --hge-key="$HASURA_GRAPHQL_ADMIN_SECRET" --test-allowlist-queries test_allowlist_queries.py
+
+kill_hge_servers
+unset HASURA_GRAPHQL_ENABLE_ALLOWLIST
+
+run_hge_with_args serve --enable-allowlist
+wait_for_port 8080
+
+pytest -n  1 -vv --hge-urls "$HGE_URL" --pg-urls "$HASURA_GRAPHQL_DATABASE_URL" --hge-key="$HASURA_GRAPHQL_ADMIN_SECRET" --test-allowlist-queries test_allowlist_queries.py
+
+kill_hge_servers
+
+# end allowlist queries test
+
 # horizontal scale test
 unset HASURA_GRAPHQL_AUTH_HOOK
 unset HASURA_GRAPHQL_AUTH_HOOK_MODE

@@ -12,8 +12,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/Masterminds/semver"
+
 	"github.com/hasura/graphql-engine/cli/migrate"
 	mt "github.com/hasura/graphql-engine/cli/migrate/testing"
+	"github.com/hasura/graphql-engine/cli/version"
 	_ "github.com/lib/pq"
 	"github.com/parnurzeal/gorequest"
 	"github.com/stretchr/testify/assert"
@@ -27,7 +30,7 @@ var ravenVersions = []mt.Version{
 	{Image: "hasura/graphql-engine:190d78e", Cmd: []string{"raven", "serve", "--database-url"}, ExposedPort: 8080},
 }
 
-var testMetadata = map[string][]byte{
+var testMetadataPrev = map[string][]byte{
 	"metadata": []byte(`functions: []
 query_templates: []
 remote_schemas: []
@@ -48,6 +51,31 @@ tables: []
 `),
 }
 
+var testMetadataCurrent = map[string][]byte{
+	"metadata": []byte(`allowlist: []
+functions: []
+query_collections: []
+query_templates: []
+remote_schemas: []
+tables:
+- array_relationships: []
+  delete_permissions: []
+  event_triggers: []
+  insert_permissions: []
+  object_relationships: []
+  select_permissions: []
+  table: test
+  update_permissions: []
+`),
+	"empty-metadata": []byte(`allowlist: []
+functions: []
+query_collections: []
+query_templates: []
+remote_schemas: []
+tables: []
+`),
+}
+
 func isReadyPostgres(i mt.Instance) bool {
 	db, err := sql.Open("postgres", fmt.Sprintf("postgres://postgres@%v:%v/postgres?sslmode=disable", i.Host(), i.Port()))
 	if err != nil {
@@ -119,6 +147,13 @@ func TestMigrateCmd(t *testing.T) {
 }
 
 func testMigrate(t *testing.T, endpoint *url.URL, migrationsDir string) {
+	versionCtx := version.New()
+	v, err := version.FetchServerVersion(endpoint.String())
+	if err != nil {
+		t.Fatal(err)
+	}
+	versionCtx.SetServerVersion(v)
+
 	metadataFile := filepath.Join(migrationsDir, "metadata.yaml")
 	// Create 1_create_table_test.up.sql which creates table test
 	mustWriteFile(t, migrationsDir, "1_create_table_test.up.sql", `CREATE TABLE "test"("id" serial NOT NULL, PRIMARY KEY ("id") )`)
@@ -208,15 +243,15 @@ func testMigrate(t *testing.T, endpoint *url.URL, migrationsDir string) {
 	testMigrateApply(t, endpoint, migrationsDir, "", "", "", "")
 
 	testMetadataExport(t, metadataFile, endpoint)
-	compareMetadata(t, metadataFile, testMetadata["metadata"])
+	compareMetadata(t, metadataFile, "metadata", versionCtx.ServerSemver)
 
 	testMetadataApply(t, metadataFile, endpoint)
 	testMetadataExport(t, metadataFile, endpoint)
-	compareMetadata(t, metadataFile, testMetadata["metadata"])
+	compareMetadata(t, metadataFile, "metadata", versionCtx.ServerSemver)
 
 	testMetadataReset(t, metadataFile, endpoint)
 	testMetadataExport(t, metadataFile, endpoint)
-	compareMetadata(t, metadataFile, testMetadata["empty-metadata"])
+	compareMetadata(t, metadataFile, "empty-metadata", versionCtx.ServerSemver)
 }
 
 func mustWriteFile(t testing.TB, dir, file string, body string) {
@@ -225,7 +260,17 @@ func mustWriteFile(t testing.TB, dir, file string, body string) {
 	}
 }
 
-func compareMetadata(t testing.TB, metadataFile string, actualData []byte) {
+func compareMetadata(t testing.TB, metadataFile string, actualType string, serverVersion *semver.Version) {
+	var actualData []byte
+	c, err := semver.NewConstraint("<= 1.0.0-alpha45")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if serverVersion == nil || !c.Check(serverVersion) {
+		actualData = testMetadataCurrent[actualType]
+	} else {
+		actualData = testMetadataPrev[actualType]
+	}
 	data, err := ioutil.ReadFile(metadataFile)
 	if err != nil {
 		t.Fatalf("error reading metadata %s", err)

@@ -58,7 +58,7 @@
     "deep-equal": "^1.0.1",
     "graphiql": "^0.11.11",
     "graphiql-explorer-hasura": "0.0.7",
-    "graphql": "^14.0.2",
+    "graphql": "^14.3.0",
     "hasura-console-graphiql": "0.0.10",
     "history": "^3.0.0",
     "hoist-non-react-statics": "^1.0.3",

@@ -43,7 +43,7 @@ class CollapsibleToggle extends React.Component {
       let _title;
 
       if (useDefaultTitleStyle) {
-        _title = <div className={styles.collapsibleTitle}>{title}</div>;
+        _title = <div className={styles.defaultCollapsibleTitle}>{title}</div>;
       } else {
         _title = title;
       }
@@ -52,23 +52,7 @@ class CollapsibleToggle extends React.Component {
     };
 
     const getChildren = () => {
-      let _children;
-
-      if (isOpen) {
-        _children = <div className={styles.collapsibleContent}>{children}</div>;
-      }
-
-      return _children;
-    };
-
-    const getIndicatorType = () => {
-      let _indicatorStateStyle;
-
-      if (isOpen) {
-        _indicatorStateStyle = styles.collapsibleIndicatorOpen;
-      }
-
-      return _indicatorStateStyle;
+      return <div className={styles.collapsibleContent}>{children}</div>;
     };
 
     return (
@@ -82,14 +66,14 @@ class CollapsibleToggle extends React.Component {
             <i
               className={`fa fa-chevron-right ${
                 styles.collapsibleIndicator
-              } ${getIndicatorType()}`}
+              } ${isOpen && styles.collapsibleIndicatorOpen}`}
             />
           </span>
 
           <span className={styles.titleWrapper}>{getTitle()}</span>
         </div>
 
-        {getChildren()}
+        {isOpen && getChildren()}
       </div>
     );
   }

@@ -22,7 +22,7 @@
       display: inline-block;
     }
 
-    .collapsibleTitle {
+    .defaultCollapsibleTitle {
       color: #788095;
       font-weight: bold;
       font-size: 14px;

@@ -574,10 +574,6 @@ code {
   padding-bottom: 10px !important;
 }
 
-.ul_padd_left {
-  -webkit-padding-start: 15px;
-}
-
 .add_pad_bottom {
   padding-bottom: 20px;
 }
@@ -590,16 +586,22 @@ code {
   padding-right: 15px;
 }
 
+.padd_top {
+  padding-top: 20px !important;
+}
+
+
 .clear_fix {
   clear: both;
 }
 
-.remove_ul_left {
+.ul_left_small {
   -webkit-padding-start: 15px;
 }
 
-.padd_top {
-  padding-top: 20px !important;
+.subsection {
+  padding-left: 15px;
+  padding-right: 15px;
 }
 
 .disabled {

@@ -64,7 +64,7 @@ class Editor extends React.Component {
         data-test={`${service}-${property}-save`}
         disabled={isProcessing}
       >
-        Save
+        {this.props.saveButtonText || 'Save'}
       </Button>
     );
   };
@@ -82,7 +82,7 @@ class Editor extends React.Component {
         data-test={`${service}-${property}-remove`}
         disabled={isProcessing}
       >
-        Remove
+        {this.props.removeButtonText || 'Remove'}
       </Button>
     );
   };
@@ -139,7 +139,7 @@ class Editor extends React.Component {
           {editorLabel}
         </div>
         {editorContent}
-        {actionButtons}
+        <div className={styles.add_mar_top_small}>{actionButtons}</div>
       </div>
     );
   }

@@ -144,10 +144,6 @@ a.expanded {
     display: inline-block;
   }
 
-  .remove_ul_left {
-
-  }
-
   .select {
     display: inline-block;
     width: 300px;

@@ -1,8 +1,7 @@
 import React from 'react';
 import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger';
 import Tooltip from 'react-bootstrap/lib/Tooltip';
-
-const styles = require('./ModifyEvent.scss');
+import styles from './Tooltip.scss';
 
 const tooltipGen = message => {
   return <Tooltip id={message}>{message}</Tooltip>;

@@ -0,0 +1,3 @@
+.tooltipIcon{
+  margin-left: 5px;
+}
@@ -9,7 +9,7 @@ import { push } from 'react-router-redux';
 import { fetchResolver, RESET } from '../Add/addResolverReducer';
 
 import { VIEW_RESOLVER } from '../customActions';
-import ReloadMetadata from '../../Metadata/ReloadMetadata';
+import ReloadMetadata from '../../Metadata/MetadataOptions/ReloadMetadata';
 
 import { appPrefix } from '../constants';
 

@@ -47,7 +47,7 @@ const MigrationsHome = ({ dispatch, migrationMode }) => {
       </div>
       <div className={styles.add_mar_top}>
         <b>Note</b>
-        <ul className={styles.remove_ul_left + ' ' + styles.add_mar_top_small}>
+        <ul className={styles.ul_left_small + ' ' + styles.add_mar_top_small}>
           <li>
             Recommend that you turn this off if you're working with an existing
             app or database.

@@ -62,7 +62,7 @@ const Operations = ({
           </OverlayTrigger>
           &nbsp;&nbsp;
           <a
-            href="https://docs.hasura.io/graphql/manual/event-triggers/invoke-trigger-console.html"
+            href="https://docs.hasura.io/1.0/graphql/manual/event-triggers/invoke-trigger-console.html"
             target="_blank"
             rel="noopener noreferrer"
           >

@@ -9,7 +9,7 @@ import {
   setHeaderValue,
 } from './Actions';
 import DropdownButton from '../../../Common/DropdownButton/DropdownButton';
-import Tooltip from './Tooltip';
+import Tooltip from '../../../Common/Tooltip/Tooltip';
 
 class HeadersEditor extends React.Component {
   setValues = () => {

@@ -1,5 +1,5 @@
 import React from 'react';
-import Tooltip from './Tooltip';
+import Tooltip from '../../../Common/Tooltip/Tooltip';
 
 const Info = ({ triggerName, tableName, schemaName, styles }) => (
   <div className={`${styles.container} ${styles.borderBottom}`}>

@@ -289,10 +289,6 @@ modifyHeadersCollapsedHeadings {
   margin-bottom: 20px;
 }
 
-.tooltipIcon{
-  padding-left: 5px;
-}
-
 .cursorPointer {
   cursor: pointer;
 }

@@ -1,6 +1,6 @@
 import React from 'react';
 import Editor from '../../../Common/Layout/ExpandableEditor/Editor';
-import Tooltip from './Tooltip';
+import Tooltip from '../../../Common/Tooltip/Tooltip';
 
 import { toggleQueryType, toggleColumn, toggleManualType } from './Actions';
 

@@ -6,7 +6,7 @@ import {
   setRetryTimeout,
   showValidationError,
 } from './Actions';
-import Tooltip from './Tooltip';
+import Tooltip from '../../../Common/Tooltip/Tooltip';
 
 import semverCheck from '../../../../helpers/semver';
 

@@ -6,7 +6,7 @@ import {
   setWebhookUrlType,
   showValidationError,
 } from './Actions';
-import Tooltip from './Tooltip';
+import Tooltip from '../../../Common/Tooltip/Tooltip';
 
 class WebhookEditor extends React.Component {
   setValues = () => {