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.

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

fix: embedding setting and iframe display #1255

Merged
merged 3 commits into from
May 29, 2024
Merged

fix: embedding setting and iframe display #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445fb04
fix: embedding setting and iframe display
spaenleh May 29, 2024
1062df5
fix: update html check in linkForm component
spaenleh May 29, 2024
e0b4d49
chore: use released version of UI
spaenleh May 29, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@graasp/query-client": "3.9.0",
"@graasp/sdk": "4.12.0",
"@graasp/translations": "1.28.0",
"@graasp/ui": "4.19.0",
"@graasp/ui": "4.19.1",
"@mui/icons-material": "5.15.18",
"@mui/lab": "5.0.0-alpha.170",
"@mui/material": "5.15.18",
Expand Down
2 changes: 1 addition & 1 deletion src/components/item/form/link/LinkForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ const LinkForm = ({
// only show this options when embedding is allowed and there is no html code
// as the html will take precedence over showing the site as an iframe
// and some sites like daily motion actually allow both, we want to allow show the html setting
linkData?.isEmbeddingAllowed && linkData?.html === '' && (
linkData?.isEmbeddingAllowed && !linkData?.html && (
<StyledFormControlLabel
value={LinkType.Embedded}
label={embeddedLinkPreview}
Expand Down
31 changes: 11 additions & 20 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ __metadata:
languageName: node
linkType: hard

"@ag-grid-community/client-side-row-model@npm:31.3.1":
version: 31.3.1
resolution: "@ag-grid-community/client-side-row-model@npm:31.3.1"
"@ag-grid-community/client-side-row-model@npm:31.3.2":
version: 31.3.2
resolution: "@ag-grid-community/client-side-row-model@npm:31.3.2"
dependencies:
"@ag-grid-community/core": "npm:31.3.1"
"@ag-grid-community/core": "npm:31.3.2"
tslib: "npm:^2.3.0"
checksum: 10/39e313831fa91062bcfa978b55690cc2728d091b44a26a9df3cf1e20aa4f97ba3ee6f49dde938f470db99b5d802e23d63b93510b2abad264f85b14fe3b405cf1
checksum: 10/305c8d46604c35f7e8d6ee8fad1db1d14babb4eff40c2c457abd4134f4a43eb81cbdcc1c3343ddabd3af166efaf19750d654195faa01ab9d6906192a0f7422e0
languageName: node
linkType: hard

Expand All @@ -48,15 +48,6 @@ __metadata:
languageName: node
linkType: hard

"@ag-grid-community/core@npm:31.3.1":
version: 31.3.1
resolution: "@ag-grid-community/core@npm:31.3.1"
dependencies:
tslib: "npm:^2.3.0"
checksum: 10/03caf838d0a23cbbe2701322bd4e98d62931d35c04e2e77a074ab5cabc7e862acb4a09e774ee321f5dd267ca768e378907ef7ddbcdbe90e4b5646054becbd108
languageName: node
linkType: hard

"@ag-grid-community/core@npm:31.3.2":
version: 31.3.2
resolution: "@ag-grid-community/core@npm:31.3.2"
Expand Down Expand Up @@ -1684,11 +1675,11 @@ __metadata:
languageName: node
linkType: hard

"@graasp/ui@npm:4.19.0":
version: 4.19.0
resolution: "@graasp/ui@npm:4.19.0"
"@graasp/ui@npm:4.19.1":
version: 4.19.1
resolution: "@graasp/ui@npm:4.19.1"
dependencies:
"@ag-grid-community/client-side-row-model": "npm:31.3.1"
"@ag-grid-community/client-side-row-model": "npm:31.3.2"
"@ag-grid-community/react": "npm:^31.3.1"
"@ag-grid-community/styles": "npm:^31.3.1"
"@storybook/react-vite": "npm:8.1.3"
Expand Down Expand Up @@ -1719,7 +1710,7 @@ __metadata:
react-router-dom: ^6.11.0
stylis: ^4.1.3
stylis-plugin-rtl: ^2.1.1
checksum: 10/48dc536e60bc3ae1ce2285b7d6174f82c6726bc40473bbf43ac9d3b76e85ed64d23fa42e5340c947b0036fac6863b8d80e55ffbd24c17e722557474f2eaece49
checksum: 10/51f885c2e73b97a2e8ee8f8f53e643c7f6c8e7d09b60f1aafdc000a77cf05f472773cffc46ba4218a1e4fa6b9bab4bce7e6bb3147b9d3a62ce23835ff39ac14b
languageName: node
linkType: hard

Expand Down Expand Up @@ -7922,7 +7913,7 @@ __metadata:
"@graasp/query-client": "npm:3.9.0"
"@graasp/sdk": "npm:4.12.0"
"@graasp/translations": "npm:1.28.0"
"@graasp/ui": "npm:4.19.0"
"@graasp/ui": "npm:4.19.1"
"@mui/icons-material": "npm:5.15.18"
"@mui/lab": "npm:5.0.0-alpha.170"
"@mui/material": "npm:5.15.18"
Expand Down