Update: 1.3.0-floweditor-1.18.4

CHANGELOG.md

@@ -4,24 +4,47 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.18.4](https://github.com/nyaruka/floweditor/compare/v1.18.3...v1.18.4)
+
+> 29 November 2022
+
+- Fix StartSessionForm bug for definitions without exclusions [`#1091`](https://github.com/nyaruka/floweditor/pull/1091)
+
+#### [v1.18.3](https://github.com/nyaruka/floweditor/compare/v1.18.2...v1.18.3)
+
+> 23 November 2022
+
+- Disallow groups on start session action [`#1089`](https://github.com/nyaruka/floweditor/pull/1089)
+- excluding all date, time, and numeric rules from translations [`#1085`](https://github.com/nyaruka/floweditor/pull/1085)
+- dial router form - new advanced tab with dial limit and call limit values [`#1080`](https://github.com/nyaruka/floweditor/pull/1080)
+- start somebody else in a flow form - add skip contacts in a flow checkbox [`#1083`](https://github.com/nyaruka/floweditor/pull/1083)
+- wait for response form - numeric rule - rule translations tab - has number between and empty translations bugfixes [`#1082`](https://github.com/nyaruka/floweditor/pull/1082)
+- switched from simple boolean to JSON object containing boolean [`035fc50`](https://github.com/nyaruka/floweditor/commit/035fc500e6e36fefddcf740437d2c1c0da6b5d93)
+- updates based on review to match the original spec! [`9df9183`](https://github.com/nyaruka/floweditor/commit/9df9183c718f780e92e503e834419b4da7fe4926)
+- switch to flexbox row layout in progress [`0ea169d`](https://github.com/nyaruka/floweditor/commit/0ea169d294d7080e49a017ba5371a2096b09c759)
+
 #### [v1.18.2](https://github.com/nyaruka/floweditor/compare/v1.18.1...v1.18.2)
 
 > 31 October 2022
 
 - Allow wait for digits routers to use `has_text` and `has_pattern` rules [`#1084`](https://github.com/nyaruka/floweditor/pull/1084)
-- Allow wait for digits routers to use has_text and has_pattern rules [`714bc0f`](https://github.com/nyaruka/floweditor/commit/714bc0fa6b474a5ab2b004dd7c188c266fa908cc)
+- added unit tests for dial_limit and call_limit [`055a2dc`](https://github.com/nyaruka/floweditor/commit/055a2dc8ebf58bfd5d45cd5c55ab525ec90330a0)
+- updates based on review, testing in progress [`9f364fc`](https://github.com/nyaruka/floweditor/commit/9f364fcc8e8f836ff4a0e277d175a1c30737a656)
+- updated snapshot to include skipContactsInFlow and temba-checkbox [`4787e84`](https://github.com/nyaruka/floweditor/commit/4787e8451a33a0f84c341dc951931f9e14d53fc6)
 
 #### [v1.18.1](https://github.com/nyaruka/floweditor/compare/v1.18.0...v1.18.1)
 
 > 18 October 2022
 
 - Fix attachment selector hiding on its own [`#1078`](https://github.com/nyaruka/floweditor/pull/1078)
+- adding dial and call limit to advanced tab in progress [`dff30e4`](https://github.com/nyaruka/floweditor/commit/dff30e473b56d73c6f4da32f17c28169c872485b)
 
 #### [v1.18.0](https://github.com/nyaruka/floweditor/compare/v1.17.5...v1.18.0)
 
 > 13 October 2022
 
 - Add hooks to allow exeternal resets [`#1079`](https://github.com/nyaruka/floweditor/pull/1079)
+- initial commit with advanced tab [`4fddb11`](https://github.com/nyaruka/floweditor/commit/4fddb11d2021a6639d436d6b7ceac4c792d68142)
 - Update uuid snapshot [`702156c`](https://github.com/nyaruka/floweditor/commit/702156c3ddfa9f810fcb944dfef8100594804bda)
 - Fix attachment selector hiding on its own [`0343855`](https://github.com/nyaruka/floweditor/commit/0343855977a1c43d6d2101da5cff085d55bf874c)
 

WENI-CHANGELOG.md

@@ -1,3 +1,7 @@
+1.3.0-floweditor-1.18.4
+----------
+* Update floweditor with version 1.18.4
+
 1.2.1-floweditor-1.18.2
 ----------
 * Update floweditor with version 1.18.2

package.json

@@ -2,7 +2,7 @@
   "name": "@weni/flow-editor-rp",
   "license": "AGPL-3.0",
   "repository": "git://github.com/ilhasoft/floweditor.git",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Standalone flow editing tool designed for use within the RapidPro suite of messaging tools but can be adopted for use outside of that ecosystem.",
   "browser": "umd/flow-editor.min.js",
   "unpkg": "umd/flow-editor.min.js",

src/components/__snapshots__/index.test.ts.snap

@@ -7,6 +7,7 @@ Array [
     "attachments": "/assets/attachments.json",
     "channels": "/assets/channels.json",
     "classifiers": "/assets/classifiers.json",
+    "contacts": "/assets/recipients.json",
     "editor": "/flow/editor",
     "environment": "/assets/environment.json",
     "fields": "/assets/fields.json",

src/components/flow/actions/startsession/StartSessionForm.module.scss

@@ -6,4 +6,8 @@
   margin-left: 0.25em;
   margin-top: 0.5em;
   margin-bottom: 1em;
+}
+
+.checkbox {
+  margin-top: 20px;
 }

src/components/flow/actions/startsession/StartSessionForm.tsx

@@ -1,5 +1,5 @@
 import { react as bindCallbacks } from 'auto-bind';
-import Dialog, { ButtonSet } from 'components/dialog/Dialog';
+import Dialog, { ButtonSet, Tab } from 'components/dialog/Dialog';
 import { ActionFormProps } from 'components/flow/props';
 import AssetSelector from 'components/form/assetselector/AssetSelector';
 import TypeList from 'components/nodeeditor/TypeList';
@@ -11,7 +11,8 @@ import {
   mergeForm,
   StringEntry,
   SelectOptionEntry,
-  FormEntry
+  FormEntry,
+  ExclusionsCheckboxEntry
 } from 'store/nodeEditor';
 import { shouldRequireIf, validate } from 'store/validators';
 import { renderIf } from 'utils';
@@ -21,6 +22,7 @@ import TextInputElement from 'components/form/textinput/TextInputElement';
 import i18n from 'config/i18n';
 import { renderIssues } from '../helpers';
 import styles from './StartSessionForm.module.scss';
+import CheckboxElement from 'components/form/checkbox/CheckboxElement';
 
 export const START_TYPE_ASSETS: SelectOption = {
   name: i18n.t('forms.start_type_manual', 'Select recipients manually'),
@@ -42,6 +44,7 @@ export interface StartSessionFormState extends FormState {
   flow: FormEntry;
   startType: SelectOptionEntry;
   contactQuery: StringEntry;
+  exclusions: ExclusionsCheckboxEntry;
 }
 
 export class StartSessionForm extends React.Component<ActionFormProps, StartSessionFormState> {
@@ -75,8 +78,19 @@ export class StartSessionForm extends React.Component<ActionFormProps, StartSess
     return this.handleUpdate({ contactQuery });
   }
 
+  public handleExclusions(skipContactsInAFlow: boolean): boolean {
+    let exclusions = { in_a_flow: skipContactsInAFlow };
+    return this.handleUpdate({ exclusions });
+  }
+
   private handleUpdate(
-    keys: { flow?: Asset; recipients?: Asset[]; startType?: SelectOption; contactQuery?: string },
+    keys: {
+      flow?: Asset;
+      recipients?: Asset[];
+      startType?: SelectOption;
+      contactQuery?: string;
+      exclusions?: ExclusionsCheckboxEntry;
+    },
     submitting = false
   ): boolean {
     const updates: Partial<StartSessionFormState> = {};
@@ -112,6 +126,10 @@ export class StartSessionForm extends React.Component<ActionFormProps, StartSess
       ]);
     }
 
+    if (keys.hasOwnProperty('exclusions')) {
+      updates.exclusions = keys.exclusions;
+    }
+
     const updated = mergeForm(this.state, updates);
     this.setState(updated);
     return updated.valid;
@@ -149,8 +167,33 @@ export class StartSessionForm extends React.Component<ActionFormProps, StartSess
   public render(): JSX.Element {
     const typeConfig = this.props.typeConfig;
 
+    const advanced: Tab = {
+      name: i18n.t('forms.advanced', 'Advanced'),
+      body: (
+        <CheckboxElement
+          name={i18n.t('forms.skip_contacts_in_a_flow', 'Skip contacts currently in a flow')}
+          title={i18n.t('forms.skip_contacts_in_a_flow', 'Skip contacts currently in a flow')}
+          labelClassName={styles.checkbox}
+          checked={this.state.exclusions.in_a_flow}
+          description={i18n.t(
+            'forms.skip_contacts_in_a_flow_description',
+            'Avoid interrupting a contact who is already in a flow.'
+          )}
+          onChange={this.handleExclusions}
+        />
+      ),
+      checked: this.state.exclusions.in_a_flow
+    };
+
+    const tabs = [advanced];
+
     return (
-      <Dialog title={typeConfig.name} headerClass={typeConfig.type} buttons={this.getButtons()}>
+      <Dialog
+        title={typeConfig.name}
+        headerClass={typeConfig.type}
+        buttons={this.getButtons()}
+        tabs={tabs}
+      >
         <TypeList __className="" initialType={typeConfig} onChange={this.props.onTypeChange} />
         <div>
           <SelectElement
@@ -171,7 +214,7 @@ export class StartSessionForm extends React.Component<ActionFormProps, StartSess
                   'forms.select_who_to_start',
                   'Select who should be started in the flow'
                 )}
-                assets={this.props.assetStore.recipients}
+                assets={this.props.assetStore.contacts}
                 entry={this.state.recipients}
                 searchable={true}
                 multi={true}

src/components/flow/actions/startsession/__snapshots__/StartSessionForm.test.tsx.snap

@@ -6,6 +6,16 @@ exports[`StartSessionForm render should render 1`] = `
     <div
       class="dialog"
     >
+      <div
+        class="tabs"
+      >
+        <div
+          class="tab "
+        >
+          Advanced
+
+        </div>
+      </div>
       <div
         class="header start_session"
       >
@@ -87,7 +97,6 @@ exports[`StartSessionForm render should render 1`] = `
                   name="Recipients"
                   namekey="name"
                   placeholder="Select who should be started in the flow"
-                  queryparam="search"
                   searchable="true"
                   valuekey="uuid"
                   values="[{\\"id\\":\\"2dc85899-0577-4f1b-a620-f12094e34b5e\\",\\"name\\":\\"Cat Fanciers\\",\\"type\\":\\"group\\"},{\\"id\\":\\"42ebf1d0-a43e-4ba6-9577-c863b20c88c4\\",\\"name\\":\\"Norbert Kwizera\\",\\"type\\":\\"contact\\",\\"missing\\":false},{\\"id\\":\\"70ac6ea6-803a-4c33-81c7-dc26803c313f\\",\\"name\\":\\"Rowan Seymour\\",\\"type\\":\\"contact\\",\\"missing\\":false}]"
@@ -152,6 +161,9 @@ Object {
   "contactQuery": Object {
     "value": "",
   },
+  "exclusions": Object {
+    "in_a_flow": false,
+  },
   "flow": Object {
     "value": null,
   },
@@ -183,6 +195,22 @@ exports[`StartSessionForm render should render an empty form with no action 2`]
     }
   }
   headerClass="start_session"
+  tabs={
+    Array [
+      Object {
+        "body": <CheckboxElement
+          checked={false}
+          description="Avoid interrupting a contact who is already in a flow."
+          labelClassName="checkbox"
+          name="Skip contacts currently in a flow"
+          onChange={[Function]}
+          title="Skip contacts currently in a flow"
+        />,
+        "checked": false,
+        "name": "Advanced",
+      },
+    ]
+  }
   title="Start Somebody Else"
 >
   <TypeList
@@ -244,12 +272,6 @@ exports[`StartSessionForm render should render an empty form with no action 2`]
       data-testid="recipients"
     >
       <AssetSelector
-        assets={
-          Object {
-            "items": Object {},
-            "type": "contact",
-          }
-        }
         entry={
           Object {
             "value": Array [],
@@ -291,6 +313,16 @@ exports[`StartSessionForm render should render contact query 1`] = `
     <div
       class="dialog"
     >
+      <div
+        class="tabs"
+      >
+        <div
+          class="tab "
+        >
+          Advanced
+
+        </div>
+      </div>
       <div
         class="header start_session"
       >
@@ -434,6 +466,9 @@ Array [
     "contact_query": "my_field > 6",
     "contacts": Array [],
     "create_contact": false,
+    "exclusions": Object {
+      "in_a_flow": false,
+    },
     "flow": Object {
       "name": "Flow to Start",
       "uuid": "flow_uuid",
@@ -452,6 +487,16 @@ exports[`StartSessionForm render should render create new contacts 1`] = `
     <div
       class="dialog"
     >
+      <div
+        class="tabs"
+      >
+        <div
+          class="tab "
+        >
+          Advanced
+
+        </div>
+      </div>
       <div
         class="header start_session"
       >
@@ -581,6 +626,22 @@ exports[`StartSessionForm render should render self, children with base props 1`
     }
   }
   headerClass="start_session"
+  tabs={
+    Array [
+      Object {
+        "body": <CheckboxElement
+          checked={false}
+          description="Avoid interrupting a contact who is already in a flow."
+          labelClassName="checkbox"
+          name="Skip contacts currently in a flow"
+          onChange={[Function]}
+          title="Skip contacts currently in a flow"
+        />,
+        "checked": false,
+        "name": "Advanced",
+      },
+    ]
+  }
   title="Start Somebody Else"
 >
   <TypeList
@@ -642,12 +703,6 @@ exports[`StartSessionForm render should render self, children with base props 1`
       data-testid="recipients"
     >
       <AssetSelector
-        assets={
-          Object {
-            "items": Object {},
-            "type": "contact",
-          }
-        }
         entry={
           Object {
             "value": Array [
@@ -710,6 +765,16 @@ exports[`StartSessionForm render should warn about invalid fields in contact que
     <div
       class="dialog"
     >
+      <div
+        class="tabs"
+      >
+        <div
+          class="tab "
+        >
+          Advanced
+
+        </div>
+      </div>
       <div
         class="header start_session"
       >
@@ -852,6 +917,9 @@ Array [
   Object {
     "contacts": Array [],
     "create_contact": false,
+    "exclusions": Object {
+      "in_a_flow": false,
+    },
     "flow": Object {
       "name": "My Flow",
       "uuid": undefined,
@@ -869,6 +937,9 @@ Object {
   "contactQuery": Object {
     "value": "",
   },
+  "exclusions": Object {
+    "in_a_flow": false,
+  },
   "flow": Object {
     "validationFailures": Array [],
     "value": Object {
@@ -901,6 +972,9 @@ Array [
   Object {
     "contacts": Array [],
     "create_contact": false,
+    "exclusions": Object {
+      "in_a_flow": false,
+    },
     "flow": Object {
       "name": "My Flow",
       "uuid": undefined,