68 Commits

Author SHA1 Message Date
Bilal
a5c09206c9 delete obsolete file 2018-04-18 00:12:17 +00:00
GotPPay
95b8fea01a close session after finishing intent 2018-04-18 00:26:41 +02:00
Bilal
26e186bf3a verify request from amazon 2018-04-17 16:50:28 +00:00
Bilal
4d2c4891cc Merge branch 'master' of https://github.com/GotPPay/tellall 2018-04-16 10:43:15 +00:00
Senad Uka
d281dda327 Merge pull request #17 from GotPPay/summarizer-feature
4b. Summarizer feature
2018-04-16 12:12:50 +02:00
Senad Uka
9529104632 Merge pull request #18 from GotPPay/tests-for-import-from-source
Tests for components related to 'import from source' part
2018-04-16 12:12:42 +02:00
GotPPay
70845d5594 Merge branch 'tests-for-import-from-source' into summarizer-feature 2018-04-15 16:33:03 +02:00
GotPPay
5a1d878150 flip logic (comment from PR #18) 2018-04-15 16:28:19 +02:00
GotPPay
b5d66c950a improve code (comment from PR #17) 2018-04-11 11:00:33 +02:00
GotPPay
d69972da07 Merge branch 'tests-for-import-from-source' into summarizer-feature 2018-04-11 10:54:34 +02:00
GotPPay
4ac7284724 improved code readability (comment from PR #18) 2018-04-11 10:49:12 +02:00
GotPPay
e138c6e09e improved code readability (comment from PR #18 2018-04-11 10:42:06 +02:00
GotPPay
0634c3898a fix typo 2018-04-06 22:33:53 +02:00
GotPPay
9dce82b28c Merge branch 'tests-for-import-from-source' into summarizer-feature 2018-04-06 14:53:41 +02:00
GotPPay
83134841a2 add test for question delete; fix bug with delete question 2018-04-05 15:40:10 +02:00
GotPPay
275ab2e9b1 created tests for IntentDetails component ; improved input validators 2018-04-04 21:59:13 +02:00
GotPPay
4d2cf52e4c add snapshot tests for 'import-from-source' part 2018-04-04 01:09:29 +02:00
GotPPay
ecb06fd4e2 created tests for components related to importing from source 2018-04-03 23:45:53 +02:00
GotPPay
c838c6074d apply changes from PR #15 2018-04-03 15:56:13 +02:00
Bilal
f64155e061 Merge pull request #15 from GotPPay/import-from-source
4a. Import from source
2018-04-03 15:01:39 +02:00
GotPPay
ce79c0e1e7 improved search for same questions and question variants 2018-04-03 14:49:36 +02:00
GotPPay
4a43dda852 fixed PR #15 comments 2018-04-03 14:19:07 +02:00
GotPPay
ec3d4dcd6c fix bug with undefined variable ; improve abstraction 2018-04-02 12:55:31 +02:00
GotPPay
38c63e619b use length control for summary 2018-04-02 09:44:56 +02:00
GotPPay
6643aafb54 clean text before summarization 2018-04-02 04:21:27 +02:00
GotPPay
e04dbe3ec9 clean answer from html tags so it can be recited by alexa 2018-04-02 04:15:36 +02:00
GotPPay
e4b1617dc1 change summarizing lib 2018-04-02 03:41:15 +02:00
GotPPay
cd74990165 4b. introduce summarizer ; use summarizer for top news reading 2018-04-01 22:32:20 +02:00
GotPPay
284cdcd7ba fix promise answer 2018-03-30 14:30:30 +02:00
GotPPay
0ebadcd3f7 promisify answer on user defined question 2018-03-30 12:08:38 +02:00
GotPPay
f163dde5b2 wait until unswer is ready 2018-03-30 11:52:04 +02:00
GotPPay
431daa3182 return answer instead of promise 2018-03-30 11:43:44 +02:00
GotPPay
fae0e0db23 return result instead of promise 2018-03-30 11:26:42 +02:00
GotPPay
443dc53dbd 4a. import content from WP ; change design to reflect 4a 2018-03-30 10:54:15 +02:00
MirnaM
5484a9a461 Add ui for answers from source 2018-03-28 15:51:10 +02:00
MirnaM
85d1b01dab Merge pull request #14 from GotPPay/handle-user-input
Handle user input
2018-02-07 11:06:37 +01:00
GotPPay
779e2d61f4 backend user input handling 2018-01-29 23:23:36 +01:00
GotPPay
5e92314938 frontend user input handling 2018-01-29 21:32:24 +01:00
GotPPay
3b5c287ef9 . 2018-01-27 10:53:06 +01:00
GotPPay
7ffbf42da9 update tokens 2018-01-27 03:15:47 +01:00
GotPPay
6b4256b7ab switch to saburly amazon account 2018-01-26 23:21:59 +01:00
GotPPay
e712693dd0 switch to saburly amazon account 2018-01-26 23:21:18 +01:00
GotPPay
220d76c2be test saburly account 2018-01-26 17:46:16 +01:00
GotPPay
2870695b25 Fix regex 2018-01-26 15:35:38 +01:00
GotPPay
bca71604fb Allow only letters for question name 2018-01-25 17:42:17 +01:00
GotPPay
84edb5563f prevent space in question name 2018-01-25 16:09:12 +01:00
MirnaM
bad8ccdce3 Merge pull request #13 from GotPPay/implement-built-in-intents
Implement built in intents
2018-01-25 15:59:16 +01:00
GotPPay
9b58f7745b improve code 2018-01-25 15:56:45 +01:00
GotPPay
b0737efb4e add missing spread operator 2018-01-25 15:39:48 +01:00
GotPPay
5d2a15bc93 apply comment from PR 2018-01-25 15:19:30 +01:00
GotPPay
145fff3b51 fix alexa bug with no speak action 2018-01-24 13:14:47 +01:00
GotPPay
4f6c714fa3 Rephrase continuation question 2018-01-24 13:11:35 +01:00
GotPPay
f714fdf70a improve No intent 2018-01-24 13:07:08 +01:00
GotPPay
adc1f1c099 improve default built-in intents 2018-01-24 13:02:46 +01:00
GotPPay
c0a177d39b experiment with yes no help cancel 2018-01-23 14:40:01 +01:00
GotPPay
3700d9bb58 Simulate built-in intents 2018-01-23 13:46:02 +01:00
GotPPay
7a5ddc6b52 Experiment with user-defined help intent 2018-01-23 13:33:53 +01:00
GotPPay
39b8e7608e Test built-in intents 2018-01-23 13:24:56 +01:00
Bilal
47df972033 . 2018-01-23 11:24:32 +00:00
MirnaM
a8ffe0a5c0 Merge pull request #11 from GotPPay/send-message-feature
Send message feature
2018-01-23 12:19:57 +01:00
MirnaM
def591224e Merge pull request #12 from GotPPay/question-explanation
Question explanation
2018-01-23 12:19:14 +01:00
GotPPay
d8b2f5f0b4 fix typo 2018-01-23 12:18:20 +01:00
MirnaM
f6bf3a05b2 Merge pull request #10 from GotPPay/switch-to-alexa-sdk
Switch to alexa sdk
2018-01-19 11:24:23 +01:00
MirnaM
bb9d270238 Add skill interaction model 2017-12-02 20:20:59 +01:00
MirnaM
81c9dde0ef Merge branch 'master' into bilal-step3 2017-12-01 15:07:39 +01:00
MirnaM
d375d79e67 Merge branch 'bilal-step3' of github.com:GotPPay/tellall into bilal-step3 2017-12-01 15:05:34 +01:00
MirnaM
819dbefde7 Find intent object by name and send answer as response 2017-12-01 14:37:51 +01:00
GotPPay
805deab2d9 clean 2017-12-01 14:35:05 +01:00
41 changed files with 6647 additions and 848 deletions

View File

@@ -1,6 +1,11 @@
To obtain new Auth Code :
To obtain client ID and secret :
https://developer.amazon.com/lwa/sp/overview.html
Click create new security profile, and add whitelist redirect uri : https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO
https://www.amazon.com/ap/oa?client_id=amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test&response_type=code&redirect_uri=https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO
To obtain new Auth Code :
https://www.amazon.com/ap/oa?client_id=amzn1.application-oa2-client.8c183daec15c488c9126b62bda9f7832&scope=alexa::ask:skills:readwrite alexa::ask:models:readwrite alexa::ask:skills:test&response_type=code&redirect_uri=https://layla.amazon.com/api/skill/link/M2ODJY6EXOY6KO
Response URL (Decoded) :
@@ -67,7 +72,8 @@ Prerequests for step 3 (run on server):
requires running mongodb service
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", "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" })
* Insert dummy skill with : db.skill_list.insert({"skillID" : "amzn1.ask.skill.2445552d-954d-4cd6-b77f-295368e02842", "intents" : [ { "intentName" : "GetFirstQuestion", "questionExplanation" : "","questions" : [ "tell me something about projects", "tell me all about projects" ], "answer" : "blablabla bla bla", "answerType":0, "externalAnswerSource":"" }, { "intentName" : "GetThirdQuestion", "questionExplanation" : "","questions" : [ "Give me third question" ], "answer" : "This is answer to the third question", "answerType":1, "externalAnswerSource":"http://sarajevotimes.com" } ], "invocationName" : "saburly", "invocationAnswer" : "We are Saburly team one", "contactEmail":"bilal@saburly.com" })
*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"

View File

@@ -1,17 +1,33 @@
constants = require('./constants')
var config = {};
config.SKILL_STAGE = constants.skillStage.IN_DEVELOPMENT;
config.DB_URL = 'mongodb://localhost:27017/tellall';
config.PORT = 5000;
config.TOKEN = 'Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt';
config.REFRESH_TOKEN = 'Atzr|IwEBICA3kDhfSJxlwvnQp9AD1o115AC_KBbFd5GBg8oN_QHWn2or5xFQ09BruuK6a07tGHtTt_9q2Y21mnOMH4RDtYXTVG9ADgLE6mHWKZFxYVwt3kHMiUJdY5lJcsOtWLoblrS-bJ0BEXXK5nVDt_bSI5IB7NUf-9QVZxhovRH_ANSxdTjJT0_rMIAZY3WEj68FEap49q_pg72BhnxHVZD2TC3zvX96_DN65HE5SoSgT7OiMAeiJewB_SyemW_HxBwaB-_X-G1ifOtnrzZ4gXTpOrEUlHI2YPuvRMBMtmz1h-nXDZYv3vwU3RA57Qj_ZNVcScj8_RXf2xq8w48v0PzZFXYBSalfnqPq6eUvSSbAJUp6bB8y596JlvR5dFQe_Z--X0Gkfo85IcyrI9D44vK9sJhrGhCVi2FDDa8pHczmNSen99JYZvDif-zpYzgbcymAkOV0gC7JvYMxlZfETT3NTBy7eVA7fJI1SZaeA_qW49xRcBkZBu5gkqTpeGWUU1cGr2aXRVVmXGM22NfV5E7KzvEBsCeHml_tCfxZeKY8Msd8hJb0Cd59u-_hsuc8oNjsOpIdFF976dY3uTmAgHWpG2PH';
//Bilal TOKENS
//config.TOKEN = 'Atza|IwEBIBe6gDqrrowEEav6N-_6s4NztYeP3oG8PGWmu8ZiZw6lbOh3wNla3TK6pY-VEpT1d8an-dVf_n3kXJzVFsNo_4xBfZyFHGoCTDTFjs3yBRul4PVdBOhwwiH3-sgRLcUofZbe2oE06GmTcbfYtaStfXpQI5dfpldfnsJg_CvhSA6AHb_snJT3F6lyXzbV076d_3cYUMJxFldJGnYcviNHHxjjmuQTD06hhGzCbAxxe9eBmkuopRsNfyedLT2UlKP_ublah9CUGA3AdIX_3Iuke82jMwGnNl9gv7pbaDNEjAbj7IQSl3B08uuREtJq-oTBOjALNXRvFxTJmQjZwXNf9eHC7fSHJDdEPdZQU0AcffRQObAyAkUuL6Jv39OHzhb3Q64-zzoyODqnJyLP5SQZ2JVF53Kc_cTBqjIc9pXljqe7yEVk6JDs7q1zKbBibx_AQm57TO79IzWyLBzBMlYL5HdTsqEfRzLeDw2tws-hGMgkx2HWfdbYnmf5Qb4SyIhzvmmdfPLg3MVKTxjIBu1rx0xf3n0PLZP1EO6jsJPoMRPg77Gm4oit5Zp6s37ek3A3Vxh-ntoASpkrkxGTG9kVtRNt';
//config.REFRESH_TOKEN = 'Atzr|IwEBICA3kDhfSJxlwvnQp9AD1o115AC_KBbFd5GBg8oN_QHWn2or5xFQ09BruuK6a07tGHtTt_9q2Y21mnOMH4RDtYXTVG9ADgLE6mHWKZFxYVwt3kHMiUJdY5lJcsOtWLoblrS-bJ0BEXXK5nVDt_bSI5IB7NUf-9QVZxhovRH_ANSxdTjJT0_rMIAZY3WEj68FEap49q_pg72BhnxHVZD2TC3zvX96_DN65HE5SoSgT7OiMAeiJewB_SyemW_HxBwaB-_X-G1ifOtnrzZ4gXTpOrEUlHI2YPuvRMBMtmz1h-nXDZYv3vwU3RA57Qj_ZNVcScj8_RXf2xq8w48v0PzZFXYBSalfnqPq6eUvSSbAJUp6bB8y596JlvR5dFQe_Z--X0Gkfo85IcyrI9D44vK9sJhrGhCVi2FDDa8pHczmNSen99JYZvDif-zpYzgbcymAkOV0gC7JvYMxlZfETT3NTBy7eVA7fJI1SZaeA_qW49xRcBkZBu5gkqTpeGWUU1cGr2aXRVVmXGM22NfV5E7KzvEBsCeHml_tCfxZeKY8Msd8hJb0Cd59u-_hsuc8oNjsOpIdFF976dY3uTmAgHWpG2PH';
//Saburly TOKENS
config.TOKEN = 'Atza|IwEBIABS0RvlVshGGO64X0tabhUuzpJKjbWNgxpRiy7YTftFD_lWlp-cbeXuVjRAu8kior2W2C5swf_rEHYvELQXdw78gB9WJQh4ITncPgqNCxvEnwVpIXiyeC_O287DRErnTYbI3s34i4NcxrXzobB8fIpTZxOkg6BI6vQGvvaiNLsTim2ElDYgAEmdgTN77llcMai521aovDqEw_XFc6GspeXhiGKxRomCMIL2UaT649owapDQ3y3Ug9eHvEaBzqjYdOUAtRtv19BGkG8YPs3npHmP5AD0Oc3ByCfrofcGk7fdd_nq28pRX6h4LXk4ylM279qlneWh9EErsWh8vtWuGEGusnDxW17OzEzf7HuwNDqdCJ6gCrIEkZaHISrSQ-vTsYGhKbv0z4nNjf_W_aoc9UJr9LnISCXx424R--iGDKZXhYWlZRjaiHsXE33MpS_M-sdN6GXYQwIjanTUahVXh5h-IBam5uJzTejE6CkIh5iUJ6um2IlDelJRMGS-T_aaG3zUvEagvEd9V9Z5mVN_kmO8bH4H2VefZuFGHRsCPa6SoLrlN0rkXK5fMw-zXfV2MHvQFdkgqYqGKxiEwWJ-g4n1ZrcPtWQowHT2z2yWrfnM2A6g8GIdPT23znmRcrdz4EU';
config.REFRESH_TOKEN = 'Atzr|IwEBIENdBZntrzvJYesv8SGhnty4Nyk2ZySL09elw5N0wH8S1Brz1UgIYLqenw3sKKxnc-VrIUbNtl1Ka4GDKwcTr2fDU_AbKQ6YXzeRBrfRQVvNOeCtjZE8P6Kg1PxAeQoCsqo7WPxK8ZdUaLwPjt_xiZ1FXtr01g-211PJs4KEg5jyF5nY2S14jA_TbwDW6ihpNqWd6ZklTZSRaOeSGa1mXZCSZ5yTsZIQV1Pn0fKhCXtcVg2L833YqRmextmHij4-2NtBQdW3gif5MPdhYjTqDNwgxO3OOagK1uSFqXOnMcmEDnxZuQQApugfDzClfN6DiDALCKN4dVAX8-OU_L2xsUkKiFP9rQjvHWJoRFBT1FpXjBfoVyzM1AaJ6C83WX6SjOBE0hhikQKIaPSe1ikK8_MzOIs2wqLLPnLGnKj3kcKMkDmY6DMgxfWj2H0hwLy0oZ7_qykS7wUHMGjRO5yScuBWFIr0RFFu00GS7zrKjkhFc_E4ZBBKskn0gywS-5pogo0U1rQtLg8lQJsVbxXQwtq2TxkGFMBiVxtQcXtHM1qbCVXpZQbk7ezxvasj4yAIsF4H7KBiZSGmWHkk4yADykWJSntTjFcM2wG0wSiEYoYzJQ';
config.TOKEN_EXPIRES_IN = 1515100500;
config.SKILL_ID = 'amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae';
//config.SKILL_DB_ID = '5a5016e775becaef2015da10'; //for server
config.SKILL_DB_ID = '5a232fb86ce046c749739455'; //for local
config.CLIENT_ID = 'amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7';
config.CLIENT_SECRET = '6dea8125cecd049d3c4cff7bb5bdfd3ff17bc6fed246c4c8f6b519d9ed08d0b3';
//config.SKILL_ID = 'amzn1.ask.skill.efbf0564-a732-4ba9-958f-57939138adae'; //bilal
config.SKILL_ID = 'amzn1.ask.skill.2445552d-954d-4cd6-b77f-295368e02842'; //saburly
//config.SKILL_DB_ID = '5a5016e775becaef2015da10'; //for server
config.SKILL_DB_ID = '5abd461329f85e4ec728d945'; //for local
//Bilal
//config.CLIENT_ID = 'amzn1.application-oa2-client.c748ca56ded04a95b236979898585ff7';
//config.CLIENT_SECRET = '6dea8125cecd049d3c4cff7bb5bdfd3ff17bc6fed246c4c8f6b519d9ed08d0b3';
//Saburly
config.CLIENT_ID = 'amzn1.application-oa2-client.8c183daec15c488c9126b62bda9f7832';
config.CLIENT_SECRET = '3acaa0755291132ee11e1cceaa100feef96a0244662df712a52189199cc655de';
module.exports = config;

View File

@@ -1,42 +1,84 @@
const constants = {};
constants.skillStage = {
IN_DEVELOPMENT: 'development',
LIVE: 'live',
};
constants.amazonResultCodes = {
OK:200,
ACCEPTED:202,
BAD_REQUEST:400,
UNAUTHORIZED:401,
NOT_FOUND:404,
CONFLICT:409,
PAYLOAD_TOO_LARGE:413
}
OK: 200,
ACCEPTED: 202,
BAD_REQUEST: 400,
UNAUTHORIZED: 401,
NOT_FOUND: 404,
CONFLICT: 409,
PAYLOAD_TOO_LARGE: 413,
};
constants.apiResultCodes = {
GENERIC_ERROR : -1,
OK:0,
AMAZON_ERROR:1, //amazon api works, but error is some of the amazonResultCodes
AMAZON_FAIL:2, //amazon api doesn't work
DATABASE_ERROR:3,
NO_SKILL:4,
INCONSISTENT_STATE:5,
}
GENERIC_ERROR: -1,
OK: 0,
AMAZON_ERROR: 1, //amazon api works, but error is some of the amazonResultCodes
AMAZON_FAIL: 2, //amazon api doesn't work
DATABASE_ERROR: 3,
NO_SKILL: 4,
INCONSISTENT_STATE: 5,
INVALID_SKILL: 6,
};
constants.HTTPResultCodes = {
INTERNAL_SERVER_ERROR : 500,
}
INTERNAL_SERVER_ERROR: 500,
};
constants.SKILL_ID_LENGTH = 24;
constants.voiceResponseStrings = {
QUESTION_NOT_FOUND : 'Sorry, I didnt understand',
GENERIC_CONTINUE : 'Would you like to continue'
}
QUESTION_NOT_FOUND: 'Sorry, I didnt understand',
GENERIC_CONTINUE: 'Say something to continue',
DIDNT_ASK_ANYTHING: 'There was no question to answer to',
ERROR_SUMMARIZING_CONTENT: 'Sorry, there was problem with summarizing news',
ERROR_FETCHING_CONTENT: 'Failed to get content',
};
//Timing is given in [ms]
constants.voiceResponseTimings = {
PAUSE_BETWEEN_QUESTIONS : 650,
PAUSE_AFTER_WELCOME_MESSAGE : 650,
}
PAUSE_BETWEEN_QUESTIONS: 650,
PAUSE_AFTER_WELCOME_MESSAGE: 650,
PAUSE_BETWEEN_TITLES: 500,
PAUSE_BETWEEN_TITLE_AND_CONTENT: 500,
PAUSE_BETWEEN_NEWS: 800,
};
constants.stringConstraints = {
INTENT_EXPLANATION_MAX_LENGTH: 70,
INTENT_NAME_MAX_LENGTH: 30,
INTENT_NAME_MIN_LENGTH: 2,
module.exports = constants;
QUESTION_MAX_LENGTH: 150,
QUESTION_MIN_LENGTH: 2,
ANSWER_MAX_LENGTH: 150,
ANSWER_MIN_LENGTH: 2,
INVOCATION_NAME_MAX_LENGTH: 50,
INVOCATION_NAME_MIN_LENGTH: 2,
INVOCATION_ANSWER_MAX_LENGTH: 100,
EMAIL_MAX_LENGTH: 100,
};
constants.answerType = {
PREDEFINED: 0,
EXTERNAL_SOURCE_WP_TITLES: 1,
EXTERNAL_SOURCE_WP_NEWS: 2,
};
constants.contentType = {
TITLES: 0,
NEWS: 1,
};
constants.FIXED_SUMMARY_LENGTH = 3;
module.exports = constants;

