Merge pull request #568 from noi-techpark/development

send push optimizations
noi-techpark · Apr 24, 2024 · cbcff6f · cbcff6f
2 parents 7e4610a + 3fea431
commit cbcff6f
Show file tree

Hide file tree

Showing 24 changed files with 110 additions and 46 deletions.
diff --git a/databrowser/src/components/contact/ContactSupportLink.vue b/databrowser/src/components/contact/ContactSupportLink.vue
@@ -5,7 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
 <template>
-  <a :href="t('contact.emailSupport')">{{ t('contact.emailSupport') }}</a>
+  <a :href="`mailto:${t('contact.emailSupport')}`">
+    {{ t('contact.emailSupport') }}
+  </a>
 </template>
 
 <script setup lang="ts">

diff --git a/databrowser/src/components/popover/PopoverContent.vue b/databrowser/src/components/popover/PopoverContent.vue
@@ -5,8 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
 <template>
-  <div
-    class="p-4"
+  <PopoverContentFrame
     :class="{
       'cursor-pointer hover:bg-gray-50': withHover && !disabled,
       'text-disabled': disabled,
@@ -23,10 +22,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         $event.stopPropagation();
       "
     ></slot>
-  </div>
+  </PopoverContentFrame>
 </template>
 
 <script setup lang="ts">
+import PopoverContentFrame from './PopoverContentFrame.vue';
+
 withDefaults(defineProps<{ disabled?: boolean; withHover?: boolean }>(), {
   disabled: false,
   withHover: false,

diff --git a/databrowser/src/components/popover/PopoverContentFrame.vue b/databrowser/src/components/popover/PopoverContentFrame.vue
@@ -0,0 +1,11 @@
+<!--
+SPDX-FileCopyrightText: NOI Techpark <digital@noi.bz.it>
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+
+<template>
+  <div class="p-4">
+    <slot></slot>
+  </div>
+</template>
diff --git a/databrowser/src/config/builder/tourism/gpsData.ts b/databrowser/src/config/builder/tourism/gpsData.ts
@@ -53,3 +53,13 @@ export const gpsDataTableCell = (): PropertyConfig => ({
     altitudeUnit: 'GpsPoints.position.AltitudeUnitofMeasure',
   },
 });
+
+export const gpsDataShortTableCell = (): PropertyConfig => ({
+  title: 'GPS Data',
+  component: CellComponent.GpsPointsCell,
+  class: 'w-48',
+  objectMapping: {
+    latitude: 'GpsPoints.position.Latitude',
+    longitude: 'GpsPoints.position.Longitude',
+  },
+});
diff --git a/databrowser/src/config/tourism/accommodation/accommodation.listView.ts b/databrowser/src/config/tourism/accommodation/accommodation.listView.ts
@@ -8,7 +8,7 @@ import {
   imageTableCell,
   languageTableCell,
   lastChangesTableCell,
-  locationTableCells,
+  pushDataTableCell,
   publishedOnTableCell,
   sourceTableCell,
 } from '../../builder/tourism';
@@ -40,7 +40,15 @@ export const accommodationListView: ListViewConfig = {
         text: 'AccoCategoryId',
       },
     },
-    ...locationTableCells(),
+    // ...locationTableCells(),
+    {
+      title: 'Location',
+      component: CellComponent.StringCell,
+      class: 'w-48',
+      objectMapping: {
+        text: 'LocationInfo.DistrictInfo.Name.en',
+      },
+    },
     languageTableCell(),
     lastChangesTableCell(),
     sourceTableCell(),
