Skip to content

Commit 5bd275a

Browse files
authored
fix(gitlab): ignore updated event (#279)
1 parent de47406 commit 5bd275a

File tree

4 files changed

+30
-18
lines changed

4 files changed

+30
-18
lines changed

.stylelintrc

+2-6
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
"custom-property-empty-line-before": "never",
1313
"no-descending-specificity": null,
1414
"property-no-vendor-prefix": null,
15-
"selector-pseudo-class-no-unknown": [
16-
true,
17-
{
18-
"ignorePseudoClasses": ["global"]
19-
}
20-
]
15+
"selector-pseudo-class-no-unknown": [true, { "ignorePseudoClasses": ["global"] }],
16+
"scss/no-global-function-names": null
2117
}
2218
}

src/lib/features/createGitlabNotificationData.ts

+16-11
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,21 @@ export async function prepareGitlabNotificationData(events: GitlabEventWithRepoD
6868
) {
6969
type = 'Issue';
7070
}
71-
const data = await fetchGitlab<GitlabMergeRequest | GitlabIssue>(
72-
`projects/${firstEvent.repository.encoded}/${
73-
type === 'Issue' ? 'issues' : 'merge_requests'
74-
}/${isNote ? firstEvent.note.noteable_iid : firstEvent.target_iid}`
75-
);
76-
return {
77-
target_id: item.target_id,
78-
ref: item.ref,
79-
events: item.events,
80-
data
81-
};
71+
try {
72+
const data = await fetchGitlab<GitlabMergeRequest | GitlabIssue>(
73+
`projects/${firstEvent.repository.encoded}/${
74+
type === 'Issue' ? 'issues' : 'merge_requests'
75+
}/${isNote ? firstEvent.note.noteable_iid : firstEvent.target_iid}`
76+
);
77+
return {
78+
target_id: item.target_id,
79+
ref: item.ref,
80+
events: item.events,
81+
data
82+
};
83+
} catch {
84+
return item;
85+
}
8286
} else {
8387
return item;
8488
}
@@ -262,6 +266,7 @@ export async function createGitlabNotificationData(
262266
case 'created':
263267
case 'deleted':
264268
case 'joined':
269+
case 'updated':
265270
return null;
266271

267272
default:

src/lib/types/gitlab-types.ts

+6
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ export type GitlabEvent = {
9393
target_iid: number;
9494
target_type: null;
9595
}
96+
| {
97+
action_name: 'updated';
98+
target_id: number;
99+
target_iid: number;
100+
target_type: null;
101+
}
96102
| {
97103
action_name: 'approved';
98104
target_id: number;

src/routes/(app)/dashboard/+page.svelte

+6-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,12 @@
213213
214214
let newNotifications: NotificationData[] = [];
215215
const savedNotifications = storage.get('gitlab-notifications') || [];
216-
const ignoredNotificationTypes: GitlabEvent['action_name'][] = ['created', 'deleted', 'joined'];
216+
const ignoredNotificationTypes: GitlabEvent['action_name'][] = [
217+
'created',
218+
'deleted',
219+
'joined',
220+
'updated'
221+
];
217222
const persons = storage.get('watched-persons') || [];
218223
const repos = storage.get('watched-repos') || [];
219224
const firstFetch = !$gitlabNotifications.length;

0 commit comments

Comments
 (0)