feat: Updated new tab ui with search and load more #34981
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import React from "react"; | ||
| import { Text } from "design-system"; | ||
| import { EDITOR_PANE_TEXTS, createMessage } from "@appsmith/constants/messages"; | ||
|
|
||
| const EmptySearchResult = ({ type }: { type: string }) => { | ||
| return ( | ||
| <Text | ||
| className="font-normal text-center" | ||
| color="var(--ads-v2-color-fg-muted)" | ||
| kind="body-s" | ||
| > | ||
| {createMessage(EDITOR_PANE_TEXTS.empty_search_result, type)} | ||
| </Text> | ||
| ); | ||
| }; | ||
|
|
||
| export { EmptySearchResult }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| import React, { useState } from "react"; | ||
| import type { GroupedListProps } from "./types"; | ||
| import { DEFAULT_GROUP_LIST_SIZE } from "./constants"; | ||
| import { Flex, List, Text } from "design-system"; | ||
| import styled from "styled-components"; | ||
|
|
||
| interface GroupProps { | ||
| group: GroupedListProps; | ||
| } | ||
|
|
||
| const StyledList = styled(List)` | ||
| padding: 0; | ||
| gap: 0; | ||
|
|
||
| & .ds-load-more .ads-v2-listitem__title { | ||
| --color: var(--ads-v2-color-fg-subtle); | ||
| } | ||
| & .ads-v2-listitem__wrapper .ads-v2-listitem__idesc { | ||
| opacity: 0; | ||
| } | ||
|
|
||
| & .ads-v2-listitem__wrapper:hover .ads-v2-listitem__idesc { | ||
| opacity: 1; | ||
| } | ||
| `; | ||
|
|
||
| const Group: React.FC<GroupProps> = ({ group }) => { | ||
| const [visibleItems, setVisibleItems] = useState<number>( | ||
|
There was a problem hiding this comment. I suggest renaming const [visibleItemsCount, setVisibleItemsCount] = useState<number>( |
||
| DEFAULT_GROUP_LIST_SIZE, | ||
| ); | ||
| const { className, groupTitle } = group; | ||
|
There was a problem hiding this comment. const { className, groupTitle, groupItems } = group;
const items = groupItems.slice(0, visibleItems);
const hasMoreItems = groupItems.length > visibleItems;
const handleLoadMore = () => {
setVisibleItemsCount(groupItems.length);
}; |
||
| const items = group.items.slice(0, visibleItems); | ||
| const hasMoreItems = group.items.length > visibleItems; | ||
|
|
||
| const handleLoadMore = () => { | ||
| setVisibleItems(group.items.length); | ||
| }; | ||
|
|
||
| if (hasMoreItems) { | ||
| items.push({ | ||
|
There was a problem hiding this comment. You should never mutate objects directly in React, as it can lead to unpredictable results. This can be fixed by moving items composition into a const items = useMemo(() => {
const items = groupItems.slice(0, visibleItemsCount);
const hasMoreItems = groupItems.length > visibleItemsCount;
if (hasMoreItems) {
items.push({
title: "Load more...",
description: "",
descriptionType: "inline",
onClick: handleLoadMore,
className: "ds-load-more",
});
if (groupTitle === "Datasources") {
items.push(groupItems[groupItems.length - 1]);
}
}
return items;
}, [groupItems, visibleItemsCount, handleLoadMore, groupTitle]); |
||
| title: "Load more...", | ||
| description: "", | ||
| descriptionType: "inline", | ||
| onClick: handleLoadMore, | ||
| className: "ds-load-more", | ||
| }); | ||
| } | ||
|
|
||
| // TODO: try to avoid this | ||
| if (hasMoreItems && groupTitle === "Datasources") { | ||
|
There was a problem hiding this comment. Ideally string |
||
| items.push(group.items[group.items.length - 1]); | ||
| } | ||
|
|
||
| return ( | ||
| <Flex | ||
| borderBottom="1px solid var(--ads-v2-color-border-muted)" | ||
| className="groups-list-group" | ||
| flexDirection="column" | ||
| key={groupTitle} | ||
| pb="spaces-3" | ||
| > | ||
| {groupTitle ? ( | ||
| <Text | ||
| className="pr-[var(--ads-v2-spaces-3)] py-[var(--ads-v2-spaces-1)]" | ||
| color="var(--ads-v2-color-fg-muted)" | ||
| kind="body-s" | ||
| > | ||
| {groupTitle} | ||
| </Text> | ||
| ) : null} | ||
| <StyledList className={className} items={items} /> | ||
| </Flex> | ||
| ); | ||
| }; | ||
|
|
||
| export { Group }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Consider using template literals for consistency and future extensibility.
The functions returning strings in this file use regular strings. For consistency with other parts of the codebase that might use template literals and to facilitate easier modifications in the future (like introducing variables into the strings), consider using template literals here as well.
Committable suggestion