Pārlūkot izejas kodu

add authority to timesheet

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui pirms 1 gada
vecāks
revīzija
cef593c594
3 mainītis faili ar 12 papildinājumiem un 4 dzēšanām
  1. +2
    -2
      src/components/TimesheetTable/EntryInputTable.tsx
  2. +7
    -1
      src/components/UserWorkspacePage/UserWorkspaceWrapper.tsx
  3. +3
    -1
      src/middleware.ts

+ 2
- 2
src/components/TimesheetTable/EntryInputTable.tsx Parādīt failu

@@ -438,7 +438,7 @@ const EntryInputTable: React.FC<Props> = ({
> >
{t("Record time")} {t("Record time")}
</Button> </Button>
<Button
{fastEntryEnabled && <Button
disableRipple disableRipple
variant="outlined" variant="outlined"
startIcon={<Add />} startIcon={<Add />}
@@ -446,7 +446,7 @@ const EntryInputTable: React.FC<Props> = ({
size="small" size="small"
> >
{t("Fast time entry")} {t("Fast time entry")}
</Button>
</Button>}
{hasOutOfPlannedStages && ( {hasOutOfPlannedStages && (
<Typography color="warning.main" variant="body2"> <Typography color="warning.main" variant="body2">
{t("There are entries for stages out of planned dates!")} {t("There are entries for stages out of planned dates!")}


+ 7
- 1
src/components/UserWorkspacePage/UserWorkspaceWrapper.tsx Parādīt failu

@@ -11,6 +11,8 @@ import {
fetchTimesheets, fetchTimesheets,
} from "@/app/api/timesheets"; } from "@/app/api/timesheets";
import { fetchHolidays } from "@/app/api/holidays"; import { fetchHolidays } from "@/app/api/holidays";
import { getUserAbilities } from "@/app/utils/commonUtil";
import { MAINTAIN_TIMESHEET_FAST_TIME_ENTRY } from "@/middleware";


const UserWorkspaceWrapper: React.FC = async () => { const UserWorkspaceWrapper: React.FC = async () => {
const [ const [
@@ -22,6 +24,7 @@ const UserWorkspaceWrapper: React.FC = async () => {
leaves, leaves,
leaveTypes, leaveTypes,
holidays, holidays,
abilities,
] = await Promise.all([ ] = await Promise.all([
fetchTeamMemberLeaves(), fetchTeamMemberLeaves(),
fetchTeamMemberTimesheets(), fetchTeamMemberTimesheets(),
@@ -31,8 +34,11 @@ const UserWorkspaceWrapper: React.FC = async () => {
fetchLeaves(), fetchLeaves(),
fetchLeaveTypes(), fetchLeaveTypes(),
fetchHolidays(), fetchHolidays(),
getUserAbilities()
]); ]);


const fastEntryEnabled = abilities.includes(MAINTAIN_TIMESHEET_FAST_TIME_ENTRY)

return ( return (
<UserWorkspacePage <UserWorkspacePage
teamLeaves={teamLeaves} teamLeaves={teamLeaves}
@@ -44,7 +50,7 @@ const UserWorkspaceWrapper: React.FC = async () => {
leaveTypes={leaveTypes} leaveTypes={leaveTypes}
holidays={holidays} holidays={holidays}
// Change to access check // Change to access check
fastEntryEnabled={true}
fastEntryEnabled={fastEntryEnabled}
/> />
); );
}; };


+ 3
- 1
src/middleware.ts Parādīt failu

@@ -39,6 +39,7 @@ export const [
VIEW_PROJECT, VIEW_PROJECT,
MAINTAIN_PROJECT, MAINTAIN_PROJECT,
DELETE_PROJECT, DELETE_PROJECT,
MAINTAIN_TIMESHEET_FAST_TIME_ENTRY,
] = [ ] = [
'VIEW_USER', 'VIEW_USER',
'MAINTAIN_USER', 'MAINTAIN_USER',
@@ -58,7 +59,8 @@ export const [
'MAINTAIN_TIMESHEET_7DAYS', 'MAINTAIN_TIMESHEET_7DAYS',
'VIEW_PROJECT', 'VIEW_PROJECT',
'MAINTAIN_PROJECT', 'MAINTAIN_PROJECT',
'DELETE_PROJECT'
'DELETE_PROJECT',
'MAINTAIN_TIMESHEET_FAST_TIME_ENTRY'
] ]


const PRIVATE_ROUTES = [ const PRIVATE_ROUTES = [


Notiek ielāde…
Atcelt
Saglabāt