Merge branch 'rebase/jan2024' of https://github.com/shipyard/Rocket.Chat

into rebase/jan2024
shipyard · Jan 18, 2024 · 20f96cb · 20f96cb
2 parents b3d93d9 + c1b04b7
commit 20f96cb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 112 deletions.
diff --git a/apps/meteor/app/notifications/client/index.ts b/apps/meteor/app/notifications/client/index.ts
diff --git a/apps/meteor/app/notifications/client/lib/Notifications.ts b/apps/meteor/app/notifications/client/lib/Notifications.ts
diff --git a/.../meteor/app/webdav/client/startup/sync.js → .../meteor/app/webdav/client/startup/sync.ts b/.../meteor/app/webdav/client/startup/sync.js → .../meteor/app/webdav/client/startup/sync.ts
@@ -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 () => {
@@ -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));
 });
diff --git a/apps/meteor/client/importPackages.ts b/apps/meteor/client/importPackages.ts
@@ -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';

diff --git a/packages/core-typings/src/IWebdavAccount.ts b/packages/core-typings/src/IWebdavAccount.ts
@@ -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;