Refactor nested button links

THM-Health · Jan 23, 2025 · bfaabb4 · bfaabb4
1 parent 09790a2
commit bfaabb4
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 24 deletions.
diff --git a/resources/js/components/AppBanner.vue b/resources/js/components/AppBanner.vue
@@ -27,22 +27,27 @@
       <p class="m-0 whitespace-pre-wrap">
         {{ message }}
       </p>
-      <!-- TODO Refactor -->
-      <a v-if="link" :href="link" :target="`_${linkTarget}`">
+      <div>
         <Button
+          v-if="link"
+          as="a"
+          :href="link"
+          :target="`_${linkTarget}`"
           :link="linkStyle === 'link'"
-          :style="linkStyle === 'link' ? { color: color } : {}"
-          :class="linkStyle === 'link' ? 'p-0 underline' : ''"
+          :style="buttonStyle"
+          :class="buttonClass"
           :severity="linkStyle"
           :label="linkText ? linkText : link"
         />
-      </a>
+      </div>
     </div>
   </Message>
 </template>
 
 <script setup>
-defineProps({
+import { computed } from "vue";
+
+const props = defineProps({
   background: {
     type: String,
     default: null,
@@ -88,6 +93,14 @@ defineProps({
     default: null,
   },
 });
+
+const buttonClass = computed(() => {
+  return props.linkStyle === "link" ? "p-0 underline" : "";
+});
+
+const buttonStyle = computed(() => {
+  return props.linkStyle === "link" ? { color: props.color } : {};
+});
 </script>
 <style scoped>
 .banner-message {

diff --git a/resources/js/views/MeetingsIndex.vue b/resources/js/views/MeetingsIndex.vue
@@ -198,28 +198,24 @@
           <Column :style="{ width: '100px' }" :header="$t('app.actions')">
             <template #body="slotProps">
               <div class="flex justify-between">
-                <!-- TODO Refactor -->
-                <router-link
+                <Button
+                  v-tooltip="
+                    $t('meetings.view_room', {
+                      name: slotProps.data.room.name,
+                    })
+                  "
                   :to="{
                     name: 'rooms.view',
                     params: { id: slotProps.data.room.id },
                   }"
-                  :disabled="true"
-                >
-                  <Button
-                    v-tooltip="
-                      $t('meetings.view_room', {
-                        name: slotProps.data.room.name,
-                      })
-                    "
-                    :aria-label="
-                      $t('meetings.view_room', {
-                        name: slotProps.data.room.name,
-                      })
-                    "
-                    icon="fa-solid fa-eye"
-                  />
-                </router-link>
+                  as="router-link"
+                  :aria-label="
+                    $t('meetings.view_room', {
+                      name: slotProps.data.room.name,
+                    })
+                  "
+                  icon="fa-solid fa-eye"
+                />
               </div>
             </template>
           </Column>