@nyaruka/temba-components 0.129.11 → 0.130.1

package/src/form/select/Select.ts

@@ -592,6 +592,7 @@ export class Select<T extends SelectOption> extends FieldElement {
     this.prepareOptionsDefault = this.prepareOptionsDefault.bind(this);
     this.isMatchDefault = this.isMatchDefault.bind(this);
     this.handleOrderChanged = this.handleOrderChanged.bind(this);
+    this.createArbitraryOption = this.createArbitraryOptionDefault.bind(this);
   }
 
   public prepareOptionsDefault(options: T[]): T[] {
@@ -701,20 +702,16 @@ export class Select<T extends SelectOption> extends FieldElement {
     );
   }
 
-  public async createOptionPost(payload: any) {
-    return postJSON(this.endpoint, payload).then((response) => {
-      if (response.status >= 200 && response.status < 300) {
-        return {
-          json: response.json,
-          payload
-        };
-      }
-    });
-  }
-
   public updated(changes: Map<string, any>) {
     super.updated(changes);
 
+    if (changes.has('createArbitraryOption')) {
+      if (!this.createArbitraryOption) {
+        this.createArbitraryOption =
+          this.createArbitraryOptionDefault.bind(this);
+      }
+    }
+
     if (changes.has('sorted')) {
       this.sortFunction = this.sorted ? this.alphaSort : null;
     }
@@ -727,60 +724,8 @@ export class Select<T extends SelectOption> extends FieldElement {
 
     if (changes.has('values')) {
       this.updateInputs();
-
       if (this.hasChanges(changes.get('values'))) {
-        const materialized = [];
-
-        // see if we need to materialize anything
-        if (this.allowCreate) {
-          // arbitrary values need to be posted
-          const arbitraryValues = this.values.filter((value) => {
-            return (value as any).arbitrary;
-          });
-
-          for (const value of arbitraryValues) {
-            if ((value as any).arbitrary) {
-              materialized.push(this.createOptionPost(value));
-            }
-          }
-
-          // update our created values
-          Promise.all(materialized).then((responses) => {
-            for (const response of responses) {
-              if (response) {
-                // find the value that matches our payload
-                const original = arbitraryValues.find((value) => {
-                  return value === response.payload;
-                }) as any;
-
-                if (original) {
-                  // remove our arbitrary flag
-                  delete original.arbitrary;
-
-                  // add in the new values from our respones.json
-                  if (response.json) {
-                    for (const key in response.json) {
-                      original[key] = response.json[key];
-                    }
-                  }
-                }
-              }
-            }
-
-            // remove any arbitrary values
-            for (let i = this.values.length - 1; i >= 0; i--) {
-              if ((this.values[i] as any).arbitrary) {
-                this.values.splice(i, 1);
-              }
-            }
-
-            // reset our cache
-            this.cacheKey = new Date().getTime().toString();
-            this.fireEvent('change');
-          });
-        } else {
-          this.fireEvent('change');
-        }
+        this.fireEvent('change');
       }
     }
 
@@ -955,19 +900,31 @@ export class Select<T extends SelectOption> extends FieldElement {
     }
 
     const selected = event.detail.selected;
+
     // check if we should post it
-    if (selected.post && this.endpoint) {
+    if (selected.arbitrary && this.allowCreate && this.endpoint) {
+      this.resolving = true;
       postJSON(this.endpoint, selected).then((response) => {
         if (response.status >= 200 && response.status < 300) {
           this.setSelectedOption(response.json);
           this.lruCache = lru(20, 60000);
+          this.errors = [];
         } else {
-          // TODO: find a way to share inline errors
+          this.setSelectedOption(selected);
+          setTimeout(() => {
+            this.errors = [
+              'There was an error creating "' +
+                this.getNameInternal(selected) +
+                '"'
+            ];
+          }, 0);
           this.blur();
         }
+        this.resolving = false;
       });
     } else {
       this.setSelectedOption(selected);
+      this.errors = [];
     }
   }
 
@@ -1009,6 +966,21 @@ export class Select<T extends SelectOption> extends FieldElement {
   public handleRemoveSelection(selectionToRemove: any): void {
     this.removeValue(selectionToRemove);
     this.visibleOptions = [];
+    this.errors = [];
+
+    // if we allow create, double check our values
+    if (this.allowCreate) {
+      const arbitrary = this.values.find((v) => v.arbitrary);
+      if (arbitrary) {
+        setTimeout(() => {
+          this.errors = [
+            'There was an error creating "' +
+              this.getNameInternal(arbitrary) +
+              '"'
+          ];
+        }, 0);
+      }
+    }
   }
 
   private createArbitraryOptionDefault(input: string, _options: any[]): any {

package/src/store/flow-definition.d.ts

@@ -68,6 +68,11 @@ export interface NamedObject {
   name: string;
 }
 
+export interface FieldReference {
+  key: string;
+  name: string;
+}
+
 export interface Group extends NamedObject {
   status?: string;
   system?: boolean;
@@ -111,7 +116,7 @@ export interface RemoveFromGroup extends Action {
 }
 
 export interface SetContactField extends Action {
-  field: NamedObject;
+  field: FieldReference;
   value: string;
 }
 

package/src/utils.ts

@@ -1124,3 +1124,7 @@ export const createMultiCategoryRouter = (
     exits: exits
   };
 };
+
+export const titleCase = (str: string) => {
+  return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
+};