e2e test error page and fix (#3672)

* fix wrong input parameter functionality * not reload the page to go to the content service page * navigate instead to reload to go to the process service page
2025-07-24 17:32:15 +00:00 · 2018-08-08 17:18:26 +01:00
parent 6cf6c9c0e4
commit 2e0945b0cc
32 changed files with 169 additions and 231 deletions
--- a/lib/core/i18n/de.json
+++ b/lib/core/i18n/de.json
@@ -306,25 +306,21 @@
      "TITLE": "Sie sind nicht zum Zugriff auf diesen Server berechtigt.",
      "DESCRIPTION": "Sie sind nicht zum Zugriff auf diese Ressource auf dem Server berechtigt.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Problem melden",
-        "URL": "report-issue"
+        "TEXT": "Problem melden"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Zurück zur Startseite",
-        "ROUTE": "Startseite"
+        "TEXT": "Zurück zur Startseite"
      }
    },
    "404": {
      "TITLE": "Es ist ein Fehler aufgetreten.",
      "DESCRIPTION": "Die Seite, nach der Sie suchen, wurde nicht gefunden.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Zurück zur Startseite",
-        "ROUTE": "Startseite"
+        "TEXT": "Zurück zur Startseite"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/en.json
+++ b/lib/core/i18n/en.json
@@ -294,36 +294,30 @@
      "TITLE": "We hit a problem.",
      "DESCRIPTION": "Looks like something went wrong.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
      }
    },
    "403": {
      "TITLE": "You don't have permission to access this server.",
      "DESCRIPTION": "You're not allowed access to this resource on the server.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Report issue",
-        "URL": "report-issue"
+        "TEXT": "Report issue"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
      }
    },
    "404": {
      "TITLE": "An error occurred.",
      "DESCRIPTION": "We couldn’t find the page you were looking for.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Back to home",
-        "ROUTE": "Home"
+        "TEXT": "Back to home"
      }
    }
  }
