{CustomComponents?.CustomTopicDropDown ? (
CustomComponents.CustomTopicDropDown
diff --git a/core/src/components/LMFeedUploadBanner.tsx b/core/src/components/LMFeedUploadBanner.tsx
new file mode 100644
index 0000000..eadc44f
--- /dev/null
+++ b/core/src/components/LMFeedUploadBanner.tsx
@@ -0,0 +1,141 @@
+import React from "react";
+import { useLMFeedRetryPost } from "../hooks/useRetryPost";
+import { CircularProgress, Snackbar } from "@mui/material";
+import RetryIcon from "../assets/images/retry-mechanism.svg";
+import CancelIcon from "../assets/images/X.svg";
+
+const LMFeedUploadBanner: React.FC = () => {
+ const { isVisible, uploadFailed, handleRetry, handleCancel } =
+ useLMFeedRetryPost();
+
+ if (!isVisible) return null;
+
+ const postingMessage = (
+
Upload Failed.
+
+ );
+};
+
+export default LMFeedUploadBanner;
diff --git a/core/src/components/LMQNAFeedUniversalFeed.tsx b/core/src/components/LMQNAFeedUniversalFeed.tsx
index 631bb55..6b17fd0 100644
--- a/core/src/components/LMQNAFeedUniversalFeed.tsx
+++ b/core/src/components/LMQNAFeedUniversalFeed.tsx
@@ -14,6 +14,7 @@ import LMFeedGlobalClientProviderContext from "../contexts/LMFeedGlobalClientPro
import { LMFeedNotificationAnalytics } from "../shared/enums/lmNotificationAnalytics";
import LMQNAFeedCreatePost from "./LMQNAFeedCreatePost";
import LMQNAFeedPosts from "./LMQNAFeedPosts";
+import LMFeedUploadBanner from "./LMFeedUploadBanner";
interface LMFeedUniversalFeedProps {
PostView?: React.FC;
@@ -112,6 +113,7 @@ const LMQNAFeedUniversalFeed = (props: LMFeedUniversalFeedProps) => {
return (
+
{CustomComponents?.CustomTopicDropDown ? (
CustomComponents.CustomTopicDropDown
diff --git a/core/src/components/LMSocialFeed.tsx b/core/src/components/LMSocialFeed.tsx
index d8ec4e1..d9298b1 100644
--- a/core/src/components/LMSocialFeed.tsx
+++ b/core/src/components/LMSocialFeed.tsx
@@ -23,7 +23,6 @@ import {
LMCoreCallbacks,
LMSDKCallbacksImplementations,
} from "../shared/LMSDKCoreCallbacks";
-import LMFeedPostCreationProgressBar from "./LMFeedPostCreationProgressBar";
export interface LMFeedProps extends CustomAgentProviderInterface {
children?: React.ReactNode;
@@ -144,7 +143,7 @@ function LMSocialFeed({
logoutUser: logoutUser,
}}
>
-
+
@@ -154,7 +153,6 @@ function LMSocialFeed({
onClose={closeSnackbar}
autoHideDuration={3000}
/>
-
);
diff --git a/core/src/components/lmDialogs/LMFeedDeleteDialogBox.tsx b/core/src/components/lmDialogs/LMFeedDeleteDialogBox.tsx
index 5d02593..663b008 100644
--- a/core/src/components/lmDialogs/LMFeedDeleteDialogBox.tsx
+++ b/core/src/components/lmDialogs/LMFeedDeleteDialogBox.tsx
@@ -61,4 +61,5 @@ const LMFeedDeleteDialogBox = ({ mode, onClose }: LMDeletePostDialogProps) => {
);
};
+
export default LMFeedDeleteDialogBox;
diff --git a/core/src/components/lmTopicFeed/LMFeedTopicSelectedBlock.tsx b/core/src/components/lmTopicFeed/LMFeedTopicSelectedBlock.tsx
index 22e3bff..1a0c865 100644
--- a/core/src/components/lmTopicFeed/LMFeedTopicSelectedBlock.tsx
+++ b/core/src/components/lmTopicFeed/LMFeedTopicSelectedBlock.tsx
@@ -36,4 +36,5 @@ export const LMFeedTopicSelectedBlock = ({
);
}
}
-};
+
+};
\ No newline at end of file
diff --git a/core/src/components/lmTopicFeed/LMFeedTopicSelectionTile.tsx b/core/src/components/lmTopicFeed/LMFeedTopicSelectionTile.tsx
index ae94824..acaa945 100644
--- a/core/src/components/lmTopicFeed/LMFeedTopicSelectionTile.tsx
+++ b/core/src/components/lmTopicFeed/LMFeedTopicSelectionTile.tsx
@@ -29,4 +29,5 @@ const LMFeedTopicSelectionTile: React.FC
= memo(
},
);
+
export default LMFeedTopicSelectionTile;
diff --git a/core/src/components/lmTopicFeed/LMFeedTopicsTile.tsx b/core/src/components/lmTopicFeed/LMFeedTopicsTile.tsx
index 03c76e4..f5c8e4e 100644
--- a/core/src/components/lmTopicFeed/LMFeedTopicsTile.tsx
+++ b/core/src/components/lmTopicFeed/LMFeedTopicsTile.tsx
@@ -13,4 +13,5 @@ const LMFeedTopicsTile = ({ topic }: LMFeedTopicTileInterface) => {
);
};
+
export default LMFeedTopicsTile;
diff --git a/core/src/components/lmTopicFeed/LMFeedViewTopicDropdown.tsx b/core/src/components/lmTopicFeed/LMFeedViewTopicDropdown.tsx
index a9395a5..1686c1f 100644
--- a/core/src/components/lmTopicFeed/LMFeedViewTopicDropdown.tsx
+++ b/core/src/components/lmTopicFeed/LMFeedViewTopicDropdown.tsx
@@ -360,3 +360,4 @@ const LMFeedViewTopicDropdown: React.FC = ({
};
export default LMFeedViewTopicDropdown;
+
diff --git a/core/src/hooks/useCreatePost.ts b/core/src/hooks/useCreatePost.ts
index 680e5ee..7883ccb 100644
--- a/core/src/hooks/useCreatePost.ts
+++ b/core/src/hooks/useCreatePost.ts
@@ -1,4 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+import { createTempPost } from "../shared/utils/createTempPost";
+import { isMediaAttachmentType } from "../shared/utils/attachmentUtils";
import {
MutableRefObject,
useCallback,
@@ -38,7 +40,7 @@ import { ComponentDelegatorListener } from "../shared/types/cutomCallbacks/callb
import { LMAppAwsKeys } from "../shared/constants/lmAppAwsKeys";
import { numberToPollMultipleSelectState } from "../shared/utils";
import { PollType } from "../shared/enums/ImPollType";
-import { getDisplayMessage } from "../shared/utils";
+import { getDisplayMessage, getVideoDimensions, getImageDimensions } from "../shared/utils";
import {
OneArgVoidReturns,
@@ -46,6 +48,8 @@ import {
ZeroArgVoidReturns,
} from "./useInputs";
import { SelectChangeEvent } from "@mui/material";
+import { SaveTemporaryPostRequest } from "@likeminds.community/feed-js";
+import { DeleteTemporaryPostRequest } from "@likeminds.community/feed-js";
interface UseCreatePost {
postText: string | null;
@@ -301,6 +305,7 @@ export function useCreatePost(): UseCreatePost {
// declating state variables
const [openCreatePostDialog, setOpenCreatePostDialog] =
useState(false);
+ const [postCreationStarted, setPostCreationStarted] = useState(false);
const [showOGTagViewContainer, setShowOGTagViewContainer] =
useState(true);
const [text, setText] = useState("");
@@ -435,7 +440,7 @@ export function useCreatePost(): UseCreatePost {
setShowOGTagViewContainer(false);
}
- function pollExpiryTimeClickFunction() { }
+ function pollExpiryTimeClickFunction() {}
function editPollFunction() {
setPreviewPoll(false);
@@ -450,9 +455,19 @@ export function useCreatePost(): UseCreatePost {
}
}
+ function readFileAsBase64(file: File): Promise {
+ return new Promise((resolve, reject) => {
+ const reader = new FileReader();
+ reader.onload = () => resolve(reader.result as string);
+ reader.onerror = reject;
+ reader.readAsDataURL(file);
+ });
+ }
+
const postFeed = useCallback(
async function (customWidgetsData?: Record[]) {
try {
+ setPostCreationStarted(true);
if (openCreatePostDialog) setOpenCreatePostDialog(false);
if (openCreatePollDialog) setOpenCreatePollDialog(false);
@@ -474,12 +489,15 @@ export function useCreatePost(): UseCreatePost {
const attachmentResponseArray: Attachment[] = [];
+ let localTempId = null;
+ const tempId = `-${Date.now()}`;
+
if (pollText.length !== 0) {
const pollOtionsList: string[] = pollOptions.map((obj) => obj.text);
const multipleSelectState =
numberToPollMultipleSelectState[
- advancedPollOptions.MULTIPLE_SELECTION_STATE
+ advancedPollOptions.MULTIPLE_SELECTION_STATE
];
const pollType = advancedPollOptions.DONT_SHOW_LIVE_RESULTS
@@ -508,8 +526,98 @@ export function useCreatePost(): UseCreatePost {
.build(),
);
} else {
+ // First create attachments with local file paths
+ const localAttachments: Attachment[] = [];
if (mediaList.length) {
setOpenPostCreationProgressBar!(true);
+
+ localTempId = tempId;
+ for (const file of mediaList) {
+ const attachmentType = file.type.includes("image")
+ ? AttachmentType.IMAGE
+ : file.type.includes("video") &&
+ mediaUploadMode === LMFeedCreatePostMediaUploadMode.REEL
+ ? AttachmentType.REEL
+ : file.type.includes("video")
+ ? AttachmentType.VIDEO
+ : file.type.includes("pdf")
+ ? AttachmentType.DOCUMENT
+ : AttachmentType.DOCUMENT;
+ const base64 = await readFileAsBase64(file);
+
+ const LMFeedPostAttachmentMetaBuilder =
+ LMFeedPostAttachmentMeta.builder()
+ .setUrl(base64) // Store local file URL
+ .setFormat(file?.name?.split(".").slice(-1).toString())
+ .setSize(file.size)
+ .setName(file.name);
+
+ if (attachmentType === AttachmentType.IMAGE) {
+ const { width, height } = await getImageDimensions(file);
+ LMFeedPostAttachmentMetaBuilder.setWidth(width).setHeight(
+ height,
+ );
+ }
+
+ if (
+ attachmentType === AttachmentType.VIDEO ||
+ attachmentType === AttachmentType.REEL
+ ) {
+ const { width, height } = await getVideoDimensions(file);
+ LMFeedPostAttachmentMetaBuilder.setWidth(width).setHeight(
+ height,
+ );
+ }
+
+ const localAttachment = LMFeedPostAttachment.builder()
+ .setType(attachmentType)
+ .setMetadata(LMFeedPostAttachmentMetaBuilder.build())
+ .build();
+
+ localAttachments.push(localAttachment);
+ }
+
+ // Save temporary post with local attachments first
+ const tempPost = SaveTemporaryPostRequest.builder()
+ .setTempPost({
+ post: createTempPost({
+ textContent,
+ attachments: localAttachments,
+ selectedTopicIds,
+ isAnonymousPost,
+ question: question || "",
+ tempId,
+ uuid: currentUser?.sdkClientInfo.uuid || "",
+ }),
+ })
+ .build();
+
+ // Save to local storage
+ await lmFeedclient?.saveTemporaryPost(tempPost);
+
+ // Set the temporary post in the context
+ setTemporaryPost(tempPost.tempPost.post);
+
+ // Now proceed with AWS upload
+ try {
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_STARTED,
+ { tempId },
+ );
+
+ for (const file of mediaList) {
+ await HelperFunctionsClass.uploadMedia(
+ file,
+ currentUser?.sdkClientInfo.uuid || "",
+ );
+ }
+ } catch (error) {
+ // Hide banner if upload fails
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ );
+ throw error; // Re-throw to handle in the outer catch block
+ }
}
for (let index = 0; index < mediaList.length; index++) {
const file: File = mediaList[index];
@@ -524,7 +632,7 @@ export function useCreatePost(): UseCreatePost {
const attachmentType = file.type.includes("image")
? 1
: file.type.includes("video") &&
- mediaUploadMode === LMFeedCreatePostMediaUploadMode.REEL
+ mediaUploadMode === LMFeedCreatePostMediaUploadMode.REEL
? 11 // Setting attachmentType to 11 for reels
: file.type.includes("video")
? 2
@@ -543,6 +651,8 @@ export function useCreatePost(): UseCreatePost {
.setFormat(file?.name?.split(".").slice(-1).toString())
.setSize(file.size)
.setName(file.name)
+ .setHeight(localAttachments[index]?.metaData?.height || 0)
+ .setWidth(localAttachments[index]?.metaData?.width || 0)
.build(),
)
.build(),
@@ -560,6 +670,8 @@ export function useCreatePost(): UseCreatePost {
.setSize(file.size)
.setName(file.name)
.setDuration(10)
+ .setHeight(localAttachments[index]?.metaData?.height || 0)
+ .setWidth(localAttachments[index]?.metaData?.width || 0)
.build(),
)
.build(),
@@ -594,6 +706,8 @@ export function useCreatePost(): UseCreatePost {
.setSize(file.size)
.setName(file.name)
.setDuration(10) // Assuming duration is applicable to reels
+ .setHeight(localAttachments[index]?.metaData?.height || 0)
+ .setWidth(localAttachments[index]?.metaData?.width || 0)
.build(),
)
.build(),
@@ -663,8 +777,8 @@ export function useCreatePost(): UseCreatePost {
const newCustomWidgetsData = customWidgetsData.map((customData) => {
return {
meta: customData,
- }
- })
+ };
+ });
for (const customWidgetData of newCustomWidgetsData) {
attachmentResponseArray.push(
LMFeedPostAttachment.builder()
@@ -692,8 +806,21 @@ export function useCreatePost(): UseCreatePost {
const addPostRequest = addPostRequestBuilder.build();
+ // Check if post has media attachments
+ const hasMediaAttachments = attachmentResponseArray.some((attachment) =>
+ isMediaAttachmentType(attachment.type),
+ );
const call = await lmFeedclient?.addPost(addPostRequest);
if (call?.success) {
+ if (hasMediaAttachments && localTempId) {
+ const deleteRequest = DeleteTemporaryPostRequest.builder()
+ .setTemporaryPostId(localTempId) // Use the same ID that was saved
+ .build();
+
+ // Delete the temporary post from IndexedDB
+ await lmFeedclient?.deleteTemporaryPost(deleteRequest);
+ }
+
lmfeedAnalyticsClient?.sendPostCreatedEvent(call?.data?.post);
customEventClient?.dispatchEvent(
LMFeedCustomActionEvents.POST_CREATED,
@@ -701,8 +828,15 @@ export function useCreatePost(): UseCreatePost {
}
} catch (error) {
console.log(error);
+ // Dispatch failed event with upload failure flag
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ { isUploadFailure: true },
+ );
} finally {
setOpenPostCreationProgressBar!(false);
+ setPostCreationStarted(false);
+ resetStates();
}
},
[
@@ -745,12 +879,8 @@ export function useCreatePost(): UseCreatePost {
if (ogTag) {
if (
- !attachmentResponseArray.some(
- (attachment) =>
- attachment.type === AttachmentType.IMAGE ||
- attachment.type === AttachmentType.VIDEO ||
- attachment.type === AttachmentType.DOCUMENT ||
- attachment.type === AttachmentType.REEL,
+ !attachmentResponseArray.some((attachment) =>
+ isMediaAttachmentType(attachment.type),
)
) {
attachmentResponseArray.pop();
@@ -780,8 +910,8 @@ export function useCreatePost(): UseCreatePost {
const newCustomWidgetsData = customWidgetsData.map((customData) => {
return {
meta: customData,
- }
- })
+ };
+ });
for (const customWidgetData of newCustomWidgetsData) {
attachmentResponseArray.push(
LMFeedPostAttachment.builder()
@@ -879,26 +1009,106 @@ export function useCreatePost(): UseCreatePost {
}, [lmFeedclient, text]);
useEffect(() => {
+ // Listen for post creation started event
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATION_STARTED,
+ () => {
+ setPostCreationStarted(true);
+ }
+ );
+
+ // Listen for post creation completed/failed events
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATED,
+ () => {
+ setPostCreationStarted(false);
+ }
+ );
+
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ () => {
+ setPostCreationStarted(false);
+ }
+ );
+
+ // Listen for retry upload event
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.RETRY_POST_UPLOAD,
+ async (event: Event) => {
+ const customEvent = event as CustomEvent;
+ const post = customEvent.detail?.post;
+ if (post) {
+ // Reset states and start upload again
+ setTemporaryPost(post);
+ try {
+ setOpenPostCreationProgressBar!(true);
+ // Re-upload media attachments
+ for (const attachment of post.attachments) {
+ if (isMediaAttachmentType(attachment.type)) {
+ const file = attachment.metaData.file;
+ await HelperFunctionsClass.uploadMedia(
+ file,
+ currentUser?.sdkClientInfo.uuid || "",
+ );
+ }
+ }
+ // If upload successful, create the post
+ const addPostRequest = AddPostRequest.builder()
+ .setAttachments(post.attachments)
+ .setText(post.text)
+ .setTopicIds(post.topics)
+ .setTempId(post.id)
+ .setIsAnonymous(post.isAnonymous)
+ .build();
+
+ const call = await lmFeedclient?.addPost(addPostRequest);
+ if (call?.success) {
+ // Delete temporary post after successful creation
+ const deleteRequest = DeleteTemporaryPostRequest.builder()
+ .setTemporaryPostId(post.id)
+ .build();
+ await lmFeedclient?.deleteTemporaryPost(deleteRequest);
+
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATED,
+ );
+ }
+ } catch (error) {
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ { isUploadFailure: true },
+ );
+ } finally {
+ setOpenPostCreationProgressBar!(false);
+ resetStates();
+ }
+ }
+ },
+ );
+
customEventClient?.listen(
LMFeedCustomActionEvents.OPEN_CREATE_POST_DIALOUGE,
(event: Event) => {
- setOpenCreatePostDialog(true);
- const details = (event as CustomEvent).detail;
- const tempPost = details.post;
- const topicsMap = details.topics;
- setTemporaryPost(tempPost);
- const preSelectedTopicsArr = tempPost.topics.map((topicId: string) => {
- return topicsMap[topicId];
- });
- const ogTagAttchmentObject = tempPost?.attachments?.filter(
- (attachment: Attachment) => {
- return attachment.type === AttachmentType.LINK;
- },
- );
- if (ogTagAttchmentObject.length) {
- setOgtag(ogTagAttchmentObject[0].LMFeedPostAttachmentMeta.ogTags);
+ if (!postCreationStarted) {
+ setOpenCreatePostDialog(true);
+ const details = (event as CustomEvent).detail;
+ const tempPost = details.post;
+ const topicsMap = details.topics;
+ setTemporaryPost(tempPost);
+ const preSelectedTopicsArr = tempPost.topics.map((topicId: string) => {
+ return topicsMap[topicId];
+ });
+ const ogTagAttchmentObject = tempPost?.attachments?.filter(
+ (attachment: Attachment) => {
+ return attachment.type === AttachmentType.LINK;
+ },
+ );
+ if (ogTagAttchmentObject.length) {
+ setOgtag(ogTagAttchmentObject[0].LMFeedPostAttachmentMeta.ogTags);
+ }
+ setPreSelectedTopics(preSelectedTopicsArr);
}
- setPreSelectedTopics(preSelectedTopicsArr);
},
);
return () => {
@@ -1028,6 +1238,7 @@ export function useCreatePost(): UseCreatePost {
setQuestion(temporaryPost.heading);
}
}, [temporaryPost]);
+
return {
postText: text,
setPostText,
@@ -1049,7 +1260,11 @@ export function useCreatePost(): UseCreatePost {
: editPost,
ogTag,
openCreatePostDialog,
- setOpenCreatePostDialog,
+ setOpenCreatePostDialog: (value: boolean) => {
+ if (!postCreationStarted) {
+ setOpenCreatePostDialog(value);
+ }
+ },
temporaryPost,
clearPollFunction: onPollClearClicked
? onPollClearClicked.bind(null, postCreationActionAndDataStore)
@@ -1074,12 +1289,16 @@ export function useCreatePost(): UseCreatePost {
createPostComponentClickCustomCallback:
createPostComponentClickCustomCallback
? createPostComponentClickCustomCallback.bind(
- null,
- postCreationActionAndDataStore,
- )
+ null,
+ postCreationActionAndDataStore,
+ )
: undefined,
openCreatePollDialog,
- setOpenCreatePollDialog,
+ setOpenCreatePollDialog: (value: boolean) => {
+ if (!postCreationStarted) {
+ setOpenCreatePollDialog(value);
+ }
+ },
pollOptions,
addPollOption: onAddOptionClicked
? onAddOptionClicked.bind(null, postCreationActionAndDataStore)
diff --git a/core/src/hooks/useLMUserProvider.ts b/core/src/hooks/useLMUserProvider.ts
index 5a213a8..aae42ff 100644
--- a/core/src/hooks/useLMUserProvider.ts
+++ b/core/src/hooks/useLMUserProvider.ts
@@ -130,6 +130,7 @@ export default function useUserProvider(
lmFeedclient.setUserInLocalStorage(
JSON.stringify(initiateUserCall.data?.user),
);
+ lmFeedclient.initializeDatabase();
}
const memberStateCall: GetMemberStateResponse =
diff --git a/core/src/hooks/usePostPoll.ts b/core/src/hooks/usePostPoll.ts
index e6ef091..fd3ba4e 100644
--- a/core/src/hooks/usePostPoll.ts
+++ b/core/src/hooks/usePostPoll.ts
@@ -418,10 +418,10 @@ export function usePostPoll(): UsePostPoll {
isAddOptionDialogOpen,
handleAddOptionDialog: onAddPollOptionsClicked
? onAddPollOptionsClicked.bind(null, {
- pollCreationDataStore: pollPostDataStore,
- applicationGeneralStore: applicationGeneralsStore,
- defaultActions: defaultActions,
- })
+ pollCreationDataStore: pollPostDataStore,
+ applicationGeneralStore: applicationGeneralsStore,
+ defaultActions: defaultActions,
+ })
: handleAddOptionDialog,
showSubmitVoteButton,
showAddOptionButton,
@@ -431,10 +431,10 @@ export function usePostPoll(): UsePostPoll {
pollResultSelectedTab,
setPollResultSelectedTabFunction: onOptionSelected
? onOptionSelected.bind(null, {
- pollCreationDataStore: pollPostDataStore,
- applicationGeneralStore: applicationGeneralsStore,
- defaultActions: defaultActions,
- })
+ pollCreationDataStore: pollPostDataStore,
+ applicationGeneralStore: applicationGeneralsStore,
+ defaultActions: defaultActions,
+ })
: setPollResultSelectedTabFunction,
totalMultipleOptions,
newOption,
@@ -444,17 +444,17 @@ export function usePostPoll(): UsePostPoll {
handleOptionClick,
handleAddOptionSubmit: onSubmitButtonClick
? onSubmitButtonClick.bind(null, {
- pollCreationDataStore: pollPostDataStore,
- applicationGeneralStore: applicationGeneralsStore,
- defaultActions: defaultActions,
- })
+ pollCreationDataStore: pollPostDataStore,
+ applicationGeneralStore: applicationGeneralsStore,
+ defaultActions: defaultActions,
+ })
: handleAddOptionSubmit,
submitVoteHandler: onSubmitButtonClicked
? onSubmitButtonClicked.bind(null, {
- pollCreationDataStore: pollPostDataStore,
- applicationGeneralStore: applicationGeneralsStore,
- defaultActions: defaultActions,
- })
+ pollCreationDataStore: pollPostDataStore,
+ applicationGeneralStore: applicationGeneralsStore,
+ defaultActions: defaultActions,
+ })
: submitVoteHandler,
totalVotesCount,
totalMembersVotes,
@@ -462,10 +462,10 @@ export function usePostPoll(): UsePostPoll {
setIsEditModeFunction,
onOptionVoteCountClick: onPollOptionClicked
? onPollOptionClicked.bind(null, {
- pollCreationDataStore: pollPostDataStore,
- applicationGeneralStore: applicationGeneralsStore,
- defaultActions: defaultActions,
- })
+ pollCreationDataStore: pollPostDataStore,
+ applicationGeneralStore: applicationGeneralsStore,
+ defaultActions: defaultActions,
+ })
: onOptionVoteCountClick,
pollReadMoreTapped,
pollReadMoreTappedFunction,
diff --git a/core/src/hooks/useRetryPost.ts b/core/src/hooks/useRetryPost.ts
new file mode 100644
index 0000000..029a365
--- /dev/null
+++ b/core/src/hooks/useRetryPost.ts
@@ -0,0 +1,329 @@
+import { useContext, useEffect, useState } from "react";
+import { LMFeedCustomActionEvents } from "../shared/constants/lmFeedCustomEventNames";
+import LMFeedGlobalClientProviderContext from "../contexts/LMFeedGlobalClientProviderContext";
+import LMFeedUserProviderContext from "../contexts/LMFeedUserProviderContext";
+import {
+ DeleteTemporaryPostRequest,
+ AddPostRequest,
+ AttachmentType,
+ Attachment,
+ LMFeedPostAttachment,
+ LMFeedPostAttachmentMeta,
+} from "@likeminds.community/feed-js";
+import { HelperFunctionsClass } from "../shared/helper";
+import { LMAppAwsKeys } from "../shared/constants/lmAppAwsKeys";
+
+export interface LMFeedRetryPostHook {
+ isVisible: boolean;
+ tempPostId: string | null;
+ uploadFailed: boolean;
+ handleRetry: () => Promise;
+ handleCancel: () => Promise;
+}
+
+export const useLMFeedRetryPost = (): LMFeedRetryPostHook => {
+ const [isVisible, setIsVisible] = useState(false);
+ const [tempPostId, setTempPostId] = useState(null);
+ const [uploadFailed, setUploadFailed] = useState(false);
+ const [isOnline, setIsOnline] = useState(navigator.onLine);
+
+ const { customEventClient, lmFeedclient } = useContext(
+ LMFeedGlobalClientProviderContext,
+ );
+ const { currentUser } = useContext(LMFeedUserProviderContext);
+
+ useEffect(() => {
+ const handleOnline = () => setIsOnline(true);
+ const handleOffline = () => {
+ setIsOnline(false);
+ setUploadFailed(true);
+ };
+
+ window.addEventListener('online', handleOnline);
+ window.addEventListener('offline', handleOffline);
+
+ return () => {
+ window.removeEventListener('online', handleOnline);
+ window.removeEventListener('offline', handleOffline);
+ };
+ }, []);
+
+ useEffect(() => {
+ const checkTemporaryPost = async () => {
+ try {
+ const response = await lmFeedclient?.getTemporaryPost();
+ if (response?.data?.tempPost) {
+ const tempId = response.data.tempPost.post.id;
+ setTempPostId(tempId);
+ setIsVisible(true);
+ setUploadFailed(true);
+ }
+ } catch (error) {
+ console.error("Error checking temporary post:", error);
+ }
+ };
+
+ checkTemporaryPost();
+
+ const handlePostCreationStarted = (event: Event) => {
+ const customEvent = event as CustomEvent;
+ setTempPostId(customEvent.detail.tempId);
+ setIsVisible(true);
+ setUploadFailed(false);
+ };
+
+ const handlePostCreated = () => {
+ setIsVisible(false);
+ setTempPostId(null);
+ };
+
+ const handlePostCreationFailed = () => {
+ setUploadFailed(true);
+ };
+
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATION_STARTED,
+ handlePostCreationStarted,
+ );
+
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATED,
+ handlePostCreated,
+ );
+
+ customEventClient?.listen(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ handlePostCreationFailed,
+ );
+
+ return () => {
+ customEventClient?.remove(LMFeedCustomActionEvents.POST_CREATION_STARTED);
+ customEventClient?.remove(LMFeedCustomActionEvents.POST_CREATED);
+ customEventClient?.remove(LMFeedCustomActionEvents.POST_CREATION_FAILED);
+ };
+ }, [customEventClient]);
+
+ const handleRetry = async () => {
+ if (!isOnline) {
+ return;
+ }
+
+ if (tempPostId && lmFeedclient) {
+ try {
+ setUploadFailed(false);
+ setIsVisible(false);
+ const post = await lmFeedclient.getTemporaryPost();
+ const tempPost = post?.data?.tempPost?.post;
+
+ if (tempPost) {
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_STARTED,
+ { tempId: tempPost.id },
+ );
+ try {
+ const mediaList = tempPost.attachments || [];
+ const attachmentResponseArray: Attachment[] = [];
+ if (!currentUser?.sdkClientInfo?.uuid) {
+ throw new Error("User ID not found");
+ }
+ for (const attachment of mediaList) {
+ if (
+ attachment.type === AttachmentType.IMAGE ||
+ attachment.type === AttachmentType.REEL ||
+ attachment.type === AttachmentType.VIDEO ||
+ attachment.type === AttachmentType.DOCUMENT
+ ) {
+ if (!attachment.metaData?.url) {
+ console.warn("No URL found for attachment:", attachment);
+ continue;
+ }
+ try {
+ const response = await fetch(attachment.metaData.url);
+ const blob = await response.blob();
+ const file = new File(
+ [blob],
+ attachment.metaData.name || "file",
+ {
+ type:
+ response.headers.get("content-type") ||
+ "application/octet-stream",
+ },
+ );
+ (await HelperFunctionsClass.uploadMedia(
+ file,
+ currentUser?.sdkClientInfo.uuid || "",
+ )) as never;
+
+ const uploadedFileKey = `https://${LMAppAwsKeys.bucketName}.s3.${LMAppAwsKeys.region}.amazonaws.com/${`files/post/${currentUser?.sdkClientInfo.uuid || ""}/${file.name}`}`;
+ attachment.metaData.url = uploadedFileKey;
+
+ switch (attachment.type) {
+ case AttachmentType.IMAGE: {
+ attachmentResponseArray.push(
+ LMFeedPostAttachment.builder()
+ .setType(AttachmentType.IMAGE)
+ .setMetadata(
+ LMFeedPostAttachmentMeta.builder()
+ .setUrl(uploadedFileKey)
+ .setFormat(
+ file?.name?.split(".").slice(-1).toString(),
+ )
+ .setSize(file.size)
+ .setName(file.name)
+ .setHeight(attachment.metaData.height || 0)
+ .setWidth(attachment.metaData.width || 0)
+ .build(),
+ )
+ .build(),
+ );
+ break;
+ }
+ case AttachmentType.VIDEO: {
+ attachmentResponseArray.push(
+ LMFeedPostAttachment.builder()
+ .setType(AttachmentType.VIDEO)
+ .setMetadata(
+ LMFeedPostAttachmentMeta.builder()
+ .setUrl(uploadedFileKey)
+ .setFormat(
+ file?.name?.split(".").slice(-1).toString(),
+ )
+ .setSize(file.size)
+ .setName(file.name)
+ .setDuration(10)
+ .setHeight(attachment.metaData.height || 0)
+ .setWidth(attachment.metaData.width || 0)
+ .build(),
+ )
+ .build(),
+ );
+ break;
+ }
+ case AttachmentType.DOCUMENT: {
+ attachmentResponseArray.push(
+ LMFeedPostAttachment.builder()
+ .setType(AttachmentType.DOCUMENT)
+ .setMetadata(
+ LMFeedPostAttachmentMeta.builder()
+ .setUrl(uploadedFileKey)
+ .setFormat(
+ file?.name?.split(".").slice(-1).toString(),
+ )
+ .setSize(file.size)
+ .setName(file.name)
+ .build(),
+ )
+ .build(),
+ );
+ break;
+ }
+ case AttachmentType.REEL: {
+ attachmentResponseArray.push(
+ LMFeedPostAttachment.builder()
+ .setType(AttachmentType.REEL)
+ .setMetadata(
+ LMFeedPostAttachmentMeta.builder()
+ .setUrl(uploadedFileKey)
+ .setFormat(
+ file?.name?.split(".").slice(-1).toString(),
+ )
+ .setSize(file.size)
+ .setName(file.name)
+ .setDuration(10)
+ .setHeight(attachment.metaData.height || 0)
+ .setWidth(attachment.metaData.width || 0)
+ .build(),
+ )
+ .build(),
+ );
+ break;
+ }
+ }
+ } catch (error) {
+ continue;
+ }
+ } else {
+ continue;
+ }
+ }
+
+ if (attachmentResponseArray.length > 0) {
+ const addPostRequest = AddPostRequest.builder()
+ .setAttachments(attachmentResponseArray)
+ .setText(tempPost.text || "")
+ .setTopicIds(tempPost.topics || [])
+ .setTempId(Date.now().toString())
+ .setIsAnonymous(tempPost.isAnonymous || false);
+
+ if (tempPost.heading) {
+ addPostRequest.setHeading(tempPost.heading);
+ }
+
+ const addPostResponse = await lmFeedclient.addPost(
+ addPostRequest.build(),
+ );
+ if (addPostResponse?.success) {
+ const deleteRequest = DeleteTemporaryPostRequest.builder()
+ .setTemporaryPostId(tempPostId)
+ .build();
+
+ await lmFeedclient.deleteTemporaryPost(deleteRequest);
+
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATED,
+ {},
+ );
+ }
+ }
+ } catch (error) {
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ {},
+ );
+ }
+ }
+ } catch (error) {
+ console.error("Error getting temporary post:", error);
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ {},
+ );
+ }
+ }
+ };
+
+ const handleCancel = async () => {
+ if (tempPostId && lmFeedclient) {
+ try {
+ HelperFunctionsClass.cancelUpload();
+
+ const request = DeleteTemporaryPostRequest.builder()
+ .setTemporaryPostId(tempPostId)
+ .build();
+
+ await lmFeedclient?.deleteTemporaryPost(request);
+
+ setTempPostId(null);
+ setIsVisible(false);
+ setUploadFailed(false);
+
+ customEventClient?.dispatchEvent(
+ LMFeedCustomActionEvents.POST_CREATION_FAILED,
+ );
+ } catch (error) {
+ console.error("Error during cancellation:", error);
+ setTempPostId(null);
+ setIsVisible(false);
+ setUploadFailed(false);
+ }
+ }
+ };
+
+ return {
+ isVisible,
+ tempPostId,
+ uploadFailed,
+ handleRetry,
+ handleCancel,
+ };
+};
diff --git a/core/src/shared/components/LMFeedTextArea.tsx b/core/src/shared/components/LMFeedTextArea.tsx
index 80ed4e7..8136f8e 100644
--- a/core/src/shared/components/LMFeedTextArea.tsx
+++ b/core/src/shared/components/LMFeedTextArea.tsx
@@ -44,10 +44,15 @@ const LMFeedTextArea = () => {
}, [textFieldRef]);
useEffect(() => {
- if (temporaryPost && textFieldRef?.current) {
- textFieldRef.current.innerHTML = convertTextToHTML(
- temporaryPost.text,
- ).innerHTML;
+ if (textFieldRef?.current) {
+ if (temporaryPost) {
+ textFieldRef.current.innerHTML = convertTextToHTML(
+ temporaryPost.text,
+ ).innerHTML;
+ } else {
+ // Explicitly clear the text area for new posts or when temporaryPost is null
+ textFieldRef.current.innerHTML = "";
+ }
}
setCursorToTheEnd();
// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/core/src/shared/constants/lmFeedCustomEventNames.ts b/core/src/shared/constants/lmFeedCustomEventNames.ts
index 9203757..bec42bd 100644
--- a/core/src/shared/constants/lmFeedCustomEventNames.ts
+++ b/core/src/shared/constants/lmFeedCustomEventNames.ts
@@ -17,8 +17,11 @@ export enum LMFeedCustomActionEvents {
PINNED_ON_DETAIL = "PINNED_ON_DETAIL",
DELETE_POST_ON_DETAILS = "DELETE_POST_ON_DETAILS",
TRIGGER_SET_USER = "TRIGGER_SET_USER",
- HIDDEN_ON_DETAIL = "HIDDEN_ON_DETAI",
+ HIDDEN_ON_DETAIL = "HIDDEN_ON_DETAIL",
UNHIDDEN_ON_DETAIL = "UNHIDDEN_ON_DETAIL",
MODERATION_UPDATED = "MODERATION_UPDATED",
CURRENT_USER_CM = "CURRENT_USER_CM",
+ POST_CREATION_STARTED = "POST_CREATION_STARTED",
+ POST_CREATION_FAILED = "POST_CREATION_FAILED",
+ RETRY_POST_UPLOAD = "RETRY_POST_UPLOAD",
}
diff --git a/core/src/shared/customEvents.ts b/core/src/shared/customEvents.ts
index 70b61a2..d6d3c37 100644
--- a/core/src/shared/customEvents.ts
+++ b/core/src/shared/customEvents.ts
@@ -67,8 +67,6 @@ export class LMFeedCustomEvents {
postCreationActionAndDataStore: this.postCreationActionAndDataStore,
notificationsActionsAndDataStore: this.notificationsActionsAndDataStore,
};
- // return obj;
- // console.log(fn.prototype);
return fn.bind(obj);
}
private registerEvent(eventName: string) {
diff --git a/core/src/shared/getClient.ts b/core/src/shared/getClient.ts
index 7742264..2b8ef30 100644
--- a/core/src/shared/getClient.ts
+++ b/core/src/shared/getClient.ts
@@ -3,7 +3,7 @@ import { LMFeedClient } from "@likeminds.community/feed-js";
export function initiateFeedClient() {
const lmFeedClient = LMFeedClient.Builder()
.setPlatformCode("rt")
- .setVersionCode(23)
+ .setVersionCode(25)
.build();
return lmFeedClient;
}
diff --git a/core/src/shared/helper.ts b/core/src/shared/helper.ts
index 751e54a..7c8ca88 100644
--- a/core/src/shared/helper.ts
+++ b/core/src/shared/helper.ts
@@ -10,6 +10,8 @@ import {
import { fromCognitoIdentityPool } from "@aws-sdk/credential-provider-cognito-identity";
import { LMAppAwsKeys } from "./constants/lmAppAwsKeys";
export class HelperFunctionsClass {
+ private static currentUpload: AbortController | null = null;
+
static detectLinks(text: string) {
const regex = /\b(?:https?:\/\/)?(?:[\w.]+\.\w+)(?:(?<=\\n)|\b)/g;
const links = text?.match(regex);
@@ -49,6 +51,10 @@ export class HelperFunctionsClass {
media,
userUniqueId,
);
+
+ // Create a new AbortController for this upload
+ this.currentUpload = new AbortController();
+
const command = new PutObjectCommand({
Key,
Bucket,
@@ -56,7 +62,17 @@ export class HelperFunctionsClass {
ACL,
ContentType,
});
- return s3Client.send(command);
+
+ // Pass the abort signal when sending the command
+ return s3Client.send(command, {
+ abortSignal: this.currentUpload.signal
+ });
+ }
+ static cancelUpload() {
+ if (this.currentUpload) {
+ this.currentUpload.abort();
+ this.currentUpload = null;
+ }
}
private static buildUploadParams(
diff --git a/core/src/shared/utils.ts b/core/src/shared/utils.ts
index c166418..3067534 100644
--- a/core/src/shared/utils.ts
+++ b/core/src/shared/utils.ts
@@ -649,3 +649,33 @@ export function formatTimestamp(timestamp: number): string {
};
return date.toLocaleDateString("en-GB", options).replace(",", "");
}
+
+export function getImageDimensions(
+ file: File,
+ ): Promise<{ width: number; height: number }> {
+ return new Promise((resolve, reject) => {
+ const img = new Image();
+ img.onload = () => {
+ resolve({ width: img.width, height: img.height });
+ };
+ img.onerror = reject;
+ img.src = URL.createObjectURL(file);
+ });
+ }
+
+ export function getVideoDimensions(
+ file: File,
+ ): Promise<{ width: number; height: number }> {
+ return new Promise((resolve, reject) => {
+ const video = document.createElement("video");
+ video.preload = "metadata";
+
+ video.onloadedmetadata = () => {
+ resolve({ width: video.videoWidth, height: video.videoHeight });
+ URL.revokeObjectURL(video.src);
+ };
+
+ video.onerror = reject;
+ video.src = URL.createObjectURL(file);
+ });
+ }
diff --git a/core/src/shared/utils/attachmentUtils.ts b/core/src/shared/utils/attachmentUtils.ts
new file mode 100644
index 0000000..daba2f3
--- /dev/null
+++ b/core/src/shared/utils/attachmentUtils.ts
@@ -0,0 +1,10 @@
+import { AttachmentType } from "@likeminds.community/feed-js";
+
+export function isMediaAttachmentType(type: AttachmentType): boolean {
+ return (
+ type === AttachmentType.IMAGE ||
+ type === AttachmentType.VIDEO ||
+ type === AttachmentType.DOCUMENT ||
+ type === AttachmentType.REEL
+ );
+}
diff --git a/core/src/shared/utils/createTempPost.ts b/core/src/shared/utils/createTempPost.ts
new file mode 100644
index 0000000..379221e
--- /dev/null
+++ b/core/src/shared/utils/createTempPost.ts
@@ -0,0 +1,47 @@
+import { Attachment } from "../types/models/attachment";
+
+interface CreateTempPostParams {
+ textContent: string;
+ attachments: Attachment[];
+ selectedTopicIds: string[];
+ isAnonymousPost: boolean;
+ question?: string;
+ tempId: string;
+ uuid: string;
+}
+
+export const createTempPost = ({
+ textContent,
+ attachments,
+ selectedTopicIds,
+ isAnonymousPost,
+ question = "",
+ tempId,
+ uuid,
+}: CreateTempPostParams) => {
+ const currentTime = Date.now();
+
+ return {
+ id: tempId,
+ text: textContent,
+ attachments,
+ topics: selectedTopicIds,
+ isAnonymous: isAnonymousPost,
+ heading: question,
+ createdAt: currentTime,
+ commentsCount: 0,
+ isEdited: false,
+ isLiked: false,
+ isPinned: false,
+ isRepost: false,
+ isRepostedByUser: false,
+ isSaved: false,
+ likesCount: 0,
+ menuItems: [],
+ repostCount: 0,
+ tempId: null,
+ updatedAt: currentTime,
+ uuid,
+ isHidden: false,
+ };
+};
diff --git a/core/tsconfig.json b/core/tsconfig.json
index 9e21c09..24816ff 100644
--- a/core/tsconfig.json
+++ b/core/tsconfig.json
@@ -24,4 +24,4 @@
"include": ["src"],
"exclude": ["node_modules"],
"references": [{ "path": "./tsconfig.node.json" }]
-}
+}
\ No newline at end of file