forked from OpenStackweb/summit-admin
-
Notifications
You must be signed in to change notification settings - Fork 4
fix: replace image popover with image preview dialog #965
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
Open
priscila-moneo
wants to merge
3
commits into
master
Choose a base branch
from
fix/form-template-grid-image-preview
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,68 @@ | ||
| import React from "react"; | ||
| import { render, screen, waitFor } from "@testing-library/react"; | ||
| import userEvent from "@testing-library/user-event"; | ||
| import T from "i18n-react/dist/i18n-react"; | ||
| import { ImagePreviewCell } from "../image-preview-cell"; | ||
|
|
||
| describe("ImagePreviewCell", () => { | ||
| const imageUrl = "https://example.com/path/sponsor_banner.png"; | ||
| const title = T.translate("preview_modal.title"); | ||
|
|
||
| test("does not render when imageUrl is null or empty", () => { | ||
| const { rerender } = render(<ImagePreviewCell imageUrl={null} />); | ||
| expect(screen.queryByRole("button")).not.toBeInTheDocument(); | ||
|
|
||
| rerender(<ImagePreviewCell imageUrl="" />); | ||
| expect(screen.queryByRole("button")).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("renders a trigger button", () => { | ||
| render(<ImagePreviewCell imageUrl={imageUrl} />); | ||
| expect(screen.getByRole("button", { name: title })).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("opens PreviewModal on click", async () => { | ||
| const user = userEvent.setup(); | ||
| render(<ImagePreviewCell imageUrl={imageUrl} />); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: title })); | ||
| expect(screen.getByRole("dialog")).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("passes itemName as dialog title", async () => { | ||
| const user = userEvent.setup(); | ||
| render(<ImagePreviewCell imageUrl={imageUrl} itemName="Sponsor Banner" />); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: title })); | ||
| expect(screen.getByText("Sponsor Banner")).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("extracts filename from URL when no fileName prop", async () => { | ||
| const user = userEvent.setup(); | ||
| render(<ImagePreviewCell imageUrl={imageUrl} />); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: title })); | ||
| expect(screen.getByText("sponsor_banner.png")).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("uses fileName prop over URL extraction", async () => { | ||
| const user = userEvent.setup(); | ||
| render(<ImagePreviewCell imageUrl={imageUrl} fileName="custom.png" />); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: title })); | ||
| expect(screen.getByText("custom.png")).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test("closes dialog when X is clicked", async () => { | ||
| const user = userEvent.setup(); | ||
| render(<ImagePreviewCell imageUrl={imageUrl} />); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: title })); | ||
| expect(screen.getByRole("dialog")).toBeInTheDocument(); | ||
|
|
||
| await user.click(screen.getByRole("button", { name: "close" })); | ||
| await waitFor(() => | ||
| expect(screen.queryByRole("dialog")).not.toBeInTheDocument() | ||
| ); | ||
| }); | ||
| }); |
This file contains hidden or 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,58 @@ | ||
| /** | ||
| * Copyright 2026 OpenStack Foundation | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * */ | ||
|
|
||
| import React, { useState } from "react"; | ||
| import IconButton from "@mui/material/IconButton"; | ||
| import ImageIcon from "@mui/icons-material/Image"; | ||
| import T from "i18n-react/dist/i18n-react"; | ||
| import PreviewModal from "./mui/PreviewModal"; | ||
|
|
||
| export const ImagePreviewCell = React.memo( | ||
| ({ imageUrl, itemName, fileName, uploadDate }) => { | ||
| const [open, setOpen] = useState(false); | ||
|
|
||
| if (!imageUrl) return null; | ||
|
|
||
| const rawSegment = imageUrl.split("/").pop().split("?")[0]; | ||
| let decoded = rawSegment; | ||
| try { | ||
| decoded = decodeURIComponent(rawSegment); | ||
| } catch { | ||
| /* malformed encoding — keep raw */ | ||
| } | ||
| const resolvedFileName = fileName || decoded; | ||
|
|
||
| return ( | ||
| <> | ||
| <IconButton | ||
| size="small" | ||
| aria-label={T.translate("preview_modal.title")} | ||
| onClick={() => setOpen(true)} | ||
| > | ||
| <ImageIcon fontSize="small" /> | ||
| </IconButton> | ||
|
|
||
| <PreviewModal | ||
| title={itemName || T.translate("preview_modal.title")} | ||
| open={open} | ||
| onClose={() => setOpen(false)} | ||
| url={imageUrl} | ||
| filename={resolvedFileName} | ||
| uploadDate={uploadDate} | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
| ); | ||
|
|
||
| ImagePreviewCell.displayName = "ImagePreviewCell"; |
This file contains hidden or 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
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.
url shouldn't be a dependecy here