@@ -53,5 +61,6 @@ export const accommodationListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/article/article.listView.ts b/databrowser/src/config/tourism/article/article.listView.ts
@@ -11,6 +11,7 @@ import {
   sourceTableCell,
   titleTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const articleListView: ListViewConfig = {
@@ -48,5 +49,6 @@ export const articleListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/district/district.listView.ts b/databrowser/src/config/tourism/district/district.listView.ts
@@ -10,6 +10,7 @@ import {
   publishedOnTableCell,
   sourceTableCell,
   titleTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const districtListView: ListViewConfig = {
@@ -35,5 +36,6 @@ export const districtListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/event/event.listView.ts b/databrowser/src/config/tourism/event/event.listView.ts
@@ -9,6 +9,7 @@ import {
   languageTableCell,
   lastChangesTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
   titleTableCell,
 } from '../../builder/tourism';
@@ -32,14 +33,6 @@ export const eventListView: ListViewConfig = {
       params: { format: DEFAULT_DATE_TIME_FORMAT },
       objectMapping: { date: 'DateEnd' },
     },
-    {
-      title: 'Price',
-      component: CellComponent.StringCell,
-      class: 'w-32',
-      objectMapping: {
-        text: 'EventPrice.Price',
-      },
-    },
     {
       title: 'Event Organizer',
       component: CellComponent.StringCell,
@@ -68,5 +61,6 @@ export const eventListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/eventShort/eventShort.listView.ts b/databrowser/src/config/tourism/eventShort/eventShort.listView.ts
@@ -8,6 +8,7 @@ import {
   languageTableCell,
   lastChangesTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
 } from '../../builder/tourism';
 import { DEFAULT_DATE_TIME_FORMAT } from '../../utils';
@@ -50,5 +51,6 @@ export const eventShortListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/measuringPoint/measuringPoint.listView.ts b/databrowser/src/config/tourism/measuringPoint/measuringPoint.listView.ts
@@ -9,6 +9,8 @@ import {
   lastChangesTableCell,
   odhActiveTableCell,
   sourceTableCell,
+  publishedOnTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const measuringPointListView: ListViewConfig = {
@@ -57,5 +59,7 @@ export const measuringPointListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     odhActiveTableCell(),
+    publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/metaRegion/metaRegion.listView.ts b/databrowser/src/config/tourism/metaRegion/metaRegion.listView.ts
@@ -8,6 +8,7 @@ import {
   languageTableCell,
   lastChangesTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
   titleTableCell,
 } from '../../builder/tourism';
@@ -20,5 +21,6 @@ export const metaRegionListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/municipality/municipality.listView.ts b/databrowser/src/config/tourism/municipality/municipality.listView.ts
@@ -11,6 +11,7 @@ import {
   publishedOnTableCell,
   sourceTableCell,
   titleTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const municipalityListView: ListViewConfig = {
@@ -45,5 +46,6 @@ export const municipalityListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/odhActivityPoi/odhActivityPoi.listView.ts b/databrowser/src/config/tourism/odhActivityPoi/odhActivityPoi.listView.ts
@@ -5,11 +5,11 @@
 import { CellComponent } from '../../../domain/cellComponents/types';
 import { ListViewConfig } from '../../../domain/datasets/config/types';
 import {
+  gpsDataShortTableCell,
   imageTableCell,
   languageTableCell,
   lastChangesTableCell,
   locationTableCells,
-  logoTableCell,
   publishedOnTableCell,
   pushDataTableCell,
   sourceTableCell,
@@ -19,7 +19,6 @@ import {
 export const odhActivityPoiListView: ListViewConfig = {
   elements: [
     imageTableCell(),
-    logoTableCell(),
     titleTableCell(),
     {
       title: 'Categories',
@@ -33,12 +32,13 @@ export const odhActivityPoiListView: ListViewConfig = {
       },
     },
     ...locationTableCells(),
-    {
-      title: 'Web-URL',
-      component: CellComponent.UrlCell,
-      class: 'w-52',
-      objectMapping: { text: 'ContactInfos.{language}.Url' },
-    },
+    // {
+    //   title: 'Web-URL',
+    //   component: CellComponent.UrlCell,
+    //   class: 'w-52',
+    //   objectMapping: { text: 'ContactInfos.{language}.Url' },
+    // },
+    gpsDataShortTableCell(),
     languageTableCell(),
     lastChangesTableCell(),
     sourceTableCell(),

diff --git a/databrowser/src/config/tourism/region/region.listView.ts b/databrowser/src/config/tourism/region/region.listView.ts
@@ -10,6 +10,7 @@ import {
   logoTableCell,
   sourceTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   titleTableCell,
 } from '../../builder/tourism';
 
@@ -22,5 +23,6 @@ export const regionListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/skiArea/skiArea.listView.ts b/databrowser/src/config/tourism/skiArea/skiArea.listView.ts
@@ -9,6 +9,7 @@ import {
   lastChangesTableCell,
   logoTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
   titleTableCell,
 } from '../../builder/tourism';
@@ -22,5 +23,6 @@ export const skiAreaListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/skiRegion/skiRegion.listView.ts b/databrowser/src/config/tourism/skiRegion/skiRegion.listView.ts
@@ -8,7 +8,8 @@ import {
   languageTableCell,
   lastChangesTableCell,
   logoTableCell,
-  odhActiveTableCell,
+  publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
   titleTableCell,
 } from '../../builder/tourism';
@@ -21,6 +22,7 @@ export const skiRegionListView: ListViewConfig = {
     languageTableCell(),
     lastChangesTableCell(),
     sourceTableCell(),
-    odhActiveTableCell(),
+    publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/tourismAssociationList/tourismAssociationList.listView.ts b/databrowser/src/config/tourism/tourismAssociationList/tourismAssociationList.listView.ts
@@ -9,6 +9,7 @@ import {
   lastChangesTableCell,
   logoTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
   titleTableCell,
 } from '../../builder/tourism';
@@ -22,5 +23,6 @@ export const tourismAssociationListListView: ListViewConfig = {
     lastChangesTableCell(),
     sourceTableCell(),
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/venue/venue.listView.ts b/databrowser/src/config/tourism/venue/venue.listView.ts
@@ -11,6 +11,7 @@ import {
   languageTableCell,
   lastChangesTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const venueListView: ListViewConfig = {
@@ -43,5 +44,6 @@ export const venueListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/webcamInfo/webcamInfo.listView.ts b/databrowser/src/config/tourism/webcamInfo/webcamInfo.listView.ts
@@ -8,8 +8,9 @@ import {
   gpsDataTableCell,
   imageTableCell,
   lastChangesTableCell,
-  odhActiveTableCell,
   sourceTableCell,
+  publishedOnTableCell,
+  pushDataTableCell,
 } from '../../builder/tourism';
 
 export const webcamInfoListView: ListViewConfig = {
@@ -34,6 +35,7 @@ export const webcamInfoListView: ListViewConfig = {
     gpsDataTableCell(),
     lastChangesTableCell(),
     sourceTableCell(),
-    odhActiveTableCell(),
+    publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/config/tourism/wineAward/wineAward.listView.ts b/databrowser/src/config/tourism/wineAward/wineAward.listView.ts
@@ -9,6 +9,7 @@ import {
   languageTableCell,
   lastChangesTableCell,
   publishedOnTableCell,
+  pushDataTableCell,
   sourceTableCell,
 } from '../../builder/tourism';
 
@@ -70,5 +71,6 @@ export const wineAwardListView: ListViewConfig = {
       },
     },
     publishedOnTableCell(),
+    pushDataTableCell(),
   ],
 };
diff --git a/databrowser/src/domain/cellComponents/components/cells/gpsPointsCell/GpsPointsCell.vue b/databrowser/src/domain/cellComponents/components/cells/gpsPointsCell/GpsPointsCell.vue
@@ -19,9 +19,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
         </SubCategoryItem>
         <SubCategoryItem v-if="altitude != null" title="Altitude">
           <StringCell :text="altitude" />
-        </SubCategoryItem>
-        <SubCategoryItem v-if="altitudeUnit != null" title="Altitude Unit">
-          <StringCell :text="altitudeUnit" />
+          <StringCell v-if="altitudeUnit != null" :text="altitudeUnit" />
         </SubCategoryItem>
       </div>
     </div>