Skip to content

Commit b919935

Browse files
authored
regression(core-typings): Optionalize _updatedAt field to cloud-related schemas (#40834)
1 parent 4298f14 commit b919935

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

apps/meteor/app/cloud/server/functions/syncWorkspace/handleCommsSync.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NPS, Banner } from '@rocket.chat/core-services';
2-
import type { Cloud, IBanner } from '@rocket.chat/core-typings';
2+
import type { Cloud, IBanner, Optional } from '@rocket.chat/core-typings';
33

44
import { getAndCreateNpsSurvey } from '../../../../../server/services/nps/getAndCreateNpsSurvey';
55

@@ -23,7 +23,7 @@ export const handleNpsOnWorkspaceSync = async (nps: Cloud.NpsSurveyAnnouncement)
2323
}
2424
};
2525

26-
export const handleBannerOnWorkspaceSync = async (banners: IBanner[]) => {
26+
export const handleBannerOnWorkspaceSync = async (banners: Optional<IBanner, '_updatedAt'>[]) => {
2727
for (const banner of banners) {
2828
await Banner.create(banner);
2929
}

packages/core-typings/src/cloud/Announcement.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import * as z from 'zod';
22

33
import { IBannerSchema } from '../IBanner';
4+
import { TimestampSchema } from '../utils';
45

56
export const AnnouncementSchema = IBannerSchema.extend({
67
createdBy: z.enum(['cloud', 'system']),
8+
_updatedAt: TimestampSchema.optional(),
79
selector: z.object({ roles: z.array(z.string()) }).optional(),
810
});
911

packages/core-typings/src/cloud/WorkspaceSyncPayload.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ export const WorkspaceSyncPayloadSchema = z.object({
2929
/** @deprecated */
3030
nps: NpsSurveyAnnouncementSchema.optional().meta({ deprecated: true }),
3131
/** @deprecated */
32-
banners: z.array(IBannerSchema).optional().meta({ deprecated: true }),
32+
banners: z
33+
.array(IBannerSchema.extend({ _updatedAt: TimestampSchema.optional() }))
34+
.optional()
35+
.meta({ deprecated: true }),
3336
});
3437

3538
export type WorkspaceSyncPayload = z.infer<typeof WorkspaceSyncPayloadSchema>;

0 commit comments

Comments
 (0)