[IMPROVE] Uses view id to handle modal submit

RocketChat · Jul 21, 2021 · fce018f · fce018f
1 parent ed03a0e
commit fce018f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/PollApp.ts b/PollApp.ts
@@ -31,10 +31,10 @@ export class PollApp extends App implements IUIKitInteractionHandler {
     public async executeViewSubmitHandler(context: UIKitViewSubmitInteractionContext, read: IRead, http: IHttp, persistence: IPersistence, modify: IModify) {
         const data = context.getInteractionData();
 
-        const title = data.view.title.text;
+        const id = data.view.id;
+
+        if (/create-poll-modal/i.test(id)) {
 
-        switch (title) {
-            case 'Create a poll': {
                 const { state }: {
                     state: {
                         poll: {
@@ -87,9 +87,8 @@ export class PollApp extends App implements IUIKitInteractionHandler {
                 return {
                     success: true,
                 };
-            }
+            } else if (/create-mixed-visibility-modal/.test(id)) {
 
-            case 'Select anonymous options': {
                 const { state }: {
                     state: {
                         mixedVisibility: {
@@ -121,8 +120,6 @@ export class PollApp extends App implements IUIKitInteractionHandler {
                 };
             }
 
-        }
-
         return {
             success: true,
         };

diff --git a/src/lib/createMixedVisibilityModal.ts b/src/lib/createMixedVisibilityModal.ts
@@ -24,7 +24,7 @@ export async function createMixedVisibilityModal({
     data: IUIKitViewSubmitIncomingInteraction;
     modify: IModify;
 }): Promise<IUIKitModalViewParam> {
-    const viewId = id || uuid();
+    const viewId = id || `create-mixed-visibility-modal-${uuid()}`;
 
     const association = new RocketChatAssociationRecord(
         RocketChatAssociationModel.MISC,

diff --git a/src/lib/createPollModal.ts b/src/lib/createPollModal.ts
@@ -13,7 +13,7 @@ export async function createPollModal({ id = '', question, persistence, data, mo
     modify: IModify,
     options?: number,
 }): Promise<IUIKitModalViewParam> {
-    const viewId = id || uuid();
+    const viewId = id || `create-poll-modal-${uuid()}`;
 
     const association = new RocketChatAssociationRecord(RocketChatAssociationModel.MISC, viewId);
     await persistence.createWithAssociation(data, association);