@verdocs/web-sdk 5.0.2 → 5.0.4

package/dist/collection/components/templates/verdocs-template-roles/verdocs-template-roles.css

@@ -11,135 +11,97 @@
 }
 verdocs-template-roles {
   display: block;
-  min-width: 400px;
+  max-width: 600px;
   font-family: "Inter", -apple-system, "Segoe UI", "Roboto", "Helvetica Neue", sans-serif;
 }
-verdocs-template-roles > form {
+verdocs-template-roles .roles {
   display: flex;
   flex-direction: column;
-  background-color: #ffffff;
-  padding: 12px;
-}
-verdocs-template-roles > form h5 {
-  font-size: 16px;
-  font-weight: bold;
-  color: #46497d;
-  margin: 0 0 10px 0;
-}
-verdocs-template-roles > form .participants {
-  position: relative;
-}
-verdocs-template-roles > form .left-line {
-  top: 32px;
-  left: 11px;
-  z-index: 1;
-  width: 12px;
-  bottom: 30px;
-  position: absolute;
-  background: #ffffff;
-  border-left: 3px dotted #9b9b9b;
-}
-verdocs-template-roles > form .row {
-  display: flex;
-  column-gap: 0;
-  min-height: 35px;
-  margin-top: 0;
-  margin-left: 40px;
-  position: relative;
-  flex-direction: row;
-  padding: 6px 0 4px 0;
+  gap: 10px;
+  margin-top: 10px;
 }
-verdocs-template-roles > form .row .row-roles {
-  flex: 1;
+verdocs-template-roles .roles .sequence {
   gap: 10px;
+  height: 34px;
   display: flex;
   flex-wrap: wrap;
+  font-weight: 500;
+  padding: 0 0 8px 0;
   flex-direction: row;
+  border-bottom: 1px dotted #e3e3e3;
 }
-verdocs-template-roles > form .row .icon {
-  top: 14px;
-  z-index: 2;
-  left: -40px;
-  width: 24px;
-  height: 24px;
-  position: absolute;
-  background: #ffffff;
+verdocs-template-roles .roles .sequence.add-sequence {
+  color: #777777;
+  line-height: 34px;
 }
-verdocs-template-roles > form .row .sender {
-  height: 30px;
+verdocs-template-roles .roles .sequence-label {
+  font-size: 18px;
+  line-height: 32px;
+}
+verdocs-template-roles .roles .sequence-roles {
+  gap: 10px;
   display: flex;
-  font-size: 14px;
-  line-height: 30px;
-  align-items: center;
-  border-radius: 30px;
+  position: relative;
+  flex-wrap: wrap;
+  font-weight: 500;
   flex-direction: row;
-  padding: 0 15px 0 15px;
-  border: 1px solid #c6c9cc;
-  background-color: #f5f5fa;
 }
-verdocs-template-roles > form .row .complete {
-  height: 30px;
+verdocs-template-roles .roles .role {
+  height: 32px;
+  cursor: move;
   display: flex;
+  max-width: 200px;
+  position: relative;
+  border-radius: 32px;
+  background-color: #eff7fb;
+  box-sizing: border-box;
+  padding: 0 14px 0 34px;
+  border: 1px solid #ccc;
+  flex-direction: column;
+}
+verdocs-template-roles .roles .role .role-name {
   font-size: 14px;
-  padding: 0 15px;
+  overflow: hidden;
+  font-weight: 400;
   line-height: 30px;
-  flex-direction: row;
-  border-radius: 30px;
-  background-color: #f5f5fa;
-  border: 1px solid #aeb4bf;
-}
-verdocs-template-roles > form .row .label {
-  font-weight: bold;
-  margin-right: 6px;
-  color: #33364b;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
-verdocs-template-roles > form .row .settings-button {
-  display: flex;
+verdocs-template-roles .roles .role .icons {
+  position: absolute;
+  left: 1px;
+  top: -3px;
   cursor: pointer;
-  margin: 0 0 0 9px;
+  padding: 5px;
+  z-index: 10;
 }
-verdocs-template-roles > form .row .recipient {
-  height: 30px;
-  display: flex;
-  font-size: 14px;
-  border-radius: 30px;
-  align-items: center;
-  flex-direction: row;
-  padding: 0 5px 0 6px;
-  white-space: nowrap;
-  border: 2px solid #aeb4bf;
+verdocs-template-roles .roles .role .icons .gear-button {
+  display: none;
+  transform: scale(1.1);
+  margin: 4px 0 0 1px;
 }
-verdocs-template-roles > form .row .recipient .type-icon {
-  width: 24px;
-  height: 24px;
-  transform: scale(0.8);
+verdocs-template-roles .roles .role .icons .type-icon {
   opacity: 0.6;
-  margin: 0 12px 0 0;
-}
-verdocs-template-roles > form .row .recipient.dragging {
-  position: absolute;
+  display: block;
+  transform: scale(0.8);
 }
-verdocs-template-roles > form .row .recipient.dragging + .dropzone {
-  display: none !important;
+verdocs-template-roles .roles .role .icons:hover .gear-button {
+  display: block;
 }
-verdocs-template-roles > form .row .dropzone {
-  width: 14px;
-  height: 30px;
+verdocs-template-roles .roles .role .icons:hover .type-icon {
   display: none;
 }
-verdocs-template-roles > form .row .dropzone svg {
-  fill: #cccccc;
-}
-verdocs-template-roles > form .row .dropzone.visible {
-  margin: 0 7px;
+verdocs-template-roles > form {
   display: flex;
-  flex: 0 0 14px;
+  flex-direction: column;
+  background-color: #ffffff;
+  padding: 12px;
 }
-verdocs-template-roles > form .row .dropzone.active {
-  flex: 0 0 120px;
-  border-radius: 30px;
-  background: rgba(101, 77, 203, 0.4980392157);
-  border: 1px dashed #654dcb;
+verdocs-template-roles > form h5 {
+  font-size: 16px;
+  font-weight: bold;
+  color: #46497d;
+  margin: 0 0 10px 0;
 }
 verdocs-template-roles > form label {
   display: block;
@@ -165,9 +127,10 @@ verdocs-template-roles .add-role {
   margin: 0;
   padding: 0;
   border: none;
-  opacity: 0.5;
+  opacity: 0.3;
   cursor: pointer;
   background: none;
+  transform: scale(0.75);
 }
 verdocs-template-roles .add-role:hover {
   opacity: 1;
@@ -191,27 +154,9 @@ verdocs-template-roles .add-step svg {
   width: 32px;
   height: 32px;
 }
-verdocs-template-roles.dragging .add-role {
-  display: none;
-}
-verdocs-template-roles.dragging form .row .recipient + .dropzone {
-  display: flex;
-}
 verdocs-template-roles.dragging .row.add-sequence {
   display: flex;
 }
-verdocs-template-roles.dragging .row.add-sequence .dropzone {
-  opacity: 0.5;
-  flex: 0 0 120px;
-  border-radius: 30px;
-  align-items: center;
-  background: rgba(101, 77, 203, 0.4980392157);
-  justify-content: center;
-  border: 1px dashed #654dcb;
-}
-verdocs-template-roles.dragging .row.add-sequence .dropzone.active {
-  opacity: 1;
-}
 verdocs-template-roles .buttons {
   display: flex;
   column-gap: 8px;
@@ -230,6 +175,15 @@ verdocs-template-roles .empty svg {
   margin-bottom: 2px;
   display: inline-block;
 }
+verdocs-template-roles.dragging .roles .sequence.add-sequence .add-role,
+verdocs-template-roles.dragging .roles .sequence.add-sequence .add-step-label {
+  display: none;
+}
+verdocs-template-roles.dragging .roles .sequence.add-sequence .sequence-roles {
+  display: flex;
+  min-width: 150px;
+  background: #e0e0e0;
+}
 verdocs-template-roles ::placeholder {
   color: #aaaaaa;
 }

package/dist/collection/components/templates/verdocs-template-roles/verdocs-template-roles.js

@@ -1,23 +1,17 @@
-import interact from "interactjs";
-import { h, Fragment, Host } from "@stencil/core";
-import { createTemplateRole, formatFullName, getRGBA, getTemplate, updateTemplateRole, VerdocsEndpoint } from "@verdocs/js-sdk";
-import { getRoleIndex } from "../../../utils/Templates";
+import Sortable from "sortablejs";
+import { h, Host } from "@stencil/core";
+import { createTemplateRole, formatFullName, getTemplate, updateTemplateRole, VerdocsEndpoint } from "@verdocs/js-sdk";
+// import {createTemplateRole, formatFullName, getRGBA, getTemplate, IRole, ITemplate, updateTemplateRole, VerdocsEndpoint} from '@verdocs/js-sdk';
+// import {getRoleIndex} from '../../../utils/Templates';
 import { SDKError } from "../../../utils/errors";
 import { Store } from "../../../utils/Datastore";
-// const senderLabels: Record<TTemplateSender, string> = {
-//   template_owner: 'Template Owner',
-//   envelope_creator: 'Envelope Creator',
-// };
 const settingsIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" fill="#00000089"><path d="m8.021 17.917-.313-2.5q-.27-.125-.625-.334-.354-.208-.625-.395l-2.312.979-1.979-3.438 1.979-1.5q-.021-.167-.031-.364-.011-.198-.011-.365 0-.146.011-.344.01-.198.031-.385l-1.979-1.5 1.979-3.417 2.312.958q.271-.187.615-.385t.635-.344l.313-2.5h3.958l.313 2.5q.312.167.625.344.312.177.604.385l2.333-.958 1.979 3.417-1.979 1.521q.021.187.021.364V10q0 .146-.01.333-.011.188-.011.396l1.958 1.5-1.979 3.438-2.312-.979q-.292.208-.615.395-.323.188-.614.334l-.313 2.5Zm1.937-5.355q1.063 0 1.813-.75t.75-1.812q0-1.062-.75-1.812t-1.813-.75q-1.041 0-1.802.75-.76.75-.76 1.812t.76 1.812q.761.75 1.802.75Zm0-1.333q-.5 0-.864-.364-.365-.365-.365-.865t.365-.865q.364-.364.864-.364t.865.364q.365.365.365.865t-.365.865q-.365.364-.865.364ZM10.021 10Zm-.854 6.583h1.666l.25-2.187q.605-.167 1.136-.49.531-.323 1.031-.802l2.021.875.854-1.375-1.792-1.354q.105-.333.136-.635.031-.303.031-.615 0-.292-.031-.573-.031-.281-.115-.635l1.792-1.396-.834-1.375-2.062.875q-.438-.438-1.021-.781-.583-.344-1.125-.49l-.271-2.208H9.167l-.271 2.208q-.584.146-1.125.458-.542.313-1.042.792l-2.021-.854-.833 1.375 1.75 1.354q-.083.333-.125.646-.042.312-.042.604t.042.594q.042.302.125.635l-1.75 1.375.833 1.375 2.021-.854q.479.458 1.021.771.542.312 1.146.479Z"/></svg>';
-const startIcon = '<svg focusable="false" aria-hidden="true" viewBox="0 0 24 24" fill="#00000089"><path d="M2 12C2 6.48 6.48 2 12 2s10 4.48 10 10-4.48 10-10 10S2 17.52 2 12zm10 6c3.31 0 6-2.69 6-6s-2.69-6-6-6-6 2.69-6 6 2.69 6 6 6z"></path></svg>';
-const stepIcon = '<svg focusable="false" aria-hidden="true" viewBox="0 0 24 24" fill="#00000089"><path d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5z"></path></svg>';
-const doneIcon = '<svg focusable="false" aria-hidden="true" viewBox="0 0 24 24" fill="#00000089"><path d="m18 7-1.41-1.41-6.34 6.34 1.41 1.41L18 7zm4.24-1.41L11.66 16.17 7.48 12l-1.41 1.41L11.66 19l12-12-1.42-1.41zM.41 13.41 6 19l1.41-1.41L1.83 12 .41 13.41z"></path></svg>';
 const plusIcon = `<svg xmlns="http://www.w3.org/2000/svg" fill="#ffffff" viewBox="0 0 24 24" strokeWidth={1.5} stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" d="M12 9v6m3-3H9m12 0a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>`;
 const iconSigner = '<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="m9.225 21.225 4.65-4.65h8.45v4.65Zm-5.35-2.2H5.05l8.5-8.5-1.175-1.175-8.5 8.5Zm14.25-9.95L13.8 4.8l1.325-1.325q.625-.65 1.525-.663.9-.012 1.6.663l1.225 1.175q.675.675.663 1.562-.013.888-.663 1.513ZM16.7 10.55 6 21.225H1.675V16.9L12.35 6.225Zm-3.725-.625-.6-.575 1.175 1.175Z"/></svg>';
-const iconApprover = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12zm13.36-1.814a.75.75 0 10-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 00-1.06 1.06l2.25 2.25a.75.75 0 001.14-.094l3.75-5.25z" clip-rule="evenodd" /></svg>`;
-const iconCC = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M1.5 8.67v8.58a3 3 0 003 3h15a3 3 0 003-3V8.67l-8.928 5.493a3 3 0 01-3.144 0L1.5 8.67z" /><path d="M22.5 6.908V6.75a3 3 0 00-3-3h-15a3 3 0 00-3 3v.158l9.714 5.978a1.5 1.5 0 001.572 0L22.5 6.908z" /></svg>`;
+const iconApprover = `<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path fill-rule="evenodd" d="M2.25 12c0-5.385 4.365-9.75 9.75-9.75s9.75 4.365 9.75 9.75-4.365 9.75-9.75 9.75S2.25 17.385 2.25 12zm13.36-1.814a.75.75 0 10-1.22-.872l-3.236 4.53L9.53 12.22a.75.75 0 00-1.06 1.06l2.25 2.25a.75.75 0 001.14-.094l3.75-5.25z" clip-rule="evenodd" /></svg>`;
+const iconCC = `<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"><path d="M1.5 8.67v8.58a3 3 0 003 3h15a3 3 0 003-3V8.67l-8.928 5.493a3 3 0 01-3.144 0L1.5 8.67z" /><path d="M22.5 6.908V6.75a3 3 0 00-3-3h-15a3 3 0 00-3 3v.158l9.714 5.978a1.5 1.5 0 001.572 0L22.5 6.908z" /></svg>`;
 /**
- * Displays an edit form that allows the user to adjust a template's roles and workflow.
+ * Display an edit form that allows the user to adjust a template's roles and workflow.
  */
 export class VerdocsTemplateRoles {
     constructor() {
@@ -26,6 +20,7 @@ export class VerdocsTemplateRoles {
         this.templateId = '';
         this.showingRoleDialog = null;
         this.sender = null;
+        this.dragging = false;
         this.loading = true;
         this.template = null;
     }
@@ -36,7 +31,7 @@ export class VerdocsTemplateRoles {
         console.log('[ROLES] Loading template', this.templateId);
         this.unlistenToTemplate();
         Store.subscribe('templates', this.templateId, () => getTemplate(this.endpoint, this.templateId), false, (template) => {
-            console.log('[BUILD] Template Updated', template);
+            console.log('[ROLES] Template Updated', template);
             this.template = template;
             this.loading = false;
         });
@@ -67,60 +62,73 @@ export class VerdocsTemplateRoles {
         }
     }
     componentDidRender() {
-        interact.dynamicDrop(true);
-        interact('.recipient').draggable({
-            listeners: {
-                start: function handleStart(e) {
-                    e.target.classList.add('dragging');
-                    this.el.classList.add('dragging');
-                }.bind(this),
-                move: function handleMove(e) {
-                    const oldX = +(e.target.getAttribute('dX') || 0);
-                    const oldY = +(e.target.getAttribute('dY') || 0);
-                    const sequence = +(e.target.dataset['sequence'] || 0);
-                    const order = +(e.target.dataset['order'] || 0);
-                    const newX = e.dx + oldX;
-                    const newY = e.dy + oldY;
-                    e.target.setAttribute('dX', newX);
-                    e.target.setAttribute('dY', newY);
-                    const rect = e.target.getBoundingClientRect();
-                    // Note: I never did figure out exactly why this is, but if we don't offset the transform
-                    // the dragged item is offset from the mouse cursor quite a bit.
-                    console.log('w', rect.width);
-                    e.target.style.transform = `translate(${newX + rect.width - (order + 1)}px, ${newY - rect.height * sequence}px)`;
-                }.bind(this),
-                end: function handleEnd(e) {
-                    e.target.classList.remove('dragging');
-                    this.el.classList.remove('dragging');
-                    // console.log('end', event);
-                    e.target.removeAttribute('dX');
-                    e.target.removeAttribute('dY');
-                    e.target.style.transform = null;
-                }.bind(this),
-            },
+        // Existing sequence numbers
+        const sequenceNumbers = this.getSequenceNumbers();
+        sequenceNumbers.forEach(sequence => {
+            const el = document.getElementById(`verdocs-roles-sequence-${sequence}`);
+            if (el) {
+                new Sortable(el, {
+                    group: 'roles',
+                    animation: 150,
+                    dragoverBubble: true,
+                    filter: '.no-drag',
+                    onEnd: this.handleMoveEnd.bind(this),
+                    onChoose: () => (this.dragging = true),
+                    onUnchoose: () => (this.dragging = false),
+                });
+            }
         });
-        interact('.dropzone').dropzone({
-            overlap: 0.05,
-            ondrop: async function onDrop(event) {
-                var _a;
-                event.target.classList.remove('active');
-                // This will re-sort the roles and renumbers them via server calls if necessary
-                await this.renumberTemplateRoles();
-                console.log('[ROLES] Updated roles', this.getSortedRoles());
-                (_a = this.rolesUpdated) === null || _a === void 0 ? void 0 : _a.emit({ event: 'updated', endpoint: this.endpoint, templateId: this.templateId, roles: this.getSortedRoles() });
-            }.bind(this),
-            ondropactivate: e => {
-                e.target.classList.add('visible');
-            },
-            ondropdeactivate: e => {
-                e.target.classList.remove('visible');
-            },
-            ondragenter: e => {
-                e.target.classList.add('active');
-            },
-            ondragleave: e => {
-                e.target.classList.remove('active');
-            },
+        const el = document.getElementById(`verdocs-roles-sequence-${sequenceNumbers.length + 1}`);
+        if (el) {
+            new Sortable(el, {
+                group: 'roles',
+                animation: 150,
+                dragoverBubble: true,
+                filter: '.no-drag',
+                onEnd: this.handleMoveEnd.bind(this),
+                onChoose: () => (this.dragging = true),
+                onUnchoose: () => (this.dragging = false),
+            });
+        }
+    }
+    handleMoveEnd(evt) {
+        const fromSeq = +evt.from.id.split('-').pop();
+        const toSeq = +evt.to.id.split('-').pop();
+        const fromIndex = +evt.oldIndex + 1;
+        const toIndex = +evt.newIndex + 1;
+        // console.log(`Move from ${fromSeq}:${fromIndex} to ${toSeq}:${toIndex}`, evt.item);
+        const sortableRoles = {};
+        const sequenceNumbers = this.getSequenceNumbers();
+        sequenceNumbers.forEach(sequence => {
+            sortableRoles[sequence] = JSON.parse(JSON.stringify(this.getRolesAtSequence(sequence)));
+        });
+        // We might be adding a new sequence number now. Make sure we have an array to drop
+        // the record into.
+        sortableRoles[sequenceNumbers.length + 1] = [];
+        const role = sortableRoles[fromSeq].splice(fromIndex - 1, 1)[0];
+        sortableRoles[toSeq].splice(toIndex - 1, 0, role);
+        const renumberRequests = [];
+        Object.entries(sortableRoles).forEach(([targetSeq, roles]) => {
+            roles.forEach((role, index) => {
+                console.log('Evaluating role', role.name, role.sequence, role.order);
+                const targetOrder = +index + 1;
+                if (role.sequence !== +targetSeq || role.order !== targetOrder) {
+                    role.sequence = +targetSeq;
+                    role.order = targetOrder;
+                    renumberRequests.push(updateTemplateRole(this.endpoint, this.templateId, role.name, { sequence: +targetSeq, order: targetOrder })
+                        .then(r => console.log('[ROLES] Updated role', role.name, r))
+                        .catch(e => console.log('[ROLES] Error updating role', e)));
+                }
+            });
+        });
+        // When renumbering, we don't try to update the store for every individual item
+        // changing. We just do it once at the end.
+        console.log(`[ROLES] Awaiting ${renumberRequests.length} renumber requests`, renumberRequests);
+        return Promise.all(renumberRequests).then(async () => {
+            const newTemplate = JSON.parse(JSON.stringify(this.template));
+            newTemplate.roles = Object.keys(sortableRoles).reduce((acc, seq) => acc.concat(sortableRoles[seq]), []);
+            await Store.getTemplate(this.endpoint, this.templateId, true);
+            // Store.updateTemplate(this.templateId, newTemplate);
         });
     }
     handleCancel() {
@@ -140,13 +148,11 @@ export class VerdocsTemplateRoles {
         });
     }
     getSequenceNumbers() {
-        const sequences = [];
-        this.getSortedRoles().forEach(role => {
-            if (!sequences.includes(role.sequence)) {
-                sequences.push(role.sequence);
-            }
-        });
-        return sequences.sort((a, b) => a - b);
+        var _a;
+        const sequenceNumbers = (((_a = this.template) === null || _a === void 0 ? void 0 : _a.roles) || []).map(role => role.sequence);
+        const deduped = [...new Set(sequenceNumbers)];
+        deduped.sort((a, b) => a - b);
+        return deduped;
     }
     getRoleNames() {
         const roles = this.getSortedRoles();
@@ -162,32 +168,64 @@ export class VerdocsTemplateRoles {
     // e.g. 1.5 to place it between items 1 and 2, 0.5 to place it at the beginning, or last+0.5 to place it at the end.
     // Then we re-sort the list of roles and renumber them.
     async renumberTemplateRoles() {
-        // console.log('Renumbering roles', this.getSequenceNumbers(), JSON.stringify(this.roleStore.state));
-        // Avoid dupe renumber attempts
-        const renumbered = [];
-        // If the user dragged an entry from below a row to above it, we end up here like [1,0]. Make sure it's [0,1] for the next operation.
+        const sortableRoles = {};
         const renumberRequests = [];
-        this.getSequenceNumbers().forEach((originalSequence, newSequenceIndex) => {
-            this.getRolesAtSequence(originalSequence).forEach((role, newOrderIndex) => {
-                if (!renumbered.includes(role.name)) {
-                    if (role.sequence !== newSequenceIndex + 1 || role.order !== newOrderIndex + 1) {
-                        role.sequence = newSequenceIndex + 1;
-                        role.order = newOrderIndex + 1;
-                        renumbered.push(role.name);
-                        renumberRequests.push(updateTemplateRole(this.endpoint, this.templateId, role.name, { sequence: role.sequence, order: role.order }));
-                    }
+        const sequenceNumbers = this.getSequenceNumbers();
+        console.log('Sorting sequences', sequenceNumbers);
+        sequenceNumbers.forEach(targetSeq => {
+            sortableRoles[targetSeq].forEach((role, targetOrderMinusOne) => {
+                const targetOrder = +targetOrderMinusOne + 1;
+                if (role.sequence !== +targetSeq || role.order !== targetOrder) {
+                    console.log('[ROLES] Updating role', role.name, 'from', role.sequence, role.order, 'to', targetSeq, targetOrder);
+                    role.sequence = +targetSeq;
+                    role.order = targetOrder;
+                    renumberRequests.push(updateTemplateRole(this.endpoint, this.templateId, role.name, { sequence: +targetSeq, order: targetOrder })
+                        .then(r => console.log('[ROLES] Updated role', role.name, r))
+                        .catch(e => console.log('[ROLES] Error updating role', e)));
                 }
             });
         });
-        if (renumberRequests.length > 0) {
-            console.log(`[ROLES] Submitting ${renumberRequests.length} renumber requests`);
-            return Promise.all(renumberRequests).then(async () => {
-                // When renumbering, we don't try to update the store for every individual item
-                // changing. We just do it once at the end.
-                this.template = await Store.getTemplate(this.endpoint, this.templateId, true);
-            });
-        }
-        return true;
+        console.log('Sortable Roles', sortableRoles);
+        console.log(`[ROLES] Awaiting ${renumberRequests.length} renumber requests`);
+        return Promise.all(renumberRequests).then(async () => {
+            // When renumbering, we don't try to update the store for every individual item
+            // changing. We just do it once at the end.
+            const newTemplate = JSON.parse(JSON.stringify(this.template));
+            newTemplate.roles = Object.keys(sortableRoles).reduce((acc, seq) => acc.concat(sortableRoles[seq]), []);
+            console.log('[ROLES] Done renumbering', newTemplate.roles.map(r => ({ name: r.name, sequence: r.sequence, order: r.order })));
+            Store.updateTemplate(this.templateId, newTemplate);
+            // TODO: Explore race condition in reordering roles
+            // this.template = await Store.getTemplate(this.endpoint, this.templateId, true);
+        });
+        // // Avoid dupe renumber attempts
+        // const renumbered = [];
+        //
+        // // If the user dragged an entry from below a row to above it, we end up here like [1,0]. Make sure it's [0,1] for the next operation.
+        // const renumberRequests = [];
+        // this.getSequenceNumbers().forEach((originalSequence, newSequenceIndex) => {
+        //   this.getRolesAtSequence(originalSequence).forEach((role, newOrderIndex) => {
+        //     if (!renumbered.includes(role.name)) {
+        //       if (role.sequence !== newSequenceIndex + 1 || role.order !== newOrderIndex + 1) {
+        //         role.sequence = newSequenceIndex + 1;
+        //         role.order = newOrderIndex + 1;
+        //         renumbered.push(role.name);
+        //         // console.log('[ROLES] Renumbering', role.name, targetSequence, targetOrder);
+        //         renumberRequests.push(updateTemplateRole(this.endpoint, this.templateId, role.name, {sequence: role.sequence, order: role.order}));
+        //       }
+        //     }
+        //   });
+        // });
+        //
+        // if (renumberRequests.length > 0) {
+        //   console.log(`[ROLES] Submitting ${renumberRequests.length} renumber requests`);
+        //   return Promise.all(renumberRequests).then(async () => {
+        //     // When renumbering, we don't try to update the store for every individual item
+        //     // changing. We just do it once at the end.
+        //     this.template = await Store.getTemplate(this.endpoint, this.templateId, true);
+        //   });
+        // }
+        //
+        // return true;
     }
     // Look for name conflicts, because they're UGC and can be anything, regardless of order.
     getNextRoleName() {
@@ -252,12 +290,17 @@ export class VerdocsTemplateRoles {
         if (this.loading || !this.template) {
             return (h(Host, { class: "loading" }, h("verdocs-loader", null)));
         }
+        console.log('[ROLES] Rendering', this.template.roles.map(r => ({ name: r.name, sequence: r.sequence, order: r.order })));
         const roleNames = this.getRoleNames();
         const sequences = this.getSequenceNumbers();
-        return (h(Host, null, h("form", { onSubmit: e => e.preventDefault(), onClick: e => e.stopPropagation(), autocomplete: "off" }, h("h5", null, "Roles and Workflow"), h("div", { class: "participants" }, h("div", { class: "left-line" }), h("div", { class: "row" }, h("div", { class: "icon", innerHTML: startIcon }), h("div", { class: "row-roles" }, h("div", { class: "sender" }, h("span", { class: "label" }, "Send Envelope")))), h("div", { class: "row add-sequence", "data-sequence": 0 }, h("div", { class: "icon", innerHTML: plusIcon }), h("div", { class: "row-roles" }, h("div", { class: "dropzone", "data-sequence": 0, "data-order": 1 }, "Add Step"))), sequences.map(sequence => (h(Fragment, null, h("div", { class: "row" }, h("div", { class: "icon", innerHTML: stepIcon }), h("div", { class: "row-roles" }, h("div", { class: "dropzone", "data-order": 0.5, "data-sequence": sequence }), this.getRolesAtSequence(sequence).map(role => {
+        console.log('Rendering sequences', sequences, roleNames);
+        // style={{backgroundColor: getRGBA(getRoleIndex(this.template, role.name))}}
+        return (h(Host, { class: { dragging: this.dragging } }, h("form", { onSubmit: e => e.preventDefault(), onClick: e => e.stopPropagation(), autocomplete: "off" }, h("h5", null, "Roles and Workflow"), h("div", { class: "roles" }, sequences.map(sequence => (h("div", { class: "sequence" }, h("div", { class: "sequence-label no-drag" }, sequence, "."), h("div", { class: "sequence-roles", id: `verdocs-roles-sequence-${sequence}`, "data-sequence": sequence }, this.getRolesAtSequence(sequence).map(role => {
             const unknown = !role.email;
-            return unknown ? (h(Fragment, null, h("div", { class: "recipient", style: { backgroundColor: getRGBA(getRoleIndex(this.template, role.name)) }, "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), role.name, " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence }))) : (h(Fragment, null, h("div", { class: "recipient", style: { borderColor: getRGBA(getRoleIndex(this.template, role.name)) }, "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), formatFullName(role), " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence })));
-        }), h("button", { class: "add-role", innerHTML: plusIcon, onClick: e => this.handleAddRole(e, sequence) }))), sequences.length > 0 && (h("div", { class: "row add-sequence", "data-sequence": sequence }, h("div", { class: "row-roles" }, h("div", { class: "icon", innerHTML: plusIcon }), h("div", { class: "dropzone", "data-sequence": sequence + 1, "data-order": 1 }, "Add Step"))))))), h("div", { class: "row", "data-sequence": sequences.length + 1 }, h("div", { class: "row-roles" }, h("div", { class: "icon", innerHTML: plusIcon }), h("button", { class: "add-step", innerHTML: plusIcon, onClick: e => this.handleAddStep(e, sequences.length + 1) }))), h("div", { class: "row" }, h("div", { class: "icon", innerHTML: doneIcon }), h("div", { class: "row-roles" }, h("div", { class: "complete" }, "Document Complete")))), roleNames.length < 1 && (h("div", { class: "empty" }, "You must add at least one Role before proceeding.", h("br", null), " Click the ", h("span", { innerHTML: plusIcon }), " Add button above to get started.")), h("div", { class: "buttons" }, h("div", { class: "flex-fill" }), h("verdocs-button", { variant: "outline", label: "Cancel", size: "small", onClick: () => this.handleCancel() }), h("verdocs-button", { label: "OK", size: "small", onClick: () => this.handleSubmit(), disabled: roleNames.length < 1 }))), this.showingRoleDialog && (h("verdocs-template-role-properties", { endpoint: this.endpoint, templateId: this.templateId, roleName: this.showingRoleDialog, onClose: () => {
+            return unknown ? (h("div", { class: "role", "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("div", { class: "role-name" }, role.name), h("div", { class: "icons" }, h("div", { class: "gear-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" }), h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover })))) : (h("div", { class: "role", "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("div", { class: "role-name" }, formatFullName(role)), h("div", { class: "icons" }, h("div", { class: "gear-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" }), h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }))));
+        })), h("button", { class: "add-role no-drag", innerHTML: plusIcon, onClick: e => this.handleAddRole(e, sequence) })))), h("div", { class: "sequence add-sequence" }, h("div", { class: "sequence-label no-drag" }, sequences.length + 1, "."), h("div", { class: "sequence-roles", id: `verdocs-roles-sequence-${sequences.length + 1}`, "data-sequence": sequences.length + 1 }, h("div", { class: "role-name add-step-label" }, "Add Step.")), h("button", { class: "add-role no-drag", innerHTML: plusIcon, onClick: e => this.handleAddRole(e, sequences.length + 1) }))), roleNames.length < 1 && (h("div", { class: "empty" }, "You must add at least one Role before proceeding.", h("br", null), " Click the ", h("span", { innerHTML: plusIcon }), " Add button above to get started.")), h("div", { class: "buttons" }, h("div", { class: "flex-fill" }), h("verdocs-button", { variant: "outline", label: "Cancel", size: "small", onClick: () => this.handleCancel() }), h("verdocs-button", { label: "OK", size: "small", onClick: () => this.handleSubmit(), disabled: roleNames.length < 1 }))), this.showingRoleDialog && (h("verdocs-menu-panel", { onClose: () => (this.showingRoleDialog = null) }, h("verdocs-template-role-properties", { endpoint: this.endpoint, templateId: this.templateId, roleName: this.showingRoleDialog, onClose: () => {
+                var _a;
+                (_a = document.getElementById('verdocs-menu-panel-overlay')) === null || _a === void 0 ? void 0 : _a.remove();
                 this.showingRoleDialog = null;
             }, onDelete: async () => {
                 var _a;
@@ -265,7 +308,7 @@ export class VerdocsTemplateRoles {
                 // This will re-sort the roles and renumbers them via server calls if necessary
                 await this.renumberTemplateRoles();
                 (_a = this.rolesUpdated) === null || _a === void 0 ? void 0 : _a.emit({ event: 'deleted', endpoint: this.endpoint, templateId: this.templateId, roles: this.getSortedRoles() });
-            } }))));
+            } })))));
     }
     static get is() { return "verdocs-template-roles"; }
     static get originalStyleUrls() {
@@ -326,6 +369,7 @@ export class VerdocsTemplateRoles {
         return {
             "showingRoleDialog": {},
             "sender": {},
+            "dragging": {},
             "loading": {},
             "template": {}
         };

package/dist/collection/components/templates/verdocs-template-star/verdocs-template-star.js

@@ -38,7 +38,7 @@ export class VerdocsTemplateStar {
         });
     }
     render() {
-        return (h(Host, { key: 'a6f58209cd99b4c9e5865ca1d65447d720a42968' }, h("div", { key: '06039fdfd887e1edcf40df20cd853765b8d3f981', class: `star ${this.updating ? 'updating' : ''}`, innerHTML: this.template.star_counter ? SolidStarIcon : OutlineStarIcon, onClick: e => this.toggle(e) }), h("div", { key: '5e5c42134c1b1e46b78340d13d21a2c78e3d941c', class: "count" }, this.template.star_counter || '--')));
+        return (h(Host, { key: '4b2e5c3bc4bbbbdeb699f23d36af8bd409677d02' }, h("div", { key: 'cac3bad8a37bcf044e037391bee73932b95931d1', class: `star ${this.updating ? 'updating' : ''}`, innerHTML: this.template.star_counter ? SolidStarIcon : OutlineStarIcon, onClick: e => this.toggle(e) }), h("div", { key: '3b947e3b3e0a8fe4a91aeba068bc10a86dbe82f5', class: "count" }, this.template.star_counter || '--')));
     }
     static get is() { return "verdocs-template-star"; }
     static get originalStyleUrls() {

package/dist/collection/components/templates/verdocs-template-tags/verdocs-template-tags.js

@@ -8,7 +8,7 @@ export class VerdocsTemplateTags {
     }
     render() {
         var _a;
-        return (h(Host, { key: 'bc1467762286083fab80ee7bab00155fc5d0c521' }, (_a = this.tags) === null || _a === void 0 ? void 0 : _a.map(tag => (h("span", null, tag)))));
+        return (h(Host, { key: '5b52ce24a601aa820868affd555ce4b46935938d' }, (_a = this.tags) === null || _a === void 0 ? void 0 : _a.map(tag => (h("span", null, tag)))));
     }
     static get is() { return "verdocs-template-tags"; }
     static get originalStyleUrls() {

package/dist/collection/utils/Datastore.js

@@ -68,11 +68,10 @@ export const Store = {
             callback(rowToObject(row));
         });
         if (!store.hasRow(tableId, rowId) || forceReload) {
-            console.log('[STORE] Reloading', { tableId, rowId });
+            console.log('[STORE] Loading/reloading', { tableId, rowId });
             getter()
                 .then(result => {
                 // We don't need to call the callback because it's already listening
-                console.log('[STORE] Loaded row', { tableId, rowId, forceReload }, result);
                 store.setRow(tableId, rowId, objectToRow(result));
             })
                 .catch(e => {
@@ -93,6 +92,7 @@ export const Store = {
             return rowToObject(row);
         }
         const template = await getTemplate(endpoint, templateId);
+        console.log('[STORE] Reloading template', template);
         store.setRow('templates', templateId, objectToRow(template));
         return template;
     },