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

feat: add opt property to use schedule name #125

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
15 changes: 8 additions & 7 deletions src/components/OnCallList/OnCallList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ export const OnCallForScheduleList = ({ schedule, responderFormatter }: OnCallFo
);
};

export const OnCallForScheduleCard = ({ schedule, responderFormatter }: { schedule: Schedule, responderFormatter?: ResponderTitleFormatter }) => {
export const OnCallForScheduleCard = ({ schedule, useScheduleName, responderFormatter }: { schedule: Schedule, useScheduleName: boolean, responderFormatter?: ResponderTitleFormatter }) => {
const title = (
<div style={{ display: "flex" }}>
<Tooltip title={schedule.enabled ? 'Enabled' : 'Disabled'}>
<div>{schedule.enabled ? <StatusOK /> : <StatusAborted />}</div>
</Tooltip>
{schedule.ownerTeam.name}
{useScheduleName ? schedule.name : schedule.ownerTeam.name}
</div>
);

Expand All @@ -111,7 +111,7 @@ export const OnCallForScheduleCard = ({ schedule, responderFormatter }: { schedu
);
};

const SchedulesGrid = ({ schedules, cardsPerPage, responderFormatter }: { schedules: Schedule[], cardsPerPage: number, responderFormatter?: ResponderTitleFormatter }) => {
const SchedulesGrid = ({ schedules, cardsPerPage, responderFormatter, useScheduleName }: { schedules: Schedule[], cardsPerPage: number, useScheduleName: boolean, responderFormatter?: ResponderTitleFormatter }) => {
const classes = useStyles();
const [results, setResults] = React.useState(schedules);
const [search, setSearch] = React.useState("");
Expand Down Expand Up @@ -157,7 +157,7 @@ const SchedulesGrid = ({ schedules, cardsPerPage, responderFormatter }: { schedu
/>

<ItemCardGrid classes={{ root: classes.onCallItemGrid }}>
{results.filter((_, i) => i >= offset && i < offset + cardsPerPage).map(schedule => <OnCallForScheduleCard key={schedule.id} schedule={schedule} responderFormatter={responderFormatter} />)}
{results.filter((_, i) => i >= offset && i < offset + cardsPerPage).map(schedule => <OnCallForScheduleCard key={schedule.id} schedule={schedule} responderFormatter={responderFormatter} useScheduleName={useScheduleName} />)}
</ItemCardGrid>

<Pagination
Expand All @@ -175,9 +175,10 @@ const SchedulesGrid = ({ schedules, cardsPerPage, responderFormatter }: { schedu
export type OnCallListProps = {
cardsPerPage?: number;
responderFormatter?: ResponderTitleFormatter;
useScheduleName?: boolean;
};

export const OnCallList = ({ cardsPerPage, responderFormatter }: OnCallListProps) => {
export const OnCallList = ({ cardsPerPage, responderFormatter, useScheduleName }: OnCallListProps) => {
const opsgenieApi = useApi(opsgenieApiRef);
const { value, loading, error } = useAsync(async () => await opsgenieApi.getSchedules());

Expand All @@ -191,5 +192,5 @@ export const OnCallList = ({ cardsPerPage, responderFormatter }: OnCallListProps
);
}

return <SchedulesGrid schedules={value!.filter(schedule => schedule.enabled)} cardsPerPage={cardsPerPage || 6} responderFormatter={responderFormatter} />;
};
return <SchedulesGrid schedules={value!.filter(schedule => schedule.enabled)} cardsPerPage={cardsPerPage || 6} responderFormatter={responderFormatter} useScheduleName={useScheduleName || false} />;
};
4 changes: 2 additions & 2 deletions src/components/OpsgeniePage/DefaultOpsgeniePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import { Analytics } from '../Analytics';
import { Layout } from './Layout';
import { OpsgeniePageProps } from "./OpsgeniePage";

export const DefaultOpsgeniePage = ({ onCallListCardsCount }: OpsgeniePageProps) => {
export const DefaultOpsgeniePage = ({ onCallListCardsCount, onCallUseScheduleName }: OpsgeniePageProps) => {
return (
<Layout>
<Layout.Route path="who-is-on-call" title="Who is on-call">
<OnCallList cardsPerPage={onCallListCardsCount} />
<OnCallList cardsPerPage={onCallListCardsCount} useScheduleName={onCallUseScheduleName}/>
</Layout.Route>
<Layout.Route path="alerts" title="Alerts">
<AlertsList />
Expand Down
7 changes: 4 additions & 3 deletions src/components/OpsgeniePage/OpsgeniePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import { DefaultOpsgeniePage } from './DefaultOpsgeniePage';

export type OpsgeniePageProps = {
onCallListCardsCount?: number;
onCallUseScheduleName?: boolean;
};

export const OpsgeniePage = ({ onCallListCardsCount }: OpsgeniePageProps) => {
export const OpsgeniePage = ({ onCallListCardsCount, onCallUseScheduleName }: OpsgeniePageProps) => {
const outlet = useOutlet();

return outlet || <DefaultOpsgeniePage onCallListCardsCount={onCallListCardsCount} />;
};
return outlet || <DefaultOpsgeniePage onCallListCardsCount={onCallListCardsCount} onCallUseScheduleName={onCallUseScheduleName} />;
};