save

src/components/common/deploy/Deploy.jsx

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import {Card} from 'antd';
+import {Card, Input} from 'antd';
 
 import TencentConfig from './tencent/TencentConfig';
 import AliConfig from './ali/AliConfig';
@@ -33,9 +33,9 @@ class Deploy extends Component {
             amazonCloudID: '',
             // todo: 该schema应该由props传入，无论是哪一层，反正不是这一层。(路由传入吧)
             // 有fc的schema -- 测试数据
-            schemaID: 'schema_1542243424669_92094965',
+            // schemaID: 'schema_1542243424669_92094965',
             // 无fc的schema -- 测试数据
-            // schemaID: 'schema_1542967129456_05958413',
+            schemaID: 'schema_1542967129456_05958413',
             schemaName: ''
         };
         request('http://123.206.193.98:3000/graphql', SHOW_FC, {schema_id: this.state.schemaID}).then(
@@ -78,6 +78,14 @@ class Deploy extends Component {
         );
     }
 
+    switchConfig = (label) => {
+        return (e) => {
+            this.setState({
+                [label]: e.target.value
+            })
+        };
+    };
+
     render() {
         const contentListNoTitle = {
             tencent: <TencentConfig cloudID={this.state.tencentCloudID} schemaName={this.state.schemaName}/>,
@@ -87,6 +95,7 @@ class Deploy extends Component {
 
         let userID = this.props.userID;
 
+
         return (
             <div>
                 <div>

src/components/common/deploy/tencent/DeployCard.js

@@ -11,7 +11,7 @@ class DeployCard extends Component {
 
         props.deploy !== '' ?
             this.state = {
-                configs: ['description', 'cosBucketName', 'cosObjectName', 'serviceName', 'vpcId', 'subnetId'],
+                configs: ['description', 'cosBucketName', 'cosObjectName', 'vpcId', 'subnetId'],
                 functionName,
                 region,
                 cosBucketName,
@@ -23,7 +23,7 @@ class DeployCard extends Component {
             }
             :
             this.state = {
-                configs: ['description', 'cosBucketName', 'cosObjectName', 'serviceName', 'vpcId', 'subnetId'],
+                configs: ['description', 'cosBucketName', 'cosObjectName', 'vpcId', 'subnetId'],
                 functionName: props.schemaName,
                 region: props.region,
                 cosBucketName: 'graphqlfc',
@@ -112,6 +112,11 @@ class DeployCard extends Component {
                                 <Radio.Button value="chengdu">Chengdu</Radio.Button>
                             </Radio.Group>
                         </div>
+                        <div style={{marginBottom: 10}}>
+                            <span className='vice-title'>serviceName: </span>
+                            <Input value={this.state.serviceName} style={{width: 200}} disabled
+                                   onChange={this.switchConfig('serviceName')}/>
+                        </div>
                         {
                             this.state.configs.map(config => (
                                 <div key={config} style={{marginBottom: 10}}>

src/components/gql.js

@@ -3,17 +3,6 @@
 // graphql-request 不需要使用 gql
 // import gql from "graphql-tag";
 
-const SHOW_FC = `
-            query FC($schema_id: ID!) {
-                fc_by_props(schema_id: $schema_id) {
-                    cloud_id {
-                        id
-                        cloudName
-                    }
-                }
-            }
-        `;
-
 const GET_USER = `
             query USER($id: ID!) {
                 user_by_id(id: $id) {
@@ -60,6 +49,7 @@ const ADD_USER = `
 
         `;
 
+
 const SHOW_SCHEMA = `
             query SCHEMA($user_id: ID) {
                 schema_by_props(user_id: $user_id) {
@@ -127,6 +117,7 @@ const SHOW_TABLE = `
             }
         `;
 
+
 const ADD_CLOUD = `
         mutation CLOUD($id: ID!, $user_id: ID, $cloudName: String, $secretId: String, $secretKey: String, $updatedAt: String, $createdAt: String, $appId: String) {
             create_cloud(
@@ -188,6 +179,53 @@ const SHOW_DEPLOY = `
             }
         `;
 
+const ADD_DEPLOY = `
+            mutation DEPLOY($serviceName:String, $description: String, $updatedAt: String, $cosBucketName: String, $memorySize: Int, $fc_id: ID, $createdAt: String, $subnetId: String, $cosObjectName: String, $region: String, $vpcId: String, $cosBucketRegion: String, $id: ID!, $cloud_id: ID, $user_id: ID, $timeout: Int, $handler: String, $functionName: String) {
+                create_deploy(
+                    id: $id 
+                    description: $description 
+                    cosBucketName: $cosBucketName 
+                    memorySize: $memorySize 
+                    fc_id: $fc_id 
+                    subnetId: $subnetId 
+                    cosObjectName: $cosObjectName 
+                    region: $region 
+                    vpcId: $vpcId 
+                    cosBucketRegion: $cosBucketRegion
+                    cloud_id: $cloud_id 
+                    user_id: $user_id 
+                    timeout: $timeout 
+                    handler: $handler 
+                    functionName: $functionName
+                    serviceName: $serviceName
+                    createdAt: $createdAt
+                    updatedAt: $updatedAt
+                ) {
+                    id
+                }
+            }
+        `;
+
+
+const UPDATE_DEPLOY = `
+            mutation DEPLOY($id: ID!, $serviceName:String, $description: String, $updatedAt: String, $cosBucketName: String, $memorySize: Int, $fc_id: ID, $createdAt: String, $subnetId: String, $cosObjectName: String, $region: String, $vpcId: String, $cosBucketRegion: String, $cloud_id: ID, $user_id: ID, $timeout: Int, $handler: String, $functionName: String) {
+                update_deploy(
+                    id: $id 
+                    description: $description 
+                    cosBucketName: $cosBucketName 
+                    subnetId: $subnetId 
+                    cosObjectName: $cosObjectName 
+                    region: $region 
+                    vpcId: $vpcId 
+                    cosBucketRegion: $cosBucketRegion
+                    functionName: $functionName
+                    updatedAt: $updatedAt
+                ) {
+                    id
+                }
+            }
+        `;
+
 const SHOW_APIGWGROUP = `
             query GROUP($cloud_id: ID!) {
                 apiGWGroup_by_props(cloud_id: $cloud_id) {
@@ -202,6 +240,14 @@ const SHOW_APIGWGROUP = `
             }
         `;
 
+const ADD_APIGROUP = `
+
+        `;
+
+const UPDATE_APIGROUP = `
+
+        `;
+
 const SHOW_APIGWPATH = `
             query PATH($apiGWGroup_id: ID!) {
                 apiGWPath_by_props(apiGWGroup_id: $apiGWGroup_id) {
@@ -213,8 +259,31 @@ const SHOW_APIGWPATH = `
             }
         `;
 
+const ADD_APIGWPATH = `
+
+        `;
+
+const UPDATE_APIGWPATH = `
+
+        `;
+
+
+const SHOW_FC = `
+            query FC($schema_id: ID!) {
+                fc_by_props(schema_id: $schema_id) {
+                    cloud_id {
+                        id
+                        cloudName
+                    }
+                }
+            }
+        `;
+
 
 export {
+    ADD_USER,
+    GET_USER,
+    SEARCH_USER,
     SEARCH_SCHEMA,
     ADD_SCHEMA,
     SHOW_SCHEMA,
@@ -225,10 +294,13 @@ export {
     SHOW_CLOUD,
     UPDATE_CLOUD,
     SHOW_DEPLOY,
+    ADD_DEPLOY,
+    UPDATE_DEPLOY,
     SHOW_APIGWGROUP,
+    ADD_APIGROUP,
+    UPDATE_APIGROUP,
     SHOW_APIGWPATH,
-    ADD_USER,
-    GET_USER,
-    SEARCH_USER,
+    ADD_APIGWPATH,
+    UPDATE_APIGWPATH,
     SHOW_FC
 }

src/index.js

@@ -5,29 +5,30 @@ import App from './components/app/App'
 import * as serviceWorker from './serviceWorker';
 
 import ApolloClient from "apollo-boost";
-import { ApolloProvider } from "react-apollo";
+import {ApolloProvider} from "react-apollo";
 
-import { IntlProvider,addLocaleData } from 'react-intl';
+import {IntlProvider, addLocaleData} from 'react-intl';
 //如果浏览器没有自带intl，则需要在使用npm安装intl之后添加如下代码
 // import intl from 'intl';
 import zh from 'react-intl/locale-data/zh';
 import en from 'react-intl/locale-data/en';
 import zh_CN from './language/zh_CN.js';
 import en_US from './language/en_US.js';
-addLocaleData([...en,...zh]);
+
+addLocaleData([...en, ...zh]);
 
 
 const client = new ApolloClient({
-  // uri: "http://service-eucrnpse-1254337200.ap-guangzhou.apigateway.myqcloud.com/release/graphql"
-  uri: "http://123.206.193.98:3000/graphql"
+    // uri: "http://service-eucrnpse-1254337200.ap-guangzhou.apigateway.myqcloud.com/release/graphql"
+    uri: "http://123.206.193.98:3000/graphql"
 });
 
 let browserLanguage = (navigator.language || navigator.browserLanguage).toLowerCase().split('-')[0];
 
-class MainApp extends Component{
+class MainApp extends Component {
     constructor() {
         super();
-        sessionStorage.setItem("language",browserLanguage);
+        sessionStorage.setItem("language", browserLanguage);
         this.state = {
             nowLanguage: sessionStorage.getItem("language")
         };
@@ -36,43 +37,43 @@ class MainApp extends Component{
     changeLanguage = (language) => {
         // console.log("index changeLanguage",language);
         this.setState({
-            nowLanguage:language
+            nowLanguage: language
         });
     };
 
-    chooseLocale = (language)=> {
-        let locale,messages;
-        switch(language){
+    chooseLocale = (language) => {
+        let locale, messages;
+        switch (language) {
             case 'en':
                 locale = 'en';
                 messages = en_US;
-                return {locale,messages};
+                return {locale, messages};
 
             case 'zh':
                 locale = 'zh';
                 messages = zh_CN;
-                return {locale,messages};
+                return {locale, messages};
 
             default:
                 locale = 'zh';
                 messages = zh_CN;
-                return {locale,messages};
+                return {locale, messages};
         }
     };
 
-    render(){
+    render() {
         let {nowLanguage} = this.state;
-        let {locale,messages} = this.chooseLocale(nowLanguage);
-        return(
+        let {locale, messages} = this.chooseLocale(nowLanguage);
+        return (
             <ApolloProvider client={client}>
-                <IntlProvider locale={locale} messages={messages} >
-                <App changeLanguage={this.changeLanguage}/>
+                <IntlProvider locale={locale} messages={messages}>
+                    <App changeLanguage={this.changeLanguage}/>
                 </IntlProvider>
             </ApolloProvider>
         )
     }
 }
 
-ReactDOM.render(<MainApp />, document.getElementById('root'));
+ReactDOM.render(<MainApp/>, document.getElementById('root'));
 
 serviceWorker.unregister();