Skip to content

refactor: Remove Notifications module #31463

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.

Sign up for GitHub

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

Merged
ggazzo merged 7 commits into from
Jan 18, 2024
Merged

refactor: Remove Notifications module #31463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8417ec
Finish removing Notifications
gabriellsh Jan 16, 2024
f97ccf6
Merge branch 'develop' into sdk/webdav
ggazzo Jan 17, 2024
966fe36
Merge branch 'develop' into sdk/webdav
gabriellsh Jan 18, 2024
8e858f9
fix ts
gabriellsh Jan 18, 2024
c284417
Merge branch 'develop' into sdk/webdav
gabriellsh Jan 18, 2024
e538350
remove import
gabriellsh Jan 18, 2024
b8e9915
Merge branch 'sdk/webdav' of github.com:RocketChat/Rocket.Chat into s…
gabriellsh Jan 18, 2024
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
3 changes: 0 additions & 3 deletions apps/meteor/app/notifications/client/index.ts
View file
Open in desktop

This file was deleted.

102 changes: 0 additions & 102 deletions apps/meteor/app/notifications/client/lib/Notifications.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions .../meteor/app/webdav/client/startup/sync.js → .../meteor/app/webdav/client/startup/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type { IWebdavAccount } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import { Tracker } from 'meteor/tracker';

import { WebdavAccounts } from '../../../models/client';
import { Notifications } from '../../../notifications/client';
import { sdk } from '../../../utils/client/lib/SDKClient';

const events = {
changed: (account) => WebdavAccounts.upsert({ _id: account._id }, account),
removed: ({ _id }) => WebdavAccounts.remove({ _id }),
changed: (account: IWebdavAccount) => WebdavAccounts.upsert({ _id: account._id }, account),
removed: ({ _id }: { _id: IWebdavAccount['_id'] }) => WebdavAccounts.remove({ _id }),
};

Tracker.autorun(async () => {
Expand All @@ -16,5 +16,5 @@ Tracker.autorun(async () => {
}
const { accounts } = await sdk.rest.get('/v1/webdav.getMyAccounts');
accounts.forEach((account) => WebdavAccounts.insert(account));
Notifications.onUser('webdav', ({ type, account }) => events[type](account));
sdk.stream('notify-user', [`${Meteor.userId()}/webdav`], ({ type, account }) => events[type](account as IWebdavAccount));
});
1 change: 0 additions & 1 deletion apps/meteor/client/importPackages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import '../app/user-status/client';
import '../app/utils/client';
import '../app/settings/client';
import '../app/models/client';
import '../app/notifications/client';
import '../app/ui-utils/client';
import '../app/ui-cached-collection/client';
import '../app/reactions/client';
Expand Down
4 changes: 2 additions & 2 deletions packages/core-typings/src/IWebdavAccount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ import type { IRocketChatRecord } from './IRocketChatRecord';
export interface IWebdavAccount extends IRocketChatRecord {
userId: string;
serverURL: string;
username?: string;
username: string;
password?: string;
name: string;
}

export type IWebdavAccountIntegration = Pick<IWebdavAccount, '_id' | 'username' | 'serverURL' | 'name'>;

export type IWebdavAccountPayload = Pick<IWebdavAccount, 'serverURL' | 'username' | 'password' | 'name'>;
export type IWebdavAccountPayload = Pick<IWebdavAccount, 'serverURL' | 'password' | 'name'> & Partial<Pick<IWebdavAccount, 'username'>>;

export type IWebdavNode = {
basename: string;
Expand Down