merge

Author: abz53378

docs/canner.schema.js

@@ -31,7 +31,7 @@ const postColumns = [{
   dataIndex: 'title'
 }];
 
-export default <root connector={connector}>
+export default <root>
   <object keyName="overview"
     title="Components Overview"
     storage={storage}

docs/index.js

@@ -4,54 +4,14 @@ import { Link, BrowserRouter as Router, Route } from 'react-router-dom';
 import CMS from '../src/components';
 import schema from './canner.schema';
 import {Layout, Menu} from 'antd';
-import firebase from 'firebase';
-import {FirebaseRtdbClientConnector} from 'canner-graphql-interface';
+// eslint-disable-next-line
 console.log(schema);
 
 class CMSExample extends React.Component {
   constructor(props) {
     super(props);
-    // try {
-    //   firebase.app();
-    // } catch (e) {
-    //   firebase.initializeApp({
-    //     apiKey: "AIzaSyDXsFofZTaEk6SIhDj0Ot4YuPidKAfY750",
-    //     authDomain: "test-new-qa.firebaseapp.com",
-    //     databaseURL: "https://test-new-qa.firebaseio.com",
-    //     projectId: "test-new-qa",
-    //     storageBucket: "test-new-qa.appspot.com",
-    //     messagingSenderId: "983887338585"
-    //   });
-    // }
-    // const defaultApp = firebase.app()
-    // this.connector = new FirebaseRtdbClientConnector({
-    //   database: defaultApp.database()
-    // });
-    this.state = {
-      login: true,
-      dataChanged: {}
-    };
   }
 
-  // auth = () => new Promise((resolve, reject) => {
-  //   firebase.auth().onAuthStateChanged(user => {
-  //     if (user) {
-  //       resolve(user);
-  //     }
-  //   });
-  //   firebase.auth().signInAnonymously().catch(error => {
-  //     reject(error);
-  //   });
-  // });
-
-  // componentDidMount() {
-  //   this.auth().then(() => {
-  //     this.setState({
-  //       login: true
-  //     });
-  //   });
-  // }
-
   dataDidChange = (dataChanged) => {
     // eslint-disable-next-line
     console.log(dataChanged);
@@ -64,7 +24,6 @@ class CMSExample extends React.Component {
 
   render() {
     const baseUrl = "/docs";
-    const {login} = this.state;
     // eslint-disable-next-line
     return (
       <Router>
@@ -84,17 +43,13 @@ class CMSExample extends React.Component {
               </Menu>
             </Layout.Sider>
             <Layout.Content>
-              {
-                login ?
-                  <CMS
-                    schema={schema}
-                    baseUrl={baseUrl}
-                    history={history}
-                    afterDeploy={this.afterDeploy}
-                    dataDidChange={this.dataDidChange}
-                  /> :
-                  null
-              }
+              <CMS
+                schema={schema}
+                baseUrl={baseUrl}
+                history={history}
+                afterDeploy={this.afterDeploy}
+                dataDidChange={this.dataDidChange}
+              />
             </Layout.Content>
           </Layout>;
         }}/>

package.json

@@ -1,6 +1,7 @@
 {
   "name": "canner",
-  "version": "1.1.11",
+
+  "version": "1.2.0",
   "description": "Build CMS in few lines of code for different data sources",
   "main": "lib/index.js",
   "scripts": {
@@ -46,7 +47,10 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-register": "^6.26.0",
+<<<<<<< HEAD
     "canner-graphql-interface": "^1.15.0",
+=======
+>>>>>>> opt-cli
     "canner-schema-loader": "^1.2.2",
     "canner-script": "^1.1.5",
     "cross-env": "^5.1.3",
@@ -100,10 +104,17 @@
     "react-intl": "^2.4.0",
     "react-loadable": "^5.3.1",
     "react-spinners": "^0.2.6",
+<<<<<<< HEAD
     "styled-components": "^3.2.1"
+=======
+    "styled-components": "^3.2.1",
+    "canner-helpers": "^0.1.15",
+    "canner-graphql-interface": "^1.15.0"
+>>>>>>> opt-cli
   },
   "peerDependencies": {
     "canner-helpers": "^0.1.15",
+    "canner-graphql-interface": "^1.15.0",
     "react": ">=16.3",
     "react-dom": ">=16.3"
   }

src/action/types.js

@@ -20,7 +20,7 @@ export type Action<T> = {
 }
 
 
-export interface Pattern<T> {
+export type Pattern<T> = {
   actions: Array<T>;
 
   addAction(action: T): void;
@@ -36,7 +36,7 @@ export type ActionManagerStore = {
     }>
 }
 
-export interface ActionManagerDef {
+export type ActionManagerDef = {
   store: ActionManagerStore;
 
   addAction(action: Action<ActionType>): void;

src/components/Generator.js

@@ -18,7 +18,7 @@ import get from 'lodash/get';
 import isUndefined from 'lodash/isUndefined';
 import mapValues from 'lodash/mapValues';
 import RefId from 'canner-ref-id';
-import dynamic, {SameLoopPromise} from 'next/dynamic';
+import Layouts from 'canner-layouts';
 
 function defaultHoc(Component) {
   return Component;
@@ -142,27 +142,19 @@ export default class Generator extends React.PureComponent<Props, State> {
     const copyNode = {...node};
     let component;
     if (isLayout(copyNode)) {
+      if (typeof copyNode.component === 'string') {
+        copyNode.component = Layouts[copyNode.component]
+      }
       component = this.wrapByHOC(copyNode.component, (copyNode.hocs || ['containerRouter']).slice() || []);
     } else if (isComponent(copyNode)) { // TODO: need to fix, turn plugins to components in compiler
 
       if (isFieldset(copyNode)) {
         component = () => <Item />;
       } else {
-        // if using next.js framework dynamic route should use next.js's dynmic function.
-        if (process.env.ENGINE === 'nextjs') {
-          component = dynamic(new SameLoopPromise((resolve, reject) => copyNode.loader.then(resolve).catch(reject)),
-            {
-              // Since we don't know whether the components are supporting SSR, so we are not going to SSR components.
-              ssr: false,
-              loading: Loading
-            }
-          )
-        } else {
-          component = Loadable({
-            loader: () => copyNode.loader || Promise.reject(`There is no loader in ${copyNode.path}`),
-            loading: Loading,
-          });
-        }
+        component = Loadable({
+          loader: () => copyNode.loader || Promise.reject(`There is no loader in ${copyNode.path}`),
+          loading: Loading,
+        });
       }
       component = this.wrapByHOC(component, ['title', 'onDeploy', 'deploy', 'request', 'query', 'cache', 'route', 'id', 'context'] || []);
     }

src/components/index.js

@@ -5,8 +5,10 @@ import queryString from 'query-string';
 import Provider from './Provider';
 import Generator from './Generator';
 import hocs from '../hocs';
+import {createEmptyData} from 'canner-helpers';
 import {Parser, Traverser} from 'canner-compiler';
-
+import {createClient, MemoryConnector} from 'canner-graphql-interface';
+import {isEmpty, isPlainObject} from 'lodash';
 // i18n
 import en from 'react-intl/locale-data/en';
 import zh from 'react-intl/locale-data/zh';
@@ -83,6 +85,7 @@ class CannerCMS extends React.Component<Props, State> {
       result[key] = v;
       return result;
     }, {});
+    this.client = genClient({...props.schema, schema: schema});
   }
 
   deploy = (key: string, id?: string): Promise<*> => {
@@ -108,7 +111,7 @@ class CannerCMS extends React.Component<Props, State> {
       afterDeploy,
       intl = {},
       hideButtons,
-      schema: {client, storages}
+      schema: {storages}
     } = this.props;
     const {location, push} = history;
     const {pathname} = location;
@@ -126,7 +129,7 @@ class CannerCMS extends React.Component<Props, State> {
       >
         <Provider
           ref={provider => this.provider = provider}
-          client={client}
+          client={this.client}
           schema={this.schema}
           dataDidChange={dataDidChange}
           afterDeploy={afterDeploy}
@@ -167,4 +170,47 @@ function compile(schema, visitors) {
   return componentTree;
 }
 
+export function genClient(schema) {
+  const {
+    resolvers,
+    connector,
+    graphqlClient,
+  } = schema;
+
+  const options: Object = {
+    schema: schema.schema
+  };
+
+  if (connector) {
+    if (isPlainObject(connector)) {
+      if (!isEmpty(connector)) {
+        options.connectors = connector
+      }
+    } else {
+      options.connector = connector;
+    }
+  }
+
+  if (graphqlClient) {
+    if (isPlainObject(graphqlClient)) {
+      if (!isEmpty(connector)) {
+        options.graphqlClients = graphqlClient;
+      }
+    } else {
+      options.graphqlClient = graphqlClient;
+    }
+  }
+
+  if (isEmpty(connector) && isEmpty(graphqlClient)) {
+    options.connector = new MemoryConnector({
+      defaultData: createEmptyData(schema.schema).toJS()
+    });
+  }
+
+  if (!isEmpty(resolvers)) {
+    options.resolvers = resolvers
+  }
+  return createClient(options);
+}
+
 export default CannerCMS;

src/components/types.js

@@ -0,0 +1,33 @@
+// @flow
+import type {ApolloClient} from 'apollo-boost';
+export type Connector = any;
+export type CannerSchema = {[key: string]: Object};
+export type LoadedSchema = {
+  schema: CannerSchema,
+  client: ApolloClient,
+  connectors: {[string]: Connector};
+}
+export interface CannerProps {
+  schema: {
+
+  },
+  dataDidChange: Object => void,
+  afterDeploy: Object => void,
+  children: React.ChildrenArray<React.Node>,
+  client: ApolloClient,
+  imageServiceConfigs: Object,
+  hocs: {[string]: React.ComponentType<*>},
+  goTo: (path: string) => void,
+  baseUrl: string,
+
+  history: {
+    push: (path: string) => void,
+    location: Object
+  },
+  intl: {
+    locale: string,
+    defaultLocale: string,
+    message: Object
+  },
+  hideButtons: boolean
+}