PB-90: Clean up code for PR

Author: LukasJoss

src/modules/map/components/LocationPopup.vue

@@ -1,7 +1,6 @@
 <script setup>
 /** Right click pop up which shows the coordinates of the position under the cursor. */
 
-// importing directly the vue component, see https://github.com/ivanvermeyen/vue-collapse-transition/issues/5
 import tippy from 'tippy.js'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -18,17 +17,17 @@ import { stringifyQuery } from '@/utils/url-router'
 
 const i18n = useI18n()
 const store = useStore()
+const route = useRoute()
 
 const clickInfo = computed(() => store.state.map.clickInfo)
 const projection = computed(() => store.state.position.projection)
 const showIn3d = computed(() => store.state.cesium.active)
 const currentLang = computed(() => store.state.i18n.lang)
+const showEmbedSharing = computed(() => selectedTab.value === 'share')
 
-const route = useRoute()
 const selectedTab = ref('position')
 const shareTabButton = ref(null)
 const newClickInfo = ref(true)
-const showEmbedSharing = ref(false)
 const requestClipboard = ref(false)
 const shareLinkCopied = ref(false)
 const shareLinkUrl = ref(null)
@@ -79,7 +78,6 @@ watch(
                 updateShareLink()
             }
         }
-        console.log('Query parameters changed:', newQuery)
     }
 )
 
@@ -123,18 +121,16 @@ async function shortenShareLink(url) {
 
 function onPositionTabClick() {
     selectedTab.value = 'position'
-    showEmbedSharing.value = false
     newClickInfo.value = false
 }
 async function onShareTabClick() {
-    selectedTab.value = 'share'
     if (newClickInfo.value && showEmbedSharing.value == false) {
         //copyShareLink is called by watcher since new shortlink is computed with a delay
         requestClipboard.value = true
     } else {
         copyShareLink()
     }
-    showEmbedSharing.value = true
+    selectedTab.value = 'share'
     newClickInfo.value = false
 }
 
@@ -153,7 +149,6 @@ async function copyShareLink() {
 
 function clearClick() {
     store.dispatch('clearClick')
-    showEmbedSharing.value = false
     requestClipboard.value = false
 }
 </script>
@@ -162,7 +157,7 @@ function clearClick() {
     <component
         :is="mappingFrameworkSpecificPopup"
         v-if="coordinate"
-        :title="selectedTab == 'position' ? $t('position') : $t('link_bowl_crosshair')"
+        :title="selectedTab == 'position' ? i18n.t('position') : i18n.t('link_bowl_crosshair')"
         :coordinates="coordinate"
         :projection="projection"
         use-content-padding
@@ -184,7 +179,7 @@ function clearClick() {
                     :aria-selected="selectedTab === 'position'"
                     @click="onPositionTabClick()"
                 >
-                    {{ $t('position') }}
+                    {{ i18n.t('position') }}
                 </button>
             </li>
             <li class="nav-item" role="presentation">
@@ -208,7 +203,8 @@ function clearClick() {
                             '': currentLang != 'it',
                         }"
                     >
-                        {{ $t('link_bowl_crosshair') }} &nbsp;&nbsp;<FontAwesomeIcon
+                        {{ i18n.t('link_bowl_crosshair') }} &nbsp;&nbsp;<FontAwesomeIcon
+                            data-cy="location-popup-share-tab-check"
                             class="px-0 icon"
                             :icon="copyButtonIcon"
                         />

src/modules/map/components/LocationPopupCopyInput.vue

@@ -159,7 +159,7 @@ async function updateHeight() {
                 :value="heightInMeter"
                 :extra-value="heightInFeet"
             >
-                <a :href="$t('elevation_href')" target="_blank">{{ $t('elevation') }}</a>
+                <a :href="i18n.t('elevation_href')" target="_blank">{{ i18n.t('elevation') }}</a>
             </LocationPopupCopySlot>
         </div>
     </div>

src/modules/map/components/LocationPopupPosition.vue

@@ -33,7 +33,3 @@ const { shareLinkUrlShorten } = toRefs(props)
         />
     </div>
 </template>
-
-<style lang="scss" scoped>
-@import 'src/scss/webmapviewer-bootstrap-theme';
-</style>

src/modules/map/components/LocationPopupShare.vue

@@ -227,9 +227,10 @@ describe('Test mouse position and interactions', () => {
 
             cy.get('[data-cy="map"]').dblclick(120, 240)
             cy.get('[data-cy="map"]').rightclick()
-            cy.get('[data-cy="location-popup-share-tab-button"]').realClick()
             cy.get('[data-cy="location-popup-share-tab-button"]').focus()
+            cy.get('[data-cy="location-popup-share-tab-button"]').click()
             cy.get('[data-cy="location-popup-share-tab-button"]').realClick()
+            cy.get('[data-cy="location-popup-share-tab-check"]').should('have.class', 'fa-check')
             cy.readClipboardValue().then((clipboardText) => {
                 expect(clipboardText).to.be.equal('https://s.geo.admin.ch/3333333')
             })