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

[Final Integration]: Notifications #2757

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
020b00d
[Feat]: Notification List UI Implementation (#2711)
Ayush8923 Dec 27, 2024
6b01240
[Feat]: Notification list logic updates (#2738)
Ayush8923 Dec 27, 2024
1f70eda
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 3, 2025
d4b7627
[Feat]: Notification Setting Page (#2712)
Ayush8923 Jan 3, 2025
beebbe3
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 3, 2025
76323fe
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 6, 2025
fdd6a31
[Feat]: Notification setting logic updates (#2752)
Ayush8923 Jan 8, 2025
2492e64
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 8, 2025
f76a7bc
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 9, 2025
ddbf265
feat: notification entry navigates to the relevant view (#2786)
Ayush8923 Jan 17, 2025
51d78ef
feat: firebase integration for push notification (#2692)
Ayush8923 Jan 19, 2025
e0bb360
feat: notification rule condition logic (#2767)
Ayush8923 Jan 19, 2025
690bb63
Merge branch 'master' into feat/1055_notifications-final
tomwwinter Jan 19, 2025
f0a585f
fix: notification race condition
tomwwinter Jan 20, 2025
0252c0e
fix: nginx proxy
tomwwinter Jan 20, 2025
4dfd350
fix: add google fcm csp
tomwwinter Jan 20, 2025
83145e9
fix: update csp for gstatic and fcm
tomwwinter Jan 20, 2025
eb8ed44
Update the Notification event to relevent view (#2796)
Ayush8923 Jan 23, 2025
0288e7b
Merge branch 'master' into feat/1055_notifications-final
Ayush8923 Jan 24, 2025
f06ce69
[Feat]: Json Editor Component (#2785)
Ayush8923 Jan 24, 2025
a3e55b0
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 24, 2025
0b095f3
[Fix]: Notifications: Internal testing updates (#2803)
Ayush8923 Jan 26, 2025
a9b3cf1
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 26, 2025
c904ddc
Merge branch 'master' into feat/entity-field-select-component
sleidig Jan 30, 2025
b141894
Merge branch 'master'
sleidig Jan 30, 2025
2d0b83c
fix: fix error syncing while uploading a file
sleidig Jan 31, 2025
4a55137
Merge branch 'master' into feat/1055_notifications-final
sleidig Jan 31, 2025
f837549
Merge branch 'master' into feat/1055_notifications-final
sleidig Feb 5, 2025
222c111
Merge branch 'master' into feat/1055_notifications-final
sleidig Feb 11, 2025
98fe67b
move "test notification" to general settings section
sleidig Feb 11, 2025
6cd7edb
make userId available directly for easier permission check in replica…
sleidig Feb 11, 2025
c45c34b
switch to separate notifications CouchDB for NotificationEvent entiti…
sleidig Feb 28, 2025
2a5682c
Merge branch 'master' into feat/1055_notifications-final
sleidig Feb 28, 2025
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
Prev Previous commit
Next Next commit
fix: fix error syncing while uploading a file
  • Loading branch information
sleidig committed Jan 31, 2025
commit 2d0b83cee4dff540295be96ece736d3d6564780c
4 changes: 2 additions & 2 deletions src/app/core/database/database-resolver.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ export class DatabaseResolverService {
}

private registerDatabase(dbName: string) {
const newDb = this.databaseFactory.createDatabase(Entity.DATABASE);
this.databases.set(Entity.DATABASE, newDb);
const newDb = this.databaseFactory.createDatabase(dbName);
this.databases.set(dbName, newDb);
newDb.changes().subscribe((change) => this._changesFeed.next(change));
}

Expand Down
4 changes: 1 addition & 3 deletions src/app/core/database/pouchdb/synced-pouch-database.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import {
SyncStateSubject,
} from "../../session/session-type";
import { from, interval, merge, of, Subject } from "rxjs";
import { Inject } from "@angular/core";
import { NAVIGATOR_TOKEN } from "../../../utils/di-tokens";
import { LoginState } from "../../session/session-states/login-state.enum";

/**
Expand Down Expand Up @@ -46,7 +44,7 @@ export class SyncedPouchDatabase extends PouchDatabase {
dbName: string,
authService: KeycloakAuthService,
private syncStateSubject: SyncStateSubject,
@Inject(NAVIGATOR_TOKEN) private navigator: Navigator,
private navigator: Navigator,
private loginStateSubject: LoginStateSubject,
) {
super(dbName);
Expand Down
7 changes: 4 additions & 3 deletions src/app/features/file/couchdb-file.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,10 @@ export class CouchdbFileService extends FileService {
* @private
*/
private ensureDocIsSynced(): Observable<SyncState> {
let sync: () => Promise<any> =
(this.databaseResolver.getDatabase() as SyncedPouchDatabase).sync ??
(() => Promise.resolve());
const mainDb = this.databaseResolver.getDatabase();
let sync: () => Promise<any> = (mainDb as SyncedPouchDatabase).sync
? () => (mainDb as SyncedPouchDatabase).sync()
: () => Promise.resolve();

return from(sync()).pipe(map(() => this.syncState.value));
}
Expand Down
Loading