@hhgtech/hhg-components 1.29.341-beta-4 → 1.29.341-beta-5

package/build/{index-29cf2fe1.js → index-9b3f7407.js}

@@ -1,22 +1,22 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-4dedca11.js');
+var tslib_es6 = require('./tslib.es6-1e89b599.js');
 var React = require('react');
-require('./index-54683d40.js');
+require('./index-f2f7c253.js');
 require('@mantine/core');
 require('@mantine/dates');
-require('./index-362bc4f9.js');
-require('./index-57cd81cf.js');
-require('./index-3eda77c6.js');
-require('./useMantineLocale-479576d6.js');
-var index = require('./index-9effb66f.js');
-require('./index-690bdbc6.js');
-require('./index.styles-be64e85f.js');
-require('./translationsContext-ac37a205.js');
+require('./index-68c83e43.js');
+require('./index-3f368d25.js');
+require('./index-63ebb255.js');
+require('./useMantineLocale-5d31eb43.js');
+var index = require('./index-60ac9e4f.js');
+require('./index-956bf295.js');
+require('./index.styles-00fb0f57.js');
+require('./translationsContext-78a38d7d.js');
 require('@mantine/hooks');
-require('./utils-26666340.js');
-require('./other-f704af7f.js');
-require('./index-3b962dba.js');
+require('./utils-0f489780.js');
+require('./other-2aef6e7b.js');
+require('./index-7c2cba9e.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 

package/build/{index-1fcad208.js → index-9d5d73b3.js}

@@ -1,49 +1,49 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-4dedca11.js');
+var tslib_es6 = require('./tslib.es6-1e89b599.js');
 var React = require('react');
 var other = require('@hhgtech/icons/other');
-var index$8 = require('./index-d0dee133.js');
-var index = require('./index-70ded784.js');
+var index$8 = require('./index-3c1fcd6a.js');
+var index = require('./index-cc01465c.js');
 var innertext = require('innertext');
 var miscTheme = require('./miscTheme.js');
-var index$5 = require('./index-54683d40.js');
+var index$5 = require('./index-f2f7c253.js');
 var core = require('@mantine/core');
 require('@mantine/dates');
-require('./index-362bc4f9.js');
-require('./index-57cd81cf.js');
-require('./index-3eda77c6.js');
-require('./useMantineLocale-479576d6.js');
-var index$2 = require('./index-9effb66f.js');
-var index$1 = require('./index-690bdbc6.js');
-require('./index.styles-be64e85f.js');
+require('./index-68c83e43.js');
+require('./index-3f368d25.js');
+require('./index-63ebb255.js');
+require('./useMantineLocale-5d31eb43.js');
+var index$2 = require('./index-60ac9e4f.js');
+var index$1 = require('./index-956bf295.js');
+require('./index.styles-00fb0f57.js');
 require('@mantine/hooks');
-var utils = require('./utils-26666340.js');
-require('./other-f704af7f.js');
-require('./index-3b962dba.js');
-var index$3 = require('./index-ede69033.js');
-var togetherComponentGlobalContext = require('./utils-5dcf29aa.js');
+var utils = require('./utils-0f489780.js');
+require('./other-2aef6e7b.js');
+require('./index-7c2cba9e.js');
+var index$3 = require('./index-bf12cb46.js');
+var togetherComponentGlobalContext = require('./utils-070d8e57.js');
 var styled = require('@emotion/styled');
-var dataTransform = require('./dataTransform-a15b85e7.js');
-var constants = require('./constants-3c7cf264.js');
-var post = require('./post-7adf6e08.js');
-var togetherMoleculesCardAuthor = require('./index-3fe0c60c.js');
-var togetherRichTextEditor = require('./editor-ca130e52.js');
-var index$4 = require('./index-be4ae18d.js');
+var dataTransform = require('./dataTransform-35738d62.js');
+var constants = require('./constants-198d54f3.js');
+var post = require('./post-ee5f90af.js');
+var togetherMoleculesCardAuthor = require('./index-14523591.js');
+var togetherRichTextEditor = require('./editor-669a36ec.js');
+var index$4 = require('./index-bb6c2f03.js');
 var debounce = require('lodash/debounce');
 var ContentEditable = require('react-contenteditable');
 var togetherApiPaths = require('./togetherApiPaths.js');
-var index$6 = require('./index-55d014c0.js');
-var index$7 = require('./index-15d71fb1.js');
-var index$9 = require('./index-58be9dad.js');
-var Locale = require('./Locale-5a458df9.js');
+var index$6 = require('./index-b2accd66.js');
+var index$7 = require('./index-7b0ba6b9.js');
+var index$9 = require('./index-73feb185.js');
+var Locale = require('./Locale-67318c96.js');
 var ReactDOM = require('react-dom');
-var togetherMoleculesPostImagePreview = require('./index-16479235.js');
-var index$c = require('./index-2d2e3b0c.js');
+var togetherMoleculesPostImagePreview = require('./index-a5495fa5.js');
+var index$c = require('./index-d4848610.js');
 var miscCookieHelper = require('./miscCookieHelper.js');
-var useUniqueId = require('./useUniqueId-30cb684a.js');
-var index$a = require('./index-5a2de97e.js');
-var index$b = require('./index-ac76bfbc.js');
+var useUniqueId = require('./useUniqueId-fe9aa36d.js');
+var index$a = require('./index-435a9bed.js');
+var index$b = require('./index-2fa2dc29.js');
 var core$1 = require('@hhgtech/icons/core');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
@@ -1467,10 +1467,18 @@ const StyledTopicSelectList$1 = styled__default["default"].div `
   }
 `;
 
-const TopicSelectList$1 = ({ className, style, topics: topicsProp, communityId, onChange, isLoading, disabled, forceTopics, selectedTopics: selectedTopicsProp, noFetch, dataEventCategory, dataEventAction, dataEventLabel, }) => {
+const TopicSelectList$1 = ({ className, style, topics: topicsProp, communityId, onChange, isLoading, disabled, 
+// forceTopics,
+selectedTopics: selectedTopicsProp, noFetch, dataEventCategory, dataEventAction, dataEventLabel, }) => {
     const { data: { locale, env: { isMarryBaby }, }, } = React.useContext(togetherComponentGlobalContext.TogetherComponentGlobalContext);
-    const [topics, setTopics] = React.useState(topicsProp ? [...topicsProp] : []);
-    const [selectedTopics, setSelectedTopics] = React.useState(selectedTopicsProp ? [...selectedTopicsProp] : []);
+    // const [topics, setTopics] = useState<Topic[]>(
+    //   topicsProp ? [...topicsProp] : [],
+    // )
+    const [topics, setTopics] = React.useState([]);
+    // const [selectedTopics, setSelectedTopics] = useState<Topic[]>(
+    //   selectedTopicsProp ? [...selectedTopicsProp] : [],
+    // )
+    const [selectedTopics, setSelectedTopics] = React.useState([]);
     const [isLoadingTopics, setIsLoadingTopics] = React.useState(false);
     const topicsPropRef = React.useRef(topicsProp);
     topicsPropRef.current = topicsProp;
@@ -1488,7 +1496,19 @@ const TopicSelectList$1 = ({ className, style, topics: topicsProp, communityId,
                     }), 'GET');
                     const topicRes = (_b = res === null || res === void 0 ? void 0 : res.data) === null || _b === void 0 ? void 0 : _b.topics;
                     if (Array.isArray(topicRes)) {
-                        setTopics(() => (topicRes === null || topicRes === void 0 ? void 0 : topicRes.map(dataTransform.formatTopic).sort((t1, t2) => (t1.order || 0) - (t2.order || 0))) || []);
+                        // setTopics(
+                        //   () =>
+                        //     topicRes
+                        //       ?.map<Topic>(formatTopic)
+                        //       .sort(
+                        //         (t1: Topic, t2: Topic) => (t1.order || 0) - (t2.order || 0),
+                        //       ) || [],
+                        // )
+                        let newTopics = [];
+                        topicRes === null || topicRes === void 0 ? void 0 : topicRes.forEach((item) => {
+                            newTopics = newTopics.concat(item.discover_category);
+                        });
+                        setTopics(newTopics);
                     }
                 }
                 catch (e) {
@@ -1499,42 +1519,54 @@ const TopicSelectList$1 = ({ className, style, topics: topicsProp, communityId,
             }))();
         }
     }, [communityId, noFetch]);
-    const topicsPropString = topicsProp === null || topicsProp === void 0 ? void 0 : topicsProp.map((t) => t.id).join('-');
-    const topicsStateString = topics === null || topics === void 0 ? void 0 : topics.map((t) => t.id).join('-');
-    const forceTopicsPropString = forceTopics === null || forceTopics === void 0 ? void 0 : forceTopics.map((t) => t.id).join('-');
-    React.useEffect(() => {
-        if (topicsProp &&
-            typeof topicsPropString !== 'undefined' &&
-            topicsPropString !== topicsStateString) {
-            setTopics(topicsProp);
-        }
-    }, [topicsProp, topicsPropString, topicsStateString]);
-    const topicsWithoutForced = React.useMemo(() => topics.filter((t) => !(forceTopics === null || forceTopics === void 0 ? void 0 : forceTopics.some((ft) => (ft.id && ft.id === t.id) ||
-        (ft.mappedCategoryId &&
-            ft.mappedCategoryId === t.mappedCategoryId)))), [topicsStateString, forceTopicsPropString]);
+    // const topicsPropString = topicsProp?.map((t) => t.id).join('-')
+    // const topicsStateString = topics?.map((t) => t.id).join('-')
+    // const forceTopicsPropString = forceTopics?.map((t) => t.id).join('-')
+    // useEffect(() => {
+    //   if (
+    //     topicsProp &&
+    //     typeof topicsPropString !== 'undefined' &&
+    //     topicsPropString !== topicsStateString
+    //   ) {
+    //     setTopics(topicsProp)
+    //   }
+    // }, [topicsProp, topicsPropString, topicsStateString])
+    // const topicsWithoutForced = useMemo(
+    //   () =>
+    //     topics.filter(
+    //       (t) =>
+    //         !forceTopics?.some(
+    //           (ft) =>
+    //             (ft.id && ft.id === t.id) ||
+    //             (ft.mappedCategoryId &&
+    //               ft.mappedCategoryId === t.mappedCategoryId),
+    //         ),
+    //     ),
+    //   [topicsStateString, forceTopicsPropString],
+    // )
     return (React__default["default"].createElement(StyledTopicSelectList$1, { "data-is-marrybaby": isMarryBaby, className: className, style: style },
-        forceTopics.map((topic) => (React__default["default"].createElement(TopicItem$1, { key: `${topic.id}-${topic.mappedCategoryId}`, topic: topic, disabled: true, selected: true, dataEventAction: dataEventAction, dataEventCategory: dataEventCategory, dataEventLabel: dataEventLabel }))),
-        topicsWithoutForced.map((topic) => (React__default["default"].createElement(TopicItem$1, { key: `${topic.id}-${topic.mappedCategoryId}`, topic: topic, disabled: disabled, selected: (selectedTopicsProp || selectedTopics).some((t) => (t.id && t.id === topic.id) ||
-                (t.mappedCategoryId &&
-                    t.mappedCategoryId === topic.mappedCategoryId)), onClick: () => {
-                const _selected = selectedTopicsProp || selectedTopics;
-                const foundIndex = _selected.findIndex((_selected) => (_selected.id && _selected.id === topic.id) ||
-                    (_selected.mappedCategoryId &&
-                        _selected.mappedCategoryId === topic.mappedCategoryId));
-                if (foundIndex !== -1) {
-                    _selected.splice(foundIndex, 1);
-                }
-                else {
-                    _selected.push(topic);
-                }
-                if (onChange && selectedTopicsProp) {
-                    onChange(_selected.slice());
-                }
-                else {
-                    onChange && onChange(_selected.slice());
-                    setSelectedTopics(_selected.slice());
-                }
-            }, dataEventAction: dataEventAction, dataEventCategory: dataEventCategory, dataEventLabel: dataEventLabel }))),
+        topics.map((topic) => {
+            return (React__default["default"].createElement(TopicItem$1, { key: `${topic.id}-${topic.category_id}`, topic: topic, disabled: disabled, selected: (selectedTopicsProp || selectedTopics).some((t) => (t.id && t.id === topic.id) ||
+                    ((t === null || t === void 0 ? void 0 : t.category_id) && (t === null || t === void 0 ? void 0 : t.category_id) === topic.category_id)), onClick: () => {
+                    const _selected = (selectedTopicsProp || selectedTopics);
+                    const foundIndex = _selected.findIndex((_selected) => (_selected.id && _selected.id === topic.id) ||
+                        ((_selected === null || _selected === void 0 ? void 0 : _selected.category_id) &&
+                            (_selected === null || _selected === void 0 ? void 0 : _selected.category_id) === topic.category_id));
+                    if (foundIndex !== -1) {
+                        _selected.splice(foundIndex, 1);
+                    }
+                    else {
+                        _selected.push(topic);
+                    }
+                    if (onChange && selectedTopicsProp) {
+                        onChange(_selected.slice());
+                    }
+                    else {
+                        onChange && onChange(_selected.slice());
+                        setSelectedTopics(_selected.slice());
+                    }
+                }, dataEventAction: dataEventAction, dataEventCategory: dataEventCategory, dataEventLabel: dataEventLabel }));
+        }),
         (isLoading || isLoadingTopics) && React__default["default"].createElement(togetherMoleculesCardAuthor.Loading, { className: "topic-spinner" })));
 };
 const TopicItem$1 = (_a) => {
@@ -2463,7 +2495,7 @@ const RichTextEditor = ({ html, onChange, className, style, placeholder, onImage
                 onChange === null || onChange === void 0 ? void 0 : onChange(value);
             }
         }
-    }, 500), []);
+    }, 200), []);
     React.useEffect(() => {
         onInvalidUrlsChange && onInvalidUrlsChange(invalidUrls);
     }, [invalidUrls]);
@@ -3418,9 +3450,11 @@ const applySpecialCharSite = [
     Locale.LOCALE.Malaysia,
     Locale.LOCALE.Vietnam,
 ];
-const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunity, articleId, editPostData, defaultCommunity, defaultTopics, userInfo, isMarryBaby = false, }) => {
+const CreateNewPostContentV2 = ({ className, style, onClose, onPostCreatedEdited, forceSelectCommunity, forceSelectTopics, articleId, editPostData, defaultCommunity, communities, userInfo, isMarryBaby = false, }) => {
     const isInEditMode = !!(editPostData === null || editPostData === void 0 ? void 0 : editPostData.id);
-    const { data: { locale, env: { togetherBasePath }, }, action: { pushNotifications, sanitizeFunction }, } = React.useContext(togetherComponentGlobalContext.TogetherComponentGlobalContext);
+    const { data: { locale,
+    // env: { togetherBasePath },
+     }, action: { pushNotifications, sanitizeFunction }, } = React.useContext(togetherComponentGlobalContext.TogetherComponentGlobalContext);
     const { t } = index.useTranslations();
     const containerRef = React.useRef(null);
     const [isAskDoctor, setIsAskDoctor] = React.useState(false);
@@ -3431,7 +3465,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
         label: t('community.choose'),
         value: '',
     });
-    const [selectedTopics, setSelectedTopics] = React.useState([]);
+    const [selectedTopics, setSelectedTopics] = React.useState([...forceSelectTopics] || []);
     const [error, setError] = React.useState({});
     const [imageFiles, setImageFiles] = React.useState([]);
     const [bannedWords, setBannedWords] = React.useState([]);
@@ -3470,14 +3504,16 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                 } })),
         },
     ];
-    const currentCommunity = React.useMemo(() => {
-        if (!communityValue.value)
-            return null;
-        const result = communitiesList.find((item) => String(item.id) === String(communityValue.value));
-        if (!result)
-            return null;
-        return result;
-    }, [communityValue, communitiesList]);
+    // const currentCommunity = useMemo(() => {
+    //   if (!communityValue.value) return null
+    //   const result = communitiesList.find(
+    //     (item) => String(item.id) === String(communityValue.value),
+    //   )
+    //   if (!result) return null
+    //   return result
+    // }, [communityValue, communitiesList])
+    const currentCommunity = forceSelectCommunity ||
+        communities.find((c) => `${c.id || ''}-${c.mappedCategoryId || ''}` === communityValue.value);
     // HANDLE etra action when OPEN AND CLOSE
     React.useEffect(() => {
         if (editPostData) {
@@ -3488,7 +3524,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                 label: post$1.community.name,
                 value: `${post$1.community.id || ''}-${post$1.community.mappedCategoryId || ''}`,
             });
-            setSelectedTopics(post$1.topics || []);
+            // setSelectedTopics(post.topics || [])
             setImageFiles(post$1.photos || []);
             setIsAskDoctor(!!post$1.isAskDoctor || false);
         }
@@ -3499,9 +3535,9 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                     value: `${defaultCommunity.id || ''}-${defaultCommunity.mappedCategoryId || ''}`,
                 });
             }
-            if (defaultTopics) {
-                setSelectedTopics(defaultTopics);
-            }
+            // if (defaultTopics) {
+            //   setSelectedTopics(defaultTopics)
+            // }
         }
     }, []);
     React.useEffect(() => {
@@ -3528,7 +3564,8 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             ]);
             const communitiesApi = (_a = resListCommunity === null || resListCommunity === void 0 ? void 0 : resListCommunity.data) === null || _a === void 0 ? void 0 : _a.communities;
             if (Array.isArray(communitiesApi) && communitiesApi.length) {
-                setCommunitiesList(communitiesApi);
+                const resultFormat = communitiesApi.map((item) => dataTransform.formatCommunity(item));
+                setCommunitiesList(resultFormat);
             }
             const topicRes = (_b = resListTopic === null || resListTopic === void 0 ? void 0 : resListTopic.data) === null || _b === void 0 ? void 0 : _b.topics;
             if (Array.isArray(topicRes)) {
@@ -3540,6 +3577,12 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             }
         }))();
     }, []);
+    const onCreateEditSuccess = (res) => {
+        if (onPostCreatedEdited) {
+            onPostCreatedEdited(dataTransform.formatPost(res), isInEditMode);
+        }
+        onClose && onClose();
+    };
     const validationUploadPhoto = (files) => {
         const errorMessage = Object.assign({}, error);
         if (files && files.length > 10) {
@@ -3622,22 +3665,20 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             console.log(value);
         }
     };
