fix(PdhHandler): softer error message for not admins

YesWiki · Dec 15, 2022 · ce5d112 · ce5d112
1 parent 4d905e9
commit ce5d112
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/javascripts/components/Step.js b/javascripts/components/Step.js
@@ -1,7 +1,7 @@
 import SpinnerLoader from './SpinnerLoader.js'
 
 export default {
-    props: ['name','value','text'],
+    props: ['name','value','text','isAdmin'],
     components: {SpinnerLoader},
     computed: {
         isChecked: function(){
@@ -21,8 +21,10 @@ export default {
                 <span v-html="text"></span>
             </label>
             &nbsp;
+            <span v-if="value === 1">&#9203;</span>
             <SpinnerLoader :size="1" :height="25" v-if="value === 1"/>
-            <span v-if="value === 3">&#10060;</span>
+            <span v-else-if="value === 3 && isAdmin">&#10060;</span>
+            <span v-else-if="value === 3 && !isAdmin">&#9889;</span>
         </div>
     `
 }
diff --git a/javascripts/handler-pdf.js b/javascripts/handler-pdf.js
@@ -9,6 +9,7 @@ let appParams = {
     components: { Translations, Step, SpinnerLoader },
     data: function() {
         return {
+            abortController : null,
             browserLoaded: 0,
             buttonAction: null,
             buttonType: 'primary',
@@ -73,14 +74,19 @@ let appParams = {
             return urls;
         },
         contactServer: async function(url){
-            return fetch(url,{referrer:wiki.url(this.pageTag)})
+            this.stopFetch();
+            this.abortController = new AbortController();
+            return fetch(url,{referrer:wiki.url(this.pageTag),signal:this.abortController.signal})
                 .then((response)=>{
                     if (!response.ok && [401,403,404].includes(response.status)){
                         return Promise.reject(`${response.status} => ${response.statusText}`);
                     }
                     return response;
                 })
                 .catch((error)=>{
+                    if (typeof error == 'DOMException' && error.name == 'AbortError'){
+                        return Promise.reject(new Error('===Do Nothing==='));
+                    }
                     let errorMessage = this.t('errorforexternaleurlcheck',{
                         extUrl: url,
                         helpLink: this.renderHelpUrlButton(),
@@ -185,7 +191,9 @@ let appParams = {
                 })
                 .catch((error)=>{
                     this.clearTimer();
-                    this.message = '';
+                    if (typeof error != "object" || error.message !== '===Do Nothing==='){
+                        this.message = '';
+                    }
                     if (this.pdfServiceContacted < 2){
                         this.pdfServiceContacted = 3;
                     }
@@ -312,7 +320,7 @@ let appParams = {
             if (error.message === '===Do Nothing==='){
                 return;
             }
-            this.messageType = 'danger';
+            this.messageType = this.isAdmin ? 'danger' : 'info';
             if (this.isAdmin){
                 this.message = this.t('errorforadmin',{error:error.toString()})
                 if (error.lineNumber != undefined && error.fileName != undefined){
@@ -339,6 +347,16 @@ let appParams = {
         renderErrorJsonFormat: function ({url,response,contentType}){
             return Promise.reject(`Bad format of response to url '${url}' : status '${response.status}'  => '${response.statusText}', but json waited with error = true, obtained : ${contentType}`);
         },
+        returnToPage: function(){
+            this.stopFetch();
+            window.location = wiki.url(wiki.pageTag);
+        },
+        stopFetch: function(){
+            if (this.abortController !== null){
+                this.abortController.abort();
+            }
+            this.abortController = null;
+        },
         t: function(text, replacements = null){
             if (replacements === null || typeof replacements != "object"){
                 replacements = {};
@@ -379,7 +397,12 @@ let appParams = {
         },
         updateStatus: async function(url){
             try {
-                let jsonResponse = await fetch(url)
+                let aController = this.abortController
+                if (aController === null){
+                    this.abortController = new AbortController();
+                    aController = this.abortController;
+                }
+                let jsonResponse = await fetch(url,{signal:this.abortController.signal})
                     .then((response)=>{
                         return (response.ok)
                             ? response.json()

diff --git a/lang/publication_en.inc.php b/lang/publication_en.inc.php
@@ -167,5 +167,6 @@
     'PUBLICATION_OPEN_DEFAULT_LINK' => 'Open external page for print',
     'PUBLICATION_PDF_CREATION' => 'Create pdf of %{pageTag}\s page',
     'PUBLICATION_PRINT_VIA_PREVIEW' => 'Print via browser',
+    'PUBLICATION_RETURN_TO_PAGE' => 'Back to page',
     'PUBLICATION_SAVE_FILE' => 'Save pdf',
 ];
diff --git a/lang/publication_fr.inc.php b/lang/publication_fr.inc.php
@@ -167,5 +167,6 @@
     'PUBLICATION_OPEN_DEFAULT_LINK' => 'Ouvrir la page externe d\'impresssion',
     'PUBLICATION_PDF_CREATION' => 'Création du pdf de la page %{pageTag}',
     'PUBLICATION_PRINT_VIA_PREVIEW' => 'Imprimer par le navigateur',
+    'PUBLICATION_RETURN_TO_PAGE' => 'Retour à la page',
     'PUBLICATION_SAVE_FILE' => 'Enregistrer le pdf',
 ];
diff --git a/lang/publication_pt.inc.php b/lang/publication_pt.inc.php
@@ -165,5 +165,6 @@
     // 'PUBLICATION_OPEN_DEFAULT_LINK' => 'Ouvrir la page externe d\'impresssion',
     // 'PUBLICATION_PDF_CREATION' => 'Création du pdf de la page %{pageTag}',
     // 'PUBLICATION_PRINT_VIA_PREVIEW' => 'Imprimer par le navigateur',
+    // 'PUBLICATION_RETURN_TO_PAGE' => 'Retour à la page',
     // 'PUBLICATION_SAVE_FILE' => 'Enregistrer le pdf',
 ];
diff --git a/templates/handler-pdf.twig b/templates/handler-pdf.twig
@@ -29,16 +29,16 @@
     <h2>{{ _t('PUBLICATION_PDF_CREATION',{pageTag:pageTag}) }}</h2>
     <div>
       {% if isAdmin == true %}
-        <step :name="'getPdfServiceUrl'" :value="urlOfPdfServiceGet" :text="{{ _t('PUBLICATION_GET_PDF_SERVICE_URL')|json_encode }}"></step>
-        <step :name="'checkUrls'" :value="urlsChecked" :text="{{ _t('PUBLICATION_CHECK_URLS')|json_encode }}"></step>
+        <step :name="'getPdfServiceUrl'" :value="urlOfPdfServiceGet" :text="{{ _t('PUBLICATION_GET_PDF_SERVICE_URL')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
+        <step :name="'checkUrls'" :value="urlsChecked" :text="{{ _t('PUBLICATION_CHECK_URLS')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
       {% endif %}
-        <step :name="'contactService'" :value="pdfServiceContacted" :text="{{ _t('PUBLICATION_CONTACT_SERVICE')|json_encode }}"></step>
+        <step :name="'contactService'" :value="pdfServiceContacted" :text="{{ _t('PUBLICATION_CONTACT_SERVICE')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
       {% if isAdmin == true %}
-        <step :name="'browserLoaded'" :value="browserLoaded" :text="{{ _t('PUBLICATION_LOADING_BROWSER')|json_encode }}"></step>
-        <step :name="'pageLoadedByBrowser'" :value="pageLoadedByBrowser" :text="{{ _t('PUBLICATION_LOADING_PAGE')|json_encode }}"></step>
-        <step :name="'creatingPdf'" :value="creatingPdf" :text="{{ _t('PUBLICATION_CREATING_PDF')|json_encode }}"></step>
+        <step :name="'browserLoaded'" :value="browserLoaded" :text="{{ _t('PUBLICATION_LOADING_BROWSER')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
+        <step :name="'pageLoadedByBrowser'" :value="pageLoadedByBrowser" :text="{{ _t('PUBLICATION_LOADING_PAGE')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
+        <step :name="'creatingPdf'" :value="creatingPdf" :text="{{ _t('PUBLICATION_CREATING_PDF')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
       {% endif %}
-        <step :name="'getPdf'" :value="pdfDownloaded" :text="{{ _t('PUBLICATION_DOWNLOAD_PDF')|json_encode }}"></step>
+        <step :name="'getPdf'" :value="pdfDownloaded" :text="{{ _t('PUBLICATION_DOWNLOAD_PDF')|json_encode }}" :is-admin="{{ isAdmin|json_encode }}"></step>
     </div>
     <div v-if="message.length > 0" :class="{alert:true,[`alert-${messageType}`]:true}" v-html="message">
     </div>
@@ -53,4 +53,5 @@
         >
       {{ _t('PUBLICATION_SAVE_FILE') }}
     </a>
+    <button class="btn btn-default" @click.prevent.stop="returnToPage">{{ _t('PUBLICATION_RETURN_TO_PAGE') }}</button>
 </div>