--- a/lib/core/i18n/es.json
+++ b/lib/core/i18n/es.json
@@ -294,37 +294,31 @@
      "TITLE": "Se ha producido un error.",
      "DESCRIPTION": "Parece que algo ha ido mal.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
      }
    },
    "403": {
      "TITLE": "No tiene permiso para acceder a este servidor.",
      "DESCRIPTION": "No tiene permitido acceder a este recurso en el servidor.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Notificar problema",
-        "URL": "notificar-problema"
+        "TEXT": "Notificar problema"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
      }
    },
    "404": {
      "TITLE": "Se ha producido un error.",
      "DESCRIPTION": "No hemos podido encontrar la página que busca.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Volver al inicio",
-        "ROUTE": "Inicio"
+        "TEXT": "Volver al inicio"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/fr.json
+++ b/lib/core/i18n/fr.json
@@ -294,37 +294,31 @@
      "TITLE": "Une erreur est survenue.",
      "DESCRIPTION": "Il semble qu'une erreur soit survenue.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
      }
    },
    "403": {
      "TITLE": "Vous n'avez pas les droits d'accès à ce serveur.",
      "DESCRIPTION": "Vous n'êtes pas autorisé à accéder à cette ressource sur le serveur.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Signaler le problème",
-        "URL": "signaler-problème"
+        "TEXT": "Signaler le problème"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
      }
    },
    "404": {
      "TITLE": "Une erreur est survenue.",
      "DESCRIPTION": "Impossible de trouver la page recherchée.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Retour à l'accueil",
-        "ROUTE": "Accueil"
+        "TEXT": "Retour à l'accueil"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/it.json
+++ b/lib/core/i18n/it.json
@@ -294,37 +294,31 @@
      "TITLE": "Si è verificato un errore.",
      "DESCRIPTION": "Si è verificato un errore.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
      }
    },
    "403": {
      "TITLE": "Non si dispone delle autorizzazioni per accedere al server.",
      "DESCRIPTION": "Accesso alla risorsa sul server non consentito.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Segnala errore",
-        "URL": "segnala problema"
+        "TEXT": "Segnala errore"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
      }
    },
    "404": {
      "TITLE": "Si è verificato un errore.",
      "DESCRIPTION": "Impossibile trovare la pagina.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Torna alla home",
-        "ROUTE": "Home"
+        "TEXT": "Torna alla home"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/ja.json
+++ b/lib/core/i18n/ja.json
@@ -294,37 +294,31 @@
      "TITLE": "エラーが発生しました。",
      "DESCRIPTION": "何らかの問題がある可能性があります。",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
      }
    },
    "403": {
      "TITLE": "このサーバーにアクセスする権限がありません。",
      "DESCRIPTION": "サーバー上のこのリソースにはアクセスできません。",
      "SECONDARY_BUTTON": {
-        "TEXT": "問題の報告",
-        "URL": "report-issue"
+        "TEXT": "問題の報告"
      },
      "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
      }
    },
    "404": {
      "TITLE": "エラーが発生しました。",
      "DESCRIPTION": "お探しのページが見つかりませんでした。",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "ホームへ戻る",
-        "ROUTE": "ホーム"
+        "TEXT": "ホームへ戻る"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/nb.json
+++ b/lib/core/i18n/nb.json
@@ -294,37 +294,31 @@
      "TITLE": "Det oppstod en feil",
      "DESCRIPTION": "Noe gikk galt.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
      }
    },
    "403": {
      "TITLE": "Du har ikke tillatelse for tilgang til denne serveren.",
      "DESCRIPTION": "Du har ikke lov til å få tilgang til denne ressursen på serveren.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Rapporter problem",
-        "URL": "rapporter-problem"
+        "TEXT": "Rapporter problem"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
      }
    },
    "404": {
      "TITLE": "Det oppstod en feil.",
      "DESCRIPTION": "Vi kunne ikke finne siden du så etter.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Tilbake til startsiden",
-        "ROUTE": "Hjem"
+        "TEXT": "Tilbake til startsiden"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/nl.json
+++ b/lib/core/i18n/nl.json
@@ -294,37 +294,31 @@
      "TITLE": "Er is een fout opgetreden.",
      "DESCRIPTION": "Er is waarschijnlijk iets fout gegaan.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
      }
    },
    "403": {
      "TITLE": "U hebt geen machtiging voor toegang tot deze server.",
      "DESCRIPTION": "Het is u niet toegestaan toegang te krijgen tot deze resource op de server.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Probleem melden",
-        "URL": "report-issue"
+        "TEXT": "Probleem melden"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
      }
    },
    "404": {
      "TITLE": "Er is een fout opgetreden.",
      "DESCRIPTION": "De pagina die u zoekt is niet gevonden.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Terug naar Home",
-        "ROUTE": "Home"
+        "TEXT": "Terug naar Home"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/pt-BR.json
+++ b/lib/core/i18n/pt-BR.json
@@ -294,37 +294,31 @@
      "TITLE": "Ocorreu um erro.",
      "DESCRIPTION": "Parece que ocorreu um erro.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
      }
    },
    "403": {
      "TITLE": "Você não tem permissão para acessar este servidor.",
      "DESCRIPTION": "Você não tem permissão para acessar este recurso no servidor.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Relatar problema",
-        "URL": "relatar-problema"
+        "TEXT": "Relatar problema""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
      }
    },
    "404": {
      "TITLE": "Ocorreu um erro.",
      "DESCRIPTION": "Não foi possível encontrar a página que você está procurando.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Voltar para a página inicial",
-        "ROUTE": "Página Inicial"
+        "TEXT": "Voltar para a página inicial"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/ru.json
+++ b/lib/core/i18n/ru.json
@@ -294,37 +294,31 @@
      "TITLE": "Произошла ошибка.",
      "DESCRIPTION": "Кажется, что-то пошло не так.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
      }
    },
    "403": {
      "TITLE": "У вас нет разрешения для доступа к этому серверу.",
      "DESCRIPTION": "У вас нет разрешения для доступа к этому ресурсу на сервере.",
      "SECONDARY_BUTTON": {
-        "TEXT": "Сообщить о проблеме",
-        "URL": "сообщить-о-проблеме"
+        "TEXT": "Сообщить о проблеме"
      },
      "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
      }
    },
    "404": {
      "TITLE": "Произошла ошибка.",
      "DESCRIPTION": "Нам не удалось найти страницу, которую вы искали.",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "Назад на главную",
-        "ROUTE": "Домашняя"
+        "TEXT": "Назад на главную"
      }
    }
  }
-}
+}
--- a/lib/core/i18n/zh-CN.json
+++ b/lib/core/i18n/zh-CN.json
@@ -294,37 +294,31 @@
      "TITLE": "出现错误。",
      "DESCRIPTION": "看似发生错误。",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
      }
    },
    "403": {
      "TITLE": "您没有访问此服务器的权限。",
      "DESCRIPTION": "不允许您访问服务器上的此资源。",
      "SECONDARY_BUTTON": {
-        "TEXT": "报告问题",
-        "URL": "report-issue"
+        "TEXT": "报告问题"
      },
      "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
      }
    },
    "404": {
      "TITLE": "出现错误。",
      "DESCRIPTION": "我们无法找到您正在查找的页面。",
      "SECONDARY_BUTTON": {
-        "TEXT": "",
-        "URL": ""
+        "TEXT": ""
      },
      "RETURN_BUTTON": {
-        "TEXT": "返回到主页",
-        "ROUTE": "主页"
+        "TEXT": "返回到主页"
      }
    }
  }
-}
+}
--- a/lib/core/templates/error-content/error-content.component.html
+++ b/lib/core/templates/error-content/error-content.component.html
@@ -11,7 +11,7 @@
    </p>
    <div class="adf-error-content-buttons">
        <a a id="adf-secondary-button" mat-raised-button color="primary"
-            *ngIf="secondaryButtonText" (click)="onSecondButton()"
+            *ngIf="hasSecondButton" (click)="onSecondButton()"
            class="adf-error-content-description-link">
            {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }}
        </a>
--- a/lib/core/templates/error-content/error-content.component.spec.ts
+++ b/lib/core/templates/error-content/error-content.component.spec.ts
@@ -103,20 +103,18 @@ describe('ErrorContentComponent', () => {
        });
        fixture.detectChanges();
        fixture.whenStable().then(() => {
-            expect(errorContentComponent.secondaryButtonText).toBe('Secondary Button');
-            const errorContentElement = element.querySelector('.adf-error-content-description-link');
+            const errorContentElement = element.querySelector('#adf-secondary-button');
            expect(errorContentElement).not.toBeNull();
            expect(errorContentElement).toBeDefined();
+            expect(errorContentElement.textContent).toContain('ERROR_CONTENT.UNKNOWN.SECONDARY_BUTTON.TEXT');
+
        });
    }));

-    it('should render return button with its value from the translate file', async(() => {
-        spyOn(translateService, 'instant').and.callFake((inputString) => {
-            return 'Home';
-        });
+    it('shoul the default value of return burron be /', async(() => {
        fixture.detectChanges();
        fixture.whenStable().then(() => {
-            expect(errorContentComponent.returnButtonUrl).toBe('Home');
+            expect(errorContentComponent.returnButtonUrl).toBe('/');
        });
    }));

--- a/lib/core/templates/error-content/error-content.component.ts
+++ b/lib/core/templates/error-content/error-content.component.ts
@@ -15,7 +15,14 @@
 * limitations under the License.
 */

-import { Component, ChangeDetectionStrategy, ViewEncapsulation, OnInit, AfterContentChecked } from '@angular/core';
+import {
+    Component,
+    ChangeDetectionStrategy,
+    Input,
+    ViewEncapsulation,
+    OnInit,
+    AfterContentChecked
+} from '@angular/core';
 import { Params, ActivatedRoute, Router } from '@angular/router';
 import { TranslationService } from '../../services/translation.service';

@@ -29,10 +36,16 @@ import { TranslationService } from '../../services/translation.service';
 })
 export class ErrorContentComponent implements OnInit, AfterContentChecked {

+    @Input()
+    secondaryButtonUrl: string = 'report-issue';
+
+    @Input()
+    returnButtonUrl: string = '/';
+
+    @Input()
    errorCode: string;
-    secondaryButtonText: string;
-    secondaryButtonUrl: string;
-    returnButtonUrl: string;
+
+    hasSecondButton: boolean;

    constructor(private route: ActivatedRoute,
                private router: Router,
@@ -42,7 +55,7 @@ export class ErrorContentComponent implements OnInit, AfterContentChecked {
    ngOnInit() {
        if (this.route) {
            this.route.params.forEach((params: Params) => {
-                if (params['id']) {
+                if (params['id'] && !this.errorCode) {
                    this.errorCode = params['id'];
                    let unknown = '';
                    this.translateService.get('ERROR_CONTENT.' + this.errorCode + '.TITLE').subscribe((errorTranslation: string) => {
@@ -56,21 +69,13 @@ export class ErrorContentComponent implements OnInit, AfterContentChecked {
        }
    }

-    ngAfterContentChecked() {
-        this.getTranslations();
+    getTranslations() {
+        this.hasSecondButton = this.translateService.instant(
+            'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.TEXT') ? true : false;
    }

-    getTranslations() {
-        this.returnButtonUrl = this.translateService.instant(
-            'ERROR_CONTENT.' + this.errorCode + '.RETURN_BUTTON.ROUTE');
-
-        this.secondaryButtonText = this.translateService.instant(
-            'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.TEXT');
-
-        if (this.secondaryButtonText) {
-            this.secondaryButtonUrl = this.translateService.instant(
-                'ERROR_CONTENT.' + this.errorCode + '.SECONDARY_BUTTON.URL');
-        }
+    ngAfterContentChecked() {
+        this.getTranslations();
    }

    onSecondButton() {