fix: settings-disappear-on-ui-navigation

Signed-off-by: Abhinav Kumar <abhinav@avitechlab.com>

apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts

@@ -183,7 +183,7 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 			}
 
 			const { _id } = newRecord;
-			this.collection.upsert({ _id } as Mongo.Selector<T>, newRecord);
+			this.collection.update({ _id } as Mongo.Selector<T>, { $set: newRecord } as unknown as Mongo.Modifier<T>, { upsert: true });
 			this.emit('changed', newRecord as any); // TODO: investigate why this is needed
 
 			if (hasUpdatedAt(newRecord) && newRecord._updatedAt > this.updatedAt) {
@@ -250,7 +250,7 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 				if (!_id) {
 					return;
 				}
-				this.collection.upsert({ _id } as any, newRecord);
+				this.collection.update({ _id } as Mongo.Selector<T>, { $set: newRecord } as unknown as Mongo.Modifier<T>, { upsert: true });
 			}
 			await this.save();
 		}) as (...args: unknown[]) => void);
@@ -294,7 +294,7 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 				changes.push({
 					action: () => {
 						const { _id } = newRecord;
-						this.collection.upsert({ _id } as Mongo.Selector<T>, newRecord);
+						this.collection.update({ _id } as Mongo.Selector<T>, { $set: newRecord } as unknown as Mongo.Modifier<T>, { upsert: true });
 						if (actionTime > this.updatedAt) {
 							this.updatedAt = actionTime;
 						}

apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts

@@ -14,7 +14,7 @@ class PrivateSettingsCachedCollection extends CachedCollection<ISetting> {
 	async setupListener(): Promise<void> {
 		sdk.stream('notify-logged', [this.eventName as 'private-settings-changed'], async (t: string, { _id, ...record }: { _id: string }) => {
 			this.log('record received', t, { _id, ...record });
-			this.collection.upsert({ _id }, record);
+			this.collection.update({ _id }, { $set: record }, { upsert: true });
 			this.sync();
 		});
 	}

apps/meteor/tests/e2e/settings-persistence-on-ui-navigation.spec.ts

@@ -0,0 +1,42 @@
+import { Users } from './fixtures/userStates';
+import { setSettingValueById } from './utils';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('settings-persistence-on-ui-navigation', () => {
+	test.beforeAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));
+
+	test.beforeEach(async ({ page }) => {
+		await page.goto('/admin/settings/Message');
+
+		// Intercept the API call and delay its response
+		await page.route('/api/v1/method.call/saveSettings', async (route) => {
+			const response = await route.fetch();
+			await new Promise((resolve) => setTimeout(resolve, 2000)); // Delay the response by 2 seconds
+			return route.fulfill({
+				response,
+				status: response.status(),
+				headers: response.headers(),
+				body: await response.body(),
+			});
+		});
+	});
+
+	test.afterAll(({ api }) => setSettingValueById(api, 'Hide_System_Messages', []));
+
+	test('expect settings to persist in ui when navigating back and forth', async ({ page }) => {
+		const settingInput = await page.locator('[data-qa-setting-id="Hide_System_Messages"] input');
+		await settingInput.pressSequentially('User joined');
+		await settingInput.press('Enter');
+
+		await page.locator('button:has-text("Save changes")').click();
+		await page.locator('button[title="Back"]').click();
+
+		await page.waitForResponse((response) => response.url().includes('/api/v1/method.call/saveSettings') && response.status() === 200);
+
+		await page.locator('a[href="/admin/settings/Message"] >> text=Open').click();
+
+		await expect(page.locator('label[for="Hide_System_Messages"][title="Hide_System_Messages"]')).toBeVisible();
+	});
+});