From a8d82d0d2cd3c80267dfce95391a71a350ecc48d Mon Sep 17 00:00:00 2001
From: Gregor Vostrak <gregor@solidtime.io>
Date: Wed, 3 Jul 2024 12:53:52 +0200
Subject: [PATCH] remove owner from invite member select, fix modal not closing
 bug

---
 .../Common/Member/MemberBillableRateModal.vue | 20 ++++++++++++++++---
 .../Common/Member/MemberEditModal.vue         |  2 +-
 resources/js/utils/roles.ts                   |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/js/Components/Common/Member/MemberBillableRateModal.vue b/resources/js/Components/Common/Member/MemberBillableRateModal.vue
index 138781ae..ee11f8e5 100644
--- a/resources/js/Components/Common/Member/MemberBillableRateModal.vue
+++ b/resources/js/Components/Common/Member/MemberBillableRateModal.vue
@@ -3,6 +3,7 @@ import SecondaryButton from '@/Components/SecondaryButton.vue';
 import DialogModal from '@/Components/DialogModal.vue';
 import PrimaryButton from '@/Components/PrimaryButton.vue';
 import { formatCents } from '../../../utils/money';
+import { ArrowTopRightOnSquareIcon } from '@heroicons/vue/24/solid';
 
 const show = defineModel('show', { default: false });
 const saving = defineModel('saving', { default: false });
@@ -27,7 +28,7 @@ const emit = defineEmits<{
         <template #content>
             <div class="flex items-center space-x-4">
                 <div class="col-span-6 sm:col-span-4 flex-1">
-                    <p class="py-0.5 text-center">
+                    <p class="py-1 text-center">
                         The billable rate of {{ memberName }} will be updated to
                         <strong>{{
                             newBillableRate
@@ -36,9 +37,11 @@ const emit = defineEmits<{
                         }}</strong
                         >.
                     </p>
-                    <p class="py-0.5 text-center font-semibold">
-                        Do you want to update all existing time entries as well?
+                    <p class="py-1 text-center font-semibold max-w-md mx-auto">
+                        Do you want to update all existing time entries, where
+                        the member billable rate applies as well?
                     </p>
+
                     <div class="space-x-3 pt-5 pb-2 flex justify-center">
                         <PrimaryButton
                             :class="{ 'opacity-25': saving }"
@@ -53,6 +56,17 @@ const emit = defineEmits<{
                             No, only for new time entries
                         </PrimaryButton>
                     </div>
+                    <p class="text-center pt-3 pb-1">
+                        Learn more about the
+                        <a
+                            target="_blank"
+                            href="https://docs.solidtime.io/user-guide/billable-rates"
+                            class="text-blue-400 hover:text-blue-500 transition"
+                            >billable rate logic
+                            <ArrowTopRightOnSquareIcon
+                                class="w-4 -mt-0.5 inline-block"></ArrowTopRightOnSquareIcon
+                        ></a>
+                    </p>
                 </div>
             </div>
         </template>
diff --git a/resources/js/Components/Common/Member/MemberEditModal.vue b/resources/js/Components/Common/Member/MemberEditModal.vue
index 6edbe891..79a00206 100644
--- a/resources/js/Components/Common/Member/MemberEditModal.vue
+++ b/resources/js/Components/Common/Member/MemberEditModal.vue
@@ -30,7 +30,7 @@ async function submit(billableRateUpdateTimeEntries: boolean) {
         billableRateUpdateTimeEntries;
     await updateMember(props.member.id, memberBody.value);
     show.value = false;
-    showBillableRateModal.value = true;
+    showBillableRateModal.value = false;
 }
 
 const showBillableRateModal = ref(false);
diff --git a/resources/js/utils/roles.ts b/resources/js/utils/roles.ts
index 72a47dfd..8646d833 100644
--- a/resources/js/utils/roles.ts
+++ b/resources/js/utils/roles.ts
@@ -2,6 +2,6 @@ import type { Role } from '@/types/jetstream';
 
 export function filterRoles(roles: Role[]) {
     return roles.filter(function (role) {
-        return role.key !== 'placeholder';
+        return role.key !== 'placeholder' || role.name !== 'owner';
     });
 }