From f39c29f10bc05ab986b74dfa8a8648df5fb307b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Fri, 23 Sep 2022 10:56:57 +0000
Subject: [PATCH] fix: modals not reacting after several uses

---
 .../data/elements/offers-in-list.component.ts |  1 -
 .../place/special/mensa/place-mensa.html      | 15 ----------
 .../modules/map/item/map-item.component.html  | 30 ++++---------------
 .../modules/map/item/map-item.component.scss  |  2 +-
 .../modules/map/page/map-page.component.ts    |  2 ++
 5 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/app/modules/data/elements/offers-in-list.component.ts b/src/app/modules/data/elements/offers-in-list.component.ts
index 5ef8de12..374d8ac1 100644
--- a/src/app/modules/data/elements/offers-in-list.component.ts
+++ b/src/app/modules/data/elements/offers-in-list.component.ts
@@ -39,7 +39,6 @@ export class OffersInListComponent {
     this.settingsProvider.getSetting('profile', 'group').then(group => {
       this.price =
         it[0].prices?.[(group.value as string).replace(/s$/, '') as never];
-      console.log(group.value);
     });
   }
 
diff --git a/src/app/modules/data/types/place/special/mensa/place-mensa.html b/src/app/modules/data/types/place/special/mensa/place-mensa.html
index e03e70f7..63f24052 100644
--- a/src/app/modules/data/types/place/special/mensa/place-mensa.html
+++ b/src/app/modules/data/types/place/special/mensa/place-mensa.html
@@ -20,22 +20,7 @@
             <stapps-data-list-item
               [item]="dish"
               [hideThumbnail]="true"
-              [id]="'show-dish-in-modal-' + i"
             ></stapps-data-list-item>
-            <ion-modal
-              *ngIf="openAsModal"
-              [trigger]="'show-dish-in-modal-' + i"
-              swipe-to-close="true"
-              [presentingElement]="routerOutlet.nativeEl"
-              class="modal-large"
-            >
-              <ng-template>
-                <stapps-data-detail-content
-                  [item]="dish"
-                  [showModalHeader]="true"
-                ></stapps-data-detail-content>
-              </ng-template>
-            </ion-modal>
           </ng-container>
         </ion-list>
       </div>
diff --git a/src/app/modules/map/item/map-item.component.html b/src/app/modules/map/item/map-item.component.html
index 6e657372..62e29655 100644
--- a/src/app/modules/map/item/map-item.component.html
+++ b/src/app/modules/map/item/map-item.component.html
@@ -19,17 +19,6 @@
       [item]="$any(item)"
       id="show-more"
     ></stapps-data-list-item>
-    <ion-modal
-      trigger="show-more"
-      [presentingElement]="routerOutlet.nativeEl"
-      canDismiss="true"
-      class="modal-large"
-    >
-      <ng-template>
-        <app-map-single-modal [item]="item" style="height: 100%">
-        </app-map-single-modal>
-      </ng-template>
-    </ion-modal>
     <stapps-skeleton-list-item *ngIf="!item"></stapps-skeleton-list-item>
   </ion-card-header>
   <ion-card-content>
@@ -39,19 +28,12 @@
         {{ address.streetAddress }}, {{ address.addressLocality }}
       </span>
     </ion-note>
-    <ion-button size="small" id="show-more-button" fill="clear">{{
-      'map.page.buttons.MORE' | translate
-    }}</ion-button>
-    <ion-modal
-      trigger="show-more-button"
-      canDismiss="true"
-      [presentingElement]="routerOutlet.nativeEl"
-      class="modal-large"
+    <ion-button
+      size="small"
+      class="show-more-button"
+      fill="clear"
+      [routerLink]="['/data-detail', item.uid]"
+      >{{ 'map.page.buttons.MORE' | translate }}</ion-button
     >
-      <ng-template>
-        <app-map-single-modal [item]="item" style="height: 100%">
-        </app-map-single-modal>
-      </ng-template>
-    </ion-modal>
   </ion-card-content>
 </ion-card>
diff --git a/src/app/modules/map/item/map-item.component.scss b/src/app/modules/map/item/map-item.component.scss
index 3c542e64..1bfe5bb6 100644
--- a/src/app/modules/map/item/map-item.component.scss
+++ b/src/app/modules/map/item/map-item.component.scss
@@ -47,7 +47,7 @@
       display: flex;
       flex-direction: row;
 
-      #show-more-button {
+      .show-more-button {
         text-transform: uppercase;
         margin-left: auto;
       }
diff --git a/src/app/modules/map/page/map-page.component.ts b/src/app/modules/map/page/map-page.component.ts
index f1bf1530..6c8f0f0f 100644
--- a/src/app/modules/map/page/map-page.component.ts
+++ b/src/app/modules/map/page/map-page.component.ts
@@ -304,6 +304,8 @@ export class MapPageComponent {
             this.modalController.dismiss(),
             this.showItem(item.uid),
           ]);
+        } else {
+          void this.router.navigate(['/data-detail', item.uid]);
         }
       }),
       this.positionService.watchCurrentLocation({maximumAge: 3000}).subscribe({