Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

fix: bump ui to 2.4.3 #627

Merged
merged 2 commits into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
fix: bump ui to 2.4.3
  • Loading branch information
spaenleh committed May 8, 2023
commit c7375cf89aec74f8311065a2524aa052559e8060
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
"@emotion/styled": "11.10.5",
"@graasp/chatbox": "1.2.1",
"@graasp/query-client": "0.4.1",
"@graasp/sdk": "0.10.1",
"@graasp/sdk": "0.12.0",
"@graasp/translations": "1.11.0",
"@graasp/ui": "2.3.1",
"@graasp/ui": "2.4.3",
"@mui/icons-material": "5.11.16",
"@mui/lab": "5.0.0-alpha.117",
"@mui/material": "5.12.0",
"@sentry/react": "7.44.2",
"@sentry/tracing": "7.44.2",
"@sentry/react": "7.51.0",
"@sentry/tracing": "7.51.0",
"@uppy/core": "3.0.4",
"@uppy/dashboard": "3.2.0",
"@uppy/drag-drop": "3.0.1",
Expand Down Expand Up @@ -98,9 +98,9 @@
"@babel/eslint-parser": "7.19.1",
"@babel/eslint-plugin": "7.19.1",
"@babel/preset-react": "7.18.6",
"@commitlint/cli": "17.4.2",
"@commitlint/config-conventional": "17.4.2",
"@cypress/code-coverage": "3.10.0",
"@commitlint/cli": "17.6.3",
"@commitlint/config-conventional": "17.6.3",
"@cypress/code-coverage": "3.10.4",
"@cypress/instrument-cra": "1.4.0",
"@graasp/plugin-websockets": "1.0.0",
"@testing-library/jest-dom": "^5.16.3",
Expand Down Expand Up @@ -142,7 +142,7 @@
"@mui/icons-material": "5.11.16",
"@mui/material": "5.12.0",
"immer": "9.0.6",
"@graasp/sdk": "0.10.1",
"@graasp/sdk": "0.12.0",
"immutable": "4.3.0",
"@types/react": "17.0.2",
"@svgr/webpack": "6.5.1"
Expand Down
23 changes: 18 additions & 5 deletions src/components/item/ItemContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { UseQueryResult } from 'react-query';

import { Api, MUTATION_KEYS } from '@graasp/query-client';
import {
DEFAULT_LANG,
DocumentItemExtraProperties,
ItemType,
PermissionLevel,
Expand Down Expand Up @@ -268,17 +269,28 @@ const AppContent = ({
<AppItem
isResizable
item={item}
apiHost={API_HOST}
editCaption={isEditing}
onSaveCaption={onSaveCaption}
onCancelCaption={onCancelCaption}
saveButtonId={saveButtonId}
cancelButtonId={cancelButtonId}
member={member}
height={ITEM_DEFAULT_HEIGHT}
permission={permission}
requestApiAccessToken={Api.requestApiAccessToken}
context={CONTEXT_BUILDER}
requestApiAccessToken={(payload) =>
Api.requestApiAccessToken(payload, { API_HOST })
}
contextPayload={{
apiHost: API_HOST,
itemId: item.id,
memberId: member.id,
permission,
settings: item.settings,
lang:
// todo: remove once it is added in ItemSettings type in sdk
(item.settings?.lang as string | undefined) ||
member.extra?.lang ||
DEFAULT_LANG,
context: CONTEXT_BUILDER,
}}
/>
);

Expand Down Expand Up @@ -339,6 +351,7 @@ const H5PContent = ({ item }: { item: H5PItemTypeRecord }): JSX.Element => {
return (
<H5PItem
itemId={item.id}
itemName={item.name}
contentId={contentId}
integrationUrl={H5P_INTEGRATION_URL}
/>
Expand Down
Loading