From b4edcaa2dcb824f0e573270c23e2f72a11fe2881 Mon Sep 17 00:00:00 2001 From: Gregor Vostrak Date: Thu, 15 May 2025 13:07:15 +0200 Subject: [PATCH] hide shared reports create for employees, fix export request for employees --- resources/js/Components/Common/Report/ReportSaveButton.vue | 6 +++++- .../js/Components/Common/Reporting/ReportingOverview.vue | 4 ++++ resources/js/utils/permissions.ts | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/resources/js/Components/Common/Report/ReportSaveButton.vue b/resources/js/Components/Common/Report/ReportSaveButton.vue index d403df6f..13ba8ff4 100644 --- a/resources/js/Components/Common/Report/ReportSaveButton.vue +++ b/resources/js/Components/Common/Report/ReportSaveButton.vue @@ -5,6 +5,7 @@ import { h, ref } from 'vue'; import type { CreateReportBodyProperties } from '@/packages/api/src'; import { isAllowedToPerformPremiumAction } from '@/utils/billing'; import UpgradeModal from '@/Components/Common/UpgradeModal.vue'; +import { canCreateReports } from '@/utils/permissions'; defineProps<{ reportProperties: CreateReportBodyProperties; }>(); @@ -33,7 +34,10 @@ function onSaveReportClick() { Sharable Reports is only available in solidtime Professional. - Save Report diff --git a/resources/js/Components/Common/Reporting/ReportingOverview.vue b/resources/js/Components/Common/Reporting/ReportingOverview.vue index 89708725..e3bd9c0e 100644 --- a/resources/js/Components/Common/Reporting/ReportingOverview.vue +++ b/resources/js/Components/Common/Reporting/ReportingOverview.vue @@ -107,6 +107,10 @@ function getFilterAttributes(): AggregatedTimeEntriesQueryParams { : undefined, tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined, billable: billable.value !== null ? billable.value : undefined, + member_id: + getCurrentRole() === 'employee' + ? getCurrentMembershipId() + : undefined, }; return params; } diff --git a/resources/js/utils/permissions.ts b/resources/js/utils/permissions.ts index 6adb74e8..8d6446cf 100644 --- a/resources/js/utils/permissions.ts +++ b/resources/js/utils/permissions.ts @@ -125,4 +125,6 @@ export function canViewAllTimeEntries() { export function canViewInvoices() { return currentUserHasPermission('invoices:view'); } - +export function canCreateReports() { + return currentUserHasPermission('reports:create'); +}