@subiz/widget-v4 4.1.215 → 4.1.217

package/compiled_src/store/store.js

@@ -885,10 +885,12 @@ class Store {
     await this.readyGate.entry();
     const key = websiteFormStorageKey(this.api, formid);
     const kv = this.kv;
+    const values = _index.default.cloneDeep(payload.values);
     const result = formResult(await this.api.submitWebsiteForm(formid, payload));
     try {
       kv.put(key, {
         conversation_id: result.conversation_id,
+        values,
         expires_at: _index.default.Date.now() + 7 * 24 * 60 * 60 * 1000
       });
     } catch (_) {}
@@ -919,7 +921,8 @@ class Store {
       return {
         submitted: true,
         status: 'found',
-        conversation_id: receipt.conversation_id
+        conversation_id: receipt.conversation_id,
+        values: Array.isArray(receipt.values) ? _index.default.cloneDeep(receipt.values) : []
       };
     } catch (_) {
       return {
@@ -1365,7 +1368,7 @@ class Store {
         if (att.type !== 'file') return;
         if (!att._file) return;
         files.push(att);
-        if (ImageTypes.includes(att._file.type)) {
+        if (!att._upload?.file && ImageTypes.includes(att._file.type)) {
           let {
             width,
             height,
@@ -1379,15 +1382,33 @@ class Store {
     }
     this.onWs(event);
     await this.convoGate.entry();
-    const uploaded = await (0, _attachments.uploadAttachments)(files, file => this.api.uploadToS3(file));
+    const uploaded = await (0, _attachments.uploadAttachments)(files, (file, state) => this.api.uploadAttachment(file, state, () => this.pubsub.publish('events', event)));
     event._error = uploaded.error;
     if (uploaded.errorMessage) event._error_message = uploaded.errorMessage;
     if (event._error) return this.onWs(event);
     if (cid && cid.startsWith('cslight')) return;
+    const outgoing = {
+      ...event,
+      data: {
+        ...event.data
+      }
+    };
+    if (event.data.message) outgoing.data.message = {
+      ...event.data.message,
+      attachments: event.data.message.attachments?.map(att => {
+        const {
+          _file,
+          _upload,
+          ...attachment
+        } = att;
+        return attachment;
+      })
+    };
     let {
       body: ret,
       error
-    } = await this.api.sendConvoEvent(cid, event);
+    } = await this.api.sendConvoEvent(cid, outgoing);
+    error = error || ret?.error;
     if (error) {
       event._error = error;
       this.onWs(event);