Skip to content
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.

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

feat: use Thumbnails from PackedItem #859

Merged
merged 1 commit into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@emotion/styled": "11.13.0",
"@graasp/chatbox": "3.3.0",
"@graasp/query-client": "3.23.0",
"@graasp/sdk": "4.29.1",
"@graasp/sdk": "4.31.0",
"@graasp/stylis-plugin-rtl": "2.2.0",
"@graasp/translations": "1.37.1",
"@graasp/ui": "5.1.0",
Expand Down
4 changes: 2 additions & 2 deletions src/modules/common/ItemCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import CardActionArea from '@mui/material/CardActionArea';
import CardContent from '@mui/material/CardContent';
import Typography from '@mui/material/Typography';

import { DiscriminatedItem, ItemType, formatDate } from '@graasp/sdk';
import { ItemType, PackedItem, formatDate } from '@graasp/sdk';

import { usePlayerTranslation } from '@/config/i18n';

import { buildContentPagePath } from '../../config/paths';
import ItemThumbnail from './ItemThumbnail';

type Props = {
item: DiscriminatedItem;
item: PackedItem;
};

const SimpleCard = ({ item }: Props): JSX.Element => {
Expand Down
17 changes: 6 additions & 11 deletions src/modules/common/ItemThumbnail.tsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
import {
DiscriminatedItem,
PackedItem,
ThumbnailSize,
ThumbnailSizeType,
ThumbnailsBySize,
getMimetype,
} from '@graasp/sdk';
import { ItemIcon } from '@graasp/ui';

import { hooks } from '@/config/queryClient';

type Props = {
item: DiscriminatedItem;
size?: ThumbnailSizeType;
item: PackedItem;
size?: keyof ThumbnailsBySize;
};
const ItemThumbnail = ({
item,
size = ThumbnailSize.Small,
size = ThumbnailSize.Medium,
}: Props): JSX.Element | null => {
const { data: thumbnailSrc } = hooks.useItemThumbnailUrl({
id: item.id,
size,
});
const thumbnailSrc = item.thumbnails?.[size];

return (
<ItemIcon
Expand Down
14 changes: 4 additions & 10 deletions src/modules/item/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import {
ActionTriggers,
AppItemType,
Context,
DiscriminatedItem,
DocumentItemType,
EtherpadItemType,
FolderItemType,
H5PItemType,
ItemType,
LinkItemType,
Expand All @@ -23,7 +21,6 @@ import {
PermissionLevel,
S3FileItemType,
ShortcutItemType,
ThumbnailSize,
} from '@graasp/sdk';
import { DEFAULT_LANG, FAILURE_MESSAGES } from '@graasp/translations';
import {
Expand Down Expand Up @@ -356,14 +353,11 @@ const ShortcutContent = ({ item }: { item: ShortcutItemType }): JSX.Element => {
);
};

const FolderButtonContent = ({ item }: { item: FolderItemType }) => {
const FolderButtonContent = ({ item }: { item: PackedItem }) => {
const [searchParams] = useSearchParams();
const { itemId } = useParams();
const { data: currentDisplayedItem } = useItem(itemId);
const { data: thumbnail } = hooks.useItemThumbnailUrl({
id: item.id,
size: ThumbnailSize.Medium,
});
const thumbnail = item.thumbnails?.medium;

const newSearchParams = new URLSearchParams(searchParams.toString());
newSearchParams.set('from', window.location.pathname);
Expand All @@ -390,7 +384,7 @@ const FolderButtonContent = ({ item }: { item: FolderItemType }) => {
};

type ItemContentProps = {
item: DiscriminatedItem;
item: PackedItem;
};

const ItemContent = ({ item }: ItemContentProps) => {
Expand Down Expand Up @@ -443,7 +437,7 @@ export const ItemContentWrapper = ({
};

type FolderContentProps = {
item: FolderItemType;
item: PackedItem;
showPinnedOnly?: boolean;
};
const FolderContent = ({
Expand Down
12 changes: 4 additions & 8 deletions src/modules/item/SectionHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
import { Stack, Typography } from '@mui/material';

import { FolderItemType, ThumbnailSize, formatDate } from '@graasp/sdk';
import { PackedItem, formatDate } from '@graasp/sdk';
import { TextDisplay, Thumbnail } from '@graasp/ui';

import { usePlayerTranslation } from '@/config/i18n';
import { hooks } from '@/config/queryClient';
import { FOLDER_NAME_TITLE_CLASS } from '@/config/selectors';
import { PLAYER } from '@/langs/constants';

const { useItemThumbnailUrl } = hooks;
type SectionHeaderProps = {
item: FolderItemType;
item: PackedItem;
};

const SectionHeader = ({ item }: SectionHeaderProps): JSX.Element => {
const { t, i18n } = usePlayerTranslation();
const { data: thumbnailSrc } = useItemThumbnailUrl({
id: item.id,
size: ThumbnailSize.Medium,
});
const thumbnailSrc = item.thumbnails?.medium;

return (
<Stack direction="column" spacing={2}>
<Stack direction="row" spacing={2} alignItems="center">
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1580,9 +1580,9 @@ __metadata:
languageName: node
linkType: hard

"@graasp/sdk@npm:4.29.1":
version: 4.29.1
resolution: "@graasp/sdk@npm:4.29.1"
"@graasp/sdk@npm:4.31.0":
version: 4.31.0
resolution: "@graasp/sdk@npm:4.31.0"
dependencies:
"@faker-js/faker": "npm:9.0.1"
filesize: "npm:10.1.6"
Expand All @@ -1591,7 +1591,7 @@ __metadata:
peerDependencies:
date-fns: ^3 || ^4.0.0
uuid: ^9 || ^10
checksum: 10/f35a4c2dfbc7b9ac7d2112536dcded3da6d7fb32a3f4593921329340f96f21ccd558f68a77d723828f23055a6fb4d77493effbc746986ce7fcce913f3775a725
checksum: 10/9b2bf85a51cc12b6f2bdefeb7bbc0c615db9ea3188ace6d460b14e61503763aeab13fd2aa1c4135cee602c2c58465895569b2845b91d942982f96f5594dfd1d4
languageName: node
linkType: hard

Expand Down Expand Up @@ -5949,7 +5949,7 @@ __metadata:
"@eslint/js": "npm:9.10.0"
"@graasp/chatbox": "npm:3.3.0"
"@graasp/query-client": "npm:3.23.0"
"@graasp/sdk": "npm:4.29.1"
"@graasp/sdk": "npm:4.31.0"
"@graasp/stylis-plugin-rtl": "npm:2.2.0"
"@graasp/translations": "npm:1.37.1"
"@graasp/ui": "npm:5.1.0"
Expand Down