Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Revert "fix: Added iFrame to load Base64 PDF data in document viewer widget (#10770)" (#10786)

Browse Source 
This reverts commit df1ee35992.
This commit is contained in:
Bhavin K 2022-02-01 15:43:20 +05:30 committed by GitHub
parent 8729c2b435
commit 4e28b4887c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/widgets/DocumentViewerWidget/component/index.test.tsx
View File

@ -36,7 +36,7 @@ describe("validate document viewer url", () => {
{ {
url: url:
"https://roteemealplancover.s3.ap-south-1.amazonaws.com/sample/Project+proposal.pdf", "https://roteemealplancover.s3.ap-south-1.amazonaws.com/sample/Project+proposal.pdf",
viewer: "pdf", viewer: "url",
errorMessage: "", errorMessage: "",
renderer: Renderers.DOCUMENT_VIEWER, renderer: Renderers.DOCUMENT_VIEWER,
}, },

34
app/client/src/widgets/DocumentViewerWidget/component/index.tsx
View File

@ -131,8 +131,6 @@ export const getDocViewerConfigs = (docUrl: string): ConfigResponse => {
renderer = Renderers.DOCX_VIEWER; renderer = Renderers.DOCX_VIEWER;
} else if (extension === "xlsx") { } else if (extension === "xlsx") {
renderer = Renderers.XLSX_VIEWER; renderer = Renderers.XLSX_VIEWER;
} else if (extension === "pdf") {
viewer = "pdf";
} }
} else { } else {
errorMessage = "invalid base64 data"; errorMessage = "invalid base64 data";
@ -174,20 +172,9 @@ export const getDocViewerConfigs = (docUrl: string): ConfigResponse => {
const { extension, hasExtension, validExtension } = checkUrlExtension(url); const { extension, hasExtension, validExtension } = checkUrlExtension(url);
if (hasExtension) { if (hasExtension) {
if (validExtension) { if (validExtension) {
renderer = Renderers.DOCUMENT_VIEWER; if (!(extension === "txt" || extension === "pdf")) {
switch (extension) { viewer = "office";
case "pdf": { renderer = Renderers.DOCUMENT_VIEWER;
viewer = "pdf";
break;
}
case "txt": {
viewer = "url";
break;
}
default: {
viewer = "office";
break;
}
} }
} else { } else {
errorMessage = "Current file type is not supported"; errorMessage = "Current file type is not supported";
@ -219,20 +206,7 @@ function DocumentViewerComponent(props: DocumentViewerComponentProps) {
</Suspense> </Suspense>
); );
case Renderers.DOCUMENT_VIEWER: case Renderers.DOCUMENT_VIEWER:
if (viewer === "pdf") { return <DocumentViewer url={url} viewer={viewer} />;
return (
<iframe
frameBorder="0"
height="100%"
id="pdfiframe"
src={url}
title="pdfiframe"
width="100%"
/>
);
} else {
return <DocumentViewer url={url} viewer={viewer} />;
}
default: default:
return null; return null;