fix: PostbackInput

frontend/src/components/visual-editor/form/inputs/triggers/PostbackInput.tsx

@@ -9,6 +9,7 @@
 import {
   Autocomplete,
   Box,
+  Chip,
   CircularProgress,
   InputAdornment,
   Skeleton,
@@ -26,6 +27,7 @@ import {
   ButtonType,
   PayloadType,
   PostBackButton,
+  QuickReplyType,
   StdOutgoingButtonsMessage,
   StdOutgoingQuickRepliesMessage,
   StdQuickReply,
@@ -37,9 +39,8 @@ type PayloadOption = PayloadPattern & {
   group: string;
 };
 
-const isSamePostback = <T extends PayloadPattern>(a: T, b: T) => {
+const isSamePostback = <T extends PayloadPattern>(a: T, b: T) =>
-  return a.label === b.label && a.value === b.value;
+  a.label === b.label && a.value === b.value;
-};
 
 type PostbackInputProps = {
   defaultValue?: PayloadPattern;
@@ -89,28 +90,24 @@ export const PostbackInput = ({
     () =>
       (block?.previousBlocks || [])
         .map((b) => getBlockFromCache(b))
-        .filter((b) => {
+        .filter(
-          return b && typeof b.message === "object" && "buttons" in b.message;
+          (b) => b && typeof b.message === "object" && "buttons" in b.message,
-        })
+        )
         .map((b) => b as IBlock)
         .reduce((acc, b) => {
           const postbackButtons = (
             (b.message as StdOutgoingButtonsMessage)?.buttons || []
           )
             .filter((btn) => btn.type === ButtonType.postback)
-            .map((btn) => {
+            .map((btn) => ({ ...btn, group: b.name }));
-              return { ...btn, group: b.name };
-            });
 
           return acc.concat(postbackButtons);
         }, [] as (PostBackButton & { group: string })[])
-        .map((btn) => {
+        .map((btn) => ({
-          return {
+          label: btn.title,
-            label: btn.title,
+          value: btn.payload,
-            value: btn.payload,
+          group: "buttons",
-            group: btn.group,
+        })),
-          };
-        }),
     [block?.previousBlocks, getBlockFromCache],
   );
   //  Gather previous blocks quick replies
@@ -118,32 +115,27 @@ export const PostbackInput = ({
     () =>
       (block?.previousBlocks || [])
         .map((b) => getBlockFromCache(b))
-        .filter((b) => {
+        .filter(
-          return (
+          (b) =>
-            b && typeof b.message === "object" && "quickReplies" in b.message
+            b && typeof b.message === "object" && "quickReplies" in b.message,
-          );
+        )
-        })
         .map((b) => b as IBlock)
         .reduce((acc, b) => {
           const postbackQuickReplies = (
             (b.message as StdOutgoingQuickRepliesMessage)?.quickReplies || []
           )
-            .filter((btn) => btn.content_type === "text")
+            .filter(({ content_type }) => content_type === QuickReplyType.text)
-            .map((btn) => {
+            .map((btn) => ({ ...btn, group: b.name }));
-              return { ...btn, group: b.name };
-            });
 
           return acc.concat(postbackQuickReplies);
         }, [] as (StdQuickReply & { group: string })[])
-        .map((btn) => {
+        .map((btn) => ({
-          return {
+          id: btn.payload as string,
-            id: btn.payload as string,
+          label: btn.title as string,
-            label: btn.title as string,
+          value: btn.payload as string,
-            value: btn.payload as string,
+          type: PayloadType.menu,
-            type: PayloadType.menu,
+          group: "quick_replies",
-            group: btn.group,
+        })),
-          };
-        }),
     [block?.previousBlocks],
   );
   const menuOptions = menu
@@ -158,15 +150,13 @@ export const PostbackInput = ({
   const contentOptions = useMemo(
     () =>
       (block?.previousBlocks || [])
-        .map((bId) => getBlockFromCache(bId))
+        .map((bId) => getBlockFromCache(bId) as IBlock)
-        .filter((b) => {
+        .filter(
-          return (
+          (b) =>
             b &&
             b.options?.content?.entity &&
-            b.options.content.buttons.length > 0
+            b.options.content.buttons.length > 0,
-          );
+        )
-        })
-        .map((b) => b as IBlock)
         .map((b) => {
           const availableContents = (contents || []).filter(
             ({ entity, status }) =>
@@ -214,60 +204,66 @@ export const PostbackInput = ({
     );
   }
   const selected = defaultValue
-    ? options.find((o) => {
+    ? options.find((o) => isSamePostback(o, defaultValue))
-        return isSamePostback(o, defaultValue);
-      })
     : undefined;
 
   return (
-    <Autocomplete<PayloadOption>
+    <Autocomplete
       size="small"
       defaultValue={selected}
       options={options}
-      // label={t("label.postback")}
       multiple={false}
       onChange={(_e, value) => {
         setSelectedValue(value);
         if (value) {
-          const {  group: _g, ...payloadPattern } = value;
+          const { group: _g, ...payloadPattern } = value;
 
           onChange(payloadPattern);
         } else {
           onChange(null);
         }
       }}
-      groupBy={(option) => {
+      groupBy={({ group }) => group ?? t("label.other")}
-        return option.group ?? t("label.other");
-      }}
       getOptionLabel={({ label }) => label}
-      renderGroup={(params) => (
+      renderGroup={({ key, group, children }) => (
-        <li key={params.key}>
+        <li key={key}>
           <Typography component="h4" p={2} fontWeight={700} color="primary">
-            {t(`label.${params.group}`)}
+            {t(`label.${group}`)}
           </Typography>
-          <Box>{params.children}</Box>
+          <Box>{children}</Box>
         </li>
       )}
-      renderInput={(props) => {
+      renderInput={(props) => (
-        return (
+        <Input
-          <Input
+          {...props}
-            {...props}
+          label={t("label.postback")}
-            label={t("label.postback")}
+          InputProps={{
-            InputProps={{
+            ...props.InputProps,
-              ...props.InputProps,
+            startAdornment: (
-              startAdornment: (
+              <InputAdornment position="start">
-                <InputAdornment position="start">
+                <Chip
-                  {selectedValue?.type || t("label.postback")}
+                  sx={{
-                </InputAdornment>
+                    p: "0",
-              ),
+                    m: "0 ",
-              endAdornment:
+                    fontSize: "12px",
-                isLoadingMenu || isLoadingContent ? (
+                    minWidth: "75px",
-                  <CircularProgress color="inherit" size={20} />
+                    maxHeight: "30px",
-                ) : null,
+                    borderRadius: "16px 0 0 16px",
-            }}
+                  }}
-          />
+                  style={{ padding: 0, margin: 0 }}
-        );
+                  color="primary"
-      }}
+                  label={selectedValue?.type || t("label.postback")}
+                  variant="role"
+                />
+              </InputAdornment>
+            ),
+            endAdornment:
+              isLoadingMenu || isLoadingContent ? (
+                <CircularProgress color="inherit" size={20} />
+              ) : null,
+          }}
+        />
+      )}
     />
   );
 };