From 1318cbca7f0cf72e10d96fff1a1116ba073fe8dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <wulkanat@gmail.com>
Date: Fri, 24 Feb 2023 11:34:41 +0000
Subject: [PATCH] fix: replace breadcrumb popover with simply expanding the
 breadcrumbs

---
 cypress/integration/assessments.spec.ts       |  8 ++-----
 .../data/detail/data-path.component.ts        |  4 +++-
 src/app/modules/data/detail/data-path.html    | 18 +++------------
 src/app/modules/data/detail/data-path.scss    | 20 ++++++++---------
 .../types/event/event-route-path.component.ts | 22 ++++++++++---------
 .../data/types/event/event-route-path.html    | 16 ++++++++------
 6 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/cypress/integration/assessments.spec.ts b/cypress/integration/assessments.spec.ts
index fead5caa..44ac6b96 100644
--- a/cypress/integration/assessments.spec.ts
+++ b/cypress/integration/assessments.spec.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 StApps
+ * Copyright (C) 2023 StApps
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -32,10 +32,6 @@ describe('assessments', function () {
     cy.visit('/assessments/detail/02f065a6-6c02-58ab-97d9-a3febdbc91a1?token=mock');
 
     cy.get('.breadcrumb-collapsed').click();
-    cy.get('ion-popover').within(() => {
-      cy.get('ion-item').should('have.length', 3);
-      cy.get('ion-item').first().should('contain', 'Basismodule');
-      cy.get('ion-item').last().should('contain', 'Modellierung');
-    });
+    cy.get('ion-breadcrumb').should('have.length', 3);
   });
 });
diff --git a/src/app/modules/data/detail/data-path.component.ts b/src/app/modules/data/detail/data-path.component.ts
index 6595d6a1..04749168 100644
--- a/src/app/modules/data/detail/data-path.component.ts
+++ b/src/app/modules/data/detail/data-path.component.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 StApps
+ * Copyright (C) 2023 StApps
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
  * Software Foundation, version 3.
@@ -35,6 +35,8 @@ export class DataPathComponent implements OnInit, OnDestroy {
 
   @Input() autoRouting = true;
 
+  @Input() maxItems = 2;
+
   @Input() set item(item: SCThings) {
     // eslint-disable-next-line unicorn/prefer-ternary
     if (item.type === SCThingType.Catalog && item.superCatalogs) {
diff --git a/src/app/modules/data/detail/data-path.html b/src/app/modules/data/detail/data-path.html
index 533958e8..5de6dc48 100644
--- a/src/app/modules/data/detail/data-path.html
+++ b/src/app/modules/data/detail/data-path.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+  ~ Copyright (C) 2023 StApps
   ~ This program is free software: you can redistribute it and/or modify it
   ~ under the terms of the GNU General Public License as published by the Free
   ~ Software Foundation, version 3.
@@ -18,8 +18,8 @@
     color="light"
     [itemsBeforeCollapse]="1"
     [itemsAfterCollapse]="($width | async) >= 768 ? 1 : 0"
-    [maxItems]="2"
-    (ionCollapsedClick)="popover.present($event)"
+    [maxItems]="maxItems"
+    (ionCollapsedClick)="maxItems = undefined"
   >
     <ion-breadcrumb *ngFor="let fragment of stack">
       <ion-label
@@ -38,16 +38,4 @@
       >
     </ion-breadcrumb>
   </ion-breadcrumbs>
-  <ion-popover #popover>
-    <ng-template>
-      <ion-list>
-        <ion-item
-          button
-          *ngFor="let fragment of stack"
-          (click)="dataRoutingService.emitPathEvent(fragment); popover.dismiss()"
-          >{{ 'name' | thingTranslate: $any(fragment) }}</ion-item
-        >
-      </ion-list>
-    </ng-template>
-  </ion-popover>
 </ng-container>
diff --git a/src/app/modules/data/detail/data-path.scss b/src/app/modules/data/detail/data-path.scss
index daa47492..d7afea7b 100644
--- a/src/app/modules/data/detail/data-path.scss
+++ b/src/app/modules/data/detail/data-path.scss
@@ -1,16 +1,16 @@
 /*!
- * Copyright (C) 2022 StApps
- *  This program is free software: you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation, version 3.
+ * Copyright (C) 2023 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
  *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- *  more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- *  You should have received a copy of the GNU General Public License along with
- *  this program. If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
 .crumb-label {
diff --git a/src/app/modules/data/types/event/event-route-path.component.ts b/src/app/modules/data/types/event/event-route-path.component.ts
index f5ec12d1..65b7cee7 100644
--- a/src/app/modules/data/types/event/event-route-path.component.ts
+++ b/src/app/modules/data/types/event/event-route-path.component.ts
@@ -1,16 +1,16 @@
 /*
- * Copyright (C) 2022 StApps
- *  This program is free software: you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License as published by the Free
- *  Software Foundation, version 3.
+ * Copyright (C) 2023 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
  *
- *  This program is distributed in the hope that it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- *  more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
  *
- *  You should have received a copy of the GNU General Public License along with
- *  this program. If not, see <https://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
  */
 import {Component, Input} from '@angular/core';
 import {SCThingWithoutReferences} from '@openstapps/core';
@@ -32,6 +32,8 @@ export class EventRoutePathComponent {
 
   @Input() itemsBeforeCollapse?: number;
 
+  @Input() showSelfInPopover = false;
+
   @Input() items: Array<SCThingWithoutReferences | undefined> = [];
 
   @Input() more?: Observable<SCThingWithoutReferences[]>;
diff --git a/src/app/modules/data/types/event/event-route-path.html b/src/app/modules/data/types/event/event-route-path.html
index 9ff03ead..e0a10180 100644
--- a/src/app/modules/data/types/event/event-route-path.html
+++ b/src/app/modules/data/types/event/event-route-path.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (C) 2022 StApps
+  ~ Copyright (C) 2023 StApps
   ~ This program is free software: you can redistribute it and/or modify it
   ~ under the terms of the GNU General Public License as published by the Free
   ~ Software Foundation, version 3.
@@ -27,7 +27,7 @@
 </ion-breadcrumbs>
 <ion-popover #popover>
   <ng-template>
-    <ion-list>
+    <ion-list lines="none">
       <ng-container *ngIf="moreAnchor === 'start' && more | async as more">
         <ng-container
           *ngFor="let item of more"
@@ -35,11 +35,13 @@
           [ngTemplateOutletContext]="{item}"
         ></ng-container>
       </ng-container>
-      <ng-container
-        *ngFor="let item of items"
-        [ngTemplateOutlet]="popoverItem"
-        [ngTemplateOutletContext]="{item}"
-      ></ng-container>
+      <ng-container *ngIf="showSelfInPopover">
+        <ng-container
+          *ngFor="let item of items"
+          [ngTemplateOutlet]="popoverItem"
+          [ngTemplateOutletContext]="{item}"
+        ></ng-container>
+      </ng-container>
       <ng-container *ngIf="moreAnchor === 'end' && more | async as more">
         <ng-container
           *ngFor="let item of more"