Skip to content

Commit 4ce94c9

Browse files
authored
[MDS-6283] Fix 'Form-Filled' PDF UI Bug (#3935)
* Resolve yarn serve error - introduced by separate PR, not part of this ticket's main task * Updated filesystem-provider's syncfusion version, to match the same version used by the frontend * Fixed styling issue affecting how filled-forms in a PDF were rendered * Update snaps * Restore commented out line that I missed - oops * Update snap, forgot to comment a line back in
1 parent efc6b07 commit 4ce94c9

6 files changed

Lines changed: 13 additions & 5 deletions

File tree

services/common/src/components/syncfusion/DocumentViewer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export const ViewPdf: React.FC<ViewPDFProps> = ({
121121
serviceUrl={pdfViewerServiceUrl}
122122
documentPath={documentPath}
123123
ajaxRequestSettings={ajaxRequestSettings}
124-
style={{ display: "block", height: "80vh" }}
124+
height="80vh"
125125
enableAnnotation={true}
126126
enableFormDesigner={false}
127127
polygonSettings={{ fillColor: 'yellow', opacity: 0.6, strokeColor: 'orange' }}

services/core-web/src/components/admin/contacts/MinistryContacts/MineSpaceMinistryContactManagement.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const MineSpaceMinistryContactManagement: FC = () => {
3434
const ministryContactTypesHash = useAppSelector(getMinistryContactTypesHash);
3535

3636
useEffect(() => {
37-
Promise.all([dispatch(fetchMinistryContacts()), dispatch(fetchDistributionLists())]).then(() => {
37+
Promise.all([dispatch(fetchMinistryContacts()), dispatch(fetchDistributionLists({}))]).then(() => {
3838
setIsLoaded(true);
3939
});
4040
}, [dispatch]);

services/core-web/src/styles/tools/syncfusion.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ $error-font: theme.$error-color; //#f44336;
4040
display: none;
4141
}
4242

43+
.e-pdfviewer-formFields {
44+
position: static;
45+
}
46+
4347
#pdfviewer-container_fileUploadElement,
4448
#pdfviewer-container_annotationContainer,
4549
#preview-permit-amendment-pdf_fileUploadElement {

services/core-web/src/tests/components/mine/Permit/__snapshots__/PreviewPermitAmendmentDocument.spec.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exports[`PreviewPermitAmendmentDocument fetches and displays document when docum
55
<div
66
class="e-control e-pdfviewer e-lib"
77
id="preview-permit-amendment-pdf"
8-
style="display: block; height: 80vh; min-height: 500px;"
8+
style="min-height: 500px; height: 80vh;"
99
>
1010
<div
1111
class="e-pv-main-container"

services/filesystem-provider/ej2-amazon-s3-aspcore-file-provider/EJ2AmazonS3ASPCoreFileProvider.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.7" />
1717
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
1818
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
19-
<PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="31.1.17" />
20-
<PackageReference Include="Syncfusion.EJ2.PdfViewer.AspNet.Core" Version="31.1.17" />
19+
<PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="31.2.5" />
20+
<PackageReference Include="Syncfusion.EJ2.PdfViewer.AspNet.Core" Version="31.2.5" />
2121
<PackageReference Include="SkiaSharp" Version="3.116.1" />
2222
<PackageReference Include="SkiaSharp.HarfBuzz" Version="3.116.1" />
2323
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />

services/minespace-web/src/styles/tools/syncfusion.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ $error-font: $error-color; //#f44336;
4040
display: none;
4141
}
4242

43+
.e-pdfviewer-formFields {
44+
position: static;
45+
}
46+
4347
#pdfviewer-container_fileUploadElement,
4448
#pdfviewer-container_annotationContainer,
4549
#preview-permit-amendment-pdf_fileUploadElement {

0 commit comments

Comments
 (0)