+    console.log(uncategorizedId);
+    console.log(topicsList);
     const submitPost = (uncategorized) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const isError = validationPost();
         if (isError)
             return;
         const bodyFormData = yield index$3.getPostFormData({
             title: titleValue,
             description: descriptionValue,
-            communityId: uncategorized
-                ? uncategorizedId
-                : String((currentCommunity === null || currentCommunity === void 0 ? void 0 : currentCommunity.id) || ''),
+            communityId: String((currentCommunity === null || currentCommunity === void 0 ? void 0 : currentCommunity.id) || ''),
             imageFiles,
             previewUrl,
-            topicIds: uncategorized
-                ? []
-                : selectedTopics === null || selectedTopics === void 0 ? void 0 : selectedTopics.map((topic) => String(topic.id || '')).filter(Boolean),
+            topicIds: selectedTopics === null || selectedTopics === void 0 ? void 0 : selectedTopics.map((topic) => String(topic.id || '')).filter(Boolean),
             locale,
             sanitizeFunction,
             categoryCommunityId: String((currentCommunity === null || currentCommunity === void 0 ? void 0 : currentCommunity.mappedCategoryId) || ''),
@@ -3649,6 +3690,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
         if (articleId) {
             bodyFormData.append('article_id', articleId);
         }
+        console.log(uncategorized);
         let res;
         if (isInEditMode) {
             if (editPostData === null || editPostData === void 0 ? void 0 : editPostData.id) {
@@ -3663,17 +3705,28 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             res = yield index$3.createPost({
                 formData: bodyFormData,
                 locale,
-                isArticleComment: !(currentCommunity === null || currentCommunity === void 0 ? void 0 : currentCommunity.id) && !!(currentCommunity === null || currentCommunity === void 0 ? void 0 : currentCommunity.mappedCategoryId),
+                isArticleComment: true,
             });
         }
         const resData = res === null || res === void 0 ? void 0 : res.data;
         if ((resData === null || resData === void 0 ? void 0 : resData.id) && !((_b = (_a = res === null || res === void 0 ? void 0 : res.messages) === null || _a === void 0 ? void 0 : _a.moderation) === null || _b === void 0 ? void 0 : _b.type)) {
-            const params = `action=${editPostData ? 'editPost' : 'createPost'}&askDoctor=${(resData === null || resData === void 0 ? void 0 : resData.is_question) ? 'true' : 'false'}`;
-            const postHref = `${togetherComponentGlobalContext.getCurrentBaseUrl(locale)}${togetherBasePath}/${(_c = resData === null || resData === void 0 ? void 0 : resData.community) === null || _c === void 0 ? void 0 : _c.slug}/${resData === null || resData === void 0 ? void 0 : resData.slug}/?${params}`;
-            window.location.href = postHref;
+            // const params = `action=${
+            //   editPostData ? 'editPost' : 'createPost'
+            // }&askDoctor=${resData?.is_question ? 'true' : 'false'}`
+            // const postHref = `${getCurrentBaseUrl(locale)}${togetherBasePath}/${
+            //   resData?.community?.slug
+            // }/${resData?.slug}/?${params}`
+            // window.location.href = postHref
+            pushNotifications({
+                message: isInEditMode
+                    ? t('updatePost.popup.success')
+                    : t('createPost.popup.success'),
+                type: 'success',
+            });
+            onCreateEditSuccess(resData);
         }
         else {
-            if (((_e = (_d = res === null || res === void 0 ? void 0 : res.messages) === null || _d === void 0 ? void 0 : _d.moderation) === null || _e === void 0 ? void 0 : _e.type) === 'banned') {
+            if (((_d = (_c = res === null || res === void 0 ? void 0 : res.messages) === null || _c === void 0 ? void 0 : _c.moderation) === null || _d === void 0 ? void 0 : _d.type) === 'banned') {
                 pushNotifications({
                     title: t('notification.post.blocked.title'),
                     message: t('notification.post.blocked.message'),
@@ -3683,7 +3736,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                     setBannedWords(res.messages.moderation.words);
                 }
             }
-            else if (((_g = (_f = res === null || res === void 0 ? void 0 : res.messages) === null || _f === void 0 ? void 0 : _f.moderation) === null || _g === void 0 ? void 0 : _g.type) === 'suspect') {
+            else if (((_f = (_e = res === null || res === void 0 ? void 0 : res.messages) === null || _e === void 0 ? void 0 : _e.moderation) === null || _f === void 0 ? void 0 : _f.type) === 'suspect') {
                 pushNotifications({
                     title: t('notification.post.suspect.title'),
                     message: t('notification.post.suspect.message'),
@@ -3691,7 +3744,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                 });
                 onClose && onClose();
             }
-            else if ((_j = (_h = res === null || res === void 0 ? void 0 : res.messages) === null || _h === void 0 ? void 0 : _h.find) === null || _j === void 0 ? void 0 : _j.call(_h, (m) => { var _a; return !!((_a = m === null || m === void 0 ? void 0 : m.includes) === null || _a === void 0 ? void 0 : _a.call(m, 'suspend')); })) {
+            else if ((_h = (_g = res === null || res === void 0 ? void 0 : res.messages) === null || _g === void 0 ? void 0 : _g.find) === null || _h === void 0 ? void 0 : _h.call(_g, (m) => { var _a; return !!((_a = m === null || m === void 0 ? void 0 : m.includes) === null || _a === void 0 ? void 0 : _a.call(m, 'suspend')); })) {
                 pushNotifications({
                     message: t('notification.suspend.message'),
                     type: 'danger',
@@ -3700,7 +3753,7 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             }
             else {
                 pushNotifications({
-                    message: ((_k = res === null || res === void 0 ? void 0 : res.messages) === null || _k === void 0 ? void 0 : _k[0]) || t('notification.failure'),
+                    message: ((_j = res === null || res === void 0 ? void 0 : res.messages) === null || _j === void 0 ? void 0 : _j[0]) || t('notification.failure'),
                     type: 'danger',
                 });
             }
@@ -3732,13 +3785,20 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
         }
     };
     const onSubmitContinuePost = () => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-        var _l;
+        var _k;
         const isError = validationPost();
         if (isError) {
             const keyElmToScroll = getFirstOrderErroKey(orderErrorFieldKey);
             handleScrollToError(keyElmToScroll);
             return;
         }
+        submitPost();
+        if (stepPost)
+            return;
+        if (isInEditMode) {
+            submitPost();
+            return;
+        }
         setStepPost('step_community');
         // Current just apply ai suggest community for Vietnam site
         if (locale === Locale.LOCALE.Vietnam && !isMarryBaby && !isInEditMode) {
@@ -3770,11 +3830,16 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                                 topic_in: listTopicId.join(),
                                 pageSize: 100,
                             }), 'GET');
-                            const topicsApi = (_l = resTopic === null || resTopic === void 0 ? void 0 : resTopic.data) === null || _l === void 0 ? void 0 : _l.topics;
-                            const topicSuggested = topicsApi
-                                ? topicsApi.map((item) => dataTransform.formatTopic(item))
-                                : [];
-                            setSelectedTopics(topicSuggested);
+                            const topicsApi = (_k = resTopic === null || resTopic === void 0 ? void 0 : resTopic.data) === null || _k === void 0 ? void 0 : _k.topics;
+                            // const topicSuggested = topicsApi
+                            //   ? topicsApi.map((item) => formatTopic(item))
+                            //   : ([] as Topic[])
+                            let newTopics = [];
+                            topicsApi === null || topicsApi === void 0 ? void 0 : topicsApi.forEach((item) => {
+                                newTopics = newTopics.concat(item.discover_category);
+                            });
+                            // setTopics(newTopics)
+                            setSelectedTopics(newTopics);
                         }
                     }
                 }
@@ -3787,7 +3852,6 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
             }
         }
     });
