from preview pdf to download pdf

Kyubinhan · Nov 22, 2018 · bbd1ff0 · bbd1ff0
1 parent 0ce7879
commit bbd1ff0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "react": "^16.6.1",
     "react-dom": "^16.6.1",
     "react-loadable": "^5.5.0",
-    "react-pdf": "^3.0.5",
+    "react-pdf": "^3.0.6",
     "react-redux": "^5.1.0",
     "react-router-dom": "^4.3.1",
     "react-scripts": "2.1.1",

diff --git a/src/components/rangeUsePlan/PDFView.js b/src/components/rangeUsePlan/PDFView.js
@@ -32,7 +32,9 @@ class PDFView extends Component {
     const { planId, agreementId } = match.params;
 
     if (planId && agreementId) {
-      fetchRupPDF(planId);
+      fetchRupPDF(planId).then(() => {
+        this.onDownloadClicked();
+      });
     }
   }
 
@@ -64,7 +66,7 @@ class PDFView extends Component {
         />
       ),
     );
-
+        
     return (
       <section className="rup-pdf">
         <a
@@ -84,8 +86,19 @@ class PDFView extends Component {
             message="Error occured while fetching pdf."
           />
         }
-
         { planPDFBlob &&
+          <div>
+            If your download does not begin, please click the button to try again.
+            <Button
+              style={{ marginLeft: '10px' }}
+              onClick={this.onDownloadClicked}
+            >
+              <Icon name="print" />
+              Download PDF
+            </Button>
+          </div>
+        }
+        {/* { planPDFBlob &&
           <div className="rup-pdf__content">
             <div className="rup-pdf__preview__header">
               <div>
@@ -102,14 +115,13 @@ class PDFView extends Component {
             <div className="rup-pdf__preview">
               <Document
                 file={planPDFBlob}
-                loading={<Loading />}
+                // loading={<Loading />}
                 onLoadSuccess={this.onLoadSuccess}
               >
                 {pages}
               </Document>
             </div>
-          </div>
-        }
+          </div> */}
       </section>
     );
   }

diff --git a/src/constants/strings.js b/src/constants/strings.js
@@ -25,7 +25,7 @@ export const AGREEMENT_SEARCH_PLACEHOLDER = 'Enter RAN, agreement holder\'s name
 export const INITIAL_PLAN = 'Initial Plan';
 
 // RUP View
-export const PREVIEW_PDF = 'Preview PDF';
+export const PREVIEW_PDF = 'Download PDF';
 export const UPDATE_STATUS = 'Update Status';
 export const SAVE_DRAFT = 'Save Draft';
 export const SUBMIT = 'Submit';

diff --git a/src/styles/Rup.scss b/src/styles/Rup.scss
@@ -327,14 +327,15 @@ $sticky-height: 55px;
 .rup-pdf {
   display: flex;
   justify-content: center;
-
+  
   &__link {
     display: none;
   }
   &__content {
     display: flex;
     flex-direction: column;
     margin: 10px 0;
+    min-width: 70%;
   }
   &__preview {
     &__header {