From 4e28b4887ca1a2ebea2baa096a74bbd371e94f95 Mon Sep 17 00:00:00 2001
From: Bhavin K <58818598+techbhavin@users.noreply.github.com>
Date: Tue, 1 Feb 2022 15:43:20 +0530
Subject: [PATCH] Revert "fix: Added iFrame to load Base64 PDF data in document
viewer widget (#10770)" (#10786)
This reverts commit df1ee35992aadf2c6c6230cd0774101104be3188.
---
.../component/index.test.tsx | 2 +-
.../DocumentViewerWidget/component/index.tsx | 34 +++----------------
2 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/app/client/src/widgets/DocumentViewerWidget/component/index.test.tsx b/app/client/src/widgets/DocumentViewerWidget/component/index.test.tsx
index f3ac87ff4d..a6a2c4e402 100644
--- a/app/client/src/widgets/DocumentViewerWidget/component/index.test.tsx
+++ b/app/client/src/widgets/DocumentViewerWidget/component/index.test.tsx
@@ -36,7 +36,7 @@ describe("validate document viewer url", () => {
{
url:
"https://roteemealplancover.s3.ap-south-1.amazonaws.com/sample/Project+proposal.pdf",
- viewer: "pdf",
+ viewer: "url",
errorMessage: "",
renderer: Renderers.DOCUMENT_VIEWER,
},
diff --git a/app/client/src/widgets/DocumentViewerWidget/component/index.tsx b/app/client/src/widgets/DocumentViewerWidget/component/index.tsx
index 64e1c65e24..a923f5a84f 100644
--- a/app/client/src/widgets/DocumentViewerWidget/component/index.tsx
+++ b/app/client/src/widgets/DocumentViewerWidget/component/index.tsx
@@ -131,8 +131,6 @@ export const getDocViewerConfigs = (docUrl: string): ConfigResponse => {
renderer = Renderers.DOCX_VIEWER;
} else if (extension === "xlsx") {
renderer = Renderers.XLSX_VIEWER;
- } else if (extension === "pdf") {
- viewer = "pdf";
}
} else {
errorMessage = "invalid base64 data";
@@ -174,20 +172,9 @@ export const getDocViewerConfigs = (docUrl: string): ConfigResponse => {
const { extension, hasExtension, validExtension } = checkUrlExtension(url);
if (hasExtension) {
if (validExtension) {
- renderer = Renderers.DOCUMENT_VIEWER;
- switch (extension) {
- case "pdf": {
- viewer = "pdf";
- break;
- }
- case "txt": {
- viewer = "url";
- break;
- }
- default: {
- viewer = "office";
- break;
- }
+ if (!(extension === "txt" || extension === "pdf")) {
+ viewer = "office";
+ renderer = Renderers.DOCUMENT_VIEWER;
}
} else {
errorMessage = "Current file type is not supported";
@@ -219,20 +206,7 @@ function DocumentViewerComponent(props: DocumentViewerComponentProps) {
);
case Renderers.DOCUMENT_VIEWER:
- if (viewer === "pdf") {
- return (
-
- );
- } else {
- return ;
- }
+ return ;
default:
return null;