Merge branch 'codesandbox-compatibility' of github.com:praveenweb/gra…

…phql-engine into codesandbox-compatibility
hasura · Jun 14, 2019 · 183fe68 · 183fe68
2 parents 7f4e2dd + 6fcb27a
commit 183fe68
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 122 deletions.
diff --git a/console/src/components/Common/Layout/LeftSubSidebar/LeftSubSidebar.js b/console/src/components/Common/Layout/LeftSubSidebar/LeftSubSidebar.js
@@ -8,7 +8,7 @@ class LeftSubSidebar extends React.Component {
     const styles = require('./LeftSubSidebar.scss');
 
     const {
-      migrationMode,
+      showAddBtn,
       searchInput,
       heading,
       addLink,
@@ -21,7 +21,7 @@ class LeftSubSidebar extends React.Component {
     const getAddButton = () => {
       let addButton = null;
 
-      if (migrationMode) {
+      if (showAddBtn) {
         addButton = (
           <div
             className={

diff --git a/console/src/components/Services/ApiExplorer/Actions.js b/console/src/components/Services/ApiExplorer/Actions.js
@@ -146,11 +146,7 @@ const changeRequestParams = newParams => {
 
 const createWsClient = (url, headers) => {
   const gqlUrl = new URL(url);
-  const windowUrl = new URL(window.location);
-  let websocketProtocol = 'ws';
-  if (gqlUrl.protocol === 'https:' && windowUrl.protocol === 'https:') {
-    websocketProtocol = 'wss';
-  }
+  const websocketProtocol = gqlUrl.protocol === 'https:' ? 'wss' : 'ws';
   const headersFinal = getHeadersAsJSON(headers);
   const graphqlUrl = `${websocketProtocol}://${url.split('//')[1]}`;
   const client = new SubscriptionClient(graphqlUrl, {

diff --git a/console/src/components/Services/CustomResolver/CustomResolverRouter.js b/console/src/components/Services/CustomResolver/CustomResolverRouter.js
@@ -48,7 +48,6 @@ const leftNavMapStateToProps = state => {
     filtered: [...state.customResolverData.listData.filtered],
     searchQuery: state.customResolverData.listData.searchQuery,
     viewResolver: state.customResolverData.listData.viewResolver,
-    migrationMode: state.main.migrationMode ? state.main.migrationMode : false,
     appPrefix,
   };
 };
@@ -84,15 +83,6 @@ const fetchInitialData = ({ dispatch }) => {
 };
 
 const getCustomResolverRouter = (connect, store, composeOnEnterHooks) => {
-  const migrationRedirects = (nextState, replaceState, cb) => {
-    const state = store.getState();
-    if (!state.main.migrationMode) {
-      replaceState(globals.urlPrefix + appPrefix + '/manage');
-      cb();
-    }
-    cb();
-  };
-
   return (
     <Route
       path="remote-schemas"
@@ -108,11 +98,7 @@ const getCustomResolverRouter = (connect, store, composeOnEnterHooks) => {
       <Route path="manage" component={rightContainerConnector(connect)}>
         <IndexRedirect to="schemas" />
         <Route path="schemas" component={landingConnector(connect)} />
-        <Route
-          path="add"
-          component={addConnector(connect)}
-          onEnter={composeOnEnterHooks([migrationRedirects])}
-        />
+        <Route path="add" component={addConnector(connect)} />
         <Route
           path=":resolverName/details"
           component={viewConnector(connect)}

diff --git a/console/src/components/Services/CustomResolver/CustomResolverSubSidebar.js b/console/src/components/Services/CustomResolver/CustomResolverSubSidebar.js
@@ -11,7 +11,6 @@ const CustomResolverSubSidebar = ({
   location,
   filterItem,
   viewResolver,
-  migrationMode,
 }) => {
   const styles = require('../../Common/Layout/LeftSubSidebar/LeftSubSidebar.scss');
 
@@ -81,7 +80,7 @@ const CustomResolverSubSidebar = ({
 
   return (
     <LeftSubSidebar
-      migrationMode={migrationMode}
+      showAddBtn
       searchInput={getSearchInput()}
       heading={`Remote Schemas (${dataList.length})`}
       addLink={`${appPrefix}/manage/add`}

diff --git a/console/src/components/Services/CustomResolver/Edit/Edit.js b/console/src/components/Services/CustomResolver/Edit/Edit.js
@@ -104,7 +104,7 @@ class Edit extends React.Component {
   render() {
     const styles = require('../CustomResolver.scss');
 
-    const { isFetching, isRequesting, editState, migrationMode } = this.props;
+    const { isFetching, isRequesting, editState } = this.props;
     const { resolverName } = this.props.params;
 
     const generateMigrateBtns = () => {
@@ -223,7 +223,7 @@ class Edit extends React.Component {
             }}
           >
             <Common {...this.props} />
-            {migrationMode ? generateMigrateBtns() : null}
+            {generateMigrateBtns()}
           </form>
         )}
       </div>
@@ -234,7 +234,6 @@ const mapStateToProps = state => {
   return {
     ...state.customResolverData.addData,
     ...state.customResolverData.headerData,
-    migrationMode: state.main.migrationMode,
     dataHeaders: { ...state.tables.dataHeaders },
   };
 };

diff --git a/console/src/components/Services/CustomResolver/Landing/CustomResolver.js b/console/src/components/Services/CustomResolver/Landing/CustomResolver.js
@@ -12,7 +12,7 @@ class CustomResolver extends React.Component {
   render() {
     const styles = require('../CustomResolver.scss');
 
-    const { dispatch, migrationMode, customResolverList } = this.props;
+    const { dispatch, customResolverList } = this.props;
     const showIntroSection = !customResolverList.resolvers.length;
     const getIntroSection = () => {
       if (!showIntroSection) {
@@ -35,25 +35,22 @@ class CustomResolver extends React.Component {
     const getAddBtn = () => {
       let addBtn = null;
 
-      if (migrationMode) {
-        const handleClick = e => {
-          e.preventDefault();
+      const handleClick = e => {
+        e.preventDefault();
+        dispatch(push(`${globals.urlPrefix}${appPrefix}/manage/add`));
+      };
 
-          dispatch(push(`${globals.urlPrefix}${appPrefix}/manage/add`));
-        };
-
-        addBtn = (
-          <Button
-            data-test="data-create-remote-schemas"
-            color="yellow"
-            size="sm"
-            className={styles.add_mar_left}
-            onClick={handleClick}
-          >
-            Add
-          </Button>
-        );
-      }
+      addBtn = (
+        <Button
+          data-test="data-create-remote-schemas"
+          color="yellow"
+          size="sm"
+          className={styles.add_mar_left}
+          onClick={handleClick}
+        >
+          Add
+        </Button>
+      );
 
       return addBtn;
     };
@@ -98,7 +95,6 @@ class CustomResolver extends React.Component {
 
 const mapStateToProps = state => {
   return {
-    migrationMode: state.main.migrationMode,
     customResolverList: state.customResolverData.listData,
   };
 };

diff --git a/console/src/components/Services/Data/DataSubSidebar.js b/console/src/components/Services/Data/DataSubSidebar.js
@@ -216,7 +216,7 @@ class DataSubSidebar extends React.Component {
 
     return (
       <LeftSubSidebar
-        migrationMode={migrationMode}
+        showAddBtn={migrationMode}
         searchInput={getSearchInput()}
         heading={`Tables (${trackedTablesLength})`}
         addLink={'/data/schema/' + currentSchema + '/table/add'}

diff --git a/console/src/components/Services/EventTrigger/EventRouter.js b/console/src/components/Services/EventTrigger/EventRouter.js
@@ -22,16 +22,13 @@ import {
   loadRunningEvents,
 } from '../EventTrigger/EventActions';
 
-import { SERVER_CONSOLE_MODE } from '../../../constants';
-
 const makeEventRouter = (
   connect,
   store,
   composeOnEnterHooks,
   requireSchema,
   requirePendingEvents,
-  requireRunningEvents,
-  migrationRedirects
+  requireRunningEvents
 ) => {
   return (
     <Route
@@ -64,12 +61,10 @@ const makeEventRouter = (
       </Route>
       <Route
         path="manage/triggers/add"
-        onEnter={composeOnEnterHooks([migrationRedirects])}
         component={addTriggerConnector(connect)}
       />
       <Route
         path="manage/triggers/:trigger/modify"
-        onEnter={composeOnEnterHooks([migrationRedirects])}
         component={modifyTriggerConnector(connect)}
       />
     </Route>
@@ -148,36 +143,16 @@ const eventRouterUtils = (connect, store, composeOnEnterHooks) => {
     );
   };
 
-  const migrationRedirects = (nextState, replaceState, cb) => {
-    const state = store.getState();
-    if (!state.main.migrationMode) {
-      replaceState(globals.urlPrefix + '/events/manage');
-      cb();
-    }
-    cb();
-  };
-
-  const consoleModeRedirects = (nextState, replaceState, cb) => {
-    if (globals.consoleMode === SERVER_CONSOLE_MODE) {
-      replaceState(globals.urlPrefix + '/events/manage');
-      cb();
-    }
-    cb();
-  };
-
   return {
     makeEventRouter: makeEventRouter(
       connect,
       store,
       composeOnEnterHooks,
       requireSchema,
       requirePendingEvents,
-      requireRunningEvents,
-      migrationRedirects,
-      consoleModeRedirects
+      requireRunningEvents
     ),
     requireSchema,
-    migrationRedirects,
   };
 };
 

diff --git a/console/src/components/Services/EventTrigger/EventSubSidebar.js b/console/src/components/Services/EventTrigger/EventSubSidebar.js
@@ -13,7 +13,6 @@ const EventSubSidebar = ({
   currentTrigger,
   triggerList,
   listingTrigger,
-  migrationMode,
   // children,
   dispatch,
   location,
@@ -93,7 +92,7 @@ const EventSubSidebar = ({
 
   return (
     <LeftSubSidebar
-      migrationMode={migrationMode}
+      showAddBtn
       searchInput={getSearchInput()}
       heading={`Event Triggers (${triggerList.length})`}
       addLink={'/events/manage/triggers/add'}
@@ -111,7 +110,6 @@ const mapStateToProps = state => {
     currentTrigger: state.triggers.currentTrigger,
     triggerList: state.triggers.triggerList,
     listingTrigger: state.triggers.listingTrigger,
-    migrationMode: state.main.migrationMode,
   };
 };
 

diff --git a/console/src/components/Services/EventTrigger/Landing/EventTrigger.js b/console/src/components/Services/EventTrigger/Landing/EventTrigger.js
@@ -23,7 +23,7 @@ class EventTrigger extends Component {
   }
 
   render() {
-    const { migrationMode, dispatch, listingTrigger } = this.props;
+    const { dispatch, listingTrigger } = this.props;
 
     const styles = require('../../../Common/Layout/LeftSubSidebar/LeftSubSidebar.scss');
 
@@ -52,29 +52,23 @@ class EventTrigger extends Component {
     };
 
     const getAddBtn = () => {
-      let addBtn = null;
-
-      if (migrationMode) {
-        const handleClick = e => {
-          e.preventDefault();
-
-          dispatch(push(`${appPrefix}/manage/triggers/add`));
-        };
-
-        addBtn = (
-          <Button
-            data-test="data-create-trigger"
-            color="yellow"
-            size="sm"
-            className={styles.add_mar_left}
-            onClick={handleClick}
-          >
-            Create
-          </Button>
-        );
-      }
+      const handleClick = e => {
+        e.preventDefault();
+
+        dispatch(push(`${appPrefix}/manage/triggers/add`));
+      };
 
-      return addBtn;
+      return (
+        <Button
+          data-test="data-create-trigger"
+          color="yellow"
+          size="sm"
+          className={styles.add_mar_left}
+          onClick={handleClick}
+        >
+          Create
+        </Button>
+      );
     };
 
     const footerEvent = (
@@ -123,15 +117,13 @@ class EventTrigger extends Component {
 EventTrigger.propTypes = {
   schema: PropTypes.array.isRequired,
   untrackedRelations: PropTypes.array.isRequired,
-  migrationMode: PropTypes.bool.isRequired,
   currentSchema: PropTypes.string.isRequired,
   dispatch: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = state => ({
   schema: state.tables.allSchemas,
   schemaList: state.tables.schemaList,
-  migrationMode: state.main.migrationMode,
   untrackedRelations: state.tables.untrackedRelations,
   currentSchema: state.tables.currentSchema,
   listingTrigger: state.triggers.listingTrigger,

diff --git a/console/src/components/Services/EventTrigger/Modify/Connector.js b/console/src/components/Services/EventTrigger/Modify/Connector.js
@@ -8,7 +8,6 @@ const mapStateToProps = (state, ownProps) => {
     schemaList: state.tables.schemaList,
     allSchemas: state.tables.allSchemas,
     serverVersion: state.main.serverVersion,
-    migrationMode: state.main.migrationMode,
     currentSchema: state.tables.currentSchema,
   };
 };

diff --git a/console/src/components/Services/EventTrigger/Modify/Modify.js b/console/src/components/Services/EventTrigger/Modify/Modify.js
@@ -32,7 +32,6 @@ class Modify extends React.Component {
       modifyTriggerName,
       modifyTrigger,
       triggerList,
-      migrationMode,
       dispatch,
     } = this.props;
 
@@ -59,7 +58,6 @@ class Modify extends React.Component {
           dispatch={dispatch}
           triggerName={modifyTriggerName}
           tabName="modify"
-          migrationMode={migrationMode}
         />
         <br />
         <div className={styles.container}>

diff --git a/console/src/components/Services/EventTrigger/PendingEvents/ViewTable.js b/console/src/components/Services/EventTrigger/PendingEvents/ViewTable.js
@@ -122,7 +122,6 @@ class ViewTable extends Component {
       rows,
       count, // eslint-disable-line no-unused-vars
       activePath,
-      migrationMode,
       ongoingRequest,
       lastError,
       lastSuccess,
@@ -168,7 +167,6 @@ class ViewTable extends Component {
         dispatch={dispatch}
         triggerName={triggerName}
         tabName="pending"
-        migrationMode={migrationMode}
       />
     );
 
@@ -187,7 +185,6 @@ ViewTable.propTypes = {
   activePath: PropTypes.array.isRequired,
   query: PropTypes.object.isRequired,
   curFilter: PropTypes.object.isRequired,
-  migrationMode: PropTypes.bool.isRequired,
   ongoingRequest: PropTypes.bool.isRequired,
   rows: PropTypes.array.isRequired,
   expandedRow: PropTypes.string.isRequired,
@@ -201,7 +198,6 @@ const mapStateToProps = (state, ownProps) => {
   return {
     triggerName: ownProps.params.trigger,
     triggerList: state.triggers.pendingEvents,
-    migrationMode: state.main.migrationMode,
     ...state.triggers.view,
   };
 };