소스 검색

add authority to timesheet

tags/Baseline_30082024_FRONTEND_UAT
cyril.tsui 1 년 전
부모
커밋
cef593c594
3개의 변경된 파일12개의 추가작업 그리고 4개의 파일을 삭제
  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 파일 보기

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


+ 7
- 1
src/components/UserWorkspacePage/UserWorkspaceWrapper.tsx 파일 보기

@@ -11,6 +11,8 @@ import {
fetchTimesheets,
} from "@/app/api/timesheets";
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 [
@@ -22,6 +24,7 @@ const UserWorkspaceWrapper: React.FC = async () => {
leaves,
leaveTypes,
holidays,
abilities,
] = await Promise.all([
fetchTeamMemberLeaves(),
fetchTeamMemberTimesheets(),
@@ -31,8 +34,11 @@ const UserWorkspaceWrapper: React.FC = async () => {
fetchLeaves(),
fetchLeaveTypes(),
fetchHolidays(),
getUserAbilities()
]);

const fastEntryEnabled = abilities.includes(MAINTAIN_TIMESHEET_FAST_TIME_ENTRY)

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


+ 3
- 1
src/middleware.ts 파일 보기

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

const PRIVATE_ROUTES = [


불러오는 중...
취소
저장