paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

add timezone to queries and sort oncalls

Browse Source
This commit is contained in:
Samira Mokaram
2020-12-09 16:33:32 +01:00
parent cbd3a44c09
commit 934c4043b4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/pagerduty/src/api/client.ts
+3 -3
View File
@@ -46,7 +46,7 @@ export class PagerDutyClient implements PagerDutyApi {
constructor(private readonly config: ClientApiConfig) {}
async getServiceByIntegrationKey(integrationKey: string): Promise<Service[]> {
const params = `include[]=integrations&include[]=escalation_policies&query=${integrationKey}`;
const params = `time_zone=UTC&include[]=integrations&include[]=escalation_policies&query=${integrationKey}`;
const url = `${await this.config.discoveryApi.getBaseUrl(
'proxy',
)}/pagerduty/services?${params}`;
@@ -56,7 +56,7 @@ export class PagerDutyClient implements PagerDutyApi {
}
async getIncidentsByServiceId(serviceId: string): Promise<Incident[]> {
const params = `statuses[]=triggered&statuses[]=acknowledged&service_ids[]=${serviceId}`;
const params = `time_zone=UTC&sort_by=created_at&statuses[]=triggered&statuses[]=acknowledged&service_ids[]=${serviceId}`;
const url = `${await this.config.discoveryApi.getBaseUrl(
'proxy',
)}/pagerduty/incidents?${params}`;
@@ -66,7 +66,7 @@ export class PagerDutyClient implements PagerDutyApi {
}
async getOnCallByPolicyId(policyId: string): Promise<OnCall[]> {
const params = `include[]=users&escalation_policy_ids[]=${policyId}`;
const params = `time_zone=UTC&include[]=users&escalation_policy_ids[]=${policyId}&include[]=escalation_level`;
const url = `${await this.config.discoveryApi.getBaseUrl(
'proxy',
)}/pagerduty/oncalls?${params}`;
plugins/pagerduty/src/components/Escalation/EscalationPolicy.tsx
+3 -1
View File
@@ -32,7 +32,9 @@ export const EscalationPolicy = ({ policyId }: Props) => {
const { value: users, loading, error } = useAsync(async () => {
const oncalls = await api.getOnCallByPolicyId(policyId);
const users = oncalls.map(oncall => oncall.user);
const users = oncalls
.sort((a, b) => a.escalation_level - b.escalation_level)
.map(oncall => oncall.user);
return users;
});
plugins/pagerduty/src/components/types.ts
+1
View File
@@ -41,6 +41,7 @@ export type Service = {
export type OnCall = {
user: User;
escalation_level: number;
};
export type Assignee = {