Skip to content

Backport #29178 activity feed editor formatting lazy-loading to 1.13 #31049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shah-harshit wants to merge 1 commit into
base: ui/direct-1.13-seq30-32-services-lineage-data-insight-lazy
Choose a base branch
from
Open

Backport #29178 activity feed editor formatting lazy-loading to 1.13 #31049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions ...n/resources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,28 @@
import { Button, Space, Typography } from 'antd';
import classNames from 'classnames';
import { isUndefined } from 'lodash';
import { FC, useEffect, useMemo, useState } from 'react';
import { FC, lazy, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { formatDateTime } from '../../../../utils/date-time/DateTimeUtils';
import {
getFrontEndFormat,
MarkdownToHTMLConverter,
} from '../../../../utils/FeedUtilsPure';
import RichTextEditorPreviewerV1 from '../../../common/RichTextEditor/RichTextEditorPreviewerV1';
import ActivityFeedEditor from '../../ActivityFeedEditor/ActivityFeedEditor';
import Reactions from '../../Reactions/Reactions';
import withSuspenseFallback from '../../../AppRouter/withSuspenseFallback';
import { FeedBodyProp } from '../ActivityFeedCard.interface';

const RichTextEditorPreviewerV1 = withSuspenseFallback(
lazy(() => import('../../../common/RichTextEditor/RichTextEditorPreviewerV1'))
);

const Reactions = withSuspenseFallback(
lazy(() => import('../../Reactions/Reactions'))
);

const ActivityFeedEditor = withSuspenseFallback(
lazy(() => import('../../ActivityFeedEditor/ActivityFeedEditor'))
);

const FeedCardBody: FC<FeedBodyProp> = ({
message,
announcementDetails,
Expand Down
28 changes: 24 additions & 4 deletions ...esources/ui/src/components/ActivityFeed/ActivityFeedCard/FeedCardBody/FeedCardBodyNew.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,32 @@ import {
getFrontEndFormat,
MarkdownToHTMLConverter,
} from '../../../../utils/FeedUtilsPure';
import RichTextEditorPreviewerNew from '../../../common/RichTextEditor/RichTextEditorPreviewNew';
import DescriptionFeedNew from '../../ActivityFeedCardV2/FeedCardBody/DescriptionFeed/DescriptionFeedNew';
import OwnersFeed from '../../ActivityFeedCardV2/FeedCardBody/OwnerFeed/OwnersFeed';
import TagsFeed from '../../ActivityFeedCardV2/FeedCardBody/TagsFeed/TagsFeed';
import './feed-card-body-v1.less';
import { FeedCardBodyV1Props } from './FeedCardBodyV1.interface';

const RichTextEditorPreviewerNew = withSuspenseFallback(
lazy(() => import('../../../common/RichTextEditor/RichTextEditorPreviewNew'))
);

const DescriptionFeedNew = withSuspenseFallback(
lazy(
() =>
import(
'../../ActivityFeedCardV2/FeedCardBody/DescriptionFeed/DescriptionFeedNew'
)
)
);

const OwnersFeed = withSuspenseFallback(
lazy(
() => import('../../ActivityFeedCardV2/FeedCardBody/OwnerFeed/OwnersFeed')
)
);

const TagsFeed = withSuspenseFallback(
lazy(() => import('../../ActivityFeedCardV2/FeedCardBody/TagsFeed/TagsFeed'))
);

const ActivityFeedEditor = withSuspenseFallback(
lazy(() => import('../../ActivityFeedEditor/ActivityFeedEditor'))
);
Expand Down
14 changes: 11 additions & 3 deletions .../src/main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThread.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

import { Divider } from 'antd';
import { AxiosError } from 'axios';
import { FC, useEffect, useState } from 'react';
import { FC, lazy, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import {
Post,
Expand All @@ -23,9 +23,17 @@ import {
import { getFeedById } from '../../../rest/feedsAPI';
import { getReplyText } from '../../../utils/FeedUtilsPure';
import { showErrorToast } from '../../../utils/ToastUtils';
import ActivityFeedCard from '../ActivityFeedCard/ActivityFeedCard';
import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import { ActivityThreadProp } from './ActivityThreadPanel.interface';

const ActivityFeedCard = withSuspenseFallback(
lazy(() => import('../ActivityFeedCard/ActivityFeedCard'))
);

const ActivityFeedEditor = withSuspenseFallback(
lazy(() => import('../ActivityFeedEditor/ActivityFeedEditor'))
);

const ActivityThread: FC<ActivityThreadProp> = ({
className,
selectedThread,
Expand Down
24 changes: 19 additions & 5 deletions .../main/resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
import { Card, Typography } from 'antd';
import { isEqual } from 'lodash';
import { FC, Fragment } from 'react';
import { FC, Fragment, lazy } from 'react';
import { useTranslation } from 'react-i18next';
import { useNavigate } from 'react-router-dom';
import {
Expand All @@ -29,14 +29,28 @@ import {
} from '../../../generated/entity/feed/thread';
import { getFeedListWithRelativeDays } from '../../../utils/FeedUtilsPure';
import { getTaskDetailPath } from '../../../utils/TasksUtils';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import { OwnerLabel } from '../../common/OwnerLabel/OwnerLabel.component';
import ActivityFeedCard from '../ActivityFeedCard/ActivityFeedCard';
import FeedCardFooter from '../ActivityFeedCard/FeedCardFooter/FeedCardFooter';
import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor';
import FeedListSeparator from '../FeedListSeparator/FeedListSeparator';
import AnnouncementBadge from '../Shared/AnnouncementBadge';
import TaskBadge from '../Shared/TaskBadge';
import { ActivityThreadListProp } from './ActivityThreadPanel.interface';

const ActivityFeedCard = withSuspenseFallback(
lazy(() => import('../ActivityFeedCard/ActivityFeedCard'))
);

const FeedCardFooter = withSuspenseFallback(
lazy(() => import('../ActivityFeedCard/FeedCardFooter/FeedCardFooter'))
);

const FeedListSeparator = withSuspenseFallback(
lazy(() => import('../FeedListSeparator/FeedListSeparator'))
);

const ActivityFeedEditor = withSuspenseFallback(
lazy(() => import('../ActivityFeedEditor/ActivityFeedEditor'))
);

const ActivityThreadList: FC<ActivityThreadListProp> = ({
className,
threads,
Expand Down
33 changes: 26 additions & 7 deletions .../resources/ui/src/components/ActivityFeed/ActivityThreadPanel/ActivityThreadPanelBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { AxiosError } from 'axios';
import classNames from 'classnames';
import { Operation } from 'fast-json-patch';
import { isEqual, isUndefined } from 'lodash';
import { FC, Fragment, RefObject, useEffect, useState } from 'react';
import { FC, Fragment, lazy, RefObject, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { confirmStateInitialValue } from '../../../constants/Feeds.constants';
import { observerOptions } from '../../../constants/Mydata.constants';
Expand All @@ -31,16 +31,35 @@ import { Paging } from '../../../generated/type/paging';
import { useElementInView } from '../../../hooks/useElementInView';
import { getAllFeeds } from '../../../rest/feedsAPI';
import { showErrorToast } from '../../../utils/ToastUtils';
import ErrorPlaceHolder from '../../common/ErrorWithPlaceholder/ErrorPlaceHolder';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import Loader from '../../common/Loader/Loader';
import ConfirmationModal from '../../Modals/ConfirmationModal/ConfirmationModal';
import { ConfirmState } from '../ActivityFeedCard/ActivityFeedCard.interface';
import ActivityFeedEditor from '../ActivityFeedEditor/ActivityFeedEditor';
import FeedPanelHeader from '../ActivityFeedPanel/FeedPanelHeader';
import ActivityThread from './ActivityThread';
import ActivityThreadList from './ActivityThreadList';
import { ActivityThreadPanelBodyProp } from './ActivityThreadPanel.interface';

const ErrorPlaceHolder = withSuspenseFallback(
lazy(() => import('../../common/ErrorWithPlaceholder/ErrorPlaceHolder'))
);

const FeedPanelHeader = withSuspenseFallback(
lazy(() => import('../ActivityFeedPanel/FeedPanelHeader'))
);

const ActivityThread = withSuspenseFallback(
lazy(() => import('./ActivityThread'))
);

const ActivityThreadList = withSuspenseFallback(
lazy(() => import('./ActivityThreadList'))
);

const ActivityFeedEditor = withSuspenseFallback(
lazy(() => import('../ActivityFeedEditor/ActivityFeedEditor'))
);

const ConfirmationModal = withSuspenseFallback(
lazy(() => import('../../Modals/ConfirmationModal/ConfirmationModal'))
);

const ActivityThreadPanelBody: FC<ActivityThreadPanelBodyProp> = ({
threadLink,
onCancel,
Expand Down
10 changes: 7 additions & 3 deletions openmetadata-ui/src/main/resources/ui/src/components/BlockEditor/BlockEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ import {
TEXT_TYPES,
} from '../../constants/BlockEditor.constants';
import blockEditorExtensionsClassBase from '../../utils/BlockEditorExtensionsClassBase';
import { formatContent, setEditorContent } from '../../utils/BlockEditorUtils';
import { formatClientContent } from '../../utils/BlockEditorPureUtils';
import {
formatServerContent,
setEditorContent,
} from '../../utils/BlockEditorUtils';
import Banner from '../common/Banner/Banner';
import { useEntityAttachment } from '../common/EntityDescription/EntityAttachmentProvider/EntityAttachmentProvider';
import BarMenu from './BarMenu/BarMenu';
Expand Down Expand Up @@ -74,7 +78,7 @@ const BlockEditor = forwardRef<BlockEditorRef, BlockEditorProps>(
onUpdate({ editor }) {
handleErrorMessage?.(undefined);
const htmlContent = editor.getHTML();
const backendFormat = formatContent(htmlContent, 'server');
const backendFormat = formatServerContent(htmlContent);
onChange?.(backendFormat);
},
onFocus() {
Expand Down Expand Up @@ -200,7 +204,7 @@ const BlockEditor = forwardRef<BlockEditorRef, BlockEditorProps>(
// mentioned here https://github.com/ueberdosis/tiptap/issues/3764#issuecomment-1546854730
setTimeout(() => {
if (content !== undefined) {
const htmlContent = formatContent(content, 'client');
const htmlContent = formatClientContent(content);
setEditorContent(editor, htmlContent);
}
});
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/resources/ui/src/components/DataContract/ContractDetailTab/ContractDetail.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jest.mock('../../../utils/DataContract/DataContractUtils', () => ({
}));

jest.mock('../../../utils/BlockEditorUtils', () => ({
formatContent: jest.fn().mockReturnValue('formatted content'),
formatServerContent: jest.fn().mockReturnValue('formatted content'),
}));

jest.mock('../../../utils/BlockEditorPureUtils', () => ({
Expand Down
4 changes: 2 additions & 2 deletions ...metadata-ui/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import classNames from 'classnames';
import { forwardRef, useImperativeHandle, useRef } from 'react';
import {
formatContent,
formatServerContent,
formatValueBasedOnContent,
setEditorContent,
} from '../../../utils/BlockEditorUtils';
Expand Down Expand Up @@ -53,7 +53,7 @@ const RichTextEditor = forwardRef<EditorContentRef, RichTextEditorProp>(
useImperativeHandle(ref, () => ({
getEditorContent() {
const htmlContent = editorRef.current?.editor?.getHTML() ?? '';
const backendFormat = formatContent(htmlContent, 'server');
const backendFormat = formatServerContent(htmlContent);

return formatValueBasedOnContent(backendFormat);
},
Expand Down
4 changes: 2 additions & 2 deletions .../main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewNew.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jest.mock('../../BlockEditor/BlockEditor', () => {
));
});

jest.mock('../../../utils/BlockEditorUtils', () => ({
formatContent: jest.fn((content) => content),
jest.mock('../../../utils/BlockEditorPureUtils', () => ({
formatClientContent: jest.fn((content) => content),
isDescriptionContentEmpty: jest.fn((content) => !content || content === ''),
}));

Expand Down
8 changes: 5 additions & 3 deletions ...i/src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewNew.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import { Button } from 'antd';
import classNames from 'classnames';
import { FC, lazy, useEffect, useMemo, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { isDescriptionContentEmpty } from '../../../utils/BlockEditorPureUtils';
import { formatContent } from '../../../utils/BlockEditorUtils';
import {
formatClientContent,
isDescriptionContentEmpty,
} from '../../../utils/BlockEditorPureUtils';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import './rich-text-editor-previewerV1.less';
import { PreviewerProp } from './RichTextEditor.interface';
Expand Down Expand Up @@ -56,7 +58,7 @@ const RichTextEditorPreviewerNew: FC<PreviewerProp> = ({
const handleReadMoreToggle = () => setReadMore((prev) => !prev);

useEffect(() => {
setContent(formatContent(markdown, 'client'));
setContent(formatClientContent(markdown));
setIsContentLoaded(false);
setIsOverflowing(false);
}, [markdown]);
Expand Down
12 changes: 7 additions & 5 deletions ...main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewerV1.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jest.mock('../../BlockEditor/BlockEditor', () => {
));
});

jest.mock('../../../utils/BlockEditorUtils', () => ({
formatContent: jest.fn((content) => content),
jest.mock('../../../utils/BlockEditorPureUtils', () => ({
formatClientContent: jest.fn((content) => content),
isDescriptionContentEmpty: jest.fn((content) => !content || content === ''),
}));

Expand Down Expand Up @@ -219,11 +219,13 @@ describe('RichTextEditorPreviewerV1', () => {
);
});

it('should format content using formatContent utility', () => {
const { formatContent } = require('../../../utils/BlockEditorUtils');
it('should format content using formatClientContent utility', () => {
const {
formatClientContent,
} = require('../../../utils/BlockEditorPureUtils');
render(<RichTextEditorPreviewerV1 {...mockProp} />);

expect(formatContent).toHaveBeenCalledWith(mockLongMarkdown, 'client');
expect(formatClientContent).toHaveBeenCalledWith(mockLongMarkdown);
});

it('should initialize with expanded state based on isDescriptionExpanded prop', () => {
Expand Down
8 changes: 5 additions & 3 deletions .../src/main/resources/ui/src/components/common/RichTextEditor/RichTextEditorPreviewerV1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ import classNames from 'classnames';
import { FC, lazy, useEffect, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { DESCRIPTION_MAX_PREVIEW_CHARACTERS } from '../../../constants/constants';
import { isDescriptionContentEmpty } from '../../../utils/BlockEditorPureUtils';
import { formatContent } from '../../../utils/BlockEditorUtils';
import {
formatClientContent,
isDescriptionContentEmpty,
} from '../../../utils/BlockEditorPureUtils';
import { getTrimmedContent } from '../../../utils/StringUtils';
import withSuspenseFallback from '../../AppRouter/withSuspenseFallback';
import './rich-text-editor-previewerV1.less';
Expand Down Expand Up @@ -63,7 +65,7 @@ const RichTextEditorPreviewerV1: FC<PreviewerProp> = ({
}, [hasReadMore, readMore, maxLength, content]);

useEffect(() => {
setContent(formatContent(markdown, 'client'));
setContent(formatClientContent(markdown));
}, [markdown]);

useEffect(() => {
Expand Down
Loading
Loading