Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typo recourse -> resource #378

Merged
merged 1 commit into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/lib/components/common/ResourceHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import {
Typography,
useTheme,
} from "@mui/material";
import { DefaultRecourse } from "../../types";
import { DefaultResource } from "../../types";
import useStore from "../../hooks/useStore";

interface ResourceHeaderProps {
resource: DefaultRecourse;
resource: DefaultResource;
}
const ResourceHeader = ({ resource }: ResourceHeaderProps) => {
const { resourceHeaderComponent, resourceFields, direction, resourceViewMode } = useStore();
Expand Down
10 changes: 5 additions & 5 deletions src/lib/components/common/WithResources.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useMemo } from "react";
import { DefaultRecourse } from "../../types";
import { DefaultResource } from "../../types";
import { ResourceHeader } from "./ResourceHeader";
import { ButtonTabProps, ButtonTabs } from "./Tabs";
import useStore from "../../hooks/useStore";
import { Box, useTheme } from "@mui/material";

interface WithResourcesProps {
renderChildren(resource: DefaultRecourse): React.ReactNode;
renderChildren(resource: DefaultResource): React.ReactNode;
}
const WithResources = ({ renderChildren }: WithResourcesProps) => {
const { resources, resourceFields, resourceViewMode } = useStore();
Expand All @@ -17,7 +17,7 @@ const WithResources = ({ renderChildren }: WithResourcesProps) => {
} else if (resourceViewMode === "vertical") {
return (
<>
{resources.map((res: DefaultRecourse, i: number) => (
{resources.map((res: DefaultResource, i: number) => (
<Box key={`${res[resourceFields.idField]}_${i}`} sx={{ display: "flex" }}>
<Box
sx={{
Expand All @@ -43,7 +43,7 @@ const WithResources = ({ renderChildren }: WithResourcesProps) => {
} else {
return (
<>
{resources.map((res: DefaultRecourse, i: number) => (
{resources.map((res: DefaultResource, i: number) => (
<div key={`${res[resourceFields.idField]}_${i}`}>
<ResourceHeader resource={res} />
{renderChildren(res)}
Expand All @@ -65,7 +65,7 @@ const ResourcesTabTables = ({ renderChildren }: WithResourcesProps) => {
};
});

const setTab = (tab: DefaultRecourse["assignee"]) => {
const setTab = (tab: DefaultResource["assignee"]) => {
handleState(tab, "selectedResource");
};

Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/month/MonthTable.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fragment, useCallback } from "react";
import { DefaultRecourse } from "../../types";
import { DefaultResource } from "../../types";
import {
getHourFormat,
getResourcedEvents,
Expand All @@ -26,7 +26,7 @@ import useSyncScroll from "../../hooks/useSyncScroll";

type Props = {
daysList: Date[];
resource?: DefaultRecourse;
resource?: DefaultResource;
eachWeekStart: Date[];
};

Expand Down Expand Up @@ -54,7 +54,7 @@ const MonthTable = ({ daysList, resource, eachWeekStart }: Props) => {
const CELL_HEIGHT = height / eachWeekStart.length;

const renderCells = useCallback(
(resource?: DefaultRecourse) => {
(resource?: DefaultResource) => {
let resourcedEvents = sortEventsByTheEarliest(events);
if (resource) {
resourcedEvents = getResourcedEvents(events, resource, resourceFields, fields);
Expand Down
6 changes: 3 additions & 3 deletions src/lib/components/week/WeekTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
getHourFormat,
} from "../../helpers/generals";
import { MULTI_DAY_EVENT_HEIGHT } from "../../helpers/constants";
import { DefaultRecourse, ProcessedEvent } from "../../types";
import { DefaultResource, ProcessedEvent } from "../../types";
import useSyncScroll from "../../hooks/useSyncScroll";
import {
addMinutes,
Expand All @@ -32,7 +32,7 @@ type Props = {
hours: Date[];
cellHeight: number;
minutesHeight: number;
resource?: DefaultRecourse;
resource?: DefaultResource;
resourcedEvents: ProcessedEvent[];
};

Expand Down Expand Up @@ -89,7 +89,7 @@ const WeekTable = ({
const renderMultiDayEvents = (
events: ProcessedEvent[],
today: Date,
resource?: DefaultRecourse
resource?: DefaultResource
) => {
const isFirstDayInWeek = isSameDay(weekStart, today);
const allWeekMulti = filterMultiDaySlot(events, daysList, timeZone);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/helpers/generals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from "date-fns";
import { View } from "../components/nav/Navigation";
import {
DefaultRecourse,
DefaultResource,
FieldProps,
ProcessedEvent,
ResourceFields,
Expand Down Expand Up @@ -53,7 +53,7 @@ export const arraytizeFieldVal = (field: FieldProps, val: any, event?: StateEven

export const getResourcedEvents = (
events: ProcessedEvent[],
resource: DefaultRecourse,
resource: DefaultResource,
resourceFields: ResourceFields,
fields: FieldProps[]
): ProcessedEvent[] => {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/positionManger/provider.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useEffect, useState } from "react";
import { PositionManagerState, PositionContext } from "./context";
import useStore from "../hooks/useStore";
import { DefaultRecourse, FieldProps, ProcessedEvent, ResourceFields } from "../types";
import { DefaultResource, FieldProps, ProcessedEvent, ResourceFields } from "../types";
import { getResourcedEvents, sortEventsByTheEarliest } from "../helpers/generals";
import { eachDayOfInterval, format } from "date-fns";

Expand Down Expand Up @@ -37,7 +37,7 @@ const setEventPositions = (events: ProcessedEvent[]) => {

const setEventPositionsWithResources = (
events: ProcessedEvent[],
resources: DefaultRecourse[],
resources: DefaultResource[],
rFields: ResourceFields,
fields: FieldProps[]
) => {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/store/types.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { DragEvent } from "react";
import { View } from "../components/nav/Navigation";
import { DefaultRecourse, EventActions, ProcessedEvent, SchedulerProps } from "../types";
import { DefaultResource, EventActions, ProcessedEvent, SchedulerProps } from "../types";

export type SelectedRange = { start: Date; end: Date };

export interface SchedulerState extends SchedulerProps {
dialog: boolean;
selectedRange?: SelectedRange;
selectedEvent?: ProcessedEvent;
selectedResource?: DefaultRecourse["assignee"];
selectedResource?: DefaultResource["assignee"];
currentDragged?: ProcessedEvent;
enableAgenda?: boolean;
}
Expand Down
6 changes: 3 additions & 3 deletions src/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export type RemoteQuery = {
end: Date;
view: "day" | "week" | "month";
};
export type DefaultRecourse = {
export type DefaultResource = {
assignee?: string | number;
text?: string;
subtext?: string;
Expand Down Expand Up @@ -245,11 +245,11 @@ export interface SchedulerProps {
/** if true, the viewer popover will be disabled globally */
disableViewer?: boolean;
/**Resources array to split event views with resources */
resources: DefaultRecourse[];
resources: DefaultResource[];
/**Map resources fields */
resourceFields: ResourceFields;
/**Override header component of resource */
resourceHeaderComponent?(resource: DefaultRecourse): JSX.Element;
resourceHeaderComponent?(resource: DefaultResource): JSX.Element;
/**Resource header view mode
* @default "default"
*/
Expand Down
4 changes: 2 additions & 2 deletions src/lib/views/Day.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
} from "date-fns";
import TodayTypo from "../components/common/TodayTypo";
import EventItem from "../components/events/EventItem";
import { CellRenderedProps, DayHours, DefaultRecourse, ProcessedEvent } from "../types";
import { CellRenderedProps, DayHours, DefaultResource, ProcessedEvent } from "../types";
import {
calcCellHeight,
calcMinuteHeight,
Expand Down Expand Up @@ -128,7 +128,7 @@ const Day = () => {
);
};

const renderTable = (resource?: DefaultRecourse) => {
const renderTable = (resource?: DefaultResource) => {
let resourcedEvents = events;
if (resource) {
resourcedEvents = getResourcedEvents(events, resource, resourceFields, fields);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/views/Month.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useCallback } from "react";
import { addDays, eachWeekOfInterval, endOfMonth, startOfMonth } from "date-fns";
import { CellRenderedProps, DayHours, DefaultRecourse } from "../types";
import { CellRenderedProps, DayHours, DefaultResource } from "../types";
import { getResourcedEvents, sortEventsByTheEarliest } from "../helpers/generals";
import { WithResources } from "../components/common/WithResources";
import useStore from "../hooks/useStore";
Expand Down Expand Up @@ -73,7 +73,7 @@ const Month = () => {
}, [fetchEvents, getRemoteEvents]);

const renderTable = useCallback(
(resource?: DefaultRecourse) => {
(resource?: DefaultResource) => {
if (agenda) {
let resourcedEvents = sortEventsByTheEarliest(events);
if (resource) {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/views/Week.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useEffect, useCallback } from "react";
import { startOfWeek, addDays, eachMinuteOfInterval, endOfDay, startOfDay, set } from "date-fns";
import { CellRenderedProps, DayHours, DefaultRecourse } from "../types";
import { CellRenderedProps, DayHours, DefaultResource } from "../types";
import { WeekDays } from "./Month";
import { calcCellHeight, calcMinuteHeight, getResourcedEvents } from "../helpers/generals";
import { WithResources } from "../components/common/WithResources";
Expand Down Expand Up @@ -78,7 +78,7 @@ const Week = () => {
}
}, [fetchEvents, getRemoteEvents]);

const renderTable = (resource?: DefaultRecourse) => {
const renderTable = (resource?: DefaultResource) => {
let resourcedEvents = events;
if (resource) {
resourcedEvents = getResourcedEvents(events, resource, resourceFields, fields);
Expand Down
Loading