Support contains conditions

LiveHelperChat · Oct 4, 2021 · 3ab5d99 · 3ab5d99
1 parent 73a7c30
commit 3ab5d99
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 8 deletions.
diff --git a/lhc_web/design/defaulttheme/js/js_static/a07851a85849880a5fd11dd78f238b28.js b/lhc_web/design/defaulttheme/js/js_static/a07851a85849880a5fd11dd78f238b28.js
diff --git a/lhc_web/design/defaulttheme/js/js_static/a07851a85849880a5fd11dd78f238b28.js.map b/lhc_web/design/defaulttheme/js/js_static/a07851a85849880a5fd11dd78f238b28.js.map
diff --git a/lhc_web/design/defaulttheme/js/react/build/all.js b/lhc_web/design/defaulttheme/js/react/build/all.js
diff --git a/.../design/defaulttheme/js/react/src/components/builder/condition/NodeActionConditionItem.js b/.../design/defaulttheme/js/react/src/components/builder/condition/NodeActionConditionItem.js
@@ -52,6 +52,7 @@ class NodeActionConditionItem extends Component {
                             <option value="neq">!=</option>
                             <option value="like">Text like</option>
                             <option value="notlike">Text not like</option>
+                            <option value="contains">Contains</option>
                         </select>
                     </div>
                 </div>

diff --git a/lhc_web/design/defaulttheme/js/widgetv2/702.616c86e5f653d8c9e05f.js b/lhc_web/design/defaulttheme/js/widgetv2/702.616c86e5f653d8c9e05f.js
diff --git a/lhc_web/design/defaulttheme/js/widgetv2/702.616c86e5f653d8c9e05f.js.map b/lhc_web/design/defaulttheme/js/widgetv2/702.616c86e5f653d8c9e05f.js.map
diff --git a/lhc_web/design/defaulttheme/tpl/lhcannedmsg/form_replace.tpl.php b/lhc_web/design/defaulttheme/tpl/lhcannedmsg/form_replace.tpl.php
@@ -77,6 +77,7 @@
                                 <option value="neq">!=</option>
                                 <option value="like">like</option>
                                 <option value="notlike">not like</option>
+                                <option value="contains">contains</option>
                             </select>
                         </div>
                         <div class="col-4">

diff --git a/lhc_web/design/defaulttheme/tpl/lhgenericbot/form_rest_api.tpl.php b/lhc_web/design/defaulttheme/tpl/lhgenericbot/form_rest_api.tpl.php
@@ -197,6 +197,7 @@
                                 <option value="neq">!=</option>
                                 <option value="like"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('genericbot/restapi','Text like')?></option>
                                 <option value="notlike"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('genericbot/restapi','Text not like')?></option>
+                                <option value="contains"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('genericbot/restapi','Contains')?></option>
                             </select>
                         </div>
                     </div>

diff --git a/lhc_web/design/defaulttheme/tpl/lhwebhooks/form.tpl.php b/lhc_web/design/defaulttheme/tpl/lhwebhooks/form.tpl.php
@@ -80,6 +80,7 @@
                                 <option value="notempty"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/webhooks','Not empty');?></option>
                                 <option value="like"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/webhooks','Text like');?></option>
                                 <option value="notlike"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/webhooks','Text not like');?></option>
+                                <option value="contains"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/webhooks','Contains');?></option>
                             </select>
                         </div>
                     </div>

diff --git a/lhc_web/lib/core/lhchat/lhchatwebhookcontinous.php b/lhc_web/lib/core/lhchat/lhchatwebhookcontinous.php
@@ -178,6 +178,8 @@ public static function processEvent() {
                                         'words_typo' => 0,
                                     ))['found'] == false) {
                                     $conditionItemValid = true;
+                                } else if ($conditionsCurrent['condition'] == 'contains' && strrpos($conditionAttr, $valueAttr) !== false) {
+                                    $conditionItemValid = true;
                                 }
                             }
 

