Merge pull request #12 from GotPPay/question-explanation
Question explanation
This commit is contained in:
@@ -67,7 +67,7 @@ Prerequests for step 3 (run on server):
|
|||||||
requires running mongodb service
|
requires running mongodb service
|
||||||
|
|
||||||
Database (tellall) with collection (skill_list)
|
Database (tellall) with collection (skill_list)
|
||||||
* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ { "intentName" : "GetFirstQuestion", "questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla" }, { "intentName" : "GetThirdQuestion", "questions" : [ "Give me third question" ], "answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
|
* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae", "intents" : [ { "intentName" : "GetFirstQuestion", "questionExplanation" : "", "questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla" }, { "intentName" : "GetThirdQuestion", "questionExplanation" : "", "questions" : [ "Give me third question" ], "answer" : "This is answer to the third question" } ], "invocationName" : "Saburly", "invocationAnswer" : "We are Saburly team one" })
|
||||||
|
|
||||||
*obtain _id and change in web/src/App.js, and also skill_db_id in backend/config.js
|
*obtain _id and change in web/src/App.js, and also skill_db_id in backend/config.js
|
||||||
*enter web/ dir and run "npm run build"
|
*enter web/ dir and run "npm run build"
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ constants.apiResultCodes = {
|
|||||||
AMAZON_FAIL:2, //amazon api doesn't work
|
AMAZON_FAIL:2, //amazon api doesn't work
|
||||||
DATABASE_ERROR:3,
|
DATABASE_ERROR:3,
|
||||||
NO_SKILL:4,
|
NO_SKILL:4,
|
||||||
INCONSISTEN_STATE:5,
|
INCONSISTENT_STATE:5,
|
||||||
}
|
}
|
||||||
|
|
||||||
constants.HTTPResultCodes = {
|
constants.HTTPResultCodes = {
|
||||||
@@ -31,6 +31,12 @@ constants.voiceResponseStrings = {
|
|||||||
GENERIC_CONTINUE : 'Would you like to continue'
|
GENERIC_CONTINUE : 'Would you like to continue'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Timing is given in [ms]
|
||||||
|
constants.voiceResponseTimings = {
|
||||||
|
PAUSE_BETWEEN_QUESTIONS : 650,
|
||||||
|
PAUSE_AFTER_WELCOME_MESSAGE : 650,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
module.exports = constants;
|
module.exports = constants;
|
||||||
@@ -41,6 +41,7 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
|
|||||||
.then (() => {
|
.then (() => {
|
||||||
//Ok, done, now update skill on Amazon (if needed)
|
//Ok, done, now update skill on Amazon (if needed)
|
||||||
if (updateOnAmazon) {
|
if (updateOnAmazon) {
|
||||||
|
//We need to update skill on Amazon
|
||||||
amazonHelper
|
amazonHelper
|
||||||
.updateSkill (skill)
|
.updateSkill (skill)
|
||||||
.then (amazonResult => {
|
.then (amazonResult => {
|
||||||
@@ -51,45 +52,78 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
|
|||||||
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
||||||
alexa.updateModel ();
|
alexa.updateModel ();
|
||||||
} else {
|
} else {
|
||||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
//Update on amazon failed, revert changes in database and send error to user
|
||||||
result: constants.apiResultCodes.AMAZON_ERROR,
|
databaseHelper
|
||||||
message: amazonResult,
|
.updateSkill (id, currentSkillState)
|
||||||
});
|
.then (() => {
|
||||||
|
res
|
||||||
|
.status (
|
||||||
|
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||||
|
)
|
||||||
|
.json ({
|
||||||
|
result: constants.apiResultCodes.AMAZON_ERROR,
|
||||||
|
message: amazonResult,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch (() => {
|
||||||
|
//This should never happen, something is seriously wrong, like no database connection
|
||||||
|
res
|
||||||
|
.status (
|
||||||
|
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||||
|
)
|
||||||
|
.json ({
|
||||||
|
result: constants.apiResultCodes.INCONSISTENT_STATE,
|
||||||
|
message: '',
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch (e => {
|
.catch (e => {
|
||||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
//Update on amazon failed, revert changes in database and send error to user
|
||||||
result: constants.apiResultCodes.AMAZON_FAIL,
|
databaseHelper
|
||||||
message: e,
|
.updateSkill (id, currentSkillState)
|
||||||
});
|
.then (() => {
|
||||||
|
res
|
||||||
|
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||||
|
.json ({
|
||||||
|
result: constants.apiResultCodes.AMAZON_FAIL,
|
||||||
|
message: e,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch (() => {
|
||||||
|
//This should never happen, something is seriously wrong, like no database connection
|
||||||
|
res
|
||||||
|
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||||
|
.json ({
|
||||||
|
result: constants.apiResultCodes.INCONSISTENT_STATE,
|
||||||
|
message: '',
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}else{
|
} else {
|
||||||
|
//No need to update on Amazon, tell to user it's ok
|
||||||
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
res.json ({result: constants.apiResultCodes.OK, message: ''});
|
||||||
alexa.updateModel ();
|
alexa.updateModel ();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch (() => {
|
.catch (() => {
|
||||||
//Update in database didn't go well, revert changes
|
//Update in database didn't go well, no need to revert since it failed to write in the first place
|
||||||
databaseHelper
|
//just send error to user
|
||||||
.updateSkill (id, currentSkillState)
|
res
|
||||||
.then (() => {
|
.status (
|
||||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
|
||||||
result: constants.apiResultCodes.DATABASE_ERROR,
|
)
|
||||||
message: '',
|
.json ({
|
||||||
});
|
result: constants.apiResultCodes.DATABASE_ERROR,
|
||||||
})
|
message: '',
|
||||||
.catch (() => {
|
});
|
||||||
//This should never happen, something is seriously wrong, like no database connection
|
|
||||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({
|
|
||||||
result: constants.apiResultCodes.INCONSISTEN_STATE,
|
|
||||||
message: '',
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch (e => {
|
.catch (e => {
|
||||||
//I don't know why, but something went wrong, possibly ID of skill is wrong, doesn't exist in DB
|
//I don't know why, but something went wrong, possibly ID of skill is wrong, doesn't exist in DB
|
||||||
res.status(constants.HTTPResultCodes.INTERNAL_SERVER_ERROR).json ({result: constants.apiResultCodes.NO_SKILL, message: ''});
|
res
|
||||||
|
.status (constants.HTTPResultCodes.INTERNAL_SERVER_ERROR)
|
||||||
|
.json ({result: constants.apiResultCodes.NO_SKILL, message: ''});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -226,24 +226,23 @@ var generateInteractionModel = function (skill) {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
let dialog = {
|
|
||||||
intents: dialogIntents,
|
|
||||||
};
|
|
||||||
|
|
||||||
result.interactionModel = {};
|
result.interactionModel = {};
|
||||||
|
|
||||||
result.interactionModel.languageModel = {
|
result.interactionModel.languageModel = {
|
||||||
invocationName: skill.invocationName,
|
invocationName: skill.invocationName,
|
||||||
types: customSlotTypes,
|
types: customSlotTypes,
|
||||||
intents: allIntents,
|
intents: allIntents,
|
||||||
prompts: dialogPrompts,
|
|
||||||
dialog: dialog,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
result.interactionModel.prompts = dialogPrompts;
|
||||||
|
result.interactionModel.dialog = {};
|
||||||
|
result.interactionModel.dialog.intents = dialogIntents;
|
||||||
|
|
||||||
return JSON.stringify (result);
|
return JSON.stringify (result);
|
||||||
};
|
};
|
||||||
|
|
||||||
var uploadSkill = function (skill) {
|
var uploadSkill = function (skill) {
|
||||||
|
let generatedInteractionModel = generateInteractionModel (skill);
|
||||||
return fetch (
|
return fetch (
|
||||||
`https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
|
`https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
|
||||||
{
|
{
|
||||||
@@ -251,7 +250,7 @@ var uploadSkill = function (skill) {
|
|||||||
headers: {
|
headers: {
|
||||||
Authorization: config.TOKEN,
|
Authorization: config.TOKEN,
|
||||||
},
|
},
|
||||||
body: generateInteractionModel (skill),
|
body: generatedInteractionModel,
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ module.exports = {
|
|||||||
// Build the context manually, because Amazon Lambda is missing
|
// Build the context manually, because Amazon Lambda is missing
|
||||||
var context = {
|
var context = {
|
||||||
succeed: function (result) {
|
succeed: function (result) {
|
||||||
console.log (result);
|
|
||||||
res.json (result);
|
res.json (result);
|
||||||
},
|
},
|
||||||
fail: function (error) {
|
fail: function (error) {
|
||||||
@@ -34,14 +33,32 @@ module.exports = {
|
|||||||
handlers = {};
|
handlers = {};
|
||||||
destinationEmail = activeSkill.contactEmail;
|
destinationEmail = activeSkill.contactEmail;
|
||||||
|
|
||||||
//Handler for launch request
|
let listOfPossibleQuestions = '';
|
||||||
|
activeSkill.intents.forEach(intent => {
|
||||||
|
if (intent.questions.length > 0 && intent.intentExplanation) {
|
||||||
|
listOfPossibleQuestions +=
|
||||||
|
intent.intentExplanation +
|
||||||
|
intent.questions[0] +
|
||||||
|
'<break time="' +
|
||||||
|
constants.voiceResponseTimings.PAUSE_BETWEEN_QUESTIONS +
|
||||||
|
'ms"/>';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log(listOfPossibleQuestions);
|
||||||
|
|
||||||
|
//Handler for launch requestconsole.log()
|
||||||
handlers = {
|
handlers = {
|
||||||
LaunchRequest: function () {
|
LaunchRequest: function () {
|
||||||
this.response
|
this.response
|
||||||
.speak (activeSkill.invocationAnswer)
|
.speak (
|
||||||
|
activeSkill.invocationAnswer +
|
||||||
|
'<break time="' +
|
||||||
|
constants.voiceResponseTimings.PAUSE_AFTER_WELCOME_MESSAGE +
|
||||||
|
'ms"/>' +
|
||||||
|
listOfPossibleQuestions
|
||||||
|
)
|
||||||
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
|
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
|
||||||
//TODO : Maybe to ask user does he want to hear possible intents
|
|
||||||
//For this functionality, we need explanation text for each intent (Question)
|
|
||||||
this.emit (':responseReady');
|
this.emit (':responseReady');
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
349
web/src/App.js
349
web/src/App.js
@@ -1,4 +1,4 @@
|
|||||||
import React, { Component } from 'react';
|
import React, {Component} from 'react';
|
||||||
import './css/App.css';
|
import './css/App.css';
|
||||||
import './css/popup.css';
|
import './css/popup.css';
|
||||||
import IntentList from './components/IntentList';
|
import IntentList from './components/IntentList';
|
||||||
@@ -6,90 +6,117 @@ import IntentDetails from './components/IntentDetails';
|
|||||||
import LaunchRequest from './components/LaunchRequest';
|
import LaunchRequest from './components/LaunchRequest';
|
||||||
import Contact from './components/Contact';
|
import Contact from './components/Contact';
|
||||||
import Popup from 'react-popup';
|
import Popup from 'react-popup';
|
||||||
import {getSkill, updateSkill} from './lib/api'
|
import {getSkill, updateSkill} from './lib/api';
|
||||||
import {
|
import {
|
||||||
NEW_INTENT_SELECTED_INDEX,
|
NEW_INTENT_SELECTED_INDEX,
|
||||||
LAUNCH_REQUEST_SELECTED_INDEX,
|
LAUNCH_REQUEST_SELECTED_INDEX,
|
||||||
CONTACT_SELECTED_INDEX,
|
CONTACT_SELECTED_INDEX,
|
||||||
RESULT_CODES} from './config/constants'
|
RESULT_CODES,
|
||||||
|
} from './config/constants';
|
||||||
|
|
||||||
class App extends Component {
|
class App extends Component {
|
||||||
|
constructor (props) {
|
||||||
|
super (props);
|
||||||
|
|
||||||
constructor(props){
|
this.state = {
|
||||||
super(props);
|
_id: '5a232fb86ce046c749739455',
|
||||||
|
skillID: '',
|
||||||
|
skillName: '',
|
||||||
|
invocationName: 'Saburly',
|
||||||
|
invocationAnswer: 'We are saburly',
|
||||||
|
allIntents: [],
|
||||||
|
selectedIntent: {
|
||||||
|
intentName: '',
|
||||||
|
intentExplanation: '',
|
||||||
|
questions: [''],
|
||||||
|
answer: '',
|
||||||
|
},
|
||||||
|
selectedIndex: NEW_INTENT_SELECTED_INDEX,
|
||||||
|
contactEmail: '',
|
||||||
|
waiting: false,
|
||||||
|
};
|
||||||
|
|
||||||
this.state={_id:'5a232fb86ce046c749739455',
|
getSkill (this.state._id).then (l => l.json ()).then (result => {
|
||||||
skillID:'',
|
if (result === undefined) return;
|
||||||
skillName:'',
|
this.setState ({
|
||||||
invocationName:'Saburly',
|
skillID: result.skillID,
|
||||||
invocationAnswer:'We are saburly',
|
skillName: result.skillName,
|
||||||
allIntents:[],
|
invocationName: result.invocationName,
|
||||||
selectedIntent: {intentName:'',questions:[''],answer:''},
|
invocationAnswer: result.invocationAnswer,
|
||||||
selectedIndex:NEW_INTENT_SELECTED_INDEX,
|
allIntents: result.intents,
|
||||||
contactEmail:'',
|
contactEmail: result.contactEmail,
|
||||||
waiting: false
|
});
|
||||||
};
|
});
|
||||||
|
|
||||||
getSkill(this.state._id).then(l=>l.json()).then(result=>{
|
this.handleIntentClick = this.handleIntentClick.bind (this);
|
||||||
if (result===undefined) return;
|
this.handleLaunchRequestClick = this.handleLaunchRequestClick.bind (this);
|
||||||
this.setState({ skillID:result.skillID,skillName:result.skillName, invocationName: result.invocationName,
|
this.handleDeleteIntentClick = this.handleDeleteIntentClick.bind (this);
|
||||||
invocationAnswer: result.invocationAnswer,
|
this.handleSaveIntentClick = this.handleSaveIntentClick.bind (this);
|
||||||
allIntents: result.intents, contactEmail: result.contactEmail})
|
this.handleAddIntentClick = this.handleAddIntentClick.bind (this);
|
||||||
})
|
this.handleSaveLaunchRequestClick = this.handleSaveLaunchRequestClick.bind (
|
||||||
|
this
|
||||||
this.handleIntentClick = this.handleIntentClick.bind(this);
|
);
|
||||||
this.handleLaunchRequestClick = this.handleLaunchRequestClick.bind(this);
|
this.createSkill = this.createSkill.bind (this);
|
||||||
this.handleDeleteIntentClick = this.handleDeleteIntentClick.bind(this);
|
this.sendSkill = this.sendSkill.bind (this);
|
||||||
this.handleSaveIntentClick = this.handleSaveIntentClick.bind(this);
|
this.handleContactClick = this.handleContactClick.bind (this);
|
||||||
this.handleAddIntentClick = this.handleAddIntentClick.bind(this);
|
this.handleSaveEmailClick = this.handleSaveEmailClick.bind (this);
|
||||||
this.handleSaveLaunchRequestClick = this.handleSaveLaunchRequestClick.bind(this);
|
|
||||||
this.createSkill = this.createSkill.bind(this);
|
|
||||||
this.sendSkill = this.sendSkill.bind(this);
|
|
||||||
this.handleContactClick = this.handleContactClick.bind(this);
|
|
||||||
this.handleSaveEmailClick = this.handleSaveEmailClick.bind(this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render () {
|
||||||
let rightPanel;
|
let rightPanel;
|
||||||
switch (this.state.selectedIndex) {
|
switch (this.state.selectedIndex) {
|
||||||
case LAUNCH_REQUEST_SELECTED_INDEX:
|
case LAUNCH_REQUEST_SELECTED_INDEX:
|
||||||
rightPanel = <LaunchRequest invocationName={this.state.invocationName}
|
rightPanel = (
|
||||||
invocationAnswer={this.state.invocationAnswer}
|
<LaunchRequest
|
||||||
onSaveClick={this.handleSaveLaunchRequestClick}
|
invocationName={this.state.invocationName}
|
||||||
waiting={this.state.waiting}/> ;
|
invocationAnswer={this.state.invocationAnswer}
|
||||||
|
onSaveClick={this.handleSaveLaunchRequestClick}
|
||||||
|
waiting={this.state.waiting}
|
||||||
|
/>
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
case CONTACT_SELECTED_INDEX:
|
case CONTACT_SELECTED_INDEX:
|
||||||
rightPanel = <Contact contactEmail={this.state.contactEmail}
|
rightPanel = (
|
||||||
onSaveEmailClick={this.handleSaveEmailClick}
|
<Contact
|
||||||
waiting={this.state.waiting}/> ;
|
contactEmail={this.state.contactEmail}
|
||||||
|
onSaveEmailClick={this.handleSaveEmailClick}
|
||||||
|
waiting={this.state.waiting}
|
||||||
|
/>
|
||||||
|
);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
rightPanel = <IntentDetails selectedIntent={this.state.selectedIntent}
|
rightPanel = (
|
||||||
onDeleteIntentClick={this.handleDeleteIntentClick}
|
<IntentDetails
|
||||||
onSaveIntentClick={this.handleSaveIntentClick}
|
selectedIntent={this.state.selectedIntent}
|
||||||
waiting={this.state.waiting}/>;
|
onDeleteIntentClick={this.handleDeleteIntentClick}
|
||||||
|
onSaveIntentClick={this.handleSaveIntentClick}
|
||||||
|
waiting={this.state.waiting}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return(
|
return (
|
||||||
<div className="App">
|
<div className="App">
|
||||||
<Popup/>
|
<Popup />
|
||||||
<div className="App-header">
|
<div className="App-header">
|
||||||
<h1> Tell All </h1>
|
<h1> Tell All </h1>
|
||||||
</div>
|
</div>
|
||||||
<IntentList allIntents={this.state.allIntents}
|
<IntentList
|
||||||
onLaunchRequestClick={this.handleLaunchRequestClick}
|
allIntents={this.state.allIntents}
|
||||||
onContactClick={this.handleContactClick}
|
onLaunchRequestClick={this.handleLaunchRequestClick}
|
||||||
onIntentClick={this.handleIntentClick}
|
onContactClick={this.handleContactClick}
|
||||||
onAddIntentClick={this.handleAddIntentClick}
|
onIntentClick={this.handleIntentClick}
|
||||||
selectedIndex={this.state.selectedIndex}
|
onAddIntentClick={this.handleAddIntentClick}
|
||||||
waiting={this.state.waiting}/>
|
selectedIndex={this.state.selectedIndex}
|
||||||
|
waiting={this.state.waiting}
|
||||||
|
/>
|
||||||
|
|
||||||
{rightPanel}
|
{rightPanel}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
createSkill(intents, name, answer, email, updateOnAmazon){
|
createSkill (intents, name, answer, email, updateOnAmazon) {
|
||||||
return {
|
return {
|
||||||
_id: this.state._id,
|
_id: this.state._id,
|
||||||
skillID: this.state.skillID,
|
skillID: this.state.skillID,
|
||||||
@@ -97,97 +124,181 @@ class App extends Component {
|
|||||||
invocationName: name,
|
invocationName: name,
|
||||||
invocationAnswer: answer,
|
invocationAnswer: answer,
|
||||||
contactEmail: email,
|
contactEmail: email,
|
||||||
updateOnAmazon: updateOnAmazon
|
updateOnAmazon: updateOnAmazon,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
handleIntentClick(selectedIntent, index){
|
handleIntentClick (selectedIntent, index) {
|
||||||
this.setState({selectedIntent:selectedIntent, selectedIndex: index, launchRequest:false});
|
this.setState ({
|
||||||
|
selectedIntent: selectedIntent,
|
||||||
|
selectedIndex: index,
|
||||||
|
launchRequest: false,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleLaunchRequestClick(){
|
handleLaunchRequestClick () {
|
||||||
this.setState({selectedIndex: LAUNCH_REQUEST_SELECTED_INDEX});
|
this.setState ({selectedIndex: LAUNCH_REQUEST_SELECTED_INDEX});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleContactClick(){
|
handleContactClick () {
|
||||||
this.setState({selectedIndex: CONTACT_SELECTED_INDEX})
|
this.setState ({selectedIndex: CONTACT_SELECTED_INDEX});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleSaveLaunchRequestClick(name, answer){
|
handleSaveLaunchRequestClick (name, answer) {
|
||||||
this.setState({waiting:true, invocationName:name, invocationAnswer: answer});
|
this.setState ({
|
||||||
this.sendSkill(this.state.allIntents,true,{waiting:false},{waiting:false},name,answer,this.state.contactEmail,true);
|
waiting: true,
|
||||||
|
invocationName: name,
|
||||||
|
invocationAnswer: answer,
|
||||||
|
});
|
||||||
|
this.sendSkill (
|
||||||
|
this.state.allIntents,
|
||||||
|
true,
|
||||||
|
{waiting: false},
|
||||||
|
{waiting: false},
|
||||||
|
name,
|
||||||
|
answer,
|
||||||
|
this.state.contactEmail,
|
||||||
|
true
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleSaveEmailClick(email){
|
handleSaveEmailClick (email) {
|
||||||
this.setState({waiting:true});
|
this.setState ({waiting: true});
|
||||||
this.sendSkill(this.state.allIntents,true,{contactEmail: email, waiting:false},{waiting:false},this.state.invocationName,this.state.invocationAnswer,email,false);
|
this.sendSkill (
|
||||||
|
this.state.allIntents,
|
||||||
|
true,
|
||||||
|
{contactEmail: email, waiting: false},
|
||||||
|
{waiting: false},
|
||||||
|
this.state.invocationName,
|
||||||
|
this.state.invocationAnswer,
|
||||||
|
email,
|
||||||
|
false
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleDeleteIntentClick(selectedIntent){
|
handleDeleteIntentClick (selectedIntent) {
|
||||||
let id = -1;
|
let id = -1;
|
||||||
//TODO : Change comparsion method ! Same object with different proeprty sorting will not be same string
|
//TODO : Change comparsion method ! Same object with different proeprty sorting will not be same string
|
||||||
this.state.allIntents.map((intent,index)=>{
|
this.state.allIntents.map ((intent, index) => {
|
||||||
if ((id===-1) && (JSON.stringify(selectedIntent)===JSON.stringify(intent)))
|
if (
|
||||||
id = index;
|
id === -1 &&
|
||||||
|
JSON.stringify (selectedIntent) === JSON.stringify (intent)
|
||||||
|
)
|
||||||
|
id = index;
|
||||||
});
|
});
|
||||||
|
|
||||||
if (id!==-1){
|
if (id !== -1) {
|
||||||
try{
|
try {
|
||||||
let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
|
let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
|
||||||
let newAllIntents = JSON.parse(newAllIntentsJSON);
|
let newAllIntents = JSON.parse (newAllIntentsJSON);
|
||||||
newAllIntents.splice(id,1);
|
newAllIntents.splice (id, 1);
|
||||||
this.setState({waiting:true});
|
this.setState ({waiting: true});
|
||||||
|
|
||||||
let newState = {allIntents: newAllIntents, selectedIntent: {intentName:'', questions:[''],answer:''}, waiting:false};
|
let newState = {
|
||||||
this.sendSkill(newAllIntents,true,newState,{waiting:false},this.state.invocationName,this.state.invocationAnswer,this.state.contactEmail,true);
|
allIntents: newAllIntents,
|
||||||
|
selectedIntent: {intentName: '', questions: [''], answer: ''},
|
||||||
}catch(e){
|
waiting: false,
|
||||||
console.log("error : " + e);
|
};
|
||||||
|
this.sendSkill (
|
||||||
|
newAllIntents,
|
||||||
|
true,
|
||||||
|
newState,
|
||||||
|
{waiting: false},
|
||||||
|
this.state.invocationName,
|
||||||
|
this.state.invocationAnswer,
|
||||||
|
this.state.contactEmail,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
console.log ('error : ' + e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleSaveIntentClick (selectedIntent) {
|
||||||
handleSaveIntentClick(selectedIntent){
|
let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
|
||||||
let newAllIntentsJSON = JSON.stringify(this.state.allIntents);
|
let newAllIntents = JSON.parse (newAllIntentsJSON);
|
||||||
let newAllIntents = JSON.parse(newAllIntentsJSON);
|
|
||||||
|
|
||||||
let newState = null;
|
let newState = null;
|
||||||
if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX){
|
if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX) {
|
||||||
//new intent
|
//new intent
|
||||||
newAllIntents.push(selectedIntent);
|
newAllIntents.push (selectedIntent);
|
||||||
newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, selectedIndex: newAllIntents.length-1, waiting:false};
|
newState = {
|
||||||
}else{
|
allIntents: newAllIntents,
|
||||||
|
selectedIntent: selectedIntent,
|
||||||
|
selectedIndex: newAllIntents.length - 1,
|
||||||
|
waiting: false,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
newAllIntents[this.state.selectedIndex] = selectedIntent;
|
newAllIntents[this.state.selectedIndex] = selectedIntent;
|
||||||
newState = {allIntents: newAllIntents, selectedIntent: selectedIntent, waiting: false};
|
newState = {
|
||||||
|
allIntents: newAllIntents,
|
||||||
|
selectedIntent: selectedIntent,
|
||||||
|
waiting: false,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
this.setState({waiting:true});
|
this.setState ({waiting: true});
|
||||||
this.sendSkill(newAllIntents, true, newState, {waiting:false}, this.state.invocationName,this.state.invocationAnswer,this.state.contactEmail, true);
|
this.sendSkill (
|
||||||
|
newAllIntents,
|
||||||
|
true,
|
||||||
|
newState,
|
||||||
|
{waiting: false},
|
||||||
|
this.state.invocationName,
|
||||||
|
this.state.invocationAnswer,
|
||||||
|
this.state.contactEmail,
|
||||||
|
true
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleAddIntentClick(){
|
handleAddIntentClick () {
|
||||||
this.setState({allIntents: this.state.allIntents, selectedIndex: NEW_INTENT_SELECTED_INDEX,launchRequest:false,selectedIntent: {intentName:'',questions:[''], answer:''}});
|
this.setState ({
|
||||||
|
allIntents: this.state.allIntents,
|
||||||
|
selectedIndex: NEW_INTENT_SELECTED_INDEX,
|
||||||
|
launchRequest: false,
|
||||||
|
selectedIntent: {intentName: '', questions: [''], answer: '', intentExplanation:''},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
sendSkill(newAllIntents, showPopUp, resolveState, rejectState, newName, newAnswer, email, updateOnAmazon){
|
sendSkill (
|
||||||
return new Promise((resolve,reject)=>{
|
newAllIntents,
|
||||||
updateSkill(this.createSkill(newAllIntents,newName,newAnswer,email,updateOnAmazon)).then(l=>l.json()).then(result=>{
|
showPopUp,
|
||||||
if (result.result !== RESULT_CODES.OK){
|
resolveState,
|
||||||
console.log(result.result);
|
rejectState,
|
||||||
if (showPopUp) Popup.alert('Model was not saved. Please try again');
|
newName,
|
||||||
this.setState(rejectState);
|
newAnswer,
|
||||||
//reject('Error code : ' + jResult.result);
|
email,
|
||||||
}else{
|
updateOnAmazon
|
||||||
if (showPopUp) Popup.alert('Saved');
|
) {
|
||||||
this.setState(resolveState);
|
return new Promise ((resolve, reject) => {
|
||||||
resolve();
|
updateSkill (
|
||||||
}
|
this.createSkill (
|
||||||
}).catch(e=>{
|
newAllIntents,
|
||||||
console.log('error : ' + e);
|
newName,
|
||||||
if (showPopUp) Popup.alert('Model was not saved. Please try again');
|
newAnswer,
|
||||||
this.setState(rejectState);
|
email,
|
||||||
//reject(e);
|
updateOnAmazon
|
||||||
});
|
)
|
||||||
|
)
|
||||||
|
.then (l => l.json ())
|
||||||
|
.then (result => {
|
||||||
|
if (result.result !== RESULT_CODES.OK) {
|
||||||
|
console.log (result);
|
||||||
|
if (showPopUp)
|
||||||
|
Popup.alert ('Model was not saved. Please try again');
|
||||||
|
this.setState (rejectState);
|
||||||
|
//reject('Error code : ' + jResult.result);
|
||||||
|
} else {
|
||||||
|
if (showPopUp) Popup.alert ('Saved');
|
||||||
|
this.setState (resolveState);
|
||||||
|
resolve ();
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch (e => {
|
||||||
|
console.log ('error : ' + e);
|
||||||
|
if (showPopUp) Popup.alert ('Model was not saved. Please try again');
|
||||||
|
this.setState (rejectState);
|
||||||
|
//reject(e);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
import React, { Component } from 'react';
|
import React, { Component } from 'react';
|
||||||
import {Button, SVGIcon, TextField} from 'react-md';
|
import {Button, SVGIcon, TextField} from 'react-md';
|
||||||
import '../css/components/IntentDetails.css';
|
import '../css/components/IntentDetails.css';
|
||||||
import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH} from '../config/constants';
|
import '../css/Common.css';
|
||||||
|
import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH, INTENT_EXPLANATION_MAX_LENGTH} from '../config/constants';
|
||||||
|
|
||||||
class IntentDetails extends Component {
|
class IntentDetails extends Component {
|
||||||
constructor(props){
|
constructor(props){
|
||||||
@@ -14,6 +15,7 @@ class IntentDetails extends Component {
|
|||||||
this.handleQuestionEdit = this.handleQuestionEdit.bind(this);
|
this.handleQuestionEdit = this.handleQuestionEdit.bind(this);
|
||||||
this.handleAnswerEdit = this.handleAnswerEdit.bind(this);
|
this.handleAnswerEdit = this.handleAnswerEdit.bind(this);
|
||||||
this.handleIntentNameEdit = this.handleIntentNameEdit.bind(this);
|
this.handleIntentNameEdit = this.handleIntentNameEdit.bind(this);
|
||||||
|
this.handleIntentExplanationEdit = this.handleIntentExplanationEdit.bind(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
componentWillReceiveProps(props){
|
componentWillReceiveProps(props){
|
||||||
@@ -24,10 +26,19 @@ class IntentDetails extends Component {
|
|||||||
return (
|
return (
|
||||||
<div className="RightPanelBox">
|
<div className="RightPanelBox">
|
||||||
<div className="QuestionBox">
|
<div className="QuestionBox">
|
||||||
|
<h5 className="PanelSubTitle"> In introduction, Alexa will help users to ask her the right questions about your business. For Example, she will say : "To ask us about our services, say : What do you do ? ". What do you do ? is defined in question field. Alexa will use first variation of question in intro.</h5>
|
||||||
|
<TextField
|
||||||
|
id="intent explanation"
|
||||||
|
lineDirection="center"
|
||||||
|
placeholder="To ask us about our services, say "
|
||||||
|
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
|
||||||
|
onChange={this.handleIntentExplanationEdit}
|
||||||
|
maxLength={INTENT_EXPLANATION_MAX_LENGTH}
|
||||||
|
value={this.state.intent.intentExplanation} />
|
||||||
|
<br/>
|
||||||
<TextField
|
<TextField
|
||||||
id="intent name"
|
id="intent name"
|
||||||
lineDirection="center"
|
lineDirection="center"
|
||||||
placeholder="Intent name"
|
|
||||||
label="Question name"
|
label="Question name"
|
||||||
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
|
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
|
||||||
onChange={this.handleIntentNameEdit}
|
onChange={this.handleIntentNameEdit}
|
||||||
@@ -98,6 +109,13 @@ class IntentDetails extends Component {
|
|||||||
this.setState({intent: newIntent});
|
this.setState({intent: newIntent});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleIntentExplanationEdit(e,index){
|
||||||
|
if (e.length === INTENT_EXPLANATION_MAX_LENGTH) return;
|
||||||
|
let newIntent = this.state.intent;
|
||||||
|
newIntent.intentExplanation = e;
|
||||||
|
this.setState({intent: newIntent});
|
||||||
|
}
|
||||||
|
|
||||||
handleAnswerEdit(e){
|
handleAnswerEdit(e){
|
||||||
if (e.length === ANSWER_MAX_LENGTH) return;
|
if (e.length === ANSWER_MAX_LENGTH) return;
|
||||||
let newIntent = this.state.intent;
|
let newIntent = this.state.intent;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
export const INTENT_NAME_MAX_LENGTH = 30;
|
export const INTENT_NAME_MAX_LENGTH = 30;
|
||||||
|
export const INTENT_EXPLANATION_MAX_LENGTH = 70;
|
||||||
export const QUESTION_MAX_LENGTH = 150;
|
export const QUESTION_MAX_LENGTH = 150;
|
||||||
export const ANSWER_MAX_LENGTH = 150;
|
export const ANSWER_MAX_LENGTH = 150;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user