Saving update UI

exm-web/modules/chat/hooks/useChatMessages.tsx

@@ -65,8 +65,6 @@ export const useChatMessages = (): IUseChats => {
 
           newData.list = [chatMessageAdd, ...newData.list]
 
-          console.log(chatMessageAdd)
-
           return { chatMessages: newData }
         })
       } catch (e) {

packages/api-plugin-template.erxes/src/index.ts

@@ -704,3 +704,6 @@ async function startServer() {
 }
 
 startServer();
+
+
+// conflict test

packages/api-utils/src/automations.ts

@@ -350,25 +350,34 @@ export const setProperty = async ({
         if (rule.field.includes(complexFieldKey)) {
           const fieldId = rule.field.replace(`${complexFieldKey}.`, '');
 
+          const complexFieldData = await sendCommonMessage({
+            subdomain,
+            serviceName: 'forms',
+            action: 'fields.generateTypedItem',
+            data: {
+              field: fieldId,
+              value
+            },
+            isRPC: true
+          });
+
           if (
             (relatedItem[complexFieldKey] || []).find(
               obj => obj.field === fieldId
             )
           ) {
             selectorDoc[`${complexFieldKey}.field`] = fieldId;
-            setDoc[`${complexFieldKey}.$.value`] = value;
-            setDoc[`${complexFieldKey}.$.stringValue`] = value;
+
+            const complexFieldDataKeys = Object.keys(complexFieldData).filter(
+              key => key !== 'field'
+            );
+
+            for (const complexFieldDataKey of complexFieldDataKeys) {
+              setDoc[`${complexFieldKey}.$.${complexFieldDataKey}`] =
+                complexFieldData[complexFieldDataKey];
+            }
           } else {
-            pushDoc[complexFieldKey] = await sendCommonMessage({
-              subdomain,
-              serviceName: 'forms',
-              action: 'fields.generateTypedItem',
-              data: {
-                field: fieldId,
-                value
-              },
-              isRPC: true
-            });
+            pushDoc[complexFieldKey] = complexFieldData;
           }
         }
       }

packages/plugin-automations-api/src/utils.ts

@@ -97,31 +97,33 @@ export const executeActions = async (
     }
 
     if (action.type === ACTIONS.IF) {
-      let ifActionId;
+      setTimeout(async () => {
+        let ifActionId;
 
-      const isIn = await isInSegment(
-        subdomain,
-        action.config.contentId,
-        execution.targetId
-      );
-      if (isIn) {
-        ifActionId = action.config.yes;
-      } else {
-        ifActionId = action.config.no;
-      }
+        const isIn = await isInSegment(
+          subdomain,
+          action.config.contentId,
+          execution.targetId
+        );
+        if (isIn) {
+          ifActionId = action.config.yes;
+        } else {
+          ifActionId = action.config.no;
+        }
 
-      execAction.nextActionId = ifActionId;
-      execAction.result = { condition: isIn };
-      execution.actions = [...(execution.actions || []), execAction];
-      execution = await execution.save();
+        execAction.nextActionId = ifActionId;
+        execAction.result = { condition: isIn };
+        execution.actions = [...(execution.actions || []), execAction];
+        execution = await execution.save();
 
-      return executeActions(
-        subdomain,
-        triggerType,
-        execution,
-        actionsMap,
-        ifActionId
-      );
+        return executeActions(
+          subdomain,
+          triggerType,
+          execution,
+          actionsMap,
+          ifActionId
+        );
+      }, 10000);
     }
 
     if (action.type === ACTIONS.SET_PROPERTY) {
@@ -319,6 +321,61 @@ export const calculateExecution = async ({
   });
 };
 
+const isWaitingDateConfig = dateConfig => {
+  if (dateConfig) {
+    const NOW = new Date();
+
+    if (dateConfig.type === 'range') {
+      const { startDate, endDate } = dateConfig;
+      if (startDate < NOW && endDate > NOW) {
+        return true;
+      }
+    }
+
+    if (dateConfig?.type === 'cycle') {
+      const { frequencyType } = dateConfig;
+
+      const generateDate = (inputDate, isMonth?) => {
+        const date = new Date(inputDate);
+
+        return new Date(
+          NOW.getFullYear(),
+          isMonth ? NOW.getMonth() : date.getMonth(),
+          date.getDay()
+        );
+      };
+
+      if (frequencyType === 'everyYear') {
+        const startDate = generateDate(dateConfig.startDate);
+        if (dateConfig?.endDate) {
+          const endDate = generateDate(dateConfig.endDate);
+
+          if (NOW < startDate && NOW > endDate) {
+            return true;
+          }
+        }
+        if (NOW < startDate) {
+          return true;
+        }
+      }
+      if (frequencyType === 'everyMonth') {
+        const startDate = generateDate(dateConfig.startDate, true);
+        if (dateConfig?.endDate) {
+          const endDate = generateDate(dateConfig.endDate, true);
+
+          if (NOW < startDate && NOW > endDate) {
+            return true;
+          }
+        }
+        if (NOW < startDate) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+};
+
 /*
  * target is one of the TriggerType objects
  */
@@ -349,6 +406,10 @@ export const receiveTrigger = async ({
           continue;
         }
 
+        if (isWaitingDateConfig(trigger?.config?.dateConfig)) {
+          continue;
+        }
+
         const execution = await calculateExecution({
           models,
           subdomain,

packages/plugin-automations-ui/src/components/forms/actions/constants.ts

@@ -54,6 +54,10 @@ export const PROPERTY_OPERATOR = {
     {
       value: 'divide',
       label: 'Divide'
+    },
+    {
+      value: 'set',
+      label: 'Set'
     }
   ],
   Default: [

packages/plugin-automations-ui/src/components/forms/actions/subForms/SetProperty.tsx

@@ -90,7 +90,7 @@ class SetProperty extends React.Component<Props, State> {
   };
 
   getFieldType = (chosenField: FieldsCombinedByType) => {
-    if (chosenField.selectOptions) {
+    if (chosenField.selectOptions && chosenField.selectOptions?.length > 0) {
       return 'select';
     }
 

packages/plugin-automations-ui/src/components/forms/triggers/TriggerDetailForm.tsx

@@ -1,11 +1,14 @@
 import React from 'react';
 import { ITrigger } from '../../../types';
 import SegmentsForm from '@erxes/ui-segments/src/containers/form/SegmentsForm';
-import { Description, TriggerTabs } from '../../../styles';
+import { Description, FlexContainer, TriggerTabs } from '../../../styles';
 import { ScrolledContent } from '@erxes/ui-automations/src/styles';
-import { __ } from 'coreui/utils';
+import { __ } from '@erxes/ui/src';
 import { Tabs, TabTitle } from '@erxes/ui/src/components/tabs';
 import ReEnrollmentContainer from '../../../containers/forms/triggers/ReEnrollment';
+import { Button, ModalTrigger } from '@erxes/ui/src';
+import DateSettings from './subForms/Date';
+import { ModalFooter } from '@erxes/ui/src/styles/main';
 
 type Props = {
   closeModal: () => void;
@@ -64,15 +67,60 @@ class TriggerDetailForm extends React.Component<
     );
   }
 
+  renderSettings() {
+    const { activeTrigger, addConfig } = this.props;
+    const config = activeTrigger.config || {};
+
+    const onChange = config => {
+      activeTrigger.config = config;
+      addConfig(activeTrigger, activeTrigger.id, config);
+    };
+
+    const onClear = () => {
+      const { contentId, reEnrollment, reEnrollmentRules } =
+        activeTrigger?.config || {};
+
+      activeTrigger.config = { contentId, reEnrollment, reEnrollmentRules };
+      addConfig(activeTrigger, activeTrigger.id);
+    };
+
+    const trigger = <Button icon="settings" btnStyle="link" />;
+
+    const content = () => {
+      return (
+        <>
+          <DateSettings onChange={onChange} config={config} />
+          <ModalFooter>
+            <Button btnStyle="simple" onClick={onClear}>
+              {__('Clear')}
+            </Button>
+          </ModalFooter>
+        </>
+      );
+    };
+
+    return (
+      <ModalTrigger
+        title="Trigger Settings"
+        trigger={trigger}
+        content={content}
+        hideHeader={true}
+      />
+    );
+  }
+
   render() {
     const { currentTab, activeTrigger } = this.state;
 
     return (
       <>
         <Description>
-          <h4>
-            {activeTrigger.label} {__('based')}
-          </h4>
+          <FlexContainer>
+            <h4>
+              {activeTrigger.label} {__('based')}
+            </h4>
+            {this.renderSettings()}
+          </FlexContainer>
           <p>{activeTrigger.description}</p>
         </Description>
         <TriggerTabs>