-    console.log('topicsList: ', topicsList);
     return (React__default["default"].createElement(StyledCreateNewPost, { className: `${className} create-post-popup-frame`, style: style },
         React__default["default"].createElement("div", { className: "input-group-container", ref: containerRef },
             React__default["default"].createElement(StyledFormGroupInner, null,
@@ -3861,7 +3925,11 @@ const CreateNewPostContentV2 = ({ className, style, onClose, forceSelectCommunit
                     validationUploadPhoto(data);
                 } }),
             React__default["default"].createElement("div", { className: "action-wrapper" },
-                React__default["default"].createElement(index$1.Button, { className: "submit-btn pointer-event-child-none", size: "lg", "data-event-category": "Ask Doctor", "data-event-action": "Submit Question", "data-event-label": window.location.href, onClick: onSubmitContinuePost, loading: isLoadingSuggest, disabled: isLoadingSuggest }, t('onboarding.button.continue'))))));
+                React__default["default"].createElement(index$1.Button, { className: "submit-btn pointer-event-child-none", size: "lg", "data-event-category": "Ask Doctor", "data-event-action": "Submit Question", "data-event-label": window.location.href, onClick: onSubmitContinuePost, loading: isLoadingSuggest, disabled: isLoadingSuggest }, 
+                /* {isInEditMode
+                ? t('createPost.popup.submit')
+                : t('onboarding.button.continue')} */
+                t('createPost.popup.submit'))))));
 };
 
 const StyledTopicSelectList = styled__default["default"].div `

package/build/{index-13529096.js → index-a05b98e2.js}

@@ -1,34 +1,34 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-4dedca11.js');
+var tslib_es6 = require('./tslib.es6-1e89b599.js');
 var React = require('react');
-var index$6 = require('./index-2d2e3b0c.js');
-var index$3 = require('./index-f67663ff.js');
-var index = require('./index-70ded784.js');
+var index$6 = require('./index-d4848610.js');
+var index$3 = require('./index-92c51829.js');
+var index = require('./index-cc01465c.js');
 var innertext = require('innertext');
-var index$1 = require('./index-ede69033.js');
-var index$2 = require('./index-3eda77c6.js');
-var constants = require('./constants-3c7cf264.js');
+var index$1 = require('./index-bf12cb46.js');
+var index$2 = require('./index-63ebb255.js');
+var constants = require('./constants-198d54f3.js');
 var useTogetherAuthRequiredAction = require('./useTogetherAuthRequiredAction.js');
-var togetherComponentGlobalContext = require('./utils-5dcf29aa.js');
-var treePopoverMenu = require('./treePopoverMenu-0ccf0827.js');
+var togetherComponentGlobalContext = require('./utils-070d8e57.js');
+var treePopoverMenu = require('./treePopoverMenu-b8ffa288.js');
 var styled = require('@emotion/styled');
-var utils = require('./utils-26666340.js');
+var utils = require('./utils-0f489780.js');
 var miscTheme = require('./miscTheme.js');
-var dataTransform = require('./dataTransform-a15b85e7.js');
+var dataTransform = require('./dataTransform-35738d62.js');
 var togetherApiPaths = require('./togetherApiPaths.js');
-var index$8 = require('./index-15d71fb1.js');
-var togetherMoleculesCardAuthor = require('./index-3fe0c60c.js');
-var togetherMoleculesProfileDetail = require('./index-81ac4232.js');
-var togetherMoleculesPostImagePreview = require('./index-16479235.js');
-var index$7 = require('./index-51298ce7.js');
-require('./index-362bc4f9.js');
+var index$8 = require('./index-7b0ba6b9.js');
+var togetherMoleculesCardAuthor = require('./index-14523591.js');
+var togetherMoleculesProfileDetail = require('./index-a8e1460a.js');
+var togetherMoleculesPostImagePreview = require('./index-a5495fa5.js');
+var index$7 = require('./index-a1e10b80.js');
+require('./index-68c83e43.js');
 var core$1 = require('@hhgtech/icons/core');
 var other = require('@hhgtech/icons/other');
 var core = require('@mantine/core');
-var index$5 = require('./index-be4ae18d.js');
-var index$4 = require('./index-9effb66f.js');
-var normalizeLink = require('./normalizeLink-e1acde98.js');
+var index$5 = require('./index-bb6c2f03.js');
+var index$4 = require('./index-60ac9e4f.js');
+var normalizeLink = require('./normalizeLink-4f4ec65f.js');
 var constantsDomainLocales = require('./constantsDomainLocales.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }

package/build/{index-84ae746e.js → index-a1adb71d.js}

@@ -1,8 +1,8 @@
 'use strict';
 
-var index$1 = require('./index-f044180a.js');
-var index$2 = require('./index-362bc4f9.js');
-var index = require('./index-57cd81cf.js');
+var index$1 = require('./index-e875e6d7.js');
+var index$2 = require('./index-68c83e43.js');
+var index = require('./index-3f368d25.js');
 var Cookies = require('js-cookie');
 var uuid = require('uuid');
 var constantsIsProduction = require('./constantsIsProduction.js');
@@ -221,12 +221,25 @@ const clickAndOpenInNewTab = (url) => {
 const TIME_RESET_RESEND_OTP = 30;
 const isFakeEmail = (email) => {
     return (email === null || email === void 0 ? void 0 : email.endsWith('@hhg.com')) || (email === null || email === void 0 ? void 0 : email.endsWith('@facebook.com'));
-};
+};
+function formatUrlWithEncrypedGa(path = '', gaId = '') {
+    if (!path.startsWith('https://') || !gaId)
+        return '';
+    const url = new URL(path);
+    const searchParams = url.searchParams;
+    if (searchParams.get('hhgclid')) {
+        searchParams.delete('hhgclid');
+        searchParams.set('hhgclid', gaId);
+        return `${url.origin}${url.pathname}?${searchParams.toString()}`;
+    }
+    return path;
+}
 
 exports.TIME_RESET_RESEND_OTP = TIME_RESET_RESEND_OTP;
 exports.checkMobile = checkMobile;
 exports.checkUntilFinished = checkUntilFinished;
 exports.clickAndOpenInNewTab = clickAndOpenInNewTab;
+exports.formatUrlWithEncrypedGa = formatUrlWithEncrypedGa;
 exports.getHelloSitesUrl = getHelloSitesUrl;
 exports.getHhgIdFromCookie = getHhgIdFromCookie;
 exports.getSubotCookieId = getSubotCookieId;

package/build/{index-1ec2efb0.js → index-a42d4999.js}

@@ -2,12 +2,12 @@
 
 var React = require('react');
 var core = require('@mantine/core');
-var utils = require('./utils-26666340.js');
+var utils = require('./utils-0f489780.js');
 var react = require('@emotion/react');
 var styled = require('@emotion/styled');
 var miscTheme = require('./miscTheme.js');
-var animation = require('./animation-12e35c54.js');
-var index = require('./index-9effb66f.js');
+var animation = require('./animation-03df4310.js');
+var index = require('./index-60ac9e4f.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }