This commit is contained in:
parent
779500d22e
commit
42a78c529d
5 changed files with 74 additions and 5 deletions
|
|
@ -1,4 +1,4 @@
|
|||
const CACHE_NAME = 'agency-cache-v2';
|
||||
const CACHE_NAME = 'agency-cache-v3';
|
||||
const ASSETS = [
|
||||
'/',
|
||||
'/index.html',
|
||||
|
|
@ -34,8 +34,16 @@ self.addEventListener('fetch', (event) => {
|
|||
})
|
||||
);
|
||||
});
|
||||
|
||||
self.addEventListener('push', (event) => {
|
||||
const data = event.data ? event.data.json() : { title: 'Notification', body: 'New update from Agency' };
|
||||
let data = { title: 'Notification', body: 'New update from Agency' };
|
||||
try {
|
||||
if (event.data) {
|
||||
data = event.data.json();
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing push data:', e);
|
||||
}
|
||||
|
||||
const options = {
|
||||
body: data.body,
|
||||
|
|
@ -44,7 +52,9 @@ self.addEventListener('push', (event) => {
|
|||
vibrate: [100, 50, 100],
|
||||
data: {
|
||||
dateOfArrival: Date.now(),
|
||||
primaryKey: '1'
|
||||
primaryKey: '1',
|
||||
taskId: data.task_id,
|
||||
runId: data.run_id
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -55,7 +65,27 @@ self.addEventListener('push', (event) => {
|
|||
|
||||
self.addEventListener('notificationclick', (event) => {
|
||||
event.notification.close();
|
||||
|
||||
const taskId = event.notification.data.taskId;
|
||||
const runId = event.notification.data.runId;
|
||||
|
||||
let url = '/';
|
||||
if (taskId && runId) {
|
||||
url = `/?taskId=${taskId}&runId=${runId}`;
|
||||
}
|
||||
|
||||
event.waitUntil(
|
||||
clients.openWindow('/')
|
||||
clients.matchAll({ type: 'window', includeUncontrolled: true }).then((windowClients) => {
|
||||
// Check if there is already a window open and focus it, or open a new one
|
||||
for (let client of windowClients) {
|
||||
if ('focus' in client) {
|
||||
// Navigate the existing client to the new URL if it's the same app
|
||||
return client.navigate(url).then(c => c.focus());
|
||||
}
|
||||
}
|
||||
if (clients.openWindow) {
|
||||
return clients.openWindow(url);
|
||||
}
|
||||
})
|
||||
);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -159,6 +159,16 @@ async function fetchTasks() {
|
|||
const response = await fetchWithAuth(`${API_URL}/tasks`);
|
||||
const newTasks = await response.json();
|
||||
|
||||
// Check for deep link in URL
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const urlTaskId = params.get('taskId');
|
||||
const urlRunId = params.get('runId');
|
||||
|
||||
if (urlTaskId && !state.selectedTaskId) {
|
||||
state.selectedTaskId = urlTaskId;
|
||||
state.selectedRunId = urlRunId;
|
||||
}
|
||||
|
||||
// Check if we should follow the latest run
|
||||
let newSelectedRunId = state.selectedRunId;
|
||||
if (state.selectedTaskId) {
|
||||
|
|
@ -179,6 +189,12 @@ async function fetchTasks() {
|
|||
tasks: newTasks,
|
||||
selectedRunId: newSelectedRunId
|
||||
});
|
||||
|
||||
// If we just loaded from a deep link, clear the params and select it
|
||||
if (urlTaskId) {
|
||||
window.history.replaceState({}, document.title, "/");
|
||||
selectTask(urlTaskId, urlRunId);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching tasks:', error);
|
||||
}
|
||||
|
|
@ -806,6 +822,16 @@ async function initializeApp() {
|
|||
if (hasSession) {
|
||||
appEl.classList.remove('hidden');
|
||||
loginOverlay.classList.add('hidden');
|
||||
|
||||
// Handle deep links from notifications
|
||||
const params = new URLSearchParams(window.location.search);
|
||||
const taskId = params.get('taskId');
|
||||
const runId = params.get('runId');
|
||||
if (taskId) {
|
||||
state.selectedTaskId = taskId;
|
||||
state.selectedRunId = runId;
|
||||
}
|
||||
|
||||
await fetchTasks();
|
||||
connectWebSocket();
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue