wx <-> deploy <-> sidebar

src/app/common/deploy/tencent/TencentConfig.js

@@ -94,29 +94,45 @@ class TencentConfig extends Component {
                             deploy = '',
                             path = '',
                             schemaID = '',
+                            configID = '',
                             api = '',
                             cloudID = 'tencent_CloudID';
 
-                        if (data.project_by_id.cloud_id !== null && data.project_by_id.cloud_id.cloudName === 'tencent') {
-                            group = data.project_by_id.apiGWGroup_id;
-                            deploy = data.project_by_id.deploy_id;
-                            cloudID = data.project_by_id.cloud_id.id;
-                            schemaID = data.project_by_id.schema_id.id;
+
+                        let dataProject = data.project_by_id;
+                        let {cloud_id, apiGWGroup_id, deploy_id, projectType, schema_id, wxConfig_id, projectName} = dataProject;
+
+                        console.log(configID);
+
+                        if (cloud_id !== null && cloud_id.cloudName === 'tencent') {
+                            group = apiGWGroup_id;
+                            deploy = deploy_id;
+                            cloudID = cloud_id.id;
+                            if(projectType === 'graphql')
+                                schemaID = schema_id.id;
+                            else
+                                configID = wxConfig_id.id
                         }
-                        let defaultName = data.project_by_id.projectName;
+
+                        console.log(configID);
+
+                        let defaultName = projectName;
                         return (
                             <div>
                                 {
-                                    data.project_by_id.schema_id.schemaState === 'ok' ?
-                                        ''
-                                        :
-                                        this.props.trialcase ?
+                                    projectType === 'graphql' ?
+                                        schema_id.schemaState === 'ok' ?
                                             ''
                                             :
-                                            <div style={{marginBottom: 10}}>
-                                                <Alert message="数据表结构不符合规范，暂不能部署，请修改" type="warning"
-                                                       banner closable/>
-                                            </div>
+                                            this.props.trialcase ?
+                                                ''
+                                                :
+                                                <div style={{marginBottom: 10}}>
+                                                    <Alert message="数据表结构不符合规范，暂不能部署，请修改" type="warning"
+                                                           banner closable/>
+                                                </div>
+                                        :
+                                        ''
                                 }
                                 <div style={{padding: '30px'}}>
                                     <Row gutter={16}>
@@ -157,7 +173,7 @@ class TencentConfig extends Component {
                                                 }
                                             </FormattedMessage>
                                             <Query query={gql(SHOW_APIGWPATH)}
-                                                   variables={{apiGWGroup_id: data.project_by_id.apiGWGroup_id ? data.project_by_id.apiGWGroup_id.id : ''}}>
+                                                   variables={{apiGWGroup_id: apiGWGroup_id ? apiGWGroup_id.id : ''}}>
                                                 {
                                                     ({loading, error, data}) => {
                                                         if (loading) {
@@ -206,10 +222,13 @@ class TencentConfig extends Component {
                                                 this.props.trialcase ?
                                                     ''
                                                     :
-                                                    data.project_by_id.schema_id.schemaState === 'ok' ?
-                                                        <Button type='primary' onClick={() => this.deployFC(schemaID,deploy,api,group)}><FormattedMessage id="deploy"/>!</Button>
+                                                    projectType === 'graphql' ?
+                                                        schema_id.schemaState === 'ok' ?
+                                                            <Button type='primary' onClick={() => this.deployFC(schemaID,deploy,api,group)}><FormattedMessage id="deploy"/>!</Button>
+                                                            :
+                                                            <Button type='primary' disabled><FormattedMessage id="deploy"/>!</Button>
                                                         :
-                                                        <Button type='primary' disabled><FormattedMessage id="deploy"/>!</Button>
+                                                        <Button type='primary' onClick={() =>{}}><FormattedMessage id="deploy"/>!</Button>
 
                                             }
                                         </Col>

src/app/wechatService/WxTrialCase.js

@@ -55,9 +55,9 @@ class WxTrialCase extends Component {
                                 case 'wechat-config':
                                     return <WxConfig projectID={projectID} defaultAppName={'ecommerce'} defaultConfigID={'ecommerce_wxConfigID'} trialcase={true} history={this.props.history} location={this.props.location}/>;
                                 case 'wechat-deploy':
-                                    return <WxDeploy trialcase={true} userID={this.state.userID} configID={configID}/>;
+                                    return <WxDeploy projectID={projectID} trialcase={true} userID={this.state.userID}/>;
                                 case 'wechat-manage':
-                                    return <Manage trialcase={true} userID={this.state.userID} configID={configID} switchMenu={this.switchMenu}/>;
+                                    return <Manage projectID={projectID} trialcase={true} userID={this.state.userID} switchMenu={this.switchMenu}/>;
                                 default:
                                     return <WxConfig/>
                             }

src/app/wechatService/WxUserCreate.js

@@ -77,9 +77,9 @@ class WxUserCreate extends Component {
                                 case 'wechat-config':
                                     return <WxConfig projectID={projectID}  userID={this.state.userID} history={this.props.history} location={this.props.location}/>;
                                 case 'wechat-deploy':
-                                    return <WxDeploy trialcase={false} userID={this.state.userID} configID={configID}/>;
+                                    return <WxDeploy projectID={projectID} trialcase={false} userID={this.state.userID} />;
                                 case 'wechat-manage':
-                                    return <Manage trialcase={false} userID={this.state.userID} configID={configID} switchMenu={this.switchMenu}/>;
+                                    return <Manage projectID={projectID} trialcase={false} userID={this.state.userID} switchMenu={this.switchMenu}/>;
                                 default:
                                     return <WxConfig/>
                             }

src/gql.js

@@ -832,6 +832,7 @@ const GET_PROJECT = `
                         id
                     }
                     wxConfig_id {
+                      id
                       updatedAt
                       mch_id
                       appName