View File

@@ -1,6 +1,9 @@
var express = require ('express'), router = express.Router ();
var bodyParser = require ('body-parser');
var alexa = require ('../models/alexa');
var verifier = require('alexa-verifier-middleware')
router.use(verifier);
router.post ('/', bodyParser.json (), async (req, res) => {
alexa.run (req, res);

View File

@@ -1,9 +1,10 @@
var express = require ('express'), router = express.Router ();
let express = require ('express'), router = express.Router ();
const constants = require ('../config/constants');
var databaseHelper = require ('../helpers/database');
var amazonHelper = require ('../helpers/amazon');
var bodyParser = require ('body-parser');
var alexa = require ('../models/alexa');
let databaseHelper = require ('../helpers/database');
let amazonHelper = require ('../helpers/amazon');
let skillValidator = require('../helpers/skillValidator');
let bodyParser = require ('body-parser');
let alexa = require ('../models/alexa');
router.get ('/:id', async (req, res, next) => {
const id = req.params.id;
@@ -31,6 +32,20 @@ router.put ('/:id', bodyParser.json (), async (req, res, next) => {
delete skill.updateOnAmazon;
delete skill._id;
//Validate skill
if (!skillValidator.validateSkill(skill)){
//skill not valid
res
.status (
constants.HTTPResultCodes.INTERNAL_SERVER_ERROR
)
.json ({
result: constants.apiResultCodes.INVALID_SKILL,
message: '',
});
return;
}
//First get current skill from DB
databaseHelper
.getSkill (id)

View File

@@ -68,6 +68,34 @@ var generateInteractionModel = function (skill) {
allIntents.push ({name: intent.intentName, samples: intent.questions});
});
//Built-In like intents (Amazon built-in don't work, probably something related to existance of dialog intent
allIntents.push ({
name: 'HelpIntent',
samples: ['Help', 'Can you help me', 'I need help'],
slots: [],
},
{
name: 'CancelIntent',
samples: ['Cancel', 'Stop', 'Please stop'],
slots: [],
},
{
name: 'YesIntent',
samples: [
'Yes',
'Yes please',
'I would like that',
'Yes I would like that',
],
slots: [],
},
{
name: 'NoIntent',
samples: ['No', 'No thank you'],
slots: [],
});
//Special intent for sending message (Dialog)
allIntents.push ({
@@ -243,10 +271,11 @@ var generateInteractionModel = function (skill) {
var uploadSkill = function (skill) {
let generatedInteractionModel = generateInteractionModel (skill);
console.log(skill.skillID);
return fetch (
`https://api.amazonalexa.com/v0/skills/${skill.skillID}/interactionModel/locales/en-US`,
`https://api.amazonalexa.com/v1/skills/${skill.skillID}/stages/development/interactionModel/locales/en-US`,
{
method: 'POST',
method: 'PUT',
headers: {
Authorization: config.TOKEN,
},

View File

@@ -26,7 +26,7 @@ module.exports = {
return validEmailRegex.test (email);
},
sendEmal: function (name, fromEmail, message, toEmail) {
sendEmail: function (name, fromEmail, message, toEmail) {
return new Promise ((resolve, reject) => {
fromEmail = this.transformEmailFromAlexaResponse(fromEmail);
let messageBody =

View File

@@ -0,0 +1,112 @@
let request = require ('request');
let Parser = require ('rss-parser');
let summarizer = require ('nodejs-text-summarizer');
var htmlToText = require ('html-to-text');
const constants = require ('../config/constants');
let parser = new Parser ();
getDataFromWPJSON = function (sourceUrl, page = 1, maxPosts = 10) {
return new Promise ((resolve, reject) => {
var options = {
method: 'GET',
url: `${sourceUrl}/wp-json/wp/v2/posts`,
qs: {
page: page,
per_page: maxPosts,
},
};
request (options, (error, response, body) => {
if (error) {
reject (error);
} else {
resolve (JSON.parse (body));
}
});
});
};
summarizeText = function (text, length, clearText = true) {
let preparedText = text;
if (clearText) {
preparedText = htmlToText.fromString (text, {
wordwrap: false,
ignoreHref: true,
ignoreImage: true,
});
}
return summarizer (preparedText, {n: length});
};
getTitlesFromWP = function (sourceUrl) {
return new Promise ((resolve, reject) => {
getDataFromWPJSON (sourceUrl)
.then (rawData => {
let result = '';
rawData.forEach (post => {
result +=
post.title.rendered +
`<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_TITLES}ms"/> `;
});
resolve (result);
})
.catch (err => {
reject (constants.voiceResponseStrings.ERROR_FETCHING_CONTENT);
});
});
};
getLatestNewsFromWP = function (
sourceUrl,
postCount = 10,
includeTitle = false
) {
return new Promise ((resolve, reject) => {
getDataFromWPJSON (sourceUrl, 1, postCount)
.then (rawData => {
let result = '';
let htmlToTextOptions = {
wordwrap: false,
ignoreHref: true,
ignoreImage: true,
};
try {
rawData.forEach (post => {
result += includeTitle ? post.title.rendered : '';
result += includeTitle
? `<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_TITLE_AND_CONTENT}ms"/>`
: '';
result += summarizeText (
post.content.rendered,
constants.FIXED_SUMMARY_LENGTH
);
result += `<break time="${constants.voiceResponseTimings.PAUSE_BETWEEN_NEWS}ms"/>`;
});
resolve (result);
} catch (err) {
reject (constants.voiceResponseStrings.ERROR_SUMMARIZING_CONTENT);
}
})
.catch (err => {
reject (constants.voiceResponseStrings.ERROR_FETCHING_CONTENT);
});
});
};
module.exports = {
getAnswerFromWP: function (sourceUrl, contentType) {
//This function will extract needed data from JSON, which we got from getDataFromWPJSON
switch (contentType) {
case constants.contentType.TITLES:
return getTitlesFromWP (sourceUrl);
break;
case constants.contentType.NEWS:
return getLatestNewsFromWP (sourceUrl);
break;
}
},
};

View File

@@ -0,0 +1,107 @@
const constants = require ('../config/constants');
validateEmail = function (email) {
if (email.length > constants.stringConstraints.EMAIL_MAX_LENGTH) return false;
let validEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return validEmailRegex.test (email);
};
validateIntentName = function (intentName) {
if (
intentName.length < constants.stringConstraints.INTENT_NAME_MIN_LENGTH ||
intentName.length > constants.stringConstraints.INTENT_NAME_MAX_LENGTH
)
return false;
let validIntentNameRegex = /^[a-z]*$/i;
return validIntentNameRegex.test (intentName);
};
validateQuestion = function (question) {
if (
question.length < constants.stringConstraints.QUESTION_MIN_LENGTH ||
question.length > constants.stringConstraints.QUESTION_MAX_LENGTH
)
return false;
let validQuestionNameRegex = /^[a-z,.' ]*$/i;
return validQuestionNameRegex.test (question);
};
validateAnswer = function (answer, answerType) {
if (answerType !== constants.answerType.PREDEFINED) return true;
if (
answer.length < constants.stringConstraints.ANSWER_MIN_LENGTH ||
answer.length > constants.stringConstraints.ANSWER_MAX_LENGTH
)
return false;
let validAnswerRegex = /^[a-z,.' ]*$/i;
return validAnswerRegex.test (answer);
};
validateExternalAnswerSource = function (externalAnswerSource, answerType){
// TODO: implement validation logic
return true;
}
validateInvocationName = function (invocationName) {
if (
invocationName.length < constants.stringConstraints.INVOCATION_NAME_MIN_LENGTH ||
invocationName.length > constants.stringConstraints.INVOCATION_NAME_MAX_LENGTH
)
return false;
let validInvocationNameRegex = /^[a-z,.' ]*$/;
return validInvocationNameRegex.test (invocationName);
};
validateInvocationAnswer = function (invocationAnswer) {
if (invocationAnswer.length > constants.stringConstraints.INVOCATION_ANSWER_MAX_LENGTH)
return false;
let validInvocationAnswerRegex = /^[a-z,.' ]*$/i;
return validInvocationAnswerRegex.test (invocationAnswer);
};
validateIntentExplanation = function (explanation) {
if (explanation.length > constants.stringConstraints.INTENT_EXPLANATION_MAX_LENGTH)
return false;
let validExplanationRegex = /^[a-z,.' ]*$/i;
return validExplanationRegex.test (explanation);
};
module.exports = {
validateSkill: function (skill) {
try {
if (
!validateEmail (skill.contactEmail) ||
!validateInvocationName (skill.invocationName) ||
!validateInvocationAnswer (skill.invocationAnswer)
)
return false;
for (let i = 0; i < skill.intents.length; i++) {
if (!validateIntentName (skill.intents[i].intentName)) return false;
if (!validateAnswer (skill.intents[i].answer, skill.intents[i].answerType)) return false;
if (!validateExternalAnswerSource(skill.intents[i].externalAnswerSource, skill.intents[i].answerType)) return false;
for (let j = 0; j < skill.intents.length; j++) {
if (i === j) continue;
if (skill.intents[i].intentName === skill.intents[j].intentName)
return false;
}
for (let j = 0; j < skill.intents[i].questions.length; j++) {
if (!validateQuestion (skill.intents[i].questions[j])) return false;
for (let k = 0; k < skill.intents[i].questions.length; k++) {
if (j === k) continue;
if (skill.intents[i].questions[j] === skill.intents[i].questions[k])
return false;
}
}
}
return true;
} catch (e) {
console.log ('Error : ' + e);
return false;
}
},
};

View File

@@ -3,9 +3,11 @@ const config = require ('../config/config');
var databaseHelper = require ('../helpers/database');
var emailHelper = require ('../helpers/email');
const constants = require ('../config/constants');
let predefinedSourceHelper = require ('../helpers/externalSource');
var handlers = {};
var destinationEmail;
let skillName;
module.exports = {
run: function (req, res) {
@@ -32,9 +34,10 @@ module.exports = {
.then (activeSkill => {
handlers = {};
destinationEmail = activeSkill.contactEmail;
skillName = activeSkill.invocationName;
let listOfPossibleQuestions = '';
activeSkill.intents.forEach(intent => {
activeSkill.intents.forEach (intent => {
if (intent.questions.length > 0 && intent.intentExplanation) {
listOfPossibleQuestions +=
intent.intentExplanation +
@@ -44,8 +47,8 @@ module.exports = {
'ms"/>';
}
});
console.log(listOfPossibleQuestions);
listOfPossibleQuestions +=
'If you dont know what to do, just say help or stop';
//Handler for launch requestconsole.log()
handlers = {
@@ -56,9 +59,10 @@ module.exports = {
'<break time="' +
constants.voiceResponseTimings.PAUSE_AFTER_WELCOME_MESSAGE +
'ms"/>' +
listOfPossibleQuestions
'Would you like to hear list of questions that you can ask me'
)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
this.attributes['LaunchRequestYesNo'] = true;
this.emit (':responseReady');
},
};
@@ -66,15 +70,74 @@ module.exports = {
//Handlers for user defined questions
activeSkill.intents.map (intent => {
handlers[intent.intentName] = function () {
this.response
.speak (intent.answer)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE); //Phrase from listen doesn't work !!!
this.emit (':responseReady');
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
}
let answerPromiseProps = {
resolve: null,
reject: null,
};
let answerPromise = new Promise ((resolve, reject) => {
answerPromiseProps = {
resolve: resolve,
reject: reject,
};
});
switch (intent.answerType) {
case constants.answerType.PREDEFINED:
answerPromiseProps.resolve (intent.answer);
break;
case constants.answerType.EXTERNAL_SOURCE_WP_TITLES:
predefinedSourceHelper
.getAnswerFromWP (
intent.externalAnswerSource,
constants.contentType.TITLES
)
.then (answer => {
answerPromiseProps.resolve (answer);
})
.catch (error => {
answerPromiseProps.reject (error);
});
break;
case constants.answerType.EXTERNAL_SOURCE_WP_NEWS:
predefinedSourceHelper
.getAnswerFromWP (
intent.externalAnswerSource,
constants.contentType.NEWS
)
.then (answer => {
answerPromiseProps.resolve (answer);
})
.catch (error => {
answerPromiseProps.reject (error);
});
break;
}
answerPromise
.then (answer => {
this.response
.speak (answer);
this.emit (':responseReady');
})
.catch (error => {
this.response
.speak (error);
this.emit (':responseReady');
});
};
});
//Handler for sending message
handlers.SendMessageIntent = function () {
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
}
let intent = this.event.request.intent;
console.log ('Dialog state : ' + this.event.request.dialogState);
@@ -138,7 +201,7 @@ module.exports = {
console.log ('Email : ' + intent.slots.Email.value);
console.log ('Message : ' + intent.slots.Message.value);
emailHelper
.sendEmal (
.sendEmail (
intent.slots.Name.value,
intent.slots.Email.value,
intent.slots.Message.value,
@@ -161,16 +224,63 @@ module.exports = {
}
};
//Default handlers for unknown questions and session close
//Built-In intents
handlers.CancelIntent = function () {
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
}
this.response.speak (`Thank you for using ${skillName}`);
this.emit (':responseReady');
};
handlers.HelpIntent = function () {
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
}
this.response
.speak (listOfPossibleQuestions)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
this.emit (':responseReady');
};
handlers.YesIntent = function () {
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
this.emit ('HelpIntent');
} else {
this.response
.speak (constants.voiceResponseStrings.DIDNT_ASK_ANYTHING);
this.emit (':responseReady');
}
};
handlers.NoIntent = function () {
if (this.attributes['LaunchRequestYesNo']) {
this.attributes['LaunchRequestYesNo'] = false;
this.response
.speak ('');
this.emit (':responseReady');
} else {
this.response
.speak (constants.voiceResponseStrings.DIDNT_ASK_ANYTHING);
this.emit (':responseReady');
}
};
//Default handler for unknown question
handlers.Unhandled = function () {
this.response
.speak (constants.voiceResponseStrings.QUESTION_NOT_FOUND)
.listen (constants.voiceResponseStrings.GENERIC_CONTINUE);
.speak (constants.voiceResponseStrings.QUESTION_NOT_FOUND);
this.emit (':responseReady');
};
//Session handlers
handlers.SessionEndedRequest = function () {
//We don't care for now
this.response.speak (`Thank you for using ${skillName}`);
this.emit (':responseReady');
};
})
.catch (e => {

File diff suppressed because it is too large Load Diff

View File

@@ -1,18 +1,20 @@
{
"name": "example",
"name": "tellall",
"version": "1.0.0",
"description": "",
"main": "test.js",
"dependencies": {
"alexa-sdk": "^1.0.25",
"alexa-verifier-middleware": "^1.0.1",
"body-parser": "^1.13.1",
"ejs": "^2.5.7",
"express": "^4.13.0",
"html-to-text": "^4.0.0",
"isomorphic-fetch": "^2.2.1",
"mongodb": "^2.2.33",
"nodejs-text-summarizer": "GotPPay/nodejs-text-summarizer",
"nodemailer": "^4.4.1",
"request": "^2.83.0"
},
"author": "Matt Kruse <github@mattkruse.com> (http://mattkruse.com/)",
"license": "MIT"
"request": "^2.83.0",
"rss-parser": "^3.1.1"
}
}

View File

@@ -1,10 +0,0 @@
<div style="white-space:pre;border:1px solid black;margin:5px;padding:5px;font-family:monospace;">
Schema:
<%=schema%>
Utterances:
<%=utterances%>
</div>

2824
web/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,12 +4,15 @@
"private": true,
"dependencies": {
"keymaster": "^1.6.2",
"node-sass-chokidar": "0.0.3",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-md": "^1.2.8",
"react-popup": "^0.9.1",
"react-scripts": "1.0.17",
"webfontloader": "^1.6.28"
"webfontloader": "^1.6.28",
"node-sass": "^4.7.2",
"npm-run-all": "^4.1.2"
},
"scripts": {
"build-css": "node-sass-chokidar --include-path ./node_modules src/ -o src/",
@@ -17,14 +20,19 @@
"watch-css": "nodemon -e scss -x \"npm run watch-css-mine\"",
"start-js": "react-scripts start",
"start": "npm-run-all -p watch-css start-js",
"react-build" : "react-scripts build",
"react-build": "react-scripts build",
"build": "npm-run-all -p build-css react-build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
},
"devDependencies": {
"node-sass": "^4.7.2",
"babel-jest": "^22.4.3",
"enzyme": "^3.3.0",
"enzyme-adapter-react-16": "^1.1.1",
"enzyme-to-json": "^3.3.3",
"jest": "^20.0.3",
"jest-enzyme": "^6.0.0",
"nodemon": "^1.12.1",
"npm-run-all": "^4.1.2"
"react-test-renderer": "^16.3.0"
}
}

View File

@@ -7,11 +7,17 @@ import LaunchRequest from './components/LaunchRequest';
import Contact from './components/Contact';
import Popup from 'react-popup';
import {getSkill, updateSkill} from './lib/api';
import {isEmailValid} from './lib/helpers';
import {
NEW_INTENT_SELECTED_INDEX,
LAUNCH_REQUEST_SELECTED_INDEX,
CONTACT_SELECTED_INDEX,
RESULT_CODES,
INVOCATION_NAME_MIN_LENGTH,
INTENT_NAME_MIN_LENGTH,
QUESTION_MIN_LENGTH,
ANSWER_MIN_LENGTH,
ANSWER_TYPE,
} from './config/constants';
class App extends Component {
@@ -19,7 +25,7 @@ class App extends Component {
super (props);
this.state = {
_id: '5a232fb86ce046c749739455',
_id: '5abd461329f85e4ec728d945',
skillID: '',
skillName: '',
invocationName: 'Saburly',
@@ -30,6 +36,8 @@ class App extends Component {
intentExplanation: '',
questions: [''],
answer: '',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
},
selectedIndex: NEW_INTENT_SELECTED_INDEX,
contactEmail: '',
@@ -132,7 +140,6 @@ class App extends Component {
this.setState ({
selectedIntent: selectedIntent,
selectedIndex: index,
launchRequest: false,
});
}
@@ -145,6 +152,11 @@ class App extends Component {
}
handleSaveLaunchRequestClick (name, answer) {
if (name.length < INVOCATION_NAME_MIN_LENGTH) {
Popup.alert ('Invocation name should be at least 2 characters long');
return;
}
this.setState ({
waiting: true,
invocationName: name,
@@ -163,17 +175,21 @@ class App extends Component {
}
handleSaveEmailClick (email) {
this.setState ({waiting: true});
this.sendSkill (
this.state.allIntents,
true,
{contactEmail: email, waiting: false},
{waiting: false},
this.state.invocationName,
this.state.invocationAnswer,
email,
false
);
if (isEmailValid (email)) {
this.setState ({waiting: true});
this.sendSkill (
this.state.allIntents,
true,
{contactEmail: email, waiting: false},
{waiting: false},
this.state.invocationName,
this.state.invocationAnswer,
email,
false
);
} else {
Popup.alert ('Please enter valid email');
}
}
handleDeleteIntentClick (selectedIntent) {
@@ -216,14 +232,57 @@ class App extends Component {
}
handleSaveIntentClick (selectedIntent) {
if (selectedIntent.intentName.length < INTENT_NAME_MIN_LENGTH) {
Popup.alert ('Question name should have at least 2 characters');
return;
}
if (
selectedIntent.answerType === ANSWER_TYPE.PREDEFINED &&
selectedIntent.answer.length < ANSWER_MIN_LENGTH
) {
Popup.alert ('Answer should have at least 2 characters');
return;
}
for (let i = 0; i < selectedIntent.questions.length; i++) {
if (selectedIntent.questions[i].length < QUESTION_MIN_LENGTH) {
Popup.alert ('Question variant should have at least 2 characters');
return;
}
}
//Check for same question variants and same question name in other intents
//all intents with the same intentName, or some of the questions are the same
//will be kept in filteredIntents. After filterring, there should be only one
//intent left, the selected one
let selectedIntentQuestionsForSearch = selectedIntent.questions.map(question=>
question.toLowerCase().trim());
let filteredIntents = this.state.allIntents.filter(intent=>{
let result = (selectedIntent.intentName.toLowerCase().trim() === intent.intentName.toLowerCase().trim());
let filteredQuestions = intent.questions.filter(question=>{
return (selectedIntentQuestionsForSearch.indexOf(question.toLowerCase().trim())!==-1);
});
return (result || filteredQuestions.length > 0);
});
if (filteredIntents.length > 1){
Popup.alert('Question name or question variant already exists');
return;
}
let newAllIntentsJSON = JSON.stringify (this.state.allIntents);
let newAllIntents = JSON.parse (newAllIntentsJSON);
let newState = null;
let resolveState = null;
let rejectState = {waiting: false};
if (this.state.selectedIndex === NEW_INTENT_SELECTED_INDEX) {
//new intent
newAllIntents.push (selectedIntent);
newState = {
resolveState = {
allIntents: newAllIntents,
selectedIntent: selectedIntent,
selectedIndex: newAllIntents.length - 1,
@@ -231,7 +290,7 @@ class App extends Component {
};
} else {
newAllIntents[this.state.selectedIndex] = selectedIntent;
newState = {
resolveState = {
allIntents: newAllIntents,
selectedIntent: selectedIntent,
waiting: false,
@@ -241,8 +300,8 @@ class App extends Component {
this.sendSkill (
newAllIntents,
true,
newState,
{waiting: false},
resolveState,
rejectState,
this.state.invocationName,
this.state.invocationAnswer,
this.state.contactEmail,
@@ -255,7 +314,14 @@ class App extends Component {
allIntents: this.state.allIntents,
selectedIndex: NEW_INTENT_SELECTED_INDEX,
launchRequest: false,
selectedIntent: {intentName: '', questions: [''], answer: '', intentExplanation:''},
selectedIntent: {
intentName: '',
questions: [''],
answer: '',
intentExplanation: '',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
},
});
}

View File

@@ -1,8 +0,0 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
});

View File

@@ -0,0 +1,60 @@
import React, {Component} from 'react';
import {Button} from 'react-md';
import AnswerSourceForm from './helper/AnswerSourceForm';
import '../css/components/IntentDetails.css';
class AnswerSource extends Component {
constructor (props) {
super (props);
this.state = {
isModalOpen: false,
answerType: this.props.answerType
};
}
onOpen () {
this.setState ({
isModalOpen: true,
answerType: this.props.answerType
});
}
onClose () {
this.setState ({
isModalOpen: false,
});
}
onSave(){
this.onClose();
this.props.onSaveAnswerType(this.state.answerType);
}
onSourceChange(value, event){
this.setState({answerType:parseInt(value,10)});
}
render () {
let modal;
if (this.state.isModalOpen) {
modal = <AnswerSourceForm
isModalOpen={this.state.isModalOpen}
answerType={this.state.answerType}
onSave={this.onSave.bind(this)}
onClose={this.onClose.bind(this)}
onSourceChange={this.onSourceChange.bind(this)}
/>
}
return (
<div>
<Button flat primary onClick={this.onOpen.bind (this)}>
Answer type
</Button>
{modal}
</div>
);
}
}
export default AnswerSource;

View File

@@ -40,8 +40,10 @@ class Contact extends Component {
}
handleEmailEdit(e){
if (e.length === EMAIL_MAX_LENGTH) return;
this.setState({contactEmail: e});
const isEmailValid = e.length < EMAIL_MAX_LENGTH;
if (isEmailValid){
this.setState({contactEmail: e});
}
}
}

View File

@@ -1,41 +1,54 @@
import React, { Component } from 'react';
import React, {Component} from 'react';
import {Button, SVGIcon, TextField} from 'react-md';
import AnswerSource from './AnswerSource.js';
import '../css/components/IntentDetails.css';
import '../css/Common.css';
import {QUESTION_MAX_LENGTH, ANSWER_MAX_LENGTH, INTENT_NAME_MAX_LENGTH, INTENT_EXPLANATION_MAX_LENGTH} from '../config/constants';
import {
QUESTION_MAX_LENGTH,
ANSWER_MAX_LENGTH,
INTENT_NAME_MAX_LENGTH,
INTENT_EXPLANATION_MAX_LENGTH,
ANSWER_TYPE,
} from '../config/constants';
import AnswerTextBox from './helper/AnswerTextBox.js';
class IntentDetails extends Component {
constructor(props){
super(props);
constructor (props) {
super (props);
this.state= {intent: props.selectedIntent};
this.state = {intent: props.selectedIntent};
this.addQuestion = this.addQuestion.bind(this);
this.deleteQuestion = this.deleteQuestion.bind(this);
this.handleQuestionEdit = this.handleQuestionEdit.bind(this);
this.handleAnswerEdit = this.handleAnswerEdit.bind(this);
this.handleIntentNameEdit = this.handleIntentNameEdit.bind(this);
this.handleIntentExplanationEdit = this.handleIntentExplanationEdit.bind(this);
this.addQuestion = this.addQuestion.bind (this);
this.deleteQuestion = this.deleteQuestion.bind (this);
this.handleQuestionEdit = this.handleQuestionEdit.bind (this);
this.handleIntentNameEdit = this.handleIntentNameEdit.bind (this);
this.handleIntentExplanationEdit = this.handleIntentExplanationEdit.bind (
this
);
}
componentWillReceiveProps(props){
this.setState({intent: props.selectedIntent});
componentWillReceiveProps (props) {
this.setState ({intent: props.selectedIntent});
}
render() {
render () {
return (
<div className="RightPanelBox">
<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
<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/>
value={this.state.intent.intentExplanation}
/>
<br />
<TextField
id="intent name"
lineDirection="center"
@@ -43,91 +56,153 @@ class IntentDetails extends Component {
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
onChange={this.handleIntentNameEdit}
maxLength={INTENT_NAME_MAX_LENGTH}
value={this.state.intent.intentName} />
value={this.state.intent.intentName}
/>
</div>
<h5 className="QuestionTitle">Question variants</h5>
{
this.state.intent.questions.map((question, index)=>{
return (
<div key={index} className="QuestionBox">
<TextField
id="intent question"
lineDirection="center"
placeholder="Question"
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
maxLength={QUESTION_MAX_LENGTH}
rightIcon={<SVGIcon onClick={()=>{this.deleteQuestion(question)}}> <path fill="#000000" d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"/> </SVGIcon>}
onChange={(e)=>{this.handleQuestionEdit(e,index)}}
value={question}/>
</div>
);
})
}
<br></br>
{
<div className="QuestionBox">
<TextField
id="intent answer"
lineDirection="center"
label="Answer"
placeholder="Answer"
maxLength={ANSWER_MAX_LENGTH}
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
onChange={this.handleAnswerEdit}
value={this.state.intent.answer}/>
</div>
}
<br></br>
<br></br>
<Button className="IntentDetailsButton" flat primary onClick={()=>{this.props.onDeleteIntentClick(this.state.intent)}} disabled={this.props.waiting}>Delete question</Button>
<Button className="IntentDetailsButton" flat primary swapTheming onClick={this.addQuestion} disabled={this.props.waiting}>Add variant</Button>
<Button className="IntentDetailsButton" flat primary swapTheming onClick={()=>{this.props.onSaveIntentClick(this.state.intent)}} disabled={this.props.waiting}>Save</Button>
{this.state.intent.questions.map ((question, index) => {
return (
<div key={index} className="QuestionBox">
<TextField
id="intent question"
lineDirection="center"
placeholder="Question"
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
maxLength={QUESTION_MAX_LENGTH}
rightIcon={
<SVGIcon
onClick={() => {
this.deleteQuestion (index);
}}
>
{' '}
<path
fill="#000000"
d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
/>
{' '}
</SVGIcon>
}
onChange={e => {
this.handleQuestionEdit (e, index);
}}
value={question}
/>
</div>
);
})}
<Button
className="AddQuestionVariantButton"
icon
primary
onClick={this.addQuestion}
disabled={this.props.waiting}
>
add
</Button>
<AnswerSource
className="AnswerTypeButton"
onSaveAnswerType={this.handleExternalSourceSave.bind(this)}
answerType={this.state.intent.answerType}
/>
<AnswerTextBox
answerType={this.state.intent.answerType}
externalAnswerSource={this.state.intent.externalAnswerSource}
handleAnswerSourceEdit={this.handleAnswerSourceEdit.bind(this)}
handleAnswerEdit={this.handleAnswerEdit.bind(this)}
answer={this.state.intent.answer}
/>
<Button
className="IntentDetailsButton-firstInRow"
flat
primary
swapTheming
onClick={() => {
this.props.onSaveIntentClick (this.state.intent);
}}
disabled={this.props.waiting}
>
Save
</Button>
<Button
className="IntentDetailsButton"
flat
primary
onClick={() => {
this.props.onDeleteIntentClick (this.state.intent);
}}
disabled={this.props.waiting}
>
Delete
</Button>
</div>
);
}
addQuestion(){
addQuestion () {
let newIntent = this.state.intent;
newIntent.questions.push('');
this.setState({intent: newIntent});
newIntent.questions.push ('');
this.setState ({intent: newIntent});
}
deleteQuestion(question){
let newIntent = this.state.intent;
let removeId = newIntent.questions.indexOf(question);
if (removeId !== -1)
newIntent.questions.splice(removeId,1);
this.setState({intent: newIntent});
deleteQuestion (index) {
if (this.state.intent.questions.length > 1) {
let newIntent = this.state.intent;
if (index >= 0 && index < newIntent.questions.length) newIntent.questions.splice (index, 1);
this.setState ({intent: newIntent});
}
}
handleQuestionEdit(e,index){
if (e.length === QUESTION_MAX_LENGTH) return;
let newIntent = this.state.intent;
newIntent.questions[index] = e;
this.setState({intent: newIntent});
handleQuestionEdit (e, index) {
const isQuestionValid = e.length < QUESTION_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
if (isQuestionValid){
let newIntent = this.state.intent;
newIntent.questions[index] = e;
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});
handleIntentExplanationEdit (e, index) {
const isExplanationValid = e.length < INTENT_EXPLANATION_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
if (isExplanationValid){
let newIntent = this.state.intent;
newIntent.intentExplanation = e;
this.setState ({intent: newIntent});
}
}
handleAnswerEdit(e){
if (e.length === ANSWER_MAX_LENGTH) return;
let newIntent = this.state.intent;
newIntent.answer = e;
this.setState({intent: newIntent});
handleAnswerEdit (e) {
const isAnswerValid = e.length < ANSWER_MAX_LENGTH && /^[a-z,.' ]*$/i.test (e);
if (isAnswerValid){
let newIntent = this.state.intent;
newIntent.answer = e;
this.setState ({intent: newIntent});
}
}
handleIntentNameEdit(e){
if (e.length === INTENT_NAME_MAX_LENGTH) return;
handleAnswerSourceEdit (e) {
const isAnswerSourceValid = e.length < ANSWER_MAX_LENGTH;
if (isAnswerSourceValid){
let newIntent = this.state.intent;
newIntent.externalAnswerSource = e;
this.setState ({intent: newIntent});
}
}
handleIntentNameEdit (e) {
const isIntentNameValid = e.length < INTENT_NAME_MAX_LENGTH && /^[a-z]*$/i.test (e);
if (isIntentNameValid){
let newIntent = this.state.intent;
newIntent.intentName = e;
this.setState ({intent: newIntent});
}
}
handleExternalSourceSave (answerType) {
let newIntent = this.state.intent;
newIntent.intentName = e;
this.setState({intent: newIntent});
newIntent.answerType = answerType;
this.setState ({intent: newIntent});
}
}

View File

@@ -25,7 +25,7 @@ class LaunchRequest extends Component {
<TextField
id="invocation name"
lineDirection="center"
placeholder="Saburly"
placeholder="saburly"
label="Invocation name"
className="md-cell md-cell--bottom InvocationInputBoxes"
maxLength={INVOCATION_NAME_MAX_LENGTH}
@@ -52,13 +52,17 @@ class LaunchRequest extends Component {
}
handleNameEdit(e){
if (e.length === INVOCATION_NAME_MAX_LENGTH) return;
this.setState({invocationName: e});
const isInvocationNameValid = e.length < INVOCATION_NAME_MAX_LENGTH && (/^[a-z,.' ]*$/.test(e));
if (isInvocationNameValid) {
this.setState({invocationName: e});
}
}
handleAnswerEdit(e){
if (e.length === INVOCATION_ANSWER_MAX_LENGTH) return;
this.setState({invocationAnswer: e});
const isInvocationAnswerValid = e.length < INVOCATION_ANSWER_MAX_LENGTH && (/^[a-z,.' ]*$/i.test(e));
if (isInvocationAnswerValid){
this.setState({invocationAnswer: e});
}
}
}

View File

@@ -0,0 +1,61 @@
import React from 'react';
import {Button} from 'react-md';
import {shallow, mount} from 'enzyme';
import AnswerSource from '../AnswerSource';
import {ANSWER_TYPE} from '../../config/constants';
it ('renders without crashing', () => {
shallow (<AnswerSource />);
});
describe ('functional tests', () => {
let wrapper;
beforeEach (() => {
const onSaveAnswerTypeFunction = jest.fn ();
wrapper = mount (
<AnswerSource onSaveAnswerType={onSaveAnswerTypeFunction} />
);
wrapper.setState ({
isModalOpen: false,
answerType: 0,
});
});
it ('snapshot', ()=>{
expect(wrapper).toMatchSnapshot();
});
it ('renders only a button', () => {
expect (wrapper.first ().text ()).toEqual ('Answer type');
expect (wrapper.find ('AnswerSourceForm').exists ()).toEqual (false);
});
it ('answer type button click opens modal form', () => {
expect (wrapper.find ('AnswerSourceFormA').exists ()).toEqual (false);
expect (wrapper.state ().isModalOpen).toEqual (false);
const AnswerTypeButton = wrapper.find ('button').first ();
AnswerTypeButton.simulate ('click');
expect (wrapper.state ().isModalOpen).toEqual (true);
expect (wrapper.find ('AnswerSourceForm').exists ()).toEqual (true);
expect (wrapper.find ('button').length).toBe (3);
expect (wrapper.find ('button').first ().text ()).toEqual ('Answer type');
});
it ('save button changes answerType value in state and closes the form ', () => {
const AnswerTypeButton = wrapper.find ('button').first ();
AnswerTypeButton.simulate ('click');
const saveButton = wrapper.find ('button').at (2);
const optionControl = wrapper.find ('SelectionControlGroup');
expect (saveButton.text ()).toEqual ('Save');
expect (optionControl.exists ()).toEqual (true);
optionControl.simulate ('change', {
target: {value: String (ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS)},
});
saveButton.simulate ('click');
expect (wrapper.state ().answerType).toBe (
ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS
);
expect (wrapper.state ().isModalOpen).toEqual (false);
expect (wrapper.find ('button').length).toBe (1);
});
});

View File

@@ -0,0 +1,318 @@
import React from 'react';
import {shallow, mount} from 'enzyme';
import IntentDetails from '../IntentDetails';
import {
QUESTION_MAX_LENGTH,
ANSWER_MAX_LENGTH,
INTENT_NAME_MAX_LENGTH,
INTENT_EXPLANATION_MAX_LENGTH,
ANSWER_TYPE,
} from '../../config/constants';
it ('renders without crashing', () => {
const dummyIntent = {
questions: ['q1', 'q2'],
};
shallow (<IntentDetails selectedIntent={dummyIntent} />);
});
describe('complete testing', () => {
let wrapper;
let newIntent;
beforeEach(()=>{
newIntent = {
intentName: '',
intentExplanation: '',
questions: [''],
answer: '',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
};
wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
expect(wrapper.state('intent')).toEqual(newIntent);
});
it ('snapshot', () =>{
expect(wrapper).toMatchSnapshot();
});
it ('renders correctly for new intent input when empty intent is sent', () => {
expect(wrapper.find('TextField').length).toBe(4);
expect(wrapper.find('Button').length).toBe(4);
expect(wrapper.find('TextField').at(0).props().id).toEqual('intent explanation');
expect(wrapper.find('TextField').at(1).props().id).toEqual('intent name');
expect(wrapper.find('TextField').at(2).props().id).toEqual('intent question');
expect(wrapper.find('TextField').at(3).props().id).toEqual('intent answer');
expect(wrapper.find('Button').at(0).props().children).toEqual('add');
expect(wrapper.find('Button').at(1).props().children).toEqual('Answer type');
expect(wrapper.find('Button').at(2).props().children).toEqual('Save');
expect(wrapper.find('Button').at(3).props().children).toEqual('Delete');
});
it ('receives correct props for non empty intent with predefined answer', () => {
newIntent = {
intentName: 'Dummy intent',
intentExplanation: 'Dummy explanation',
questions: ['Dummy question'],
answer: 'dummy answer',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
};
wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
expect(wrapper.state('intent')).toEqual(newIntent);
});
it ('receives correct props for non empty intent with external source for answer', () => {
newIntent = {
intentName: 'Dummy intent',
intentExplanation: 'Dummy explanation',
questions: ['Dummy question'],
answer: '',
answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
externalAnswerSource: 'http://sarajevotimes.com',
};
wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
expect(wrapper.state('intent')).toEqual(newIntent);
});
it ('adds text field when add button is clicked', () => {
const addButton = wrapper.find('button').at(0);
addButton.simulate('click');
expect(wrapper.find('TextField').length).toBe(5);
addButton.simulate('click');
expect(wrapper.find('TextField').length).toBe(6);
expect(wrapper.find('TextField').at(0).props().id).toEqual('intent explanation');
expect(wrapper.find('TextField').at(1).props().id).toEqual('intent name');
expect(wrapper.find('TextField').at(2).props().id).toEqual('intent question');
expect(wrapper.find('TextField').at(3).props().id).toEqual('intent question');
expect(wrapper.find('TextField').at(4).props().id).toEqual('intent question');
expect(wrapper.find('TextField').at(5).props().id).toEqual('intent answer');
expect(wrapper.state('intent').questions.length).toBe(3);
});
it ('removes correct text field when delete button on text field is clicked', () => {
const addButton = wrapper.find('button').at(0);
addButton.simulate('click');
addButton.simulate('click');
let firstQuestionTextField = wrapper.find('TextField').at(2);
let secondQuestionTextField = wrapper.find('TextField').at(3);
let thirdQuestionTextField = wrapper.find('TextField').at(4);
firstQuestionTextField.instance().props.onChange('first question');
secondQuestionTextField.instance().props.onChange('second question');
thirdQuestionTextField.instance().props.onChange('third question');
expect(firstQuestionTextField.instance().value).toEqual('first question');
expect(secondQuestionTextField.instance().value).toEqual('second question');
expect(thirdQuestionTextField.instance().value).toEqual('third question');
expect(wrapper.state('intent').questions.length).toBe(3);
const rightIcon = secondQuestionTextField.props().rightIcon;
rightIcon.props.onClick(secondQuestionTextField.props().key);
expect(wrapper.state('intent').questions.length).toBe(2);
expect(secondQuestionTextField.instance().value).toEqual('third question');
expect(thirdQuestionTextField.instance()._field._field).toBeNull();
});
it ('does not remove text field when it is only one left', () => {
let firstQuestionTextField = wrapper.find('TextField').at(2);
firstQuestionTextField.instance().props.onChange('first question');
expect(firstQuestionTextField.props().id).toEqual('intent question');
expect(wrapper.state('intent').questions.length).toBe(1);
const rightIcon = firstQuestionTextField.props().rightIcon;
rightIcon.props.onClick(firstQuestionTextField.props().key);
expect(wrapper.state('intent').questions.length).toBe(1);
expect(firstQuestionTextField.instance().value).toEqual('first question');
});
it ('accepts text without special characters for intent explanation', () => {
let explanationTextField = wrapper.find('TextField').at(0);
let validExplanationText = 'to get latest news, say ';
explanationTextField.instance().props.onChange(validExplanationText);
expect(wrapper.state('intent').intentExplanation).toEqual(validExplanationText);
expect(explanationTextField.instance().value).toEqual(validExplanationText);
});
it ('does not accept text with special characters for intent explanation', () => {
let explanationTextField = wrapper.find('TextField').at(0);
let invalidExplanationText = '554to get latest news, say #$ ';
explanationTextField.instance().props.onChange(invalidExplanationText);
expect(wrapper.state('intent').intentExplanation).toEqual('');
expect(explanationTextField.instance().value).toEqual('');
});
it ('does not accept too long text for intent explanation', () => {
let explanationTextField = wrapper.find('TextField').at(0);
let invalidExplanationText = new Array(INTENT_EXPLANATION_MAX_LENGTH + 10).join('A');
explanationTextField.instance().props.onChange(invalidExplanationText);
expect(wrapper.state('intent').intentExplanation).toEqual('');
expect(explanationTextField.instance().value).toEqual('');
});
it ('accepts text without special characters for intent name', () => {
let intentNameTextField = wrapper.find('TextField').at(1);
let validIntentNameText = 'intentName';
intentNameTextField.instance().props.onChange(validIntentNameText);
expect(wrapper.state('intent').intentName).toEqual(validIntentNameText);
expect(intentNameTextField.instance().value).toEqual(validIntentNameText);
});
it ('does not accept text with speces characters for intent name', () => {
let intentNameTextField = wrapper.find('TextField').at(1);
let invalidIntentNameText = 'intentName with space';
intentNameTextField.instance().props.onChange(invalidIntentNameText);
expect(wrapper.state('intent').intentName).toEqual('');
expect(intentNameTextField.instance().value).toEqual('');
});
it ('does not accept text with special characters for intent name', () => {
let intentNameTextField = wrapper.find('TextField').at(1);
let invalidIntentNameText = 'intentName23!';
intentNameTextField.instance().props.onChange(invalidIntentNameText);
expect(wrapper.state('intent').intentName).toEqual('');
expect(intentNameTextField.instance().value).toEqual('');
});
it ('does not accept too long text for intent name', () => {
let intentNameTextField = wrapper.find('TextField').at(1);
let invalidIntentNameText = new Array(INTENT_NAME_MAX_LENGTH + 10).join('A');
intentNameTextField.instance().props.onChange(invalidIntentNameText);
expect(wrapper.state('intent').intentName).toEqual('');
expect(intentNameTextField.instance().value).toEqual('');
});
it ('accepts text without special characters for question text', () => {
let questionTextField = wrapper.find('TextField').at(2);
let validQuestionText = 'read me latest news'
questionTextField.instance().props.onChange(validQuestionText);
expect(wrapper.state('intent').questions).toEqual([validQuestionText]);
expect(questionTextField.instance().value).toEqual(validQuestionText);
});
it ('does not accept text with special characters for question text', () => {
let questionTextField = wrapper.find('TextField').at(2);
let invalidQuestionText = 'read m3 1at35t news #'
questionTextField.instance().props.onChange(invalidQuestionText);
expect(wrapper.state('intent').questions).toEqual(['']);
expect(questionTextField.instance().value).toEqual('');
});
it ('does not accept too long text for question text', () => {
let questionTextField = wrapper.find('TextField').at(2);
let invalidQuestionText = new Array(QUESTION_MAX_LENGTH + 10).join('A');
questionTextField.instance().props.onChange(invalidQuestionText);
expect(wrapper.state('intent').questions).toEqual(['']);
expect(questionTextField.instance().value).toEqual('');
});
it ('accepts text without special characters for answer text', () => {
let answerTextField = wrapper.find('TextField').at(3);
let validAnswerText = 'this is valid answer.'
answerTextField.instance().props.onChange(validAnswerText);
expect(wrapper.state('intent').answer).toEqual(validAnswerText);
expect(answerTextField.instance().value).toEqual(validAnswerText);
});
it ('does not accept text with special characters for answer text', () => {
let answerTextField = wrapper.find('TextField').at(3);
let invalidAnswerText = 'this is invalid answer.0123'
answerTextField.instance().props.onChange(invalidAnswerText);
expect(wrapper.state('intent').answer).toEqual('');
expect(answerTextField.instance().value).toEqual('');
});
it ('does not accept too long text for answer text', () => {
let answerTextField = wrapper.find('TextField').at(3);
let invalidAnswerText = new Array(ANSWER_MAX_LENGTH + 10).join('A');
answerTextField.instance().props.onChange(invalidAnswerText);
expect(wrapper.state('intent').answer).toEqual('');
expect(answerTextField.instance().value).toEqual('');
});
it ('accepts text for external source as answer', () => {
newIntent = {
intentName: '',
intentExplanation: '',
questions: [''],
answer: '',
answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
externalAnswerSource: '',
};
wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
let answerTextField = wrapper.find('TextField').at(3);
let validAnswerText = 'http://sarajevotimes.com'
answerTextField.instance().props.onChange(validAnswerText);
expect(wrapper.state('intent').externalAnswerSource).toEqual(validAnswerText);
expect(answerTextField.instance().value).toEqual(validAnswerText);
});
it ('does not accept too long text for external source as answer', () => {
newIntent = {
intentName: '',
intentExplanation: '',
questions: [''],
answer: '',
answerType: ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS,
externalAnswerSource: '',
};
wrapper = mount(<IntentDetails selectedIntent={newIntent} />);
let answerTextField = wrapper.find('TextField').at(3);
let invalidAnswerText = new Array(ANSWER_MAX_LENGTH + 10).join('A');
answerTextField.instance().props.onChange(invalidAnswerText);
expect(wrapper.state('intent').answer).toEqual('');
expect(answerTextField.instance().value).toEqual('');
});
it ('calls function with correct data on save button click', () => {
newIntent = {
intentName: 'Dummy intent',
intentExplanation: 'Dummy explanation',
questions: ['Dummy question'],
answer: 'Dummy answer',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
};
const onSaveFunction = jest.fn();
wrapper = mount(<IntentDetails selectedIntent={newIntent} onSaveIntentClick={onSaveFunction} />);
wrapper.find('Button').at(2).simulate('click');
expect(onSaveFunction).toBeCalledWith(newIntent);
});
it ('calls function with correct data on delete button click', () => {
newIntent = {
intentName: 'Dummy intent',
intentExplanation: 'Dummy explanation',
questions: ['Dummy question'],
answer: 'Dummy answer',
answerType: ANSWER_TYPE.PREDEFINED,
externalAnswerSource: '',
};
const onSaveFunction = jest.fn();
wrapper = mount(<IntentDetails selectedIntent={newIntent} onDeleteIntentClick={onSaveFunction} />);
wrapper.find('Button').at(3).simulate('click');
expect(onSaveFunction).toBeCalledWith(newIntent);
});
});

View File

@@ -0,0 +1,93 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`functional tests snapshot 1`] = `
<AnswerSource
onSaveAnswerType={[Function]}
>
<div>
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
>
<withTooltip(Button)
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
>
<Button
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Answer type
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
</div>
</AnswerSource>
`;

View File

@@ -0,0 +1,898 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`complete testing snapshot 1`] = `
<IntentDetails
selectedIntent={
Object {
"answer": "",
"answerType": 0,
"externalAnswerSource": "",
"intentExplanation": "",
"intentName": "",
"questions": Array [
"",
],
}
}
>
<div
className="RightPanelBox"
>
<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
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent explanation"
leftIconStateful={true}
lineDirection="center"
maxLength={70}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="To ask us about our services, say "
rightIconStateful={true}
type="text"
value=""
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={false}
htmlFor="intent explanation"
iconOffset={false}
key="label"
/>
<InputField
className=""
fullWidth={true}
id="intent explanation"
inlineIndicator={false}
key="field"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="To ask us about our services, say "
type="text"
value=""
>
<input
className="md-text-field md-text-field--margin md-full-width md-text"
id="intent explanation"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="To ask us about our services, say "
type="text"
value=""
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={0}
error={false}
key="message"
leftIcon={false}
maxLength={70}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
0 / 70
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
<br />
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent name"
label="Question name"
leftIconStateful={true}
lineDirection="center"
maxLength={30}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
rightIconStateful={true}
type="text"
value=""
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={false}
htmlFor="intent name"
iconOffset={false}
key="label"
label="Question name"
>
<label
className="md-floating-label md-floating-label--inactive md-floating-label--inactive-sized md-text--secondary"
htmlFor="intent name"
>
Question name
</label>
</FloatingLabel>
<InputField
className=""
fullWidth={true}
id="intent name"
inlineIndicator={false}
key="field"
label="Question name"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder={null}
type="text"
value=""
>
<input
className="md-text-field md-text-field--floating-margin md-full-width md-text"
id="intent name"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder={null}
type="text"
value=""
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={0}
error={false}
key="message"
leftIcon={false}
maxLength={30}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
0 / 30
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
<h5
className="QuestionTitle"
>
Question variants
</h5>
<div
className="QuestionBox"
key="0"
>
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent question"
leftIconStateful={true}
lineDirection="center"
maxLength={150}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="Question"
rightIcon={
<SVGIcon
focusable="false"
onClick={[Function]}
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
fill="#000000"
/>
</SVGIcon>
}
rightIconStateful={true}
type="text"
value=""
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={false}
htmlFor="intent question"
iconOffset={false}
key="label"
/>
<div
className="md-text-field-icon-container"
key="icon-divider"
>
<div
className="md-text-field-divider-container md-text-field-divider-container--grow"
key="divider-container"
>
<InputField
className=""
fullWidth={true}
id="intent question"
inlineIndicator={false}
key="field"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Question"
type="text"
value=""
>
<input
className="md-text-field md-text-field--margin md-full-width md-text"
id="intent question"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Question"
type="text"
value=""
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
</div>
<SVGIcon
className="md-text-field-icon md-text-field-icon--positioned"
error={false}
focusable="false"
key="icon-right"
onClick={[Function]}
primary={false}
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<svg
aria-labelledby={null}
className="md-icon md-text-field-icon md-text-field-icon--positioned"
focusable="false"
onClick={[Function]}
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z"
fill="#000000"
/>
</svg>
</SVGIcon>
</div>
<TextFieldMessage
active={false}
currentLength={0}
error={false}
key="message"
leftIcon={false}
maxLength={150}
rightIcon={true}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-text-field-message-container--right-icon-offset md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
0 / 150
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
<withInk(withTooltip(Button))
className="AddQuestionVariantButton"
icon={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
>
<withTooltip(Button)
className="AddQuestionVariantButton"
icon={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
>
<Button
className="AddQuestionVariantButton"
fixedPosition="br"
icon={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
type="button"
>
<button
className="md-btn md-btn--icon md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block AddQuestionVariantButton"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
<FontIcon
iconClassName="material-icons"
inherit={true}
>
<i
className="md-icon material-icons md-text--inherit"
>
add
</i>
</FontIcon>
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
<AnswerSource
answerType={0}
className="AnswerTypeButton"
onSaveAnswerType={[Function]}
>
<div>
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
>
<withTooltip(Button)
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
>
<Button
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Answer type
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
</div>
</AnswerSource>
<AnswerTextBox
answer=""
answerType={0}
externalAnswerSource=""
handleAnswerEdit={[Function]}
handleAnswerSourceEdit={[Function]}
>
<div
className="QuestionBox"
>
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent answer"
label="Answer"
leftIconStateful={true}
lineDirection="center"
maxLength={150}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="Answer"
rightIconStateful={true}
type="text"
value=""
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={false}
htmlFor="intent answer"
iconOffset={false}
key="label"
label="Answer"
>
<label
className="md-floating-label md-floating-label--inactive md-floating-label--inactive-sized md-text--secondary"
htmlFor="intent answer"
>
Answer
</label>
</FloatingLabel>
<InputField
className=""
fullWidth={true}
id="intent answer"
inlineIndicator={false}
key="field"
label="Answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder={null}
type="text"
value=""
>
<input
className="md-text-field md-text-field--floating-margin md-full-width md-text"
id="intent answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder={null}
type="text"
value=""
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={0}
error={false}
key="message"
leftIcon={false}
maxLength={150}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
0 / 150
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
</AnswerTextBox>
<withInk(withTooltip(Button))
className="IntentDetailsButton-firstInRow"
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
swapTheming={true}
>
<withTooltip(Button)
className="IntentDetailsButton-firstInRow"
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
swapTheming={true}
>
<Button
className="IntentDetailsButton-firstInRow"
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
swapTheming={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-background--primary md-background--primary-hover md-inline-block IntentDetailsButton-firstInRow"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Save
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
<withInk(withTooltip(Button))
className="IntentDetailsButton"
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
>
<withTooltip(Button)
className="IntentDetailsButton"
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
>
<Button
className="IntentDetailsButton"
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text--theme-primary md-ink--primary md-inline-block IntentDetailsButton"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Delete
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
</div>
</IntentDetails>
`;

View File

@@ -0,0 +1,57 @@
import React, {Component} from 'react';
import {Button, SelectionControlGroup} from 'react-md';
import Modal from './Modal';
class AnswerSourceForm extends Component{
render(){
return(
<Modal
title="Answer type"
actions={[
<Button
flat
swapTheming
onClick={this.props.onClose.bind (this)}
key="cancel"
>
Cancel
</Button>,
<Button
flat
primary
swapTheming
key="save"
onClick={this.props.onSave.bind(this)}
>
Save
</Button>,
]}
>
<SelectionControlGroup
id="answer-source"
name="answer-source"
type="radio"
label="Import answer from:"
onChange={this.props.onSourceChange.bind(this)}
controls={[
{
label: 'Predefined answer',
value: '0'
},
{
label: 'WordPress titles',
value: '1',
},
{
label: 'WordPress latest news',
value: '2',
},
]}
defaultValue={String(this.props.answerType)}
/>
</Modal>);
}
}
export default AnswerSourceForm;

View File

@@ -0,0 +1,44 @@
import React, {Component} from 'react';
import {TextField} from 'react-md';
import '../../css/components/IntentDetails.css';
import '../../css/Common.css';
import {
ANSWER_MAX_LENGTH,
ANSWER_TYPE,
} from '../../config/constants';
class AnswerTextBox extends Component {
render () {
//theese are defaults for ANSWER_TYPE.PREDEFINED
let labelText="Answer";
let valueText=this.props.answer;
let onChangeValue=this.props.handleAnswerEdit;
switch(this.props.answerType){
case ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES:
case ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS:
labelText="Answer source";
valueText=this.props.externalAnswerSource;
onChangeValue=this.props.handleAnswerSourceEdit
break;
}
return(
<div className="QuestionBox">
<TextField
id="intent answer"
lineDirection="center"
label={labelText}
placeholder={labelText}
maxLength={ANSWER_MAX_LENGTH}
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
onChange={onChangeValue}
value={valueText}
/>
</div>
);
}
}
export default AnswerTextBox;

View File

@@ -0,0 +1,23 @@
import React, { Component } from 'react';
import '../../css/components/Modal.css';
class Modal extends Component {
render() {
const { title, children, actions } = this.props;
return (
<div className="modal">
<div className="modal-content">
<h2 className="header">
{title}
</h2>
{children}
<div className="actions">
{actions}
</div>
</div>
</div>
);
}
}
export default Modal;

View File

@@ -0,0 +1,76 @@
import React from 'react';
import { shallow, mount } from 'enzyme';
import AnswerSourceForm from '../AnswerSourceForm';
import {ANSWER_TYPE} from '../../../config/constants'
it('renders without crashing', () => {
shallow(<AnswerSourceForm onClose={()=>{}} onSave={()=>{}} onSourceChange={()=>{}} />);
});
it ('snapshot',()=>{
const wrapper = mount(<AnswerSourceForm onClose={()=>{}} onSave={()=>{}} onSourceChange={()=>{}} />);
expect(wrapper).toMatchSnapshot();
})
it('calls onClose when cancel is pressed', () => {
const onClose = jest.fn();
const wrapper = mount(<AnswerSourceForm onClose={onClose} onSave={()=>{}} onSourceChange={()=>{}} />);
const cancelButton = wrapper.find('button').at(0);
expect(cancelButton.text()).toEqual('Cancel');
cancelButton.simulate('click');
expect(onClose).toBeCalled();
});
it('calls onSave when save is pressed', () => {
const onSave = jest.fn();
const wrapper = mount(<AnswerSourceForm onClose={()=>{}} onSave={onSave} onSourceChange={()=>{}} />);
const saveButton = wrapper.find('button').at(1);
expect(saveButton.text()).toEqual('Save');
saveButton.simulate('click');
expect(onSave).toBeCalled();
});
it('sets PREDEFINED value when Predefined answer is selected', () => {
let selectedValue = null;
const wrapper = mount(<AnswerSourceForm
onClose={()=>{}}
onSave={()=>{}}
onSourceChange={(value)=>{selectedValue=value}} />);
const optionControl = wrapper.find('SelectionControlGroup');
expect(optionControl.exists()).toEqual(true);
optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.PREDEFINED)}});
expect(selectedValue).toBe(String(ANSWER_TYPE.PREDEFINED));
});
it('sets EXTERNAL_SOURCE_WP_TITLES value when WordPress titles is selected', () => {
let selectedValue = null;
const wrapper = mount(<AnswerSourceForm
onClose={()=>{}}
onSave={()=>{}}
onSourceChange={(value)=>{selectedValue=value}} />);
const optionControl = wrapper.find('SelectionControlGroup');
expect(optionControl.exists()).toEqual(true);
optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES)}});
expect(selectedValue).toBe(String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES));
});
it('sets EXTERNAL_SOURCE_WP_NEWS value when WordPress latest news is selected', () => {
let selectedValue = null;
const wrapper = mount(<AnswerSourceForm
onClose={()=>{}}
onSave={()=>{}}
onSourceChange={(value)=>{selectedValue=value}} />);
const optionControl = wrapper.find('SelectionControlGroup');
expect(optionControl.exists()).toEqual(true);
optionControl.simulate('change',{target:{value:String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS)}});
expect(selectedValue).toBe(String(ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS));
});

View File

@@ -0,0 +1,93 @@
import React from 'react';
import {shallow, mount} from 'enzyme';
import AnswerTextBox from '../AnswerTextBox';
import {ANSWER_TYPE} from '../../../config/constants';
it ('renders without crashing', () => {
shallow (<AnswerTextBox />);
});
describe ('predefined answer selected', () => {
let wrapper;
let textField;
beforeEach (() => {
const onChange = jest.fn();
wrapper = mount (
<AnswerTextBox
answerType={ANSWER_TYPE.PREDEFINED}
answer={'Dummy answer'}
handleAnswerEdit={onChange}
/>
);
textField = wrapper.find ('TextField').first ();
});
it ('snapshot', () =>{
expect(wrapper).toMatchSnapshot();
});
it ('renders text box for normal answer', () => {
expect (textField.props ().label).toEqual ('Answer');
});
it ('receives valid answer text', () => {
expect (textField.props ().value).toEqual ('Dummy answer');
});
});
describe ('WordPress titles selected', () => {
let wrapper;
let textField;
beforeEach (() => {
const onChange = jest.fn();
wrapper = mount (
<AnswerTextBox
answerType={ANSWER_TYPE.EXTERNAL_SOURCE_WP_TITLES}
externalAnswerSource={'Dummy answer'}
handleAnswerSourceEdit={onChange}
/>
);
textField = wrapper.find ('TextField').first ();
});
it ('snapshot', () =>{
expect(wrapper).toMatchSnapshot();
});
it ('renders text box for external source input', () => {
expect (textField.props ().label).toEqual ('Answer source');
});
it ('receives valid answer text', () => {
expect (textField.props ().value).toEqual ('Dummy answer');
});
});
describe ('WordPress latest news selected', () => {
let wrapper;
let textField;
beforeEach (() => {
const onChange = jest.fn();
wrapper = mount (
<AnswerTextBox
answerType={ANSWER_TYPE.EXTERNAL_SOURCE_WP_NEWS}
externalAnswerSource={'Dummy answer'}
handleAnswerSourceEdit={onChange}
/>
);
textField = wrapper.find ('TextField').first ();
});
it ('snapshot', () =>{
expect(wrapper).toMatchSnapshot();
});
it ('renders text box for external source input', () => {
expect (textField.props ().label).toEqual ('Answer source');
});
it ('receives valid answer text', () => {
expect (textField.props ().value).toEqual ('Dummy answer');
});
});

View File

@@ -0,0 +1,27 @@
import React from 'react';
import { shallow, mount } from 'enzyme';
import Modal from '../Modal';
it('renders without crashing', () => {
shallow(<Modal />);
});
let actionButton;
let childButton;
let wrapper;
beforeEach(()=>{
actionButton = <button key={0}>Dummy action button</button>;
childButton = <button key={1}>Child button</button>;
wrapper = mount(<Modal title={'Dummy title'} actions={[actionButton]}>{childButton}</Modal>);
});
it ('snapshot', () => {
expect(wrapper).toMatchSnapshot();
});
it('receives props as expected', () =>{
expect(wrapper.props().title).toEqual('Dummy title');
expect(wrapper.props().actions).toEqual([actionButton]);
expect(wrapper.props().children).toEqual(childButton);
});

View File

@@ -0,0 +1,675 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`snapshot 1`] = `
<AnswerSourceForm
onClose={[Function]}
onSave={[Function]}
onSourceChange={[Function]}
>
<Modal
actions={
Array [
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
swapTheming={true}
>
Cancel
</withInk(withTooltip(Button))>,
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
onClick={[Function]}
primary={true}
swapTheming={true}
>
Save
</withInk(withTooltip(Button))>,
]
}
title="Answer type"
>
<div
className="modal"
>
<div
className="modal-content"
>
<h2
className="header"
>
Answer type
</h2>
<SelectionControlGroup
component="fieldset"
controls={
Array [
Object {
"label": "Predefined answer",
"value": "0",
},
Object {
"label": "WordPress titles",
"value": "1",
},
Object {
"label": "WordPress latest news",
"value": "2",
},
]
}
defaultValue="undefined"
id="answer-source"
label="Import answer from:"
labelClassName="md-subheading-1"
labelComponent="legend"
name="answer-source"
onChange={[Function]}
type="radio"
>
<fieldset
className="md-selection-control-group"
onChange={[Function]}
onKeyDown={[Function]}
>
<legend
className="md-subheading-1"
>
Import answer from:
</legend>
<SelectionControl
checked={false}
checkedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box
</FontIcon>
}
checkedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_checked
</FontIcon>
}
className=""
id="answer-source0"
key="control0"
label="Predefined answer"
name="answer-source"
type="radio"
uncheckedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box_outline_blank
</FontIcon>
}
uncheckedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_unchecked
</FontIcon>
}
value="0"
>
<div
className="md-selection-control-container"
onKeyDown={[Function]}
>
<input
aria-hidden={true}
checked={false}
className="md-selection-control-input"
id="answer-source0"
name="answer-source"
onChange={[Function]}
type="radio"
value="0"
/>
<label
className="md-selection-control-label md-pointer--hover md-text"
htmlFor="answer-source0"
>
<withInk(AccessibleFakeButton)
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
role="radio"
>
<AccessibleFakeButton
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
component="div"
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
listenToEnter={true}
listenToSpace={true}
noFocusOutline={true}
role="radio"
tabIndex={0}
>
<div
aria-checked={false}
aria-pressed={false}
className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
onBlur={[Function]}
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
role="radio"
tabIndex={0}
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
<FontIcon
iconClassName="material-icons"
inherit={true}
key=".1"
>
<i
className="md-icon material-icons md-text--inherit"
>
radio_button_unchecked
</i>
</FontIcon>
</div>
</AccessibleFakeButton>
</withInk(AccessibleFakeButton)>
<span>
Predefined answer
</span>
</label>
</div>
</SelectionControl>
<SelectionControl
checked={false}
checkedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box
</FontIcon>
}
checkedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_checked
</FontIcon>
}
className=""
id="answer-source1"
key="control1"
label="WordPress titles"
name="answer-source"
tabIndex={-1}
type="radio"
uncheckedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box_outline_blank
</FontIcon>
}
uncheckedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_unchecked
</FontIcon>
}
value="1"
>
<div
className="md-selection-control-container"
onKeyDown={[Function]}
>
<input
aria-hidden={true}
checked={false}
className="md-selection-control-input"
id="answer-source1"
name="answer-source"
onChange={[Function]}
type="radio"
value="1"
/>
<label
className="md-selection-control-label md-pointer--hover md-text"
htmlFor="answer-source1"
>
<withInk(AccessibleFakeButton)
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
role="radio"
tabIndex={-1}
>
<AccessibleFakeButton
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
component="div"
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
listenToEnter={true}
listenToSpace={true}
noFocusOutline={true}
role="radio"
tabIndex={-1}
>
<div
aria-checked={false}
aria-pressed={false}
className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
onBlur={[Function]}
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
role="radio"
tabIndex={-1}
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
<FontIcon
iconClassName="material-icons"
inherit={true}
key=".1"
>
<i
className="md-icon material-icons md-text--inherit"
>
radio_button_unchecked
</i>
</FontIcon>
</div>
</AccessibleFakeButton>
</withInk(AccessibleFakeButton)>
<span>
WordPress titles
</span>
</label>
</div>
</SelectionControl>
<SelectionControl
checked={false}
checkedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box
</FontIcon>
}
checkedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_checked
</FontIcon>
}
className=""
id="answer-source2"
key="control2"
label="WordPress latest news"
name="answer-source"
tabIndex={-1}
type="radio"
uncheckedCheckboxIcon={
<FontIcon
iconClassName="material-icons"
>
check_box_outline_blank
</FontIcon>
}
uncheckedRadioIcon={
<FontIcon
iconClassName="material-icons"
>
radio_button_unchecked
</FontIcon>
}
value="2"
>
<div
className="md-selection-control-container"
onKeyDown={[Function]}
>
<input
aria-hidden={true}
checked={false}
className="md-selection-control-input"
id="answer-source2"
name="answer-source"
onChange={[Function]}
type="radio"
value="2"
/>
<label
className="md-selection-control-label md-pointer--hover md-text"
htmlFor="answer-source2"
>
<withInk(AccessibleFakeButton)
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
role="radio"
tabIndex={-1}
>
<AccessibleFakeButton
aria-checked={false}
className="md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
component="div"
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
listenToEnter={true}
listenToSpace={true}
noFocusOutline={true}
role="radio"
tabIndex={-1}
>
<div
aria-checked={false}
aria-pressed={false}
className="md-fake-btn md-pointer--hover md-fake-btn--no-outline md-selection-control-toggle md-btn md-btn--icon md-text--secondary"
onBlur={[Function]}
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
role="radio"
tabIndex={-1}
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
<FontIcon
iconClassName="material-icons"
inherit={true}
key=".1"
>
<i
className="md-icon material-icons md-text--inherit"
>
radio_button_unchecked
</i>
</FontIcon>
</div>
</AccessibleFakeButton>
</withInk(AccessibleFakeButton)>
<span>
WordPress latest news
</span>
</label>
</div>
</SelectionControl>
</fieldset>
</SelectionControlGroup>
<div
className="actions"
>
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
key="cancel"
onClick={[Function]}
swapTheming={true}
>
<withTooltip(Button)
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
swapTheming={true}
>
<Button
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
swapTheming={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-text md-inline-block"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Cancel
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
<withInk(withTooltip(Button))
flat={true}
inkTransitionEnterTimeout={450}
inkTransitionLeaveTimeout={300}
inkTransitionOverlap={150}
key="save"
onClick={[Function]}
primary={true}
swapTheming={true}
>
<withTooltip(Button)
flat={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
swapTheming={true}
>
<Button
fixedPosition="br"
flat={true}
iconBefore={true}
ink={
<InkContainer
className={undefined}
disabledInteractions={undefined}
inkClassName={undefined}
inkStyle={undefined}
pulse={undefined}
style={undefined}
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
waitForInkTransition={undefined}
/>
}
onClick={[Function]}
primary={true}
swapTheming={true}
type="button"
>
<button
className="md-btn md-btn--flat md-btn--text md-pointer--hover md-background--primary md-background--primary-hover md-inline-block"
onClick={[Function]}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
onMouseEnter={[Function]}
onMouseLeave={[Function]}
onMouseUp={[Function]}
onTouchEnd={[Function]}
onTouchStart={[Function]}
type="button"
>
<InkContainer
key="ink-container"
transitionEnterTimeout={450}
transitionLeaveTimeout={300}
transitionOverlap={150}
>
<TransitionGroup
childFactory={[Function]}
className="md-ink-container"
component="div"
>
<div
className="md-ink-container"
/>
</TransitionGroup>
</InkContainer>
Save
</button>
</Button>
</withTooltip(Button)>
</withInk(withTooltip(Button))>
</div>
</div>
</div>
</Modal>
</AnswerSourceForm>
`;

View File

@@ -0,0 +1,376 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`WordPress latest news selected snapshot 1`] = `
<AnswerTextBox
answerType={2}
externalAnswerSource="Dummy answer"
handleAnswerSourceEdit={[Function]}
>
<div
className="QuestionBox"
>
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent answer"
label="Answer source"
leftIconStateful={true}
lineDirection="center"
maxLength={150}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="Answer source"
rightIconStateful={true}
type="text"
value="Dummy answer"
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={true}
htmlFor="intent answer"
iconOffset={false}
key="label"
label="Answer source"
>
<label
className="md-floating-label md-floating-label--floating md-text--secondary"
htmlFor="intent answer"
>
Answer source
</label>
</FloatingLabel>
<InputField
className=""
fullWidth={true}
id="intent answer"
inlineIndicator={false}
key="field"
label="Answer source"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer source"
type="text"
value="Dummy answer"
>
<input
className="md-text-field md-text-field--floating-margin md-full-width md-text"
id="intent answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer source"
type="text"
value="Dummy answer"
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={12}
error={false}
key="message"
leftIcon={false}
maxLength={150}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
12 / 150
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
</AnswerTextBox>
`;
exports[`WordPress titles selected snapshot 1`] = `
<AnswerTextBox
answerType={1}
externalAnswerSource="Dummy answer"
handleAnswerSourceEdit={[Function]}
>
<div
className="QuestionBox"
>
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent answer"
label="Answer source"
leftIconStateful={true}
lineDirection="center"
maxLength={150}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="Answer source"
rightIconStateful={true}
type="text"
value="Dummy answer"
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={true}
htmlFor="intent answer"
iconOffset={false}
key="label"
label="Answer source"
>
<label
className="md-floating-label md-floating-label--floating md-text--secondary"
htmlFor="intent answer"
>
Answer source
</label>
</FloatingLabel>
<InputField
className=""
fullWidth={true}
id="intent answer"
inlineIndicator={false}
key="field"
label="Answer source"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer source"
type="text"
value="Dummy answer"
>
<input
className="md-text-field md-text-field--floating-margin md-full-width md-text"
id="intent answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer source"
type="text"
value="Dummy answer"
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={12}
error={false}
key="message"
leftIcon={false}
maxLength={150}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
12 / 150
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
</AnswerTextBox>
`;
exports[`predefined answer selected snapshot 1`] = `
<AnswerTextBox
answer="Dummy answer"
answerType={0}
handleAnswerEdit={[Function]}
>
<div
className="QuestionBox"
>
<TextField
className="md-cell md-cell--bottom IntentDetailsInputBoxes"
fullWidth={true}
id="intent answer"
label="Answer"
leftIconStateful={true}
lineDirection="center"
maxLength={150}
onChange={[Function]}
passwordIcon={
<FontIcon
iconClassName="material-icons"
>
remove_red_eye
</FontIcon>
}
placeholder="Answer"
rightIconStateful={true}
type="text"
value="Dummy answer"
>
<div
className="md-text-field-container md-full-width md-text-field-container--input md-cell md-cell--bottom IntentDetailsInputBoxes"
onClick={[Function]}
>
<FloatingLabel
active={false}
error={false}
floating={true}
htmlFor="intent answer"
iconOffset={false}
key="label"
label="Answer"
>
<label
className="md-floating-label md-floating-label--floating md-text--secondary"
htmlFor="intent answer"
>
Answer
</label>
</FloatingLabel>
<InputField
className=""
fullWidth={true}
id="intent answer"
inlineIndicator={false}
key="field"
label="Answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer"
type="text"
value="Dummy answer"
>
<input
className="md-text-field md-text-field--floating-margin md-full-width md-text"
id="intent answer"
onBlur={[Function]}
onChange={[Function]}
onFocus={[Function]}
placeholder="Answer"
type="text"
value="Dummy answer"
/>
</InputField>
<TextFieldDivider
active={false}
error={false}
key="text-divider"
lineDirection="center"
>
<Divider
className="md-divider--text-field md-divider--expand-from-center"
>
<hr
className="md-divider md-divider--text-field md-divider--expand-from-center"
/>
</Divider>
</TextFieldDivider>
<TextFieldMessage
active={false}
currentLength={12}
error={false}
key="message"
leftIcon={false}
maxLength={150}
rightIcon={false}
>
<div
className="md-text-field-message-container md-text-field-message-container--count-only md-full-width md-text--disabled"
>
<Message
active={false}
key="message"
/>
<Message
active={false}
className="md-text-field-message--counter"
key="counter"
>
<div
aria-hidden={true}
className="md-text-field-message md-text-field-message--inactive md-text-field-message--counter"
>
12 / 150
</div>
</Message>
</div>
</TextFieldMessage>
</div>
</TextField>
</div>
</AnswerTextBox>
`;

View File

@@ -0,0 +1,42 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`snapshot 1`] = `
<Modal
actions={
Array [
<button>
Dummy action button
</button>,
]
}
title="Dummy title"
>
<div
className="modal"
>
<div
className="modal-content"
>
<h2
className="header"
>
Dummy title
</h2>
<button
key="1"
>
Child button
</button>
<div
className="actions"
>
<button
key="0"
>
Dummy action button
</button>
</div>
</div>
</div>
</Modal>
`;

View File

@@ -1,12 +1,19 @@
export const INTENT_NAME_MAX_LENGTH = 30;
export const INTENT_EXPLANATION_MAX_LENGTH = 70;
export const INTENT_NAME_MAX_LENGTH = 30;
export const INTENT_NAME_MIN_LENGTH = 2;
export const QUESTION_MAX_LENGTH = 150;
export const QUESTION_MIN_LENGTH = 2;
export const ANSWER_MAX_LENGTH = 150;
export const ANSWER_MIN_LENGTH = 2;
export const INTENT_TITLE_MAX_LENGTH = 20;
export const INTENT_TITLE_TOOLTIP_DELAY = 700;
export const INVOCATION_NAME_MAX_LENGTH = 15;
export const INVOCATION_NAME_MAX_LENGTH = 50;
export const INVOCATION_NAME_MIN_LENGTH = 2;
export const INVOCATION_ANSWER_MAX_LENGTH = 100;
export const EMAIL_MAX_LENGTH = 100;
@@ -15,6 +22,12 @@ export const NEW_INTENT_SELECTED_INDEX = -1;
export const LAUNCH_REQUEST_SELECTED_INDEX = -2;
export const CONTACT_SELECTED_INDEX = -3;
export const ANSWER_TYPE = {
PREDEFINED: 0,
EXTERNAL_SOURCE_WP_TITLES : 1,
EXTERNAL_SOURCE_WP_NEWS : 2
}
export const RESULT_CODES = {
OK: 0,
ERROR: -1,

View File

@@ -9,10 +9,25 @@
}
.IntentDetailsInputBoxes{
width: 60%;
width: 90%;
}
.IntentDetailsButton{
float: left;
margin-left: 25px;
float: right;
margin-right: 25px;
}
.IntentDetailsButton-firstInRow{
float: right;
margin-right: 10%;
}
.AddQuestionVariantButton{
float: right;
margin-right: 10%;
}
.AnswerTypeButton{
float: right;
margin-right: 30px;
}

View File

@@ -0,0 +1,32 @@
.modal {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: rgba(37, 37, 37, .7);
z-index: 1;
display: flex;
align-items: center;
justify-content: center;
.modal-content {
color: black;
padding: 20px;
padding-bottom: 0px;
display: flex;
flex-direction: column;
align-items: flex-start;
height: auto;
background-color: #FFF;
min-width: 500px;
.actions {
border-top: 1px solid #bebebe;
width: 100%;
display: flex;
justify-content: flex-end;
min-width: 500px;
margin: 0 -20px;
padding: 10px;
}
}
}

View File

@@ -115,10 +115,10 @@ h5, .md-subheading-1 {
line-height: 24px; }
p, .md-body-1 {
line-height: 1.42857; }
line-height: 20px; }
h6, .md-body-2 {
line-height: 1.42857; }
line-height: 24px; }
caption, .md-caption {
font-size: 12px; }
@@ -1378,7 +1378,7 @@ tbody .md-table-row {
line-height: inherit; }
.md-table-checkbox .md-selection-control-label {
display: block; }
display: flex; }
.md-table-checkbox .md-selection-control-container {
margin-left: 12px;

View File

@@ -17,4 +17,4 @@ export const updateSkill = (skill)=>{
},
body: JSON.stringify(skill),
});
}
}

5
web/src/lib/helpers.js Normal file
View File

@@ -0,0 +1,5 @@
export const isEmailValid = email => {
let validEmailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return validEmailRegex.test (email);
};

5
web/src/setupTests.js Normal file
View File

@@ -0,0 +1,5 @@
import { configure } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import 'jest-enzyme';
configure({ adapter: new Adapter() });