diff --git a/lhc_web/lib/core/lhchat/lhchatwebhookhttp.php b/lhc_web/lib/core/lhchat/lhchatwebhookhttp.php
@@ -148,7 +148,7 @@ public function isValidConditions($continuousHook, $chat) {
                         $conditionAttr = str_replace(array_keys($replaceArray), array_values($replaceArray),$conditionAttr);
                         $valueAttr = str_replace(array_keys($replaceArray), array_values($replaceArray),$valueAttr);
 
-                        if (!in_array($conditionsCurrent['condition'],['like','notlike'])) {
+                        if (!in_array($conditionsCurrent['condition'],['like','notlike','contains'])) {
                             // Remove spaces
                             $conditionAttr = preg_replace('/\s+/', '', $conditionAttr);
                             $valueAttr = preg_replace('/\s+/', '', $valueAttr);
@@ -202,6 +202,8 @@ public function isValidConditions($continuousHook, $chat) {
                                 'words_typo' => 0,
                             ))['found'] == false) {
                             $conditionItemValid = true;
+                        } else if ($conditionsCurrent['condition'] == 'contains' && strrpos($conditionAttr, $valueAttr) !== false) {
+                            $conditionItemValid = true;
                         }
                     }
 

diff --git a/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionconditions.php b/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionconditions.php
@@ -124,6 +124,9 @@ public static function process($chat, $action, $trigger, $params)
                         ))['found'] == true) {
                         $conditionsMet = false;
                         break;
+                    } else if ($condition['content']['comp'] == 'contains' && strrpos($attr, $valAttr) === false) {
+                        $conditionsMet = false;
+                        break;
                     }
                 }
             }

diff --git a/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php b/lhc_web/lib/core/lhgenericbot/actionTypes/lhgenericbotactionrestapi.php
@@ -374,6 +374,8 @@ public static function makeRequest($host, $methodSettings, $paramsCustomer)
                         $validCondition = false;
                     } else if ($condition['success_condition'] == 'notlike' && erLhcoreClassGenericBotWorkflow::checkPresence(explode(',',$condition['value']),$condition['key'],0) == true) {
                         $validCondition = false;
+                    } else if ($condition['success_condition'] == 'contains' && strrpos($condition['value'],$condition['key']) === false) {
+                        $validCondition = false;
                     }
                 }
 
@@ -649,6 +651,8 @@ public static function makeRequest($host, $methodSettings, $paramsCustomer)
                             continue;
                         } else if ($outputCombination['success_condition'] == 'notlike' && erLhcoreClassGenericBotWorkflow::checkPresence(explode(',',$outputCombination['success_compare_value']),$responseValueCompare,0) == true) {
                             continue;
+                        } else if ($outputCombination['success_condition'] == 'contains' && strrpos($responseValueCompare, $outputCombination['success_compare_value']) === false) {
+                            continue;
                         }
                     }
 

diff --git a/lhc_web/lib/models/lhchat/erlhcoreclassmodelcannedmsgreplace.php b/lhc_web/lib/models/lhchat/erlhcoreclassmodelcannedmsgreplace.php
@@ -128,7 +128,7 @@ public function getValueReplace($params)
                         $conditionAttr = str_replace(array_keys($replaceArray), array_values($replaceArray), $conditionAttr);
                         $valueAttr = str_replace(array_keys($replaceArray), array_values($replaceArray), $valueAttr);
 
-                        if (!in_array($conditionsCurrent['comparator'],['like','notlike'])) {
+                        if (!in_array($conditionsCurrent['comparator'],['like','notlike','contains'])) {
                             // Remove spaces
                             $conditionAttr = preg_replace('/\s+/', '', $conditionAttr);
                             $valueAttr = preg_replace('/\s+/', '', $valueAttr);
@@ -172,6 +172,8 @@ public function getValueReplace($params)
                                 'words_typo' => 0,
                             ))['found'] == false) {
                             $conditionItemValid = true;
+                        } else if ($conditionsCurrent['comparator'] == 'contains' && strrpos($conditionAttr,$valueAttr) !== false) {
+                            $conditionItemValid = true;
                         }
 
                         if ($conditionItemValid == true) {