feat: upgrade close dialog code snippets (#362)

PierrickVoulet · web-flow · commit 9459ae7d7b8f · 2025-05-01T14:14:04.000-04:00
* feat: upgrade close dialog code snippets

* Update python sample

* Update Java sample

* Update Apps Script sample
diff --git a/apps-script/contact-form-app/main.gs b/apps-script/contact-form-app/main.gs
@@ -177,26 +177,25 @@ function submitForm(event) {
   const contactName = event.common.parameters["contactName"];
   // Checks to make sure the user entered a contact name.
   // If no name value detected, returns an error message.
-  if (!contactName) {
-    const errorMessage = "Don't forget to name your new contact!";
-    if (event.dialogEventType === "SUBMIT_DIALOG") {
-      return { actionResponse: {
-        type: "DIALOG",
-        dialogAction: { actionStatus: {
-          statusCode: "INVALID_ARGUMENT",
-          userFacingMessage: errorMessage
-        }}
-      }};
-    } else {
-      return {
-        privateMessageViewer: event.user,
-        text: errorMessage
-      };
-    }
+  const errorMessage = "Don't forget to name your new contact!";
+  if (!contactName && event.dialogEventType === "SUBMIT_DIALOG") {
+    return { actionResponse: {
+      type: "DIALOG",
+      dialogAction: { actionStatus: {
+        statusCode: "INVALID_ARGUMENT",
+        userFacingMessage: errorMessage
+      }}
+    }};
   }
   // [END status_notification]
+  if (!contactName) {
+    return {
+      privateMessageViewer: event.user,
+      text: errorMessage
+    };
+  }
 
-  // [START confirmation_message]
+  // [START confirmation_success]
   // The Chat app indicates that it received form data from the dialog or card.
   // Sends private text message that confirms submission.
   const confirmationMessage = "✅ " + contactName + " has been added to your contacts.";
@@ -209,14 +208,15 @@ function submitForm(event) {
           userFacingMessage: "Success " + contactName
         }}
       }
-    }
-  } else {
-    return {
-      actionResponse: { type: "NEW_MESSAGE" },
-      privateMessageViewer: event.user,
-      text: confirmationMessage
     };
   }
+  // [END confirmation_success]
+  // [START confirmation_message]
+  return {
+    actionResponse: { type: "NEW_MESSAGE" },
+    privateMessageViewer: event.user,
+    text: confirmationMessage
+  };
   // [END confirmation_message]
 }
 
diff --git a/java/contact-form-app/src/main/java/com/google/chat/contact/App.java b/java/contact-form-app/src/main/java/com/google/chat/contact/App.java
@@ -202,23 +202,22 @@ Message submitForm(JsonNode event) {
     String contactName = event.at("/common/parameters/contactName").asText();
     // Checks to make sure the user entered a contact name.
     // If no name value detected, returns an error message.
-    if (contactName.isEmpty()) {
-      String errorMessage = "Don't forget to name your new contact!";
-      if (event.at("/dialogEventType") != null && "SUBMIT_DIALOG".equals(event.at("/dialogEventType").asText())) {
-        return new Message().setActionResponse(new ActionResponse()
-          .setType("DIALOG")
-          .setDialogAction(new DialogAction().setActionStatus(new ActionStatus()
-            .setStatusCode("INVALID_ARGUMENT")
-            .setUserFacingMessage(errorMessage))));
-      } else {
-        return new Message()
-          .setPrivateMessageViewer(new User().setName(event.at("/user/name").asText()))
-          .setText(errorMessage);
-      }
+    String errorMessage = "Don't forget to name your new contact!";
+    if (contactName.isEmpty() && event.at("/dialogEventType") != null && "SUBMIT_DIALOG".equals(event.at("/dialogEventType").asText())) {
+      return new Message().setActionResponse(new ActionResponse()
+        .setType("DIALOG")
+        .setDialogAction(new DialogAction().setActionStatus(new ActionStatus()
+          .setStatusCode("INVALID_ARGUMENT")
+          .setUserFacingMessage(errorMessage))));
     }
     // [END status_notification]
+    if (contactName.isEmpty()) {
+      return new Message()
+        .setPrivateMessageViewer(new User().setName(event.at("/user/name").asText()))
+        .setText(errorMessage);
+    }
 
-    // [START confirmation_message]
+    // [START confirmation_success]
     // The Chat app indicates that it received form data from the dialog or card.
     // Sends private text message that confirms submission.
     String confirmationMessage = "✅ " + contactName + " has been added to your contacts.";
@@ -228,12 +227,13 @@ Message submitForm(JsonNode event) {
         .setDialogAction(new DialogAction().setActionStatus(new ActionStatus()
           .setStatusCode("OK")
           .setUserFacingMessage("Success " + contactName))));
-    } else {
-      return new Message()
-        .setActionResponse(new ActionResponse().setType("NEW_MESSAGE"))
-        .setPrivateMessageViewer(new User().setName(event.at("/user/name").asText()))
-        .setText(confirmationMessage);
     }
+    // [END confirmation_success]
+    // [START confirmation_message]
+    return new Message()
+      .setActionResponse(new ActionResponse().setType("NEW_MESSAGE"))
+      .setPrivateMessageViewer(new User().setName(event.at("/user/name").asText()))
+      .setText(confirmationMessage);
     // [END confirmation_message]
   }
 
diff --git a/node/contact-form-app/index.js b/node/contact-form-app/index.js
@@ -197,26 +197,25 @@ function submitForm(event) {
   const contactName = event.common.parameters["contactName"];
   // Checks to make sure the user entered a contact name.
   // If no name value detected, returns an error message.
-  if (!contactName) {
-    const errorMessage = "Don't forget to name your new contact!";
-    if (event.dialogEventType === "SUBMIT_DIALOG") {
-      return { actionResponse: {
-        type: "DIALOG",
-        dialogAction: { actionStatus: {
-          statusCode: "INVALID_ARGUMENT",
-          userFacingMessage: errorMessage
-        }}
-      }};
-    } else {
-      return {
-        privateMessageViewer: event.user,
-        text: errorMessage
-      };
-    }
+  const errorMessage = "Don't forget to name your new contact!";
+  if (!contactName && event.dialogEventType === "SUBMIT_DIALOG") {
+    return { actionResponse: {
+      type: "DIALOG",
+      dialogAction: { actionStatus: {
+        statusCode: "INVALID_ARGUMENT",
+        userFacingMessage: errorMessage
+      }}
+    }};
   }
   // [END status_notification]
+  if (!contactName) {
+    return {
+      privateMessageViewer: event.user,
+      text: errorMessage
+    };
+  }
 
-  // [START confirmation_message]
+  // [START confirmation_success]
   // The Chat app indicates that it received form data from the dialog or card.
   // Sends private text message that confirms submission.
   const confirmationMessage = "✅ " + contactName + " has been added to your contacts.";
@@ -229,14 +228,15 @@ function submitForm(event) {
           userFacingMessage: "Success " + contactName
         }}
       }
-    }
-  } else {
-    return {
-      actionResponse: { type: "NEW_MESSAGE" },
-      privateMessageViewer: event.user,
-      text: confirmationMessage
     };
   }
+  // [END confirmation_success]
+  // [START confirmation_message]
+  return {
+    actionResponse: { type: "NEW_MESSAGE" },
+    privateMessageViewer: event.user,
+    text: confirmationMessage
+  };
   // [END confirmation_message]
 }
 
diff --git a/python/contact-form-app/main.py b/python/contact-form-app/main.py
@@ -169,24 +169,23 @@ def submit_form(event: dict) -> dict:
   contact_name = event.get('common').get('parameters')["contactName"]
   # Checks to make sure the user entered a contact name.
   # If no name value detected, returns an error message.
-  if contact_name == "":
-    error_message = "Don't forget to name your new contact!"
-    if "SUBMIT_DIALOG" == event.get('dialogEventType'):
-      return { 'actionResponse': {
-        'type': "DIALOG",
-        'dialogAction': { 'actionStatus': {
-          'statusCode': "INVALID_ARGUMENT",
-          'userFacingMessage': error_message
-        }}
+  error_message = "Don't forget to name your new contact!"
+  if contact_name == "" and "SUBMIT_DIALOG" == event.get('dialogEventType'):
+    return { 'actionResponse': {
+      'type': "DIALOG",
+      'dialogAction': { 'actionStatus': {
+        'statusCode': "INVALID_ARGUMENT",
+        'userFacingMessage': error_message
       }}
-    else:
-      return {
-        'privateMessageViewer': event.get('user'),
-        'text': error_message
-      }
-      # [END status_notification]
-
-  # [START confirmation_message]
+    }}
+    # [END status_notification]
+  if contact_name == "":
+    return {
+      'privateMessageViewer': event.get('user'),
+      'text': error_message
+    }
+  
+  # [START confirmation_success]
   # The Chat app indicates that it received form data from the dialog or card.
   # Sends private text message that confirms submission.
   confirmation_message = "✅ " + contact_name + " has been added to your contacts.";
@@ -200,13 +199,14 @@ def submit_form(event: dict) -> dict:
         }}
       }
     }
-  else:
-    return {
-      'actionResponse': { 'type': "NEW_MESSAGE" },
-      'privateMessageViewer': event.get('user'),
-      'text': confirmation_message
-    }
-    # [END confirmation_message]
+    # [END confirmation_success]
+  # [START confirmation_message]
+  return {
+    'actionResponse': { 'type': "NEW_MESSAGE" },
+    'privateMessageViewer': event.get('user'),
+    'text': confirmation_message
+  }
+  # [END confirmation_message]
 
 
 def fetch_form_value(event: dict, widgetName: str